TQt4 port kdevelop

This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdevelop@1236710 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
author: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> 2011-06-14 16:45:05 +0000
committer: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> 2011-06-14 16:45:05 +0000
commit: 48d4a26399959121f33d2bc3bfe51c7827b654fc (patch)
tree: 5ae5e6e00d3ba330b7b8be9bc097154b6bc739e8 /kdevdesigner/designer
parent: 7e701ace6592d09e1f2c0cf28c7d6d872d78f4f5 (diff)
download: tdevelop-48d4a26399959121f33d2bc3bfe51c7827b654fc.tar.gz
tdevelop-48d4a26399959121f33d2bc3bfe51c7827b654fc.zip
169 files changed, 6136 insertions, 6021 deletions
diff --git a/kdevdesigner/designer/Makefile.am b/kdevdesigner/designer/Makefile.am
index 5b8372f9..e0aacb85 100644
--- a/kdevdesigner/designer/Makefile.am
+++ b/kdevdesigner/designer/Makefile.am
@@ -9,7 +9,7 @@ kde_module_LTLIBRARIES =  libkdevdesignerpart.la
 libkdevdesignerpart_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries)
 libkdevdesignerpart_la_LIBADD = \
 	$(top_builddir)/kdevdesigner/uilib/libkdevqui.la $(top_builddir)/kdevdesigner/shared/libshared.la \
-	$(top_builddir)/lib/interfaces/external/libkinterfacedesigner.la -lqassistantclient $(LIB_KFILE) $(LIB_KPARTS)
+	$(top_builddir)/lib/interfaces/external/libkinterfacedesigner.la -ltqassistantclient $(LIB_KFILE) $(LIB_KPARTS)
 libkdevdesignerpart_la_SOURCES = kdevdesigner_part.cpp actiondnd.cpp actioneditorimpl.cpp actionlistview.cpp asciivalidator.cpp command.cpp connectionitems.cpp connectiontable.cpp customwidgeteditorimpl.cpp database.cpp dbconnectionimpl.cpp dbconnectionsimpl.cpp defs.cpp designerapp.cpp designerappiface.cpp editfunctionsimpl.cpp filechooser.cpp formfile.cpp formsettingsimpl.cpp formwindow.cpp hierarchyview.cpp iconvieweditorimpl.cpp layout.cpp listboxdnd.cpp listboxeditorimpl.cpp listboxrename.cpp listdnd.cpp listviewdnd.cpp listvieweditorimpl.cpp mainwindow.cpp mainwindowactions.cpp menubareditor.cpp metadatabase.cpp multilineeditorimpl.cpp newformimpl.cpp orderindicator.cpp outputwindow.cpp paletteeditoradvancedimpl.cpp paletteeditorimpl.cpp pixmapchooser.cpp pixmapcollection.cpp popupmenueditor.cpp previewframe.cpp previewwidgetimpl.cpp project.cpp projectsettingsimpl.cpp propertyeditor.cpp propertyobject.cpp qcompletionedit.cpp resource.cpp sizehandle.cpp sourceeditor.cpp sourcefile.cpp startdialogimpl.cpp styledbutton.cpp syntaxhighlighter_html.cpp tableeditorimpl.cpp timestamp.cpp variabledialogimpl.cpp widgetaction.cpp widgetfactory.cpp wizardeditorimpl.cpp workspace.cpp about.ui dbconnection.ui gotolinedialog.ui newform.ui previewwidget.ui variabledialog.ui actioneditor.ui dbconnectioneditor.ui iconvieweditor.ui paletteeditor.ui projectsettings.ui wizardeditor.ui configtoolboxdialog.ui dbconnections.ui listboxeditor.ui paletteeditoradvanced.ui replacedialog.ui connectiondialog.ui editfunctions.ui listeditor.ui pixmapcollectioneditor.ui richtextfontdialog.ui createtemplate.ui finddialog.ui listvieweditor.ui pixmapfunction.ui startdialog.ui customwidgeteditor.ui formsettings.ui multilineeditor.ui preferences.ui tableeditor.ui designeraction.cpp myiconloader.cpp
 partrcdir = $(kde_datadir)/kdevdesignerpart
 partdesktopdir = $(kde_servicesdir)
diff --git a/kdevdesigner/designer/about.ui b/kdevdesigner/designer/about.ui
index 68980df0..dd27fca8 100644
--- a/kdevdesigner/designer/about.ui
+++ b/kdevdesigner/designer/about.ui
@@ -25,7 +25,7 @@
 ** not clear to you.
 **
 *********************************************************************</comment>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>AboutDialog</cstring>
     </property>
@@ -50,7 +50,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QLabel">
+        <widget class="TQLabel">
             <property name="name">
                 <cstring>aboutPixmap</cstring>
             </property>
@@ -66,39 +66,39 @@
             <property name="scaledContents">
                 <bool>false</bool>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>AlignCenter</set>
             </property>
             <property name="hAlign" stdset="0">
             </property>
         </widget>
-        <widget class="QLabel">
+        <widget class="TQLabel">
             <property name="name">
                 <cstring>aboutVersion</cstring>
             </property>
             <property name="text">
                 <string>Version 3.2</string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>AlignCenter</set>
             </property>
             <property name="hAlign" stdset="0">
             </property>
         </widget>
-        <widget class="QLabel">
+        <widget class="TQLabel">
             <property name="name">
                 <cstring>aboutCopyright</cstring>
             </property>
             <property name="text">
                 <string>Copyright (C) 2000-2003 Trolltech AS. All Rights Reserved.</string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>AlignCenter</set>
             </property>
             <property name="hAlign" stdset="0">
             </property>
         </widget>
-        <widget class="QLabel">
+        <widget class="TQLabel">
             <property name="name">
                 <cstring>aboutLicense</cstring>
             </property>
@@ -113,7 +113,7 @@
             <property name="text">
                 <string>&lt;p&gt;Qt Commercial Edition license holders: This program is licensed to you under the terms of the Qt Commercial License Agreement. For details, see the file LICENSE that came with this software distribution.&lt;/p&gt;&lt;p&gt;&lt;/p&gt;&lt;p&gt;Qt Free Edition users: This program is licensed to you under the terms of the GNU General Public License Version 2. For details, see the file LICENSE.GPL that came with this software distribution.&lt;/p&gt;&lt;p&gt;The program is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.&lt;/p&gt;</string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>WordBreak|AlignVCenter|AlignLeft</set>
             </property>
             <property name="wordwrap" stdset="0">
@@ -129,14 +129,14 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
                 </size>
             </property>
         </spacer>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>Layout1</cstring>
             </property>
@@ -160,14 +160,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>PushButton1</cstring>
                     </property>
@@ -191,7 +191,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -215,5 +215,5 @@
 </includes>
 <pixmapfunction>BarIcon2</pixmapfunction>
 
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kdevdesigner/designer/actiondnd.cpp b/kdevdesigner/designer/actiondnd.cpp
index 347348bd..2bd08500 100644
--- a/kdevdesigner/designer/actiondnd.cpp
+++ b/kdevdesigner/designer/actiondnd.cpp
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -84,7 +84,7 @@ ActionDrag::~ActionDrag()
     the_action = 0;
 }
 
-void QDesignerAction::init()
+void TQDesignerAction::init()
 {
     MetaDataBase::addEntry( this );
     int id = WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( this ) );
@@ -92,7 +92,7 @@ void QDesignerAction::init()
     WidgetFactory::saveChangedProperties( this, id );
 }
 
-void QDesignerActionGroup::init()
+void TQDesignerActionGroup::init()
 {
     MetaDataBase::addEntry( this );
     int id = WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( this ) );
@@ -100,12 +100,12 @@ void QDesignerActionGroup::init()
     WidgetFactory::saveChangedProperties( this, id );
 }
 
-bool QDesignerAction::addTo( TQWidget *w )
+bool TQDesignerAction::addTo( TQWidget *w )
 {
     if ( !widgetToInsert )
 	return TQAction::addTo( w );
 
-    if ( ::qt_cast<TQPopupMenu*>(w) )
+    if ( ::tqqt_cast<TQPopupMenu*>(w) )
 	return FALSE;
 
     widgetToInsert->reparent( w, TQPoint( 0, 0 ), FALSE );
@@ -114,7 +114,7 @@ bool QDesignerAction::addTo( TQWidget *w )
     return TRUE;
 }
 
-bool QDesignerAction::removeFrom( TQWidget *w )
+bool TQDesignerAction::removeFrom( TQWidget *w )
 {
     if ( !widgetToInsert )
 	return TQAction::removeFrom( w );
@@ -123,72 +123,72 @@ bool QDesignerAction::removeFrom( TQWidget *w )
     return TRUE;
 }
 
-void QDesignerAction::remove()
+void TQDesignerAction::remove()
 {
     if ( !widgetToInsert )
 	return;
-    MainWindow::self->formWindow()->selectWidget( widgetToInsert, FALSE );
+    MainWindow::self->formWindow()->selectWidget( TQT_TQOBJECT(widgetToInsert), FALSE );
     widgetToInsert->reparent( 0, TQPoint( 0, 0 ), FALSE );
 }
 
-QDesignerToolBarSeparator::QDesignerToolBarSeparator(Orientation o , TQToolBar *parent,
+TQDesignerToolBarSeparator::TQDesignerToolBarSeparator(Qt::Orientation o , TQToolBar *tqparent,
                                      const char* name )
-    : TQWidget( parent, name )
+    : TQWidget( tqparent, name )
 {
-    connect( parent, TQT_SIGNAL(orientationChanged(Orientation)),
-             this, TQT_SLOT(setOrientation(Orientation)) );
+    connect( tqparent, TQT_SIGNAL(orientationChanged(Qt::Orientation)),
+             this, TQT_SLOT(setOrientation(Qt::Orientation)) );
     setOrientation( o );
-    setBackgroundMode( parent->backgroundMode() );
+    setBackgroundMode( tqparent->backgroundMode() );
     setBackgroundOrigin( ParentOrigin );
-    setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ) );
+    tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ) );
 }
 
-void QDesignerToolBarSeparator::setOrientation( Orientation o )
+void TQDesignerToolBarSeparator::setOrientation( Qt::Orientation o )
 {
     orient = o;
 }
 
-void QDesignerToolBarSeparator::styleChange( TQStyle& )
+void TQDesignerToolBarSeparator::styleChange( TQStyle& )
 {
     setOrientation( orient );
 }
 
-TQSize QDesignerToolBarSeparator::sizeHint() const
+TQSize TQDesignerToolBarSeparator::tqsizeHint() const
 {
-    int extent = style().pixelMetric( TQStyle::PM_DockWindowSeparatorExtent,
+    int extent = tqstyle().tqpixelMetric( TQStyle::PM_DockWindowSeparatorExtent,
 				      this );
-    if ( orient == Horizontal )
+    if ( orient ==Qt::Horizontal )
 	return TQSize( extent, 0 );
     else
 	return TQSize( 0, extent );
 }
 
-void QDesignerToolBarSeparator::paintEvent( TQPaintEvent * )
+void TQDesignerToolBarSeparator::paintEvent( TQPaintEvent * )
 {
     TQPainter p( this );
     TQStyle::SFlags flags = TQStyle::Style_Default;
 
-    if ( orientation() == Horizontal )
+    if ( orientation() ==Qt::Horizontal )
 	flags |= TQStyle::Style_Horizontal;
 
-    style().drawPrimitive( TQStyle::PE_DockWindowSeparator, &p, rect(),
-			   colorGroup(), flags );
+    tqstyle().tqdrawPrimitive( TQStyle::PE_DockWindowSeparator, &p, rect(),
+			   tqcolorGroup(), flags );
 }
 
 
 
-QSeparatorAction::QSeparatorAction( TQObject *parent )
-    : TQAction( parent, "qt_designer_separator" ), wid( 0 )
+TQSeparatorAction::TQSeparatorAction( TQObject *tqparent )
+    : TQAction( tqparent, "qt_designer_separator" ), wid( 0 )
 {
 }
 
-bool QSeparatorAction::addTo( TQWidget *w )
+bool TQSeparatorAction::addTo( TQWidget *w )
 {
-    if ( ::qt_cast<TQToolBar*>(w) ) {
+    if ( ::tqqt_cast<TQToolBar*>(w) ) {
 	TQToolBar *tb = (TQToolBar*)w;
-	wid = new QDesignerToolBarSeparator( tb->orientation(), tb );
+	wid = new TQDesignerToolBarSeparator( tb->orientation(), tb );
 	return TRUE;
-    } else if ( ::qt_cast<TQPopupMenu*>(w) ) {
+    } else if ( ::tqqt_cast<TQPopupMenu*>(w) ) {
 	idx = ( (TQPopupMenu*)w )->count();
 	( (TQPopupMenu*)w )->insertSeparator( idx );
 	return TRUE;
@@ -196,34 +196,34 @@ bool QSeparatorAction::addTo( TQWidget *w )
     return FALSE;
 }
 
-bool QSeparatorAction::removeFrom( TQWidget *w )
+bool TQSeparatorAction::removeFrom( TQWidget *w )
 {
-    if ( ::qt_cast<TQToolBar*>(w) ) {
+    if ( ::tqqt_cast<TQToolBar*>(w) ) {
 	delete wid;
 	return TRUE;
-    } else if ( ::qt_cast<TQPopupMenu*>(w) ) {
+    } else if ( ::tqqt_cast<TQPopupMenu*>(w) ) {
 	( (TQPopupMenu*)w )->removeItemAt( idx );
 	return TRUE;
     }
     return FALSE;
 }
 
-TQWidget *QSeparatorAction::widget() const
+TQWidget *TQSeparatorAction::widget() const
 {
     return wid;
 }
 
 
 
-QDesignerToolBar::QDesignerToolBar( TQMainWindow *mw )
+TQDesignerToolBar::TQDesignerToolBar( TQMainWindow *mw )
     : TQToolBar( mw ), lastIndicatorPos( -1, -1 )
 {
     insertAnchor = 0;
     afterAnchor = TRUE;
     setAcceptDrops( TRUE );
-    MetaDataBase::addEntry( this );
+    MetaDataBase::addEntry( TQT_TQOBJECT(this) );
     lastIndicatorPos = TQPoint( -1, -1 );
-    indicator = new QDesignerIndicatorWidget( this );
+    indicator = new TQDesignerIndicatorWidget( this );
     indicator->hide();
     installEventFilter( this );
     widgetInserting = FALSE;
@@ -231,66 +231,66 @@ QDesignerToolBar::QDesignerToolBar( TQMainWindow *mw )
     mw->setDockEnabled( DockTornOff, FALSE );
 }
 
-QDesignerToolBar::QDesignerToolBar( TQMainWindow *mw, Dock dock )
-    : TQToolBar( TQString::null, mw, dock), lastIndicatorPos( -1, -1 )
+TQDesignerToolBar::TQDesignerToolBar( TQMainWindow *mw, Dock dock )
+    : TQToolBar( TQString(), mw, dock), lastIndicatorPos( -1, -1 )
 {
     insertAnchor = 0;
     afterAnchor = TRUE;
     setAcceptDrops( TRUE );
-    indicator = new QDesignerIndicatorWidget( this );
+    indicator = new TQDesignerIndicatorWidget( this );
     indicator->hide();
-    MetaDataBase::addEntry( this );
+    MetaDataBase::addEntry( TQT_TQOBJECT(this) );
     installEventFilter( this );
     widgetInserting = FALSE;
     findFormWindow();
     mw->setDockEnabled( DockTornOff, FALSE );
 }
 
-void QDesignerToolBar::findFormWindow()
+void TQDesignerToolBar::findFormWindow()
 {
     TQWidget *w = this;
     while ( w ) {
-	formWindow = ::qt_cast<FormWindow*>(w);
+	formWindow = ::tqqt_cast<FormWindow*>(w);
 	if ( formWindow )
 	    break;
-	w = w->parentWidget();
+	w = w->tqparentWidget();
     }
 }
 
-void QDesignerToolBar::addAction( TQAction *a )
+void TQDesignerToolBar::addAction( TQAction *a )
 {
     actionList.append( a );
     connect( a, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( actionRemoved() ) );
-    if ( ::qt_cast<TQActionGroup*>(a) ) {
-	( (QDesignerActionGroup*)a )->widget()->installEventFilter( this );
-	actionMap.insert( ( (QDesignerActionGroup*)a )->widget(), a );
-    } else if ( ::qt_cast<QSeparatorAction*>(a) ) {
-	( (QSeparatorAction*)a )->widget()->installEventFilter( this );
-	actionMap.insert( ( (QSeparatorAction*)a )->widget(), a );
+    if ( ::tqqt_cast<TQActionGroup*>(a) ) {
+	( (TQDesignerActionGroup*)a )->widget()->installEventFilter( this );
+	actionMap.insert( ( (TQDesignerActionGroup*)a )->widget(), a );
+    } else if ( ::tqqt_cast<TQSeparatorAction*>(a) ) {
+	( (TQSeparatorAction*)a )->widget()->installEventFilter( this );
+	actionMap.insert( ( (TQSeparatorAction*)a )->widget(), a );
     } else {
-	( (QDesignerAction*)a )->widget()->installEventFilter( this );
-	actionMap.insert( ( (QDesignerAction*)a )->widget(), a );
+	( (TQDesignerAction*)a )->widget()->installEventFilter( this );
+	actionMap.insert( ( (TQDesignerAction*)a )->widget(), a );
     }
 }
 
 static void fixObject( TQObject *&o )
 {
-    while ( o && o->parent() && !::qt_cast<QDesignerToolBar*>(o->parent()) )
-	o = o->parent();
+    while ( o && o->tqparent() && !::tqqt_cast<TQDesignerToolBar*>(o->tqparent()) )
+	o = o->tqparent();
 }
 
-bool QDesignerToolBar::eventFilter( TQObject *o, TQEvent *e )
+bool TQDesignerToolBar::eventFilter( TQObject *o, TQEvent *e )
 {
-    if ( !o || !e || o->inherits( "QDockWindowHandle" ) || o->inherits( "QDockWindowTitleBar" ) )
+    if ( !o || !e || o->inherits( TQDOCKWINDOWHANDLE_OBJECT_NAME_STRING ) || o->inherits( "TQDockWindowTitleBar" ) )
 	return TQToolBar::eventFilter( o, e );
 
-    if ( o == this && e->type() == TQEvent::MouseButtonPress &&
-	 ( ( TQMouseEvent*)e )->button() == LeftButton ) {
+    if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(this) && e->type() == TQEvent::MouseButtonPress &&
+	 ( ( TQMouseEvent*)e )->button() == Qt::LeftButton ) {
 	mousePressEvent( (TQMouseEvent*)e );
 	return TRUE;
     }
 
-    if ( o == this )
+    if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(this) )
 	return TQToolBar::eventFilter( o, e );
 
     if ( e->type() == TQEvent::MouseButtonPress ) {
@@ -334,7 +334,7 @@ bool QDesignerToolBar::eventFilter( TQObject *o, TQEvent *e )
     return TQToolBar::eventFilter( o, e );
 }
 
-void QDesignerToolBar::paintEvent( TQPaintEvent *e )
+void TQDesignerToolBar::paintEvent( TQPaintEvent *e )
 {
     TQToolBar::paintEvent( e );
     if ( e->rect() != rect() )
@@ -342,24 +342,24 @@ void QDesignerToolBar::paintEvent( TQPaintEvent *e )
     lastIndicatorPos = TQPoint( -1, -1 );
 }
 
-void QDesignerToolBar::contextMenuEvent( TQContextMenuEvent *e )
+void TQDesignerToolBar::contextMenuEvent( TQContextMenuEvent *e )
 {
     e->accept();
     TQPopupMenu menu( 0 );
     menu.insertItem( i18n( "Delete Toolbar" ), 1 );
     int res = menu.exec( e->globalPos() );
     if ( res != -1 ) {
-	RemoveToolBarCommand *cmd = new RemoveToolBarCommand( i18n( "Delete Toolbar '%1'" ).arg( name() ),
+	RemoveToolBarCommand *cmd = new RemoveToolBarCommand( i18n( "Delete Toolbar '%1'" ).tqarg( name() ),
 							      formWindow, 0, this );
 	formWindow->commandHistory()->addCommand( cmd );
 	cmd->execute();
     }
 }
 
-void QDesignerToolBar::mousePressEvent( TQMouseEvent *e )
+void TQDesignerToolBar::mousePressEvent( TQMouseEvent *e )
 {
     widgetInserting = FALSE;
-    if ( e->button() == LeftButton &&
+    if ( e->button() == Qt::LeftButton &&
 	 MainWindow::self->currentTool() != POINTER_TOOL &&
 	 MainWindow::self->currentTool() != ORDER_TOOL &&
 	 MainWindow::self->currentTool() != CONNECT_TOOL &&
@@ -367,33 +367,33 @@ void QDesignerToolBar::mousePressEvent( TQMouseEvent *e )
 	widgetInserting = TRUE;
 }
 
-void QDesignerToolBar::mouseReleaseEvent( TQMouseEvent *e )
+void TQDesignerToolBar::mouseReleaseEvent( TQMouseEvent *e )
 {
     if ( widgetInserting )
 	doInsertWidget( mapFromGlobal( e->globalPos() ) );
     widgetInserting = FALSE;
 }
 
-void QDesignerToolBar::buttonMouseReleaseEvent( TQMouseEvent *e, TQObject *w )
+void TQDesignerToolBar::buttonMouseReleaseEvent( TQMouseEvent *e, TQObject *w )
 {
     if ( widgetInserting )
 	doInsertWidget( mapFromGlobal( e->globalPos() ) );
-    else if ( w->isWidgetType() && formWindow->widgets()->find( w ) ) {
+    else if ( w->isWidgetType() && formWindow->widgets()->tqfind( w ) ) {
 	formWindow->clearSelection( FALSE );
 	formWindow->selectWidget( w );
     }
     widgetInserting = FALSE;
 }
 
-void QDesignerToolBar::buttonContextMenuEvent( TQContextMenuEvent *e, TQObject *o )
+void TQDesignerToolBar::buttonContextMenuEvent( TQContextMenuEvent *e, TQObject *o )
 {
     e->accept();
     TQPopupMenu menu( 0 );
     const int ID_DELETE = 1;
     const int ID_SEP = 2;
     const int ID_DELTOOLBAR = 3;
-    TQMap<TQWidget*, TQAction*>::Iterator it = actionMap.find( (TQWidget*)o );
-    if ( it != actionMap.end() && ::qt_cast<QSeparatorAction*>(*it) )
+    TQMap<TQWidget*, TQAction*>::Iterator it = actionMap.tqfind( (TQWidget*)o );
+    if ( it != actionMap.end() && ::tqqt_cast<TQSeparatorAction*>(*it) )
 	menu.insertItem( i18n( "Delete Separator" ), ID_DELETE );
     else
 	menu.insertItem( i18n( "Delete Item" ), ID_DELETE );
@@ -402,21 +402,21 @@ void QDesignerToolBar::buttonContextMenuEvent( TQContextMenuEvent *e, TQObject *
     menu.insertItem( i18n( "Delete Toolbar" ), ID_DELTOOLBAR );
     int res = menu.exec( e->globalPos() );
     if ( res == ID_DELETE ) {
-	TQMap<TQWidget*, TQAction*>::Iterator it = actionMap.find( (TQWidget*)o );
+	TQMap<TQWidget*, TQAction*>::Iterator it = actionMap.tqfind( (TQWidget*)o );
 	if ( it == actionMap.end() )
 	    return;
 	TQAction *a = *it;
-	int index = actionList.find( a );
+	int index = actionList.tqfind( a );
 	RemoveActionFromToolBarCommand *cmd = new RemoveActionFromToolBarCommand(
 	    i18n( "Delete Action '%1' From Toolbar '%2'" ).
-	    arg( a->name() ).arg( caption() ),
+	    tqarg( a->name() ).tqarg( caption() ),
 	    formWindow, a, this, index );
 	formWindow->commandHistory()->addCommand( cmd );
 	cmd->execute();
     } else if ( res == ID_SEP ) {
 	calcIndicatorPos( mapFromGlobal( e->globalPos() ) );
-	TQAction *a = new QSeparatorAction( 0 );
-	int index = actionList.findRef( *actionMap.find( insertAnchor ) );
+	TQAction *a = new TQSeparatorAction( 0 );
+	int index = actionList.tqfindRef( *actionMap.tqfind( insertAnchor ) );
 	if ( index != -1 && afterAnchor )
 	    ++index;
 	if ( !insertAnchor )
@@ -429,21 +429,21 @@ void QDesignerToolBar::buttonContextMenuEvent( TQContextMenuEvent *e, TQObject *
 	formWindow->commandHistory()->addCommand( cmd );
 	cmd->execute();
     } else if ( res == ID_DELTOOLBAR ) {
-	RemoveToolBarCommand *cmd = new RemoveToolBarCommand( i18n( "Delete Toolbar '%1'" ).arg( name() ),
+	RemoveToolBarCommand *cmd = new RemoveToolBarCommand( i18n( "Delete Toolbar '%1'" ).tqarg( name() ),
 							      formWindow, 0, this );
 	formWindow->commandHistory()->addCommand( cmd );
 	cmd->execute();
     }
 }
 
-void QDesignerToolBar::buttonMousePressEvent( TQMouseEvent *e, TQObject * )
+void TQDesignerToolBar::buttonMousePressEvent( TQMouseEvent *e, TQObject * )
 {
     widgetInserting = FALSE;
 
-    if ( e->button() == MidButton )
+    if ( e->button() == Qt::MidButton )
 	return;
 
-    if ( e->button() == LeftButton &&
+    if ( e->button() == Qt::LeftButton &&
 	 MainWindow::self->currentTool() != POINTER_TOOL &&
 	 MainWindow::self->currentTool() != ORDER_TOOL &&
 	 MainWindow::self->currentTool() != CONNECT_TOOL &&
@@ -455,16 +455,16 @@ void QDesignerToolBar::buttonMousePressEvent( TQMouseEvent *e, TQObject * )
     dragStartPos = e->pos();
 }
 
-void QDesignerToolBar::removeWidget( TQWidget *w )
+void TQDesignerToolBar::removeWidget( TQWidget *w )
 {
-    TQMap<TQWidget*, TQAction*>::Iterator it = actionMap.find( w );
+    TQMap<TQWidget*, TQAction*>::Iterator it = actionMap.tqfind( w );
     if ( it == actionMap.end() )
 	return;
     TQAction *a = *it;
-    int index = actionList.find( a );
+    int index = actionList.tqfind( a );
     RemoveActionFromToolBarCommand *cmd =
 	new RemoveActionFromToolBarCommand( i18n( "Delete Action '%1' From Toolbar '%2'" ).
-					    arg( a->name() ).arg( caption() ),
+					    tqarg( a->name() ).tqarg( caption() ),
 					    formWindow, a, this, index );
     formWindow->commandHistory()->addCommand( cmd );
     cmd->execute();
@@ -472,39 +472,39 @@ void QDesignerToolBar::removeWidget( TQWidget *w )
     adjustSize();
 }
 
-void QDesignerToolBar::buttonMouseMoveEvent( TQMouseEvent *e, TQObject *o )
+void TQDesignerToolBar::buttonMouseMoveEvent( TQMouseEvent *e, TQObject *o )
 {
-    if ( widgetInserting || ( e->state() & LeftButton ) == 0 )
+    if ( widgetInserting || ( e->state() & Qt::LeftButton ) == 0 )
 	return;
-    if ( QABS( TQPoint( dragStartPos - e->pos() ).manhattanLength() ) < TQApplication::startDragDistance() )
+    if ( TQABS( TQPoint( dragStartPos - e->pos() ).manhattanLength() ) < TQApplication::startDragDistance() )
 	return;
-    TQMap<TQWidget*, TQAction*>::Iterator it = actionMap.find( (TQWidget*)o );
+    TQMap<TQWidget*, TQAction*>::Iterator it = actionMap.tqfind( (TQWidget*)o );
     if ( it == actionMap.end() )
 	return;
     TQAction *a = *it;
     if ( !a )
 	return;
-    int index = actionList.find( a );
+    int index = actionList.tqfind( a );
     RemoveActionFromToolBarCommand *cmd =
 	new RemoveActionFromToolBarCommand( i18n( "Delete Action '%1' From Toolbar '%2'" ).
-					    arg( a->name() ).arg( caption() ),
+					    tqarg( a->name() ).tqarg( caption() ),
 					    formWindow, a, this, index );
     formWindow->commandHistory()->addCommand( cmd );
     cmd->execute();
     TQApplication::sendPostedEvents();
     adjustSize();
 
-    TQString type = ::qt_cast<TQActionGroup*>(a) ? TQString( "application/x-designer-actiongroup" ) :
-	::qt_cast<QSeparatorAction*>(a) ? TQString( "application/x-designer-separator" ) : TQString( "application/x-designer-actions" );
+    TQString type = ::tqqt_cast<TQActionGroup*>(a) ? TQString( "application/x-designer-actiongroup" ) :
+	::tqqt_cast<TQSeparatorAction*>(a) ? TQString( "application/x-designer-separator" ) : TQString( "application/x-designer-actions" );
     TQStoredDrag *drag = new ActionDrag( type, a, this );
     drag->setPixmap( a->iconSet().pixmap() );
-    if ( ::qt_cast<QDesignerAction*>(a) ) {
-	if ( formWindow->widgets()->find( ( (QDesignerAction*)a )->widget() ) )
-	    formWindow->selectWidget( ( (QDesignerAction*)a )->widget(), FALSE );
+    if ( ::tqqt_cast<TQDesignerAction*>(a) ) {
+	if ( formWindow->widgets()->tqfind( ( (TQDesignerAction*)a )->widget() ) )
+	    formWindow->selectWidget( ( TQT_TQOBJECT(( (TQDesignerAction*)a )->widget())), FALSE );
     }
     if ( !drag->drag() ) {
 	AddActionToToolBarCommand *cmd = new AddActionToToolBarCommand( i18n( "Add Action '%1' to Toolbar '%2'" ).
-									arg( a->name() ).arg( caption() ),
+									tqarg( a->name() ).tqarg( caption() ),
 									formWindow, a, this, index );
 	formWindow->commandHistory()->addCommand( cmd );
 	cmd->execute();
@@ -513,9 +513,9 @@ void QDesignerToolBar::buttonMouseMoveEvent( TQMouseEvent *e, TQObject *o )
     indicator->hide();
 }
 
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
 
-void QDesignerToolBar::dragEnterEvent( TQDragEnterEvent *e )
+void TQDesignerToolBar::dragEnterEvent( TQDragEnterEvent *e )
 {
     widgetInserting = FALSE;
     lastIndicatorPos = TQPoint( -1, -1 );
@@ -523,7 +523,7 @@ void QDesignerToolBar::dragEnterEvent( TQDragEnterEvent *e )
 	e->accept();
 }
 
-void QDesignerToolBar::dragMoveEvent( TQDragMoveEvent *e )
+void TQDesignerToolBar::dragMoveEvent( TQDragMoveEvent *e )
 {
     if (ActionDrag::canDecode(e)) {
 	e->accept();
@@ -531,14 +531,14 @@ void QDesignerToolBar::dragMoveEvent( TQDragMoveEvent *e )
     }
 }
 
-void QDesignerToolBar::dragLeaveEvent( TQDragLeaveEvent * )
+void TQDesignerToolBar::dragLeaveEvent( TQDragLeaveEvent * )
 {
     indicator->hide();
     insertAnchor = 0;
     afterAnchor = TRUE;
 }
 
-void QDesignerToolBar::dropEvent( TQDropEvent *e )
+void TQDesignerToolBar::dropEvent( TQDropEvent *e )
 {
     if (!ActionDrag::canDecode(e))
 	return;
@@ -547,7 +547,7 @@ void QDesignerToolBar::dropEvent( TQDropEvent *e )
 
     indicator->hide();
     TQAction *a = 0;
-    int index = actionList.findRef( *actionMap.find( insertAnchor ) );
+    int index = actionList.tqfindRef( *actionMap.tqfind( insertAnchor ) );
     if ( index != -1 && afterAnchor )
 	++index;
     if ( !insertAnchor )
@@ -555,14 +555,14 @@ void QDesignerToolBar::dropEvent( TQDropEvent *e )
     if ( e->provides( "application/x-designer-actions" ) ||
 	 e->provides( "application/x-designer-separator" ) ) {
 	if ( e->provides( "application/x-designer-actions" ) )
-	    a = ::qt_cast<QDesignerAction*>(ActionDrag::action());
+	    a = ::tqqt_cast<TQDesignerAction*>(ActionDrag::action());
 	else
-	    a = ::qt_cast<QSeparatorAction*>(ActionDrag::action());
+	    a = ::tqqt_cast<TQSeparatorAction*>(ActionDrag::action());
     } else {
-	a = ::qt_cast<QDesignerActionGroup*>(ActionDrag::action());
+	a = ::tqqt_cast<TQDesignerActionGroup*>(ActionDrag::action());
     }
 
-    if ( actionList.findRef( a ) != -1 ) {
+    if ( actionList.tqfindRef( a ) != -1 ) {
 	TQMessageBox::warning( MainWindow::self, i18n( "Insert/Move Action" ),
 			      i18n( "Action '%1' has already been added to this toolbar.\n"
 				  "An Action may only occur once in a given toolbar." ).
@@ -571,7 +571,7 @@ void QDesignerToolBar::dropEvent( TQDropEvent *e )
     }
 
     AddActionToToolBarCommand *cmd = new AddActionToToolBarCommand( i18n( "Add Action '%1' to Toolbar '%2'" ).
-								    arg( a->name() ).arg( caption() ),
+								    tqarg( a->name() ).tqarg( caption() ),
 								    formWindow, a, this, index );
     formWindow->commandHistory()->addCommand( cmd );
     cmd->execute();
@@ -581,44 +581,45 @@ void QDesignerToolBar::dropEvent( TQDropEvent *e )
 
 #endif
 
-void QDesignerToolBar::reInsert()
+void TQDesignerToolBar::reInsert()
 {
     TQAction *a = 0;
     actionMap.clear();
     clear();
     for ( a = actionList.first(); a; a = actionList.next() ) {
 	a->addTo( this );
-	if ( ::qt_cast<TQActionGroup*>(a) ) {
-	    actionMap.insert( ( (QDesignerActionGroup*)a )->widget(), a );
-	    if ( ( (QDesignerActionGroup*)a )->widget() )
-		( (QDesignerActionGroup*)a )->widget()->installEventFilter( this );
-	} else if ( ::qt_cast<QDesignerAction*>(a) ) {
-	    actionMap.insert( ( (QDesignerAction*)a )->widget(), a );
-	    ( (QDesignerAction*)a )->widget()->installEventFilter( this );
-	} else if ( ::qt_cast<QSeparatorAction*>(a) ) {
-	    actionMap.insert( ( (QSeparatorAction*)a )->widget(), a );
-	    ( (QSeparatorAction*)a )->widget()->installEventFilter( this );
+	if ( ::tqqt_cast<TQActionGroup*>(a) ) {
+	    actionMap.insert( ( (TQDesignerActionGroup*)a )->widget(), a );
+	    if ( ( (TQDesignerActionGroup*)a )->widget() )
+		( (TQDesignerActionGroup*)a )->widget()->installEventFilter( this );
+	} else if ( ::tqqt_cast<TQDesignerAction*>(a) ) {
+	    actionMap.insert( ( (TQDesignerAction*)a )->widget(), a );
+	    ( (TQDesignerAction*)a )->widget()->installEventFilter( this );
+	} else if ( ::tqqt_cast<TQSeparatorAction*>(a) ) {
+	    actionMap.insert( ( (TQSeparatorAction*)a )->widget(), a );
+	    ( (TQSeparatorAction*)a )->widget()->installEventFilter( this );
 	}
     }
     TQApplication::sendPostedEvents();
     adjustSize();
 }
 
-void QDesignerToolBar::actionRemoved()
+void TQDesignerToolBar::actionRemoved()
 {
     actionList.removeRef( (TQAction*)sender() );
 }
 
-TQPoint QDesignerToolBar::calcIndicatorPos( const TQPoint &pos )
+TQPoint TQDesignerToolBar::calcIndicatorPos( const TQPoint &pos )
 {
-    if ( orientation() == Horizontal ) {
+    if ( orientation() ==Qt::Horizontal ) {
 	TQPoint pnt( width() - 2, 0 );
 	insertAnchor = 0;
 	afterAnchor = TRUE;
-	if ( !children() )
+	TQObjectList clo = childrenListObject();
+	if ( clo.isEmpty() )
 	    return pnt;
 	pnt = TQPoint( 13, 0 );
-	TQObjectListIt it( *children() );
+	TQObjectListIt it( clo );
 	TQObject * obj;
 	while( (obj=it.current()) != 0 ) {
 	    ++it;
@@ -637,10 +638,11 @@ TQPoint QDesignerToolBar::calcIndicatorPos( const TQPoint &pos )
 	TQPoint pnt( 0, height() - 2 );
 	insertAnchor = 0;
 	afterAnchor = TRUE;
-	if ( !children() )
+	TQObjectList clo = childrenListObject();
+	if ( clo.isEmpty() )
 	    return pnt;
 	pnt = TQPoint( 0, 13 );
-	TQObjectListIt it( *children() );
+	TQObjectListIt it( clo );
 	TQObject * obj;
 	while( (obj=it.current()) != 0 ) {
 	    ++it;
@@ -658,12 +660,12 @@ TQPoint QDesignerToolBar::calcIndicatorPos( const TQPoint &pos )
     }
 }
 
-void QDesignerToolBar::drawIndicator( const TQPoint &pos )
+void TQDesignerToolBar::drawIndicator( const TQPoint &pos )
 {
     if ( lastIndicatorPos == pos )
 	return;
     bool wasVsisible = indicator->isVisible();
-    if ( orientation() == Horizontal ) {
+    if ( orientation() ==Qt::Horizontal ) {
 	indicator->resize( 3, height() );
 	if ( pos != TQPoint( -1, -1 ) )
 	     indicator->move( pos.x() - 1, 0 );
@@ -682,7 +684,7 @@ void QDesignerToolBar::drawIndicator( const TQPoint &pos )
 	TQApplication::sendPostedEvents();
 }
 
-void QDesignerToolBar::doInsertWidget( const TQPoint &p )
+void TQDesignerToolBar::doInsertWidget( const TQPoint &p )
 {
     if ( formWindow != MainWindow::self->formWindow() )
 	return;
@@ -690,30 +692,30 @@ void QDesignerToolBar::doInsertWidget( const TQPoint &p )
     TQWidget *w = WidgetFactory::create( MainWindow::self->currentTool(), this, 0, TRUE );
     installEventFilters( w );
     MainWindow::self->formWindow()->insertWidget( w, TRUE );
-    QDesignerAction *a = new QDesignerAction( w, parent() );
-    int index = actionList.findRef( *actionMap.find( insertAnchor ) );
+    TQDesignerAction *a = new TQDesignerAction( w, tqparent() );
+    int index = actionList.tqfindRef( *actionMap.tqfind( insertAnchor ) );
     if ( index != -1 && afterAnchor )
 	++index;
     if ( !insertAnchor )
 	index = 0;
     AddActionToToolBarCommand *cmd = new AddActionToToolBarCommand( i18n( "Add Widget '%1' to Toolbar '%2'" ).
-								    arg( w->name() ).arg( caption() ),
+								    tqarg( w->name() ).tqarg( caption() ),
 								    formWindow, a, this, index );
     formWindow->commandHistory()->addCommand( cmd );
     cmd->execute();
     MainWindow::self->resetTool();
 }
 
-void QDesignerToolBar::clear()
+void TQDesignerToolBar::clear()
 {
     for ( TQAction *a = actionList.first(); a; a = actionList.next() ) {
-	if ( ::qt_cast<QDesignerAction*>(a) )
-	    ( (QDesignerAction*)a )->remove();
+	if ( ::tqqt_cast<TQDesignerAction*>(a) )
+	    ( (TQDesignerAction*)a )->remove();
     }
     TQToolBar::clear();
 }
 
-void QDesignerToolBar::installEventFilters( TQWidget *w )
+void TQDesignerToolBar::installEventFilters( TQWidget *w )
 {
     if ( !w )
 	return;
diff --git a/kdevdesigner/designer/actiondnd.h b/kdevdesigner/designer/actiondnd.h
index 23c461aa..560bcca4 100644
--- a/kdevdesigner/designer/actiondnd.h
+++ b/kdevdesigner/designer/actiondnd.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -38,26 +38,28 @@
 #include <tqguardedptr.h>
 #include "../shared/widgetdatabase.h"
 
-//class QDesignerPopupMenu;
-class QDesignerIndicatorWidget;
+//class TQDesignerPopupMenu;
+class TQDesignerIndicatorWidget;
 class FormWindow;
 class TQPopupMenu;
 
-class QDesignerIndicatorWidget : public QWidget
+class TQDesignerIndicatorWidget : public TQWidget
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    QDesignerIndicatorWidget( TQWidget *p )
+    TQDesignerIndicatorWidget( TQWidget *p )
 	: TQWidget( p, "qt_dockwidget_internal" ) {
 	    setBackgroundColor( red );
     }
 
 };
 
-class ActionDrag : public QStoredDrag
+class ActionDrag : public TQStoredDrag
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     ActionDrag(const TQString &type, TQAction *action, TQWidget *source);
@@ -77,22 +79,23 @@ private:
     static TQAction *the_action;
 };
 
-class QDesignerActionGroup : public QActionGroup
+class TQDesignerActionGroup : public TQActionGroup
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    QDesignerActionGroup( TQObject *parent )
-	: TQActionGroup( ::qt_cast<TQActionGroup*>(parent) ? parent : 0 ), wid( 0 ), idx( -1 ) { init(); }
+    TQDesignerActionGroup( TQObject *tqparent )
+	: TQActionGroup( ::tqqt_cast<TQActionGroup*>(tqparent) ? tqparent : 0 ), wid( 0 ), idx( -1 ) { init(); }
 
     void init();
 
     TQWidget *widget() const { return wid; }
-    TQWidget *widget( TQAction *a ) const { return *widgets.find( a ); }
+    TQWidget *widget( TQAction *a ) const { return *widgets.tqfind( a ); }
     int index() const { return idx; }
 
 protected:
-#if !defined(Q_NO_USING_KEYWORD)
+#if !defined(TQ_NO_USING_KEYWORD)
     using TQActionGroup::addedTo;
 #endif
     void addedTo( TQWidget *w, TQWidget * ) {
@@ -112,15 +115,16 @@ private:
 
 };
 
-class QDesignerAction : public QAction
+class TQDesignerAction : public TQAction
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    QDesignerAction( TQObject *parent )
-	: TQAction( ::qt_cast<TQActionGroup*>(parent) ? parent : 0 ), wid( 0 ), idx( -1 ), widgetToInsert( 0 ) { init(); }
-    QDesignerAction( TQWidget *w, TQObject *parent )
-	: TQAction( ::qt_cast<TQActionGroup*>(parent) ? parent : 0 ), wid( 0 ), idx( -1 ), widgetToInsert( w ) { init(); }
+    TQDesignerAction( TQObject *tqparent )
+	: TQAction( ::tqqt_cast<TQActionGroup*>(tqparent) ? tqparent : 0 ), wid( 0 ), idx( -1 ), widgetToInsert( 0 ) { init(); }
+    TQDesignerAction( TQWidget *w, TQObject *tqparent )
+	: TQAction( ::tqqt_cast<TQActionGroup*>(tqparent) ? tqparent : 0 ), wid( 0 ), idx( -1 ), widgetToInsert( w ) { init(); }
 
     void init();
 
@@ -148,31 +152,33 @@ private:
 
 };
 
-class QDesignerToolBarSeparator : public QWidget
+class TQDesignerToolBarSeparator : public TQWidget
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    QDesignerToolBarSeparator( Orientation, TQToolBar *parent, const char* name=0 );
+    TQDesignerToolBarSeparator( Qt::Orientation, TQToolBar *tqparent, const char* name=0 );
 
-    TQSize sizeHint() const;
-    Orientation orientation() const { return orient; }
+    TQSize tqsizeHint() const;
+    Qt::Orientation orientation() const { return orient; }
 public slots:
-   void setOrientation( Orientation );
+   void setOrientation( Qt::Orientation );
 protected:
     void styleChange( TQStyle& );
     void paintEvent( TQPaintEvent * );
 private:
-    Orientation orient;
+    Qt::Orientation orient;
 };
 
 
-class QSeparatorAction : public QAction
+class TQSeparatorAction : public TQAction
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    QSeparatorAction( TQObject *parent );
+    TQSeparatorAction( TQObject *tqparent );
 
     bool addTo( TQWidget *w );
     bool removeFrom( TQWidget *w );
@@ -186,13 +192,14 @@ private:
 };
 
 
-class QDesignerToolBar : public QToolBar
+class TQDesignerToolBar : public TQToolBar
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    QDesignerToolBar( TQMainWindow *mw );
-    QDesignerToolBar( TQMainWindow *mw, Dock dock );
+    TQDesignerToolBar( TQMainWindow *mw );
+    TQDesignerToolBar( TQMainWindow *mw, Dock dock );
     TQPtrList<TQAction> insertedActions() const { return actionList; }
     void addAction( TQAction *a );
 
@@ -208,7 +215,7 @@ public:
 protected:
     bool eventFilter( TQObject *, TQEvent * );
     void paintEvent( TQPaintEvent * );
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
     void dragEnterEvent( TQDragEnterEvent * );
     void dragMoveEvent( TQDragMoveEvent * );
     void dragLeaveEvent( TQDragLeaveEvent * );
@@ -238,7 +245,7 @@ private:
     TQPtrList<TQAction> actionList;
     TQMap<TQWidget*, TQAction*> actionMap;
     TQPoint dragStartPos;
-    QDesignerIndicatorWidget *indicator;
+    TQDesignerIndicatorWidget *indicator;
     bool widgetInserting;
     FormWindow *formWindow;
 
diff --git a/kdevdesigner/designer/actioneditor.ui b/kdevdesigner/designer/actioneditor.ui
index 669c60e0..7db4050b 100644
--- a/kdevdesigner/designer/actioneditor.ui
+++ b/kdevdesigner/designer/actioneditor.ui
@@ -25,7 +25,7 @@
 ** not clear to you.
 **
 *********************************************************************</comment>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>ActionEditorBase</cstring>
     </property>
@@ -40,7 +40,7 @@
     <property name="caption">
         <string>Edit Actions</string>
     </property>
-    <property name="layoutMargin" stdset="0">
+    <property name="tqlayoutMargin" stdset="0">
     </property>
     <vbox>
         <property name="name">
@@ -52,7 +52,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>Layout2</cstring>
             </property>
@@ -66,7 +66,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QToolButton">
+                <widget class="TQToolButton">
                     <property name="name">
                         <cstring>buttonNewAction</cstring>
                     </property>
@@ -83,7 +83,7 @@
                         <string>Create new Action</string>
                     </property>
                 </widget>
-                <widget class="QToolButton">
+                <widget class="TQToolButton">
                     <property name="name">
                         <cstring>buttonDeleteAction</cstring>
                     </property>
@@ -100,7 +100,7 @@
                         <string>Delete current Action</string>
                     </property>
                 </widget>
-                <widget class="QToolButton">
+                <widget class="TQToolButton">
                     <property name="name">
                         <cstring>buttonConnect</cstring>
                     </property>
@@ -127,7 +127,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -210,18 +210,18 @@
 <forwards>
     <forward>class QListViewItem;</forward>
 </forwards>
-<slots>
+<Q_SLOTS>
     <slot access="protected">init()</slot>
     <slot access="protected">destroy()</slot>
     <slot access="protected">connectionsClicked()</slot>
     <slot access="protected">currentActionChanged( QListViewItem * )</slot>
     <slot access="protected">deleteAction()</slot>
     <slot access="protected">newAction()</slot>
-</slots>
+</Q_SLOTS>
 <includes>
     <include location="local" impldecl="in implementation">myiconloader.h</include>
 </includes>
 <pixmapfunction>BarIcon2</pixmapfunction>
 
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kdevdesigner/designer/actioneditorimpl.cpp b/kdevdesigner/designer/actioneditorimpl.cpp
index ad014c9f..67cb0bdf 100644
--- a/kdevdesigner/designer/actioneditorimpl.cpp
+++ b/kdevdesigner/designer/actioneditorimpl.cpp
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -45,8 +45,8 @@
 
 #include <klocale.h>
 
-ActionEditor::ActionEditor( TQWidget* parent,  const char* name, WFlags fl )
-    : ActionEditorBase( parent, name, fl ), currentAction( 0 ), formWindow( 0 ),
+ActionEditor::ActionEditor( TQWidget* tqparent,  const char* name, WFlags fl )
+    : ActionEditorBase( tqparent, name, fl ), currentAction( 0 ), formWindow( 0 ),
     explicitlyClosed(false)
 {
     listActions->addColumn( i18n( "Actions" ) );
@@ -139,7 +139,7 @@ void ActionEditor::deleteAction()
 	++it;
     }
     if ( formWindow ) {
-	formWindow->setActiveObject( formWindow->mainContainer() );
+	formWindow->setActiveObject( TQT_TQOBJECT(formWindow->mainContainer()) );
 	if ( formWindow->formFile() )
 	    formWindow->formFile()->setModified( TRUE );
     }
@@ -149,8 +149,8 @@ void ActionEditor::newAction()
 {
     ActionItem *actionParent = (ActionItem*)listActions->selectedItem();
     if ( actionParent ) {
-	if ( !::qt_cast<TQActionGroup*>(actionParent->actionGroup()) )
-	    actionParent = (ActionItem*)actionParent->parent();
+	if ( !::tqqt_cast<TQActionGroup*>(actionParent->actionGroup()) )
+	    actionParent = (ActionItem*)actionParent->tqparent();
     }
 
     ActionItem *i = 0;
@@ -185,8 +185,8 @@ void ActionEditor::newActionGroup()
 {
     ActionItem *actionParent = (ActionItem*)listActions->selectedItem();
     if ( actionParent ) {
-	if ( !::qt_cast<TQActionGroup*>(actionParent->actionGroup()) )
-	    actionParent = (ActionItem*)actionParent->parent();
+	if ( !::tqqt_cast<TQActionGroup*>(actionParent->actionGroup()) )
+	    actionParent = (ActionItem*)actionParent->tqparent();
     }
 
     ActionItem *i = 0;
@@ -225,13 +225,13 @@ void ActionEditor::setFormWindow( FormWindow *fw )
     listActions->clear();
     formWindow = fw;
     if ( !formWindow ||
-	 !::qt_cast<TQMainWindow*>(formWindow->mainContainer()) ) {
+	 !::tqqt_cast<TQMainWindow*>(formWindow->mainContainer()) ) {
 	setEnabled( FALSE );
     } else {
 	setEnabled( TRUE );
 	for ( TQAction *a = formWindow->actionList().first(); a; a = formWindow->actionList().next() ) {
 	    ActionItem *i = 0;
-	    if ( ::qt_cast<TQAction*>(a->parent()) )
+	    if ( ::tqqt_cast<TQAction*>(a->tqparent()) )
 		continue;
 	    i = new ActionItem( listActions, a );
 	    i->setText( 0, a->name() );
@@ -241,7 +241,7 @@ void ActionEditor::setFormWindow( FormWindow *fw )
  				 this, TQT_SLOT( removeConnections( TQObject * ) ) );
 	    TQObject::connect( a, TQT_SIGNAL( destroyed( TQObject * ) ),
 			      this, TQT_SLOT( removeConnections( TQObject* ) ) );
-	    if ( ::qt_cast<TQActionGroup*>(a) ) {
+	    if ( ::tqqt_cast<TQActionGroup*>(a) ) {
 		insertChildActions( i );
 	    }
 	}
@@ -254,13 +254,14 @@ void ActionEditor::setFormWindow( FormWindow *fw )
 
 void ActionEditor::insertChildActions( ActionItem *i )
 {
-    if ( !i->actionGroup() || !i->actionGroup()->children() )
+    TQObjectList clo = i->actionGroup()->childrenListObject();
+    if ( !i->actionGroup() || clo.isEmpty() )
 	return;
-    TQObjectListIt it( *i->actionGroup()->children() );
+    TQObjectListIt it( clo );
     while ( it.current() ) {
 	TQObject *o = it.current();
 	++it;
-	if ( !::qt_cast<TQAction*>(o) )
+	if ( !::tqqt_cast<TQAction*>(o) )
 	    continue;
 	TQAction *a = (TQAction*)o;
 	ActionItem *i2 = new ActionItem( (TQListViewItem*)i, a );
@@ -272,7 +273,7 @@ void ActionEditor::insertChildActions( ActionItem *i )
  			     this, TQT_SLOT( removeConnections( TQObject * ) ) );
  	TQObject::connect( o, TQT_SIGNAL( destroyed( TQObject * ) ),
  			  this, TQT_SLOT( removeConnections( TQObject * ) ) );
-	if ( ::qt_cast<TQActionGroup*>(a) )
+	if ( ::tqqt_cast<TQActionGroup*>(a) )
 	    insertChildActions( i2 );
     }
 }
@@ -304,7 +305,7 @@ void ActionEditor::updateActionIcon( TQAction *a )
 void ActionEditor::connectionsClicked()
 {
     ConnectionDialog dlg( formWindow->mainWindow() );
-    dlg.setDefault( currentAction, formWindow );
+    dlg.setDefault( TQT_TQOBJECT(currentAction), TQT_TQOBJECT(formWindow) );
     dlg.addConnection();
     dlg.exec();
 }
@@ -312,9 +313,9 @@ void ActionEditor::connectionsClicked()
 void ActionEditor::removeConnections( TQObject *o )
 {
     TQValueList<MetaDataBase::Connection> conns =
-	MetaDataBase::connections( formWindow, o );
+	MetaDataBase::connections( TQT_TQOBJECT(formWindow), o );
     for ( TQValueList<MetaDataBase::Connection>::Iterator it2 = conns.begin();
 	  it2 != conns.end(); ++it2 )
-	MetaDataBase::removeConnection( formWindow, (*it2).sender, (*it2).signal,
+	MetaDataBase::removeConnection( TQT_TQOBJECT(formWindow), (*it2).sender, (*it2).signal,
 					(*it2).receiver, (*it2).slot );
 }
diff --git a/kdevdesigner/designer/actioneditorimpl.h b/kdevdesigner/designer/actioneditorimpl.h
index 1af748e9..cae92b95 100644
--- a/kdevdesigner/designer/actioneditorimpl.h
+++ b/kdevdesigner/designer/actioneditorimpl.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -36,9 +36,10 @@ class ActionItem;
 class ActionEditor : public ActionEditorBase
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    ActionEditor( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
+    ActionEditor( TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 );
     void setFormWindow( FormWindow *fw );
     void updateActionName( TQAction *a );
     void updateActionIcon( TQAction *a );
diff --git a/kdevdesigner/designer/actionlistview.cpp b/kdevdesigner/designer/actionlistview.cpp
index 7b687fe4..92b8a044 100644
--- a/kdevdesigner/designer/actionlistview.cpp
+++ b/kdevdesigner/designer/actionlistview.cpp
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -30,8 +30,8 @@
 
 #include <klocale.h>
 
-ActionListView::ActionListView( TQWidget *parent, const char *name )
-    : TQListView( parent, name )
+ActionListView::ActionListView( TQWidget *tqparent, const char *name )
+    : TQListView( tqparent, name )
 {
     setShowSortIndicator( TRUE );
     setResizeMode( LastColumn );
@@ -43,18 +43,18 @@ ActionListView::ActionListView( TQWidget *parent, const char *name )
 ActionItem::ActionItem( TQListView *lv, TQAction *ac )
     : TQListViewItem( lv ), a( 0 ), g( 0 )
 {
-    g = ::qt_cast<QDesignerActionGroup*>(ac);
+    g = ::tqqt_cast<TQDesignerActionGroup*>(ac);
     if ( !g )
-	a = ::qt_cast<QDesignerAction*>(ac);
+	a = ::tqqt_cast<TQDesignerAction*>(ac);
     setDragEnabled( TRUE );
 }
 
 ActionItem::ActionItem( TQListViewItem *i, TQAction *ac )
     : TQListViewItem( i ), a( 0 ), g( 0 )
 {
-    g = ::qt_cast<QDesignerActionGroup*>(ac);
+    g = ::tqqt_cast<TQDesignerActionGroup*>(ac);
     if ( !g )
-	a = ::qt_cast<QDesignerAction*>(ac);
+	a = ::tqqt_cast<TQDesignerAction*>(ac);
     setDragEnabled( TRUE );
     moveToEnd();
 }
diff --git a/kdevdesigner/designer/actionlistview.h b/kdevdesigner/designer/actionlistview.h
index 66d6419e..a3910c5b 100644
--- a/kdevdesigner/designer/actionlistview.h
+++ b/kdevdesigner/designer/actionlistview.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -30,38 +30,39 @@
 #include <tqlistview.h>
 #include "actiondnd.h"
 
-class ActionItem : public QListViewItem
+class ActionItem : public TQListViewItem
 {
 public:
     ActionItem( TQListView *lv, bool group )
 	: TQListViewItem( lv ),
-	  a( group ? 0 : new QDesignerAction( 0 ) ),
-	  g( group ? new QDesignerActionGroup( 0 ) : 0 ) { setDragEnabled( TRUE ); }
+	  a( group ? 0 : new TQDesignerAction( 0 ) ),
+	  g( group ? new TQDesignerActionGroup( 0 ) : 0 ) { setDragEnabled( TRUE ); }
     ActionItem( TQListView *lv, TQAction *ac );
     ActionItem( TQListViewItem *i, TQAction *ac );
-    ActionItem( ActionItem *parent, bool group = FALSE )
-	: TQListViewItem( parent ),
-	  a( group ? 0 : new QDesignerAction( parent->actionGroup() ) ),
-	  g( group ? new QDesignerActionGroup( parent->actionGroup() ) : 0 ) { setDragEnabled( TRUE ); moveToEnd(); }
+    ActionItem( ActionItem *tqparent, bool group = FALSE )
+	: TQListViewItem( tqparent ),
+	  a( group ? 0 : new TQDesignerAction( tqparent->actionGroup() ) ),
+	  g( group ? new TQDesignerActionGroup( tqparent->actionGroup() ) : 0 ) { setDragEnabled( TRUE ); moveToEnd(); }
 
-    QDesignerAction *action() const { return a; }
-    QDesignerActionGroup *actionGroup() const { return g; }
+    TQDesignerAction *action() const { return a; }
+    TQDesignerActionGroup *actionGroup() const { return g; }
 
 private:
     void moveToEnd();
 
 private:
-    QDesignerAction *a;
-    QDesignerActionGroup *g;
+    TQDesignerAction *a;
+    TQDesignerActionGroup *g;
 
 };
 
-class ActionListView : public QListView
+class ActionListView : public TQListView
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    ActionListView( TQWidget *parent = 0, const char *name = 0 );
+    ActionListView( TQWidget *tqparent = 0, const char *name = 0 );
 
 protected:
     TQDragObject *dragObject();
diff --git a/kdevdesigner/designer/asciivalidator.cpp b/kdevdesigner/designer/asciivalidator.cpp
index 695b2292..ae8661b4 100644
--- a/kdevdesigner/designer/asciivalidator.cpp
+++ b/kdevdesigner/designer/asciivalidator.cpp
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -28,18 +28,18 @@
 
 #include <tqstring.h>
 
-AsciiValidator::AsciiValidator( TQObject * parent, const char *name )
-    : TQValidator( parent, name ), functionName( FALSE )
+AsciiValidator::AsciiValidator( TQObject * tqparent, const char *name )
+    : TQValidator( tqparent, name ), functionName( FALSE )
 {
 }
 
-AsciiValidator::AsciiValidator( bool funcName, TQObject * parent, const char *name )
-    : TQValidator( parent, name ), functionName( funcName )
+AsciiValidator::AsciiValidator( bool funcName, TQObject * tqparent, const char *name )
+    : TQValidator( tqparent, name ), functionName( funcName )
 {
 }
 
-AsciiValidator::AsciiValidator( const TQString &allow, TQObject * parent, const char *name )
-    : TQValidator( parent, name ), functionName( FALSE ), allowedChars( allow )
+AsciiValidator::AsciiValidator( const TQString &allow, TQObject * tqparent, const char *name )
+    : TQValidator( tqparent, name ), functionName( FALSE ), allowedChars( allow )
 {
 }
 
@@ -85,7 +85,7 @@ TQValidator::State AsciiValidator::validate( TQString &s, int & ) const
 	    }
 	}
 	
-	if ( allowedChars.find( s[ i ] ) != -1 )
+	if ( allowedChars.tqfind( s[ i ] ) != -1 )
 	    continue;
 	
 	s[i] = '_';
diff --git a/kdevdesigner/designer/asciivalidator.h b/kdevdesigner/designer/asciivalidator.h
index 8e79d21f..00ff6b0a 100644
--- a/kdevdesigner/designer/asciivalidator.h
+++ b/kdevdesigner/designer/asciivalidator.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -31,13 +31,14 @@
 #include <tqvalidator.h>
 
 
-class AsciiValidator: public QValidator
+class AsciiValidator: public TQValidator
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    AsciiValidator( TQObject * parent, const char *name = 0 );
-    AsciiValidator( bool funcName, TQObject * parent, const char *name = 0 );
-    AsciiValidator( const TQString &allow, TQObject * parent, const char *name = 0 );
+    AsciiValidator( TQObject * tqparent, const char *name = 0 );
+    AsciiValidator( bool funcName, TQObject * tqparent, const char *name = 0 );
+    AsciiValidator( const TQString &allow, TQObject * tqparent, const char *name = 0 );
     ~AsciiValidator();
 
     TQValidator::State validate( TQString &, int & ) const;
diff --git a/kdevdesigner/designer/command.cpp b/kdevdesigner/designer/command.cpp
index e2e55061..5079fff4 100644
--- a/kdevdesigner/designer/command.cpp
+++ b/kdevdesigner/designer/command.cpp
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -51,7 +51,7 @@
 #include <tqptrstack.h>
 #include <tqheader.h>
 #include <tqsplitter.h>
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
 #include <tqtable.h>
 #endif
 #include <tqaction.h>
@@ -243,8 +243,8 @@ void ResizeCommand::execute()
 {
     widget->setGeometry( newRect );
     formWindow()->updateSelection( widget );
-    formWindow()->emitUpdateProperties( widget );
-    if ( WidgetFactory::layoutType( widget ) != WidgetFactory::NoLayout )
+    formWindow()->emitUpdateProperties( TQT_TQOBJECT(widget) );
+    if ( WidgetFactory::tqlayoutType( widget ) != WidgetFactory::NoLayout )
 	formWindow()->updateChildSelections( widget );
 }
 
@@ -252,8 +252,8 @@ void ResizeCommand::unexecute()
 {
     widget->setGeometry( oldRect );
     formWindow()->updateSelection( widget );
-    formWindow()->emitUpdateProperties( widget );
-    if ( WidgetFactory::layoutType( widget ) != WidgetFactory::NoLayout )
+    formWindow()->emitUpdateProperties( TQT_TQOBJECT(widget) );
+    if ( WidgetFactory::tqlayoutType( widget ) != WidgetFactory::NoLayout )
 	formWindow()->updateChildSelections( widget );
 }
 
@@ -261,33 +261,33 @@ void ResizeCommand::unexecute()
 
 InsertCommand::InsertCommand( const TQString &n, FormWindow *fw,
 			      TQWidget *w, const TQRect &g )
-    : Command( n, fw ), widget( w ), geometry( g )
+    : Command( n, fw ), widget( w ), tqgeometry( g )
 {
 }
 
 void InsertCommand::execute()
 {
-    if ( geometry.size() == TQSize( 0, 0 ) ) {
-	widget->move( geometry.topLeft() );
+    if ( tqgeometry.size() == TQSize( 0, 0 ) ) {
+	widget->move( tqgeometry.topLeft() );
 	widget->adjustSize();
     } else {
-	TQSize s = geometry.size().expandedTo( widget->minimumSize() );
-	s = s.expandedTo( widget->minimumSizeHint() );
-	TQRect r( geometry.topLeft(), s );
+	TQSize s = tqgeometry.size().expandedTo( widget->tqminimumSize() );
+	s = s.expandedTo( widget->tqminimumSizeHint() );
+	TQRect r( tqgeometry.topLeft(), s );
 	widget->setGeometry( r );
     }
     widget->show();
     formWindow()->widgets()->insert( widget, widget );
     formWindow()->clearSelection( FALSE );
-    formWindow()->selectWidget( widget );
+    formWindow()->selectWidget( TQT_TQOBJECT(widget) );
     formWindow()->mainWindow()->objectHierarchy()->widgetInserted( widget );
 }
 
 void InsertCommand::unexecute()
 {
     widget->hide();
-    formWindow()->selectWidget( widget, FALSE );
-    formWindow()->widgets()->remove( widget );
+    formWindow()->selectWidget( TQT_TQOBJECT(widget), FALSE );
+    formWindow()->widgets()->remove( TQT_TQOBJECT(widget) );
     formWindow()->mainWindow()->objectHierarchy()->widgetRemoved( widget );
  }
 
@@ -320,13 +320,13 @@ bool MoveCommand::canMerge( Command *c )
 void MoveCommand::execute()
 {
     for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) {
-	if ( !w->parentWidget() || WidgetFactory::layoutType( w->parentWidget() ) == WidgetFactory::NoLayout ) {
+	if ( !w->tqparentWidget() || WidgetFactory::tqlayoutType( w->tqparentWidget() ) == WidgetFactory::NoLayout ) {
 	    if ( newParent && oldParent && newParent != oldParent ) {
 		TQPoint pos = newParent->mapFromGlobal( w->mapToGlobal( TQPoint( 0,0 ) ) );
 		w->reparent( newParent, pos, TRUE );
 		formWindow()->raiseSelection( w );
 		formWindow()->raiseChildSelections( w );
-		formWindow()->widgetChanged( w );
+		formWindow()->widgetChanged( TQT_TQOBJECT(w) );
 		formWindow()->mainWindow()->objectHierarchy()->widgetRemoved( w );
 		formWindow()->mainWindow()->objectHierarchy()->widgetInserted( w );
 	    }
@@ -334,20 +334,20 @@ void MoveCommand::execute()
 	}
 	formWindow()->updateSelection( w );
 	formWindow()->updateChildSelections( w );
-	formWindow()->emitUpdateProperties( w );
+	formWindow()->emitUpdateProperties( TQT_TQOBJECT(w) );
     }
 }
 
 void MoveCommand::unexecute()
 {
     for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) {
-	if ( !w->parentWidget() || WidgetFactory::layoutType( w->parentWidget() ) == WidgetFactory::NoLayout ) {
+	if ( !w->tqparentWidget() || WidgetFactory::tqlayoutType( w->tqparentWidget() ) == WidgetFactory::NoLayout ) {
 	    if ( newParent && oldParent && newParent != oldParent ) {
 		TQPoint pos = oldParent->mapFromGlobal( w->mapToGlobal( TQPoint( 0,0 ) ) );
 		w->reparent( oldParent, pos, TRUE );
 		formWindow()->raiseSelection( w );
 		formWindow()->raiseChildSelections( w );
-		formWindow()->widgetChanged( w );
+		formWindow()->widgetChanged( TQT_TQOBJECT(w) );
 		formWindow()->mainWindow()->objectHierarchy()->widgetRemoved( w );
 		formWindow()->mainWindow()->objectHierarchy()->widgetInserted( w );
 	    }
@@ -355,7 +355,7 @@ void MoveCommand::unexecute()
 	}
 	formWindow()->updateSelection( w );
 	formWindow()->updateChildSelections( w );
-	formWindow()->emitUpdateProperties( w );
+	formWindow()->emitUpdateProperties( TQT_TQOBJECT(w) );
     }
 }
 
@@ -369,17 +369,17 @@ DeleteCommand::DeleteCommand( const TQString &n, FormWindow *fw,
     TQWidgetList copyOfWidgets = widgets;
     copyOfWidgets.setAutoDelete(FALSE);
 
-    // Include the children of the selected items when deleting
+    // Include the tqchildren of the selected items when deleting
     for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) {
-	TQObjectList *children = w->queryList( TQWIDGET_OBJECT_NAME_STRING );
-	for ( TQWidget *c = (TQWidget *)children->first(); c; c = (TQWidget *)children->next() ) {
-	    if ( copyOfWidgets.find( c ) == -1 && formWindow()->widgets()->find( c ) ) {
+	TQObjectList *tqchildren = w->queryList( TQWIDGET_OBJECT_NAME_STRING );
+	for ( TQWidget *c = (TQWidget *)tqchildren->first(); c; c = (TQWidget *)tqchildren->next() ) {
+	    if ( copyOfWidgets.tqfind( c ) == -1 && formWindow()->widgets()->tqfind( c ) ) {
 		widgets.insert(widgets.at() + 1, c);
 		widgets.prev();
 		copyOfWidgets.append(c);
 	    }
 	}
-	delete children;
+	delete tqchildren;
     }
 }
 
@@ -392,13 +392,13 @@ void DeleteCommand::execute()
 	TQString s = w->name();
 	s.prepend( "qt_dead_widget_" );
 	w->setName( s );
-	formWindow()->selectWidget( w, FALSE );
+	formWindow()->selectWidget( TQT_TQOBJECT(w), FALSE );
 	formWindow()->widgets()->remove( w );
-	TQValueList<MetaDataBase::Connection> conns = MetaDataBase::connections( formWindow(), w );
+	TQValueList<MetaDataBase::Connection> conns = MetaDataBase::connections( TQT_TQOBJECT(formWindow()), TQT_TQOBJECT(w) );
 	connections.insert( w, conns );
 	TQValueList<MetaDataBase::Connection>::Iterator it = conns.begin();
 	for ( ; it != conns.end(); ++it ) {
-	    MetaDataBase::removeConnection( formWindow(), (*it).sender,
+	    MetaDataBase::removeConnection( TQT_TQOBJECT(formWindow()), (*it).sender,
 					    (*it).signal, (*it).receiver, (*it).slot );
 	}
     }
@@ -418,11 +418,11 @@ void DeleteCommand::unexecute()
 	s.remove( 0, TQString( "qt_dead_widget_" ).length() );
 	w->setName( s );
 	formWindow()->widgets()->insert( w, w );
-	formWindow()->selectWidget( w );
-	TQValueList<MetaDataBase::Connection> conns = *connections.find( w );
+	formWindow()->selectWidget( TQT_TQOBJECT(w) );
+	TQValueList<MetaDataBase::Connection> conns = *connections.tqfind( w );
 	TQValueList<MetaDataBase::Connection>::Iterator it = conns.begin();
 	for ( ; it != conns.end(); ++it ) {
-	    MetaDataBase::addConnection( formWindow(), (*it).sender,
+	    MetaDataBase::addConnection( TQT_TQOBJECT(formWindow()), (*it).sender,
 					 (*it).signal, (*it).receiver, (*it).slot );
 	}
     }
@@ -457,8 +457,8 @@ void SetPropertyCommand::execute()
     if ( isResetCommand ) {
 	MetaDataBase::setPropertyChanged( widget, propName, FALSE );
 	if ( WidgetFactory::resetProperty( widget, propName ) ) {
-	    if ( !formWindow()->isWidgetSelected( widget ) && formWindow() != (TQObject *)widget )
-		formWindow()->selectWidget( (TQObject *)widget );
+	    if ( !formWindow()->isWidgetSelected( widget ) && TQT_TQOBJECT(formWindow()) != TQT_TQOBJECT(widget) )
+		formWindow()->selectWidget( TQT_TQOBJECT(widget) );
 	    if ( editor->widget() != widget )
 		editor->setWidget( widget, formWindow() );
 	    editor->propertyList()->setCurrentProperty( propName );
@@ -490,11 +490,11 @@ bool SetPropertyCommand::canMerge( Command *c )
     if ( !widget )
 	return FALSE;
     const TQMetaProperty *p =
-	widget->metaObject()->property( widget->metaObject()->findProperty( propName, TRUE ), TRUE );
+	widget->tqmetaObject()->property( widget->tqmetaObject()->tqfindProperty( propName, TRUE ), TRUE );
     if ( !p ) {
 	if ( propName == "toolTip" || propName == "whatsThis" )
 	    return TRUE;
-	if ( ::qt_cast<CustomWidget*>((TQObject *)widget) ) {
+	if ( ::tqqt_cast<CustomWidget*>((TQObject *)widget) ) {
 	    MetaDataBase::CustomWidget *cw = ((CustomWidget*)(TQObject*)widget)->customWidget();
 	    if ( !cw )
 		return FALSE;
@@ -545,8 +545,8 @@ bool SetPropertyCommand::checkProperty()
 	    return FALSE;
 	}
 
-	if ( ::qt_cast<FormWindow*>(widget->parent()) )
-	    formWindow()->mainWindow()->formNameChanged( (FormWindow*)((TQWidget*)(TQObject*)widget)->parentWidget() );
+	if ( ::tqqt_cast<FormWindow*>(widget->tqparent()) )
+	    formWindow()->mainWindow()->formNameChanged( (FormWindow*)((TQWidget*)(TQObject*)widget)->tqparentWidget() );
     }
     return TRUE;
 }
@@ -557,47 +557,47 @@ void SetPropertyCommand::setProperty( const TQVariant &v, const TQString &curren
         return;
 
     if ( !formWindow()->isWidgetSelected( widget ) && !formWindow()->isMainContainer( widget ) && select )
-	formWindow()->selectWidget( widget );
+	formWindow()->selectWidget( TQT_TQOBJECT(widget) );
     if ( editor->widget() != widget && select )
 	editor->setWidget( widget, formWindow() );
     if ( select )
 	editor->propertyList()->setCurrentProperty( propName );
     const TQMetaProperty *p =
-	widget->metaObject()->property( widget->metaObject()->findProperty( propName, TRUE ), TRUE );
+	widget->tqmetaObject()->property( widget->tqmetaObject()->tqfindProperty( propName, TRUE ), TRUE );
     if ( !p ) {
 	if ( propName == "hAlign" ) {
-	    p = widget->metaObject()->property( widget->metaObject()->findProperty( "alignment", TRUE ), TRUE );
-	    int align = widget->property( "alignment" ).toInt();
+	    p = widget->tqmetaObject()->property( widget->tqmetaObject()->tqfindProperty( "tqalignment", TRUE ), TRUE );
+	    int align = widget->property( "tqalignment" ).toInt();
 	    align &= ~( AlignHorizontal_Mask );
 	    align |= p->keyToValue( currentItemText );
-	    widget->setProperty( "alignment", TQVariant( align ) );
+	    widget->setProperty( "tqalignment", TQVariant( align ) );
 	} else if ( propName == "vAlign" ) {
-	    p = widget->metaObject()->property( widget->metaObject()->findProperty( "alignment", TRUE ), TRUE );
-	    int align = widget->property( "alignment" ).toInt();
+	    p = widget->tqmetaObject()->property( widget->tqmetaObject()->tqfindProperty( "tqalignment", TRUE ), TRUE );
+	    int align = widget->property( "tqalignment" ).toInt();
 	    align &= ~( AlignVertical_Mask );
 	    align |= p->keyToValue( currentItemText );
-	    widget->setProperty( "alignment", TQVariant( align ) );
+	    widget->setProperty( "tqalignment", TQVariant( align ) );
 	} else if ( propName == "wordwrap" ) {
-	    int align = widget->property( "alignment" ).toInt();
+	    int align = widget->property( "tqalignment" ).toInt();
 	    align &= ~WordBreak;
 	    if ( v.toBool() )
 		align |= WordBreak;
-	    widget->setProperty( "alignment", TQVariant( align ) );
-	} else if ( propName == "layoutSpacing" ) {
+	    widget->setProperty( "tqalignment", TQVariant( align ) );
+	} else if ( propName == "tqlayoutSpacing" ) {
 	    TQVariant val = v;
 	    if ( val.toString() == "default" )
 		val = -1;
-	    MetaDataBase::setSpacing( WidgetFactory::containerOfWidget( (TQWidget*)editor->widget() ), val.toInt() );
-	} else if ( propName == "layoutMargin" ) {
+	    MetaDataBase::setSpacing( TQT_TQOBJECT(WidgetFactory::containerOfWidget( TQT_TQWIDGET(editor->widget()) )), val.toInt() );
+	} else if ( propName == "tqlayoutMargin" ) {
 	    TQVariant val = v;
 	    if ( val.toString() == "default" )
 		val = -1;
-	    MetaDataBase::setMargin( WidgetFactory::containerOfWidget( (TQWidget*)editor->widget() ), val.toInt() );
+	    MetaDataBase::setMargin( TQT_TQOBJECT(WidgetFactory::containerOfWidget( TQT_TQWIDGET(editor->widget()) )), val.toInt() );
 	} else if ( propName == "resizeMode" ) {
-	    MetaDataBase::setResizeMode( WidgetFactory::containerOfWidget( (TQWidget*)editor->widget() ), currentItemText );
+	    MetaDataBase::setResizeMode( TQT_TQOBJECT(WidgetFactory::containerOfWidget( TQT_TQWIDGET(editor->widget()) )), currentItemText );
 	} else if ( propName == "toolTip" || propName == "whatsThis" || propName == "database" || propName == "frameworkCode" ) {
 	    MetaDataBase::setFakeProperty( editor->widget(), propName, v );
-	} else if ( ::qt_cast<CustomWidget*>(editor->widget()) ) {
+	} else if ( ::tqqt_cast<CustomWidget*>(editor->widget()) ) {
 	    MetaDataBase::CustomWidget *cw = ((CustomWidget *)(TQObject *)widget)->customWidget();
 	    if ( cw ) {
 		MetaDataBase::setFakeProperty( editor->widget(), propName, v );
@@ -606,7 +606,7 @@ void SetPropertyCommand::setProperty( const TQVariant &v, const TQString &curren
 	editor->refetchData();
 	editor->emitWidgetChanged();
 	( ( PropertyItem* )editor->propertyList()->currentItem() )->setChanged( MetaDataBase::isPropertyChanged( widget, propName ) );
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 	if ( propName == "database" ) {
 	    formWindow()->mainWindow()->objectHierarchy()->databasePropertyChanged( (TQWidget*)((TQObject *)widget), MetaDataBase::fakeProperty( widget, "database" ).toStringList() );
 	}
@@ -634,9 +634,9 @@ void SetPropertyCommand::setProperty( const TQVariant &v, const TQString &curren
 	    oldSerNum = v.toPixmap().serialNumber();
 	widget->setProperty( propName, v );
 	if ( oldSerNum != -1 && oldSerNum != widget->property( propName ).toPixmap().serialNumber() )
-	    MetaDataBase::setPixmapKey( formWindow(),
+	    MetaDataBase::setPixmapKey( TQT_TQOBJECT(formWindow()),
 					widget->property( propName ).toPixmap().serialNumber(),
-					MetaDataBase::pixmapKey( formWindow(), oldSerNum ) );
+					MetaDataBase::pixmapKey( TQT_TQOBJECT(formWindow()), oldSerNum ) );
 	if ( propName == "cursor" ) {
 	    MetaDataBase::setCursor( (TQWidget*)((TQObject *)widget), v.toCursor() );
 	}
@@ -645,10 +645,10 @@ void SetPropertyCommand::setProperty( const TQVariant &v, const TQString &curren
 	    if ( formWindow()->isMainContainer( widget ) )
 		formWindow()->setName( v.toCString() );
 	}
-	if ( propName == "name" && ::qt_cast<TQAction*>((TQObject *)widget) && ::qt_cast<TQMainWindow*>(formWindow()->mainContainer()) ) {
+	if ( propName == "name" && ::tqqt_cast<TQAction*>((TQObject *)widget) && ::tqqt_cast<TQMainWindow*>(formWindow()->mainContainer()) ) {
 	    formWindow()->mainWindow()->actioneditor()->updateActionName( (TQAction*)(TQObject *)widget );
 	}
-	if ( propName == "iconSet" && ::qt_cast<TQAction*>((TQObject *)widget) && ::qt_cast<TQMainWindow*>(formWindow()->mainContainer()) ) {
+	if ( propName == "iconSet" && ::tqqt_cast<TQAction*>((TQObject *)widget) && ::tqqt_cast<TQMainWindow*>(formWindow()->mainContainer()) ) {
 	    formWindow()->mainWindow()->actioneditor()->updateActionIcon( (TQAction*)(TQObject *)widget );
 	}
 	if ( propName == "caption" ) {
@@ -666,162 +666,162 @@ void SetPropertyCommand::setProperty( const TQVariant &v, const TQString &curren
 	( ( PropertyItem* )editor->propertyList()->currentItem() )->setChanged( MetaDataBase::isPropertyChanged( widget, propName ) );
     }
     editor->emitWidgetChanged();
-    formWindow()->killAccels( widget );
+    formWindow()->killAccels( TQT_TQOBJECT(widget) );
 }
 
 // ------------------------------------------------------------
 
 LayoutHorizontalCommand::LayoutHorizontalCommand( const TQString &n, FormWindow *fw,
-						  TQWidget *parent, TQWidget *layoutBase,
+						  TQWidget *tqparent, TQWidget *tqlayoutBase,
 						  const TQWidgetList &wl )
-    : Command( n, fw ), layout( wl, parent, fw, layoutBase )
+    : Command( n, fw ), tqlayout( wl, tqparent, fw, tqlayoutBase )
 {
 }
 
 void LayoutHorizontalCommand::execute()
 {
     formWindow()->clearSelection( FALSE );
-    layout.doLayout();
+    tqlayout.doLayout();
     formWindow()->mainWindow()->objectHierarchy()->rebuild();
 }
 
 void LayoutHorizontalCommand::unexecute()
 {
     formWindow()->clearSelection( FALSE );
-    layout.undoLayout();
+    tqlayout.undoLayout();
     formWindow()->mainWindow()->objectHierarchy()->rebuild();
 }
 
 // ------------------------------------------------------------
 
 LayoutHorizontalSplitCommand::LayoutHorizontalSplitCommand( const TQString &n, FormWindow *fw,
-							    TQWidget *parent, TQWidget *layoutBase,
+							    TQWidget *tqparent, TQWidget *tqlayoutBase,
 							    const TQWidgetList &wl )
-    : Command( n, fw ), layout( wl, parent, fw, layoutBase, TRUE, TRUE )
+    : Command( n, fw ), tqlayout( wl, tqparent, fw, tqlayoutBase, TRUE, TRUE )
 {
 }
 
 void LayoutHorizontalSplitCommand::execute()
 {
     formWindow()->clearSelection( FALSE );
-    layout.doLayout();
+    tqlayout.doLayout();
     formWindow()->mainWindow()->objectHierarchy()->rebuild();
 }
 
 void LayoutHorizontalSplitCommand::unexecute()
 {
     formWindow()->clearSelection( FALSE );
-    layout.undoLayout();
+    tqlayout.undoLayout();
     formWindow()->mainWindow()->objectHierarchy()->rebuild();
 }
 
 // ------------------------------------------------------------
 
 LayoutVerticalCommand::LayoutVerticalCommand( const TQString &n, FormWindow *fw,
-					      TQWidget *parent, TQWidget *layoutBase,
+					      TQWidget *tqparent, TQWidget *tqlayoutBase,
 					      const TQWidgetList &wl )
-    : Command( n, fw ), layout( wl, parent, fw, layoutBase )
+    : Command( n, fw ), tqlayout( wl, tqparent, fw, tqlayoutBase )
 {
 }
 
 void LayoutVerticalCommand::execute()
 {
     formWindow()->clearSelection( FALSE );
-    layout.doLayout();
+    tqlayout.doLayout();
     formWindow()->mainWindow()->objectHierarchy()->rebuild();
 }
 
 void LayoutVerticalCommand::unexecute()
 {
     formWindow()->clearSelection( FALSE );
-    layout.undoLayout();
+    tqlayout.undoLayout();
     formWindow()->mainWindow()->objectHierarchy()->rebuild();
 }
 
 // ------------------------------------------------------------
 
 LayoutVerticalSplitCommand::LayoutVerticalSplitCommand( const TQString &n, FormWindow *fw,
-							TQWidget *parent, TQWidget *layoutBase,
+							TQWidget *tqparent, TQWidget *tqlayoutBase,
 							const TQWidgetList &wl )
-    : Command( n, fw ), layout( wl, parent, fw, layoutBase, TRUE, TRUE )
+    : Command( n, fw ), tqlayout( wl, tqparent, fw, tqlayoutBase, TRUE, TRUE )
 {
 }
 
 void LayoutVerticalSplitCommand::execute()
 {
     formWindow()->clearSelection( FALSE );
-    layout.doLayout();
+    tqlayout.doLayout();
     formWindow()->mainWindow()->objectHierarchy()->rebuild();
 }
 
 void LayoutVerticalSplitCommand::unexecute()
 {
     formWindow()->clearSelection( FALSE );
-    layout.undoLayout();
+    tqlayout.undoLayout();
     formWindow()->mainWindow()->objectHierarchy()->rebuild();
 }
 
 // ------------------------------------------------------------
 
 LayoutGridCommand::LayoutGridCommand( const TQString &n, FormWindow *fw,
-				      TQWidget *parent, TQWidget *layoutBase,
+				      TQWidget *tqparent, TQWidget *tqlayoutBase,
 				      const TQWidgetList &wl, int xres, int yres )
-    : Command( n, fw ), layout( wl, parent, fw, layoutBase, TQSize( QMAX(5,xres), QMAX(5,yres) ) )
+    : Command( n, fw ), tqlayout( wl, tqparent, fw, tqlayoutBase, TQSize( TQMAX(5,xres), TQMAX(5,yres) ) )
 {
 }
 
 void LayoutGridCommand::execute()
 {
     formWindow()->clearSelection( FALSE );
-    layout.doLayout();
+    tqlayout.doLayout();
     formWindow()->mainWindow()->objectHierarchy()->rebuild();
 }
 
 void LayoutGridCommand::unexecute()
 {
     formWindow()->clearSelection( FALSE );
-    layout.undoLayout();
+    tqlayout.undoLayout();
     formWindow()->mainWindow()->objectHierarchy()->rebuild();
 }
 
 // ------------------------------------------------------------
 
 BreakLayoutCommand::BreakLayoutCommand( const TQString &n, FormWindow *fw,
-					TQWidget *layoutBase, const TQWidgetList &wl )
-    : Command( n, fw ), lb( layoutBase ), widgets( wl )
+					TQWidget *tqlayoutBase, const TQWidgetList &wl )
+    : Command( n, fw ), lb( tqlayoutBase ), widgets( wl )
 {
-    WidgetFactory::LayoutType lay = WidgetFactory::layoutType( layoutBase );
-    spacing = MetaDataBase::spacing( layoutBase );
-    margin = MetaDataBase::margin( layoutBase );
-    layout = 0;
+    WidgetFactory::LayoutType lay = WidgetFactory::tqlayoutType( tqlayoutBase );
+    spacing = MetaDataBase::spacing( TQT_TQOBJECT(tqlayoutBase) );
+    margin = MetaDataBase::margin( TQT_TQOBJECT(tqlayoutBase) );
+    tqlayout = 0;
     if ( lay == WidgetFactory::HBox )
-	layout = new HorizontalLayout( wl, layoutBase, fw, layoutBase, FALSE, ::qt_cast<TQSplitter*>(layoutBase) != 0 );
+	tqlayout = new HorizontalLayout( wl, tqlayoutBase, fw, tqlayoutBase, FALSE, ::tqqt_cast<TQSplitter*>(tqlayoutBase) != 0 );
     else if ( lay == WidgetFactory::VBox )
-	layout = new VerticalLayout( wl, layoutBase, fw, layoutBase, FALSE, ::qt_cast<TQSplitter*>(layoutBase) != 0 );
+	tqlayout = new VerticalLayout( wl, tqlayoutBase, fw, tqlayoutBase, FALSE, ::tqqt_cast<TQSplitter*>(tqlayoutBase) != 0 );
     else if ( lay == WidgetFactory::Grid )
-	layout = new GridLayout( wl, layoutBase, fw, layoutBase, TQSize( QMAX( 5, fw->grid().x()), QMAX( 5, fw->grid().y()) ), FALSE );
+	tqlayout = new GridLayout( wl, tqlayoutBase, fw, tqlayoutBase, TQSize( TQMAX( 5, fw->grid().x()), TQMAX( 5, fw->grid().y()) ), FALSE );
 }
 
 void BreakLayoutCommand::execute()
 {
-    if ( !layout )
+    if ( !tqlayout )
 	return;
     formWindow()->clearSelection( FALSE );
-    layout->breakLayout();
+    tqlayout->breakLayout();
     formWindow()->mainWindow()->objectHierarchy()->rebuild();
     for ( TQWidget *w = widgets.first(); w; w = widgets.next() )
-	w->resize( QMAX( 16, w->width() ), QMAX( 16, w->height() ) );
+	w->resize( TQMAX( 16, w->width() ), TQMAX( 16, w->height() ) );
 }
 
 void BreakLayoutCommand::unexecute()
 {
-    if ( !layout )
+    if ( !tqlayout )
 	return;
     formWindow()->clearSelection( FALSE );
-    layout->doLayout();
+    tqlayout->doLayout();
     formWindow()->mainWindow()->objectHierarchy()->rebuild();
-    MetaDataBase::setSpacing( WidgetFactory::containerOfWidget( lb ), spacing );
-    MetaDataBase::setMargin( WidgetFactory::containerOfWidget( lb ), margin );
+    MetaDataBase::setSpacing( TQT_TQOBJECT(WidgetFactory::containerOfWidget( lb )), spacing );
+    MetaDataBase::setMargin( TQT_TQOBJECT(WidgetFactory::containerOfWidget( lb )), margin );
 }
 
 // ------------------------------------------------------------
@@ -850,19 +850,19 @@ AddTabPageCommand::AddTabPageCommand( const TQString &n, FormWindow *fw,
 				      TQTabWidget *tw, const TQString &label )
     : Command( n, fw ), tabWidget( tw ), tabLabel( label )
 {
-    tabPage = new QDesignerWidget( formWindow(), tabWidget, "TabPage" );
+    tabPage = new TQDesignerWidget( formWindow(), tabWidget, "TabPage" );
     tabPage->hide();
     index = -1;
-    MetaDataBase::addEntry( tabPage );
+    MetaDataBase::addEntry( TQT_TQOBJECT(tabPage) );
 }
 
 void AddTabPageCommand::execute()
 {
     if ( index == -1 )
-	index = ( (QDesignerTabWidget*)tabWidget )->count();
+	index = ( (TQDesignerTabWidget*)tabWidget )->count();
     tabWidget->insertTab( tabPage, tabLabel, index );
     tabWidget->showPage( tabPage );
-    formWindow()->emitUpdateProperties( formWindow()->currentWidget() );
+    formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) );
     formWindow()->mainWindow()->objectHierarchy()->tabsChanged( tabWidget );
 }
 
@@ -870,7 +870,7 @@ void AddTabPageCommand::unexecute()
 {
     tabWidget->removePage( tabPage );
     tabPage->hide();
-    formWindow()->emitUpdateProperties( formWindow()->currentWidget() );
+    formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) );
     formWindow()->mainWindow()->objectHierarchy()->tabsChanged( tabWidget );
 }
 
@@ -886,19 +886,19 @@ MoveTabPageCommand::MoveTabPageCommand( const TQString &n, FormWindow *fw,
 
 void MoveTabPageCommand::execute()
 {
-    ((QDesignerTabWidget*)tabWidget )->removePage( tabPage );
-    ((QDesignerTabWidget*)tabWidget )->insertTab( tabPage, tabLabel, newIndex );
-    ((QDesignerTabWidget*)tabWidget )->showPage( tabPage );
-    formWindow()->emitUpdateProperties( formWindow()->currentWidget() );
+    ((TQDesignerTabWidget*)tabWidget )->removePage( tabPage );
+    ((TQDesignerTabWidget*)tabWidget )->insertTab( tabPage, tabLabel, newIndex );
+    ((TQDesignerTabWidget*)tabWidget )->showPage( tabPage );
+    formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) );
     formWindow()->mainWindow()->objectHierarchy()->tabsChanged( tabWidget );
 }
 
 void MoveTabPageCommand::unexecute()
 {
-    ((QDesignerTabWidget*)tabWidget )->removePage( tabPage );
-    ((QDesignerTabWidget*)tabWidget )->insertTab( tabPage, tabLabel, oldIndex );
-    ((QDesignerTabWidget*)tabWidget )->showPage( tabPage );
-    formWindow()->emitUpdateProperties( formWindow()->currentWidget() );
+    ((TQDesignerTabWidget*)tabWidget )->removePage( tabPage );
+    ((TQDesignerTabWidget*)tabWidget )->insertTab( tabPage, tabLabel, oldIndex );
+    ((TQDesignerTabWidget*)tabWidget )->showPage( tabPage );
+    formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) );
     formWindow()->mainWindow()->objectHierarchy()->tabsChanged( tabWidget );
 }
 
@@ -908,15 +908,15 @@ DeleteTabPageCommand::DeleteTabPageCommand( const TQString &n, FormWindow *fw,
 					    TQTabWidget *tw, TQWidget *page )
     : Command( n, fw ), tabWidget( tw ), tabPage( page )
 {
-    tabLabel = ( (QDesignerTabWidget*)tabWidget )->pageTitle();
-    index = ( (QDesignerTabWidget*)tabWidget )->currentPage();
+    tabLabel = ( (TQDesignerTabWidget*)tabWidget )->pageTitle();
+    index = ( (TQDesignerTabWidget*)tabWidget )->currentPage();
 }
 
 void DeleteTabPageCommand::execute()
 {
     tabWidget->removePage( tabPage );
     tabPage->hide();
-    formWindow()->emitUpdateProperties( formWindow()->currentWidget() );
+    formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) );
     formWindow()->mainWindow()->objectHierarchy()->tabsChanged( tabWidget );
 }
 
@@ -924,26 +924,26 @@ void DeleteTabPageCommand::unexecute()
 {
     tabWidget->insertTab( tabPage, tabLabel, index );
     tabWidget->showPage( tabPage );
-    formWindow()->emitUpdateProperties( formWindow()->currentWidget() );
+    formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) );
     formWindow()->mainWindow()->objectHierarchy()->tabsChanged( tabWidget );
 }
 
 // ------------------------------------------------------------
 
 AddWidgetStackPageCommand::AddWidgetStackPageCommand( const TQString &n, FormWindow *fw,
-						      QDesignerWidgetStack *ws )
+						      TQDesignerWidgetStack *ws )
     : Command( n, fw ), widgetStack( ws )
 {
-    stackPage = new QDesignerWidget( formWindow(), widgetStack, "WStackPage" );
+    stackPage = new TQDesignerWidget( formWindow(), widgetStack, "WStackPage" );
     stackPage->hide();
     index = -1;
-    MetaDataBase::addEntry( stackPage );
+    MetaDataBase::addEntry( TQT_TQOBJECT(stackPage) );
 }
 
 void AddWidgetStackPageCommand::execute()
 {
     index = widgetStack->insertPage( stackPage, index );
-    formWindow()->emitUpdateProperties( formWindow()->currentWidget() );
+    formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) );
     formWindow()->mainWindow()->objectHierarchy()->tabsChanged( 0 );
 }
 
@@ -951,12 +951,12 @@ void AddWidgetStackPageCommand::unexecute()
 {
     index = widgetStack->removePage( stackPage );
     stackPage->hide();
-    formWindow()->emitUpdateProperties( formWindow()->currentWidget() );
+    formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) );
     formWindow()->mainWindow()->objectHierarchy()->tabsChanged( 0 );
 }
 
 DeleteWidgetStackPageCommand::DeleteWidgetStackPageCommand( const TQString &n, FormWindow *fw,
-							    QDesignerWidgetStack *ws, TQWidget *page )
+							    TQDesignerWidgetStack *ws, TQWidget *page )
     : Command( n, fw), widgetStack( ws ), stackPage( page )
 {
     index = -1;
@@ -966,7 +966,7 @@ void DeleteWidgetStackPageCommand::execute()
 {
     index = widgetStack->removePage( stackPage );
     stackPage->hide();
-    formWindow()->emitUpdateProperties( formWindow()->currentWidget() );
+    formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) );
     formWindow()->mainWindow()->objectHierarchy()->widgetRemoved( stackPage );
 }
 
@@ -974,7 +974,7 @@ void DeleteWidgetStackPageCommand::unexecute()
 {
     index = widgetStack->insertPage( stackPage, index );
     widgetStack->raiseWidget( stackPage );
-    formWindow()->emitUpdateProperties( formWindow()->currentWidget() );
+    formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) );
     formWindow()->mainWindow()->objectHierarchy()->widgetInserted( stackPage );
 }
 
@@ -984,11 +984,11 @@ AddWizardPageCommand::AddWizardPageCommand( const TQString &n, FormWindow *fw,
 					    TQWizard *w, const TQString &label, int i, bool s )
     : Command( n, fw ), wizard( w ), pageLabel( label )
 {
-    page = new QDesignerWidget( formWindow(), wizard, "WizardPage" );
+    page = new TQDesignerWidget( formWindow(), wizard, "WizardPage" );
     page->hide();
     index = i;
     show = s;
-    MetaDataBase::addEntry( page );
+    MetaDataBase::addEntry( TQT_TQOBJECT(page) );
 }
 
 void AddWizardPageCommand::execute()
@@ -997,8 +997,8 @@ void AddWizardPageCommand::execute()
 	index = wizard->pageCount();
     wizard->insertPage( page, pageLabel, index );
     if ( show )
-	( (QDesignerWizard*)wizard )->setCurrentPage( ( (QDesignerWizard*)wizard )->pageNum( page ) );
-    formWindow()->emitUpdateProperties( formWindow()->currentWidget() );
+	( (TQDesignerWizard*)wizard )->setCurrentPage( ( (TQDesignerWizard*)wizard )->pageNum( page ) );
+    formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) );
     formWindow()->mainWindow()->objectHierarchy()->pagesChanged( wizard );
 }
 
@@ -1006,7 +1006,7 @@ void AddWizardPageCommand::unexecute()
 {
     wizard->removePage( page );
     page->hide();
-    formWindow()->emitUpdateProperties( formWindow()->currentWidget() );
+    formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) );
     formWindow()->mainWindow()->objectHierarchy()->pagesChanged( wizard );
 }
 
@@ -1025,7 +1025,7 @@ void DeleteWizardPageCommand::execute()
     pageLabel = wizard->title( page );
     wizard->removePage( page );
     page->hide();
-    formWindow()->emitUpdateProperties( formWindow()->currentWidget() );
+    formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) );
     formWindow()->mainWindow()->objectHierarchy()->pagesChanged( wizard );
 }
 
@@ -1033,8 +1033,8 @@ void DeleteWizardPageCommand::unexecute()
 {
     wizard->insertPage( page, pageLabel, index );
     if ( show )
-	( (QDesignerWizard*)wizard )->setCurrentPage( ( (QDesignerWizard*)wizard )->pageNum( page ) );
-    formWindow()->emitUpdateProperties( formWindow()->currentWidget() );
+	( (TQDesignerWizard*)wizard )->setCurrentPage( ( (TQDesignerWizard*)wizard )->pageNum( page ) );
+    formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) );
     formWindow()->mainWindow()->objectHierarchy()->pagesChanged( wizard );
 }
 
@@ -1054,7 +1054,7 @@ void RenameWizardPageCommand::execute()
 
     wizard->setTitle( page, label );
     label = oldLabel;
-    formWindow()->emitUpdateProperties( formWindow()->currentWidget() );
+    formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) );
 }
 
 void RenameWizardPageCommand::unexecute()
@@ -1079,7 +1079,7 @@ void SwapWizardPagesCommand::execute()
     wizard->removePage( page2 );
     wizard->insertPage( page1, page1Label, index2 );
     wizard->insertPage( page2, page2Label, index1 );
-    formWindow()->emitUpdateProperties( formWindow()->currentWidget() );
+    formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) );
     formWindow()->mainWindow()->objectHierarchy()->pagesChanged( wizard );
 }
 
@@ -1101,7 +1101,7 @@ void MoveWizardPageCommand::execute()
     TQString pageLabel = wizard->title( page );
     wizard->removePage( page );
     wizard->insertPage( page, pageLabel, index2 );
-    formWindow()->emitUpdateProperties( formWindow()->currentWidget() );
+    formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) );
     formWindow()->mainWindow()->objectHierarchy()->pagesChanged( wizard );
 }
 
@@ -1112,7 +1112,7 @@ void MoveWizardPageCommand::unexecute()
     TQString pageLabel = wizard->title( page );
     wizard->removePage( page );
     wizard->insertPage( page, pageLabel, index1 );
-    formWindow()->emitUpdateProperties( formWindow()->currentWidget() );
+    formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) );
     formWindow()->mainWindow()->objectHierarchy()->pagesChanged( wizard );
 }
 
@@ -1126,17 +1126,17 @@ AddConnectionCommand::AddConnectionCommand( const TQString &name, FormWindow *fw
 
 void AddConnectionCommand::execute()
 {
-    MetaDataBase::addConnection( formWindow(), connection.sender,
+    MetaDataBase::addConnection( TQT_TQOBJECT(formWindow()), connection.sender,
 				 connection.signal, connection.receiver, connection.slot );
-    if ( connection.receiver == formWindow()->mainContainer() )
+    if ( TQT_BASE_OBJECT(connection.receiver) == TQT_BASE_OBJECT(formWindow()->mainContainer()) )
 	formWindow()->mainWindow()->propertyeditor()->eventList()->setup();
 }
 
 void AddConnectionCommand::unexecute()
 {
-    MetaDataBase::removeConnection( formWindow(), connection.sender,
+    MetaDataBase::removeConnection( TQT_TQOBJECT(formWindow()), connection.sender,
 				    connection.signal, connection.receiver, connection.slot );
-    if ( connection.receiver == formWindow()->mainContainer() )
+    if ( TQT_BASE_OBJECT(connection.receiver) == TQT_BASE_OBJECT(formWindow()->mainContainer()) )
 	formWindow()->mainWindow()->propertyeditor()->eventList()->setup();
 }
 
@@ -1150,17 +1150,17 @@ RemoveConnectionCommand::RemoveConnectionCommand( const TQString &name, FormWind
 
 void RemoveConnectionCommand::execute()
 {
-    MetaDataBase::removeConnection( formWindow(), connection.sender,
+    MetaDataBase::removeConnection( TQT_TQOBJECT(formWindow()), connection.sender,
 				    connection.signal, connection.receiver, connection.slot );
-    if ( connection.receiver == formWindow()->mainContainer() )
+    if ( TQT_BASE_OBJECT(connection.receiver) == TQT_BASE_OBJECT(formWindow()->mainContainer()) )
 	formWindow()->mainWindow()->propertyeditor()->eventList()->setup();
 }
 
 void RemoveConnectionCommand::unexecute()
 {
-    MetaDataBase::addConnection( formWindow(), connection.sender,
+    MetaDataBase::addConnection( TQT_TQOBJECT(formWindow()), connection.sender,
 				 connection.signal, connection.receiver, connection.slot );
-    if ( connection.receiver == formWindow()->mainContainer() )
+    if ( TQT_BASE_OBJECT(connection.receiver) == TQT_BASE_OBJECT(formWindow()->mainContainer()) )
 	formWindow()->mainWindow()->propertyeditor()->eventList()->setup();
 }
 
@@ -1176,7 +1176,7 @@ AddFunctionCommand::AddFunctionCommand( const TQString &name, FormWindow *fw, co
 
 void AddFunctionCommand::execute()
 {
-    MetaDataBase::addFunction( formWindow(), function, specifier, access, functionType, language, returnType );
+    MetaDataBase::addFunction( TQT_TQOBJECT(formWindow()), function, specifier, access, functionType, language, returnType );
     formWindow()->mainWindow()->functionsChanged();
 
     //integration (add - execute)
@@ -1185,7 +1185,7 @@ void AddFunctionCommand::execute()
     f.function = function;
     f.specifier = specifier;
     f.access = access;
-    f.type = (functionType == "slot") ? KInterfaceDesigner::ftQtSlot : KInterfaceDesigner::ftFunction ;
+    f.type = (functionType == "slot") ? KInterfaceDesigner::ftTQtSlot : KInterfaceDesigner::ftFunction ;
     formWindow()->clearSelection(false);
     formWindow()->mainWindow()->part()->emitAddedFunction(formWindow()->fileName(), f);
 
@@ -1195,7 +1195,7 @@ void AddFunctionCommand::execute()
 
 void AddFunctionCommand::unexecute()
 {
-    MetaDataBase::removeFunction( formWindow(), function, specifier, access, functionType,  language, returnType );
+    MetaDataBase::removeFunction( TQT_TQOBJECT(formWindow()), function, specifier, access, functionType,  language, returnType );
     formWindow()->mainWindow()->functionsChanged();
 
     //integration (add - unexecute)
@@ -1204,7 +1204,7 @@ void AddFunctionCommand::unexecute()
     f.function = function;
     f.specifier = specifier;
     f.access = access;
-    f.type = (functionType == "slot") ? KInterfaceDesigner::ftQtSlot : KInterfaceDesigner::ftFunction ;
+    f.type = (functionType == "slot") ? KInterfaceDesigner::ftTQtSlot : KInterfaceDesigner::ftFunction ;
     formWindow()->mainWindow()->part()->emitRemovedFunction(formWindow()->fileName(), f);
 
     if ( formWindow()->formFile() )
@@ -1230,7 +1230,7 @@ ChangeFunctionAttribCommand::ChangeFunctionAttribCommand( const TQString &name,
 
 void ChangeFunctionAttribCommand::execute()
 {
-    MetaDataBase::changeFunctionAttributes( formWindow(), oldName, newName, newSpec, newAccess,
+    MetaDataBase::changeFunctionAttributes( TQT_TQOBJECT(formWindow()), oldName, newName, newSpec, newAccess,
 					    newType, newLang, newReturnType );
     formWindow()->formFile()->functionNameChanged( oldName, newName );
     formWindow()->formFile()->functionRetTypeChanged( newName, oldReturnType, newReturnType );
@@ -1242,13 +1242,13 @@ void ChangeFunctionAttribCommand::execute()
     f.function = newName;
     f.specifier = newSpec;
     f.access = newAccess;
-    f.type = (newType == "slot") ? KInterfaceDesigner::ftQtSlot : KInterfaceDesigner::ftFunction ;
+    f.type = (newType == "slot") ? KInterfaceDesigner::ftTQtSlot : KInterfaceDesigner::ftFunction ;
     KInterfaceDesigner::Function of;
     f.returnType = oldReturnType;
     f.function = oldName;
     f.specifier = oldSpec;
     f.access = oldAccess;
-    f.type = (oldType == "slot") ? KInterfaceDesigner::ftQtSlot : KInterfaceDesigner::ftFunction ;
+    f.type = (oldType == "slot") ? KInterfaceDesigner::ftTQtSlot : KInterfaceDesigner::ftFunction ;
     formWindow()->mainWindow()->part()->emitEditedFunction(formWindow()->fileName(), of, f);
 
     if ( formWindow()->formFile() )
@@ -1257,7 +1257,7 @@ void ChangeFunctionAttribCommand::execute()
 
 void ChangeFunctionAttribCommand::unexecute()
 {
-    MetaDataBase::changeFunctionAttributes( formWindow(), newName, oldName, oldSpec, oldAccess,
+    MetaDataBase::changeFunctionAttributes( TQT_TQOBJECT(formWindow()), newName, oldName, oldSpec, oldAccess,
 					    oldType, oldLang, oldReturnType );
     formWindow()->formFile()->functionNameChanged( newName, oldName );
     formWindow()->formFile()->functionRetTypeChanged( oldName, newReturnType, oldReturnType );
@@ -1269,13 +1269,13 @@ void ChangeFunctionAttribCommand::unexecute()
     f.function = newName;
     f.specifier = newSpec;
     f.access = newAccess;
-    f.type = (newType == "slot") ? KInterfaceDesigner::ftQtSlot : KInterfaceDesigner::ftFunction ;
+    f.type = (newType == "slot") ? KInterfaceDesigner::ftTQtSlot : KInterfaceDesigner::ftFunction ;
     KInterfaceDesigner::Function of;
     f.returnType = oldReturnType;
     f.function = oldName;
     f.specifier = oldSpec;
     f.access = oldAccess;
-    f.type = (oldType == "slot") ? KInterfaceDesigner::ftQtSlot : KInterfaceDesigner::ftFunction ;
+    f.type = (oldType == "slot") ? KInterfaceDesigner::ftTQtSlot : KInterfaceDesigner::ftFunction ;
     formWindow()->mainWindow()->part()->emitEditedFunction(formWindow()->fileName(), f, of);
 
     if ( formWindow()->formFile() )
@@ -1291,7 +1291,7 @@ RemoveFunctionCommand::RemoveFunctionCommand( const TQString &name, FormWindow *
       returnType( rt )
 {
     if ( spec.isNull() ) {
-	TQValueList<MetaDataBase::Function> lst = MetaDataBase::functionList( fw );
+	TQValueList<MetaDataBase::Function> lst = MetaDataBase::functionList( TQT_TQOBJECT(fw) );
 	for ( TQValueList<MetaDataBase::Function>::Iterator it = lst.begin(); it != lst.end(); ++it ) {
 	    if ( MetaDataBase::normalizeFunction( (*it).function ) ==
 		 MetaDataBase::normalizeFunction( function ) ) {
@@ -1308,7 +1308,7 @@ RemoveFunctionCommand::RemoveFunctionCommand( const TQString &name, FormWindow *
 
 void RemoveFunctionCommand::execute()
 {
-    MetaDataBase::removeFunction( formWindow(), function, specifier, access, functionType, language, returnType );
+    MetaDataBase::removeFunction( TQT_TQOBJECT(formWindow()), function, specifier, access, functionType, language, returnType );
     formWindow()->mainWindow()->functionsChanged();
 
     //integration (remove - execute)
@@ -1317,7 +1317,7 @@ void RemoveFunctionCommand::execute()
     f.function = function;
     f.specifier = specifier;
     f.access = access;
-    f.type = (functionType == "slot") ? KInterfaceDesigner::ftQtSlot : KInterfaceDesigner::ftFunction ;
+    f.type = (functionType == "slot") ? KInterfaceDesigner::ftTQtSlot : KInterfaceDesigner::ftFunction ;
     formWindow()->mainWindow()->part()->emitRemovedFunction(formWindow()->fileName(), f);
 
     if ( formWindow()->formFile() )
@@ -1326,9 +1326,9 @@ void RemoveFunctionCommand::execute()
 
 void RemoveFunctionCommand::unexecute()
 {
-    if ( MetaDataBase::hasFunction( formWindow(), function ) )
+    if ( MetaDataBase::hasFunction( TQT_TQOBJECT(formWindow()), function ) )
 	return;
-    MetaDataBase::addFunction( formWindow(), function, specifier, access, functionType, language, returnType );
+    MetaDataBase::addFunction( TQT_TQOBJECT(formWindow()), function, specifier, access, functionType, language, returnType );
     formWindow()->mainWindow()->functionsChanged();
 
     //integration (remove - unexecute)
@@ -1337,7 +1337,7 @@ void RemoveFunctionCommand::unexecute()
     f.function = function;
     f.specifier = specifier;
     f.access = access;
-    f.type = (functionType == "slot") ? KInterfaceDesigner::ftQtSlot : KInterfaceDesigner::ftFunction ;
+    f.type = (functionType == "slot") ? KInterfaceDesigner::ftTQtSlot : KInterfaceDesigner::ftFunction ;
     formWindow()->clearSelection(false);
     formWindow()->mainWindow()->part()->emitAddedFunction(formWindow()->fileName(), f);
 
@@ -1354,7 +1354,7 @@ AddVariableCommand::AddVariableCommand( const TQString &name, FormWindow *fw, co
 
 void AddVariableCommand::execute()
 {
-    MetaDataBase::addVariable( formWindow(), varName, access );
+    MetaDataBase::addVariable( TQT_TQOBJECT(formWindow()), varName, access );
     formWindow()->mainWindow()->objectHierarchy()->updateFormDefinitionView();
     if ( formWindow()->formFile() )
 	formWindow()->formFile()->setModified( TRUE );
@@ -1362,7 +1362,7 @@ void AddVariableCommand::execute()
 
 void AddVariableCommand::unexecute()
 {
-    MetaDataBase::removeVariable( formWindow(), varName );
+    MetaDataBase::removeVariable( TQT_TQOBJECT(formWindow()), varName );
     formWindow()->mainWindow()->objectHierarchy()->updateFormDefinitionView();
     if ( formWindow()->formFile() )
 	formWindow()->formFile()->setModified( TRUE );
@@ -1374,12 +1374,12 @@ SetVariablesCommand::SetVariablesCommand( const TQString &name, FormWindow *fw,
     TQValueList<MetaDataBase::Variable> lst )
     : Command( name, fw ), newList( lst )
 {
-    oldList = MetaDataBase::variables( formWindow() );
+    oldList = MetaDataBase::variables( TQT_TQOBJECT(formWindow()) );
 }
 
 void SetVariablesCommand::execute()
 {
-    MetaDataBase::setVariables( formWindow(), newList );
+    MetaDataBase::setVariables( TQT_TQOBJECT(formWindow()), newList );
     formWindow()->mainWindow()->objectHierarchy()->updateFormDefinitionView();
     if ( formWindow()->formFile() )
 	formWindow()->formFile()->setModified( TRUE );
@@ -1387,7 +1387,7 @@ void SetVariablesCommand::execute()
 
 void SetVariablesCommand::unexecute()
 {
-    MetaDataBase::setVariables( formWindow(), oldList );
+    MetaDataBase::setVariables( TQT_TQOBJECT(formWindow()), oldList );
     formWindow()->mainWindow()->objectHierarchy()->updateFormDefinitionView();
     if ( formWindow()->formFile() )
 	formWindow()->formFile()->setModified( TRUE );
@@ -1398,7 +1398,7 @@ void SetVariablesCommand::unexecute()
 RemoveVariableCommand::RemoveVariableCommand( const TQString &name, FormWindow *fw, const TQString &vn )
     : Command( name, fw ), varName( vn )
 {
-    TQValueList<MetaDataBase::Variable> lst = MetaDataBase::variables( fw );
+    TQValueList<MetaDataBase::Variable> lst = MetaDataBase::variables( TQT_TQOBJECT(fw) );
     for ( TQValueList<MetaDataBase::Variable>::Iterator it = lst.begin(); it != lst.end(); ++it ) {
 	if ( (*it).varName == varName ) {
 	    access = (*it).varAccess;
@@ -1409,7 +1409,7 @@ RemoveVariableCommand::RemoveVariableCommand( const TQString &name, FormWindow *
 
 void RemoveVariableCommand::execute()
 {
-    MetaDataBase::removeVariable( formWindow(), varName );
+    MetaDataBase::removeVariable( TQT_TQOBJECT(formWindow()), varName );
     formWindow()->mainWindow()->objectHierarchy()->updateFormDefinitionView();
     if ( formWindow()->formFile() )
 	formWindow()->formFile()->setModified( TRUE );
@@ -1417,7 +1417,7 @@ void RemoveVariableCommand::execute()
 
 void RemoveVariableCommand::unexecute()
 {
-    MetaDataBase::addVariable( formWindow(), varName, access );
+    MetaDataBase::addVariable( TQT_TQOBJECT(formWindow()), varName, access );
     formWindow()->mainWindow()->objectHierarchy()->updateFormDefinitionView();
     if ( formWindow()->formFile() )
 	formWindow()->formFile()->setModified( TRUE );
@@ -1510,7 +1510,7 @@ void PasteCommand::execute()
 {
     for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) {
 	w->show();
-	formWindow()->selectWidget( w );
+	formWindow()->selectWidget( TQT_TQOBJECT(w) );
 	formWindow()->widgets()->insert( w, w );
 	formWindow()->mainWindow()->objectHierarchy()->widgetInserted( w );
     }
@@ -1520,7 +1520,7 @@ void PasteCommand::unexecute()
 {
     for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) {
 	w->hide();
-	formWindow()->selectWidget( w, FALSE );
+	formWindow()->selectWidget( TQT_TQOBJECT(w), FALSE );
 	formWindow()->widgets()->remove( w );
 	formWindow()->mainWindow()->objectHierarchy()->widgetRemoved( w );
     }
@@ -1603,7 +1603,7 @@ PopulateIconViewCommand::PopulateIconViewCommand( const TQString &n, FormWindow
 						  TQIconView *iv, const TQValueList<Item> &items )
     : Command( n, fw ), newItems( items ), iconview( iv )
 {
-#ifndef QT_NO_ICONVIEW
+#ifndef TQT_NO_ICONVIEW
     TQIconViewItem *i = 0;
     for ( i = iconview->firstItem(); i; i = i->nextItem() ) {
 	Item item;
@@ -1617,7 +1617,7 @@ PopulateIconViewCommand::PopulateIconViewCommand( const TQString &n, FormWindow
 
 void PopulateIconViewCommand::execute()
 {
-#ifndef QT_NO_ICONVIEW
+#ifndef TQT_NO_ICONVIEW
     iconview->clear();
     for ( TQValueList<Item>::Iterator it = newItems.begin(); it != newItems.end(); ++it ) {
 	Item i = *it;
@@ -1628,7 +1628,7 @@ void PopulateIconViewCommand::execute()
 
 void PopulateIconViewCommand::unexecute()
 {
-#ifndef QT_NO_ICONVIEW
+#ifndef TQT_NO_ICONVIEW
     iconview->clear();
     for ( TQValueList<Item>::Iterator it = oldItems.begin(); it != oldItems.end(); ++it ) {
 	Item i = *it;
@@ -1689,7 +1689,7 @@ void PopulateListViewCommand::transferItems( TQListView *from, TQListView *to )
     from->setSorting( -1 );
     for ( ; it.current(); ++it ) {
 	TQListViewItem *i = it.current();
-	if ( i->parent() == fromParents.top() ) {
+	if ( i->tqparent() == fromParents.top() ) {
 	    TQListViewItem *pi = toParents.top();
 	    TQListViewItem *ni = 0;
 	    if ( pi )
@@ -1706,7 +1706,7 @@ void PopulateListViewCommand::transferItems( TQListView *from, TQListView *to )
 	    if ( pi )
 		pi->setOpen( TRUE );
 	} else {
-	    if ( i->parent() == fromLast ) {
+	    if ( i->tqparent() == fromLast ) {
 		fromParents.push( fromLast );
 		toParents.push( toLasts.top() );
 		toLasts.push( 0 );
@@ -1726,7 +1726,7 @@ void PopulateListViewCommand::transferItems( TQListView *from, TQListView *to )
 		if ( pi )
 		    pi->setOpen( TRUE );
 	    } else {
-		while ( fromParents.top() != i->parent() ) {
+		while ( fromParents.top() != i->tqparent() ) {
 		    fromParents.pop();
 		    toParents.pop();
 		    toLasts.pop();
@@ -1762,21 +1762,21 @@ PopulateMultiLineEditCommand::PopulateMultiLineEditCommand( const TQString &n, F
     : Command( n, fw ), newText( txt ), mlined( mle )
 {
     oldText = mlined->text();
-    wasChanged = MetaDataBase::isPropertyChanged( mlined, "text" );
+    wasChanged = MetaDataBase::isPropertyChanged( TQT_TQOBJECT(mlined), "text" );
 }
 
 void PopulateMultiLineEditCommand::execute()
 {
     mlined->setText( newText );
-    MetaDataBase::setPropertyChanged( mlined, "text", TRUE );
-    formWindow()->emitUpdateProperties( mlined );
+    MetaDataBase::setPropertyChanged( TQT_TQOBJECT(mlined), "text", TRUE );
+    formWindow()->emitUpdateProperties( TQT_TQOBJECT(mlined) );
 }
 
 void PopulateMultiLineEditCommand::unexecute()
 {
     mlined->setText( oldText );
-    MetaDataBase::setPropertyChanged( mlined, "text", wasChanged );
-    formWindow()->emitUpdateProperties( mlined );
+    MetaDataBase::setPropertyChanged( TQT_TQOBJECT(mlined), "text", wasChanged );
+    formWindow()->emitUpdateProperties( TQT_TQOBJECT(mlined) );
 }
 
 // ------------------------------------------------------------
@@ -1786,15 +1786,15 @@ PopulateTableCommand::PopulateTableCommand( const TQString &n, FormWindow *fw, T
 					    const TQValueList<Column> &columns )
     : Command( n, fw ), newRows( rows ), newColumns( columns ), table( t )
 {
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
     int i = 0;
-    TQMap<TQString, TQString> columnFields = MetaDataBase::columnFields( table );
+    TQMap<TQString, TQString> columnFields = MetaDataBase::columnFields( TQT_TQOBJECT(table) );
     for ( i = 0; i < table->horizontalHeader()->count(); ++i ) {
 	PopulateTableCommand::Column col;
 	col.text = table->horizontalHeader()->label( i );
 	if ( table->horizontalHeader()->iconSet( i ) )
 	    col.pix = table->horizontalHeader()->iconSet( i )->pixmap();
-	col.field = *columnFields.find( col.text );
+	col.field = *columnFields.tqfind( col.text );
 	oldColumns.append( col );
     }
     for ( i = 0; i < table->verticalHeader()->count(); ++i ) {
@@ -1809,7 +1809,7 @@ PopulateTableCommand::PopulateTableCommand( const TQString &n, FormWindow *fw, T
 
 void PopulateTableCommand::execute()
 {
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
     TQMap<TQString, TQString> columnFields;
     table->setNumCols( newColumns.count() );
     int i = 0;
@@ -1818,7 +1818,7 @@ void PopulateTableCommand::execute()
 	if ( !(*cit).field.isEmpty() )
 	    columnFields.insert( (*cit).text, (*cit).field );
     }
-    MetaDataBase::setColumnFields( table, columnFields );
+    MetaDataBase::setColumnFields( TQT_TQOBJECT(table), columnFields );
     table->setNumRows( newRows.count() );
     i = 0;
     for ( TQValueList<Row>::Iterator rit = newRows.begin(); rit != newRows.end(); ++rit, ++i )
@@ -1828,7 +1828,7 @@ void PopulateTableCommand::execute()
 
 void PopulateTableCommand::unexecute()
 {
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
     TQMap<TQString, TQString> columnFields;
     table->setNumCols( oldColumns.count() );
     int i = 0;
@@ -1837,7 +1837,7 @@ void PopulateTableCommand::unexecute()
 	if ( !(*cit).field.isEmpty() )
 	    columnFields.insert( (*cit).text, (*cit).field );
     }
-    MetaDataBase::setColumnFields( table, columnFields );
+    MetaDataBase::setColumnFields( TQT_TQOBJECT(table), columnFields );
     table->setNumRows( oldRows.count() );
     i = 0;
     for ( TQValueList<Row>::Iterator rit = oldRows.begin(); rit != oldRows.end(); ++rit, ++i )
@@ -1848,7 +1848,7 @@ void PopulateTableCommand::unexecute()
 // ------------------------------------------------------------
 
 AddActionToToolBarCommand::AddActionToToolBarCommand( const TQString &n, FormWindow *fw,
-						      TQAction *a, QDesignerToolBar *tb, int idx )
+						      TQAction *a, TQDesignerToolBar *tb, int idx )
     : Command( n, fw ), action( a ), toolBar( tb ), index( idx )
 {
 }
@@ -1857,24 +1857,24 @@ void AddActionToToolBarCommand::execute()
 {
     action->addTo( toolBar );
 
-    if ( ::qt_cast<QDesignerAction*>(action) ) {
-	TQString s = ( (QDesignerAction*)action )->widget()->name();
+    if ( ::tqqt_cast<TQDesignerAction*>(action) ) {
+	TQString s = ( (TQDesignerAction*)action )->widget()->name();
 	if ( s.startsWith( "qt_dead_widget_" ) ) {
 	    s.remove( 0, TQString( "qt_dead_widget_" ).length() );
-	    ( (QDesignerAction*)action )->widget()->setName( s );
+	    ( (TQDesignerAction*)action )->widget()->setName( s );
 	}
-	toolBar->insertAction( ( (QDesignerAction*)action )->widget(), action );
-	( (QDesignerAction*)action )->widget()->installEventFilter( toolBar );
-    } else if ( ::qt_cast<QDesignerActionGroup*>(action) ) {
-	if ( ( (QDesignerActionGroup*)action )->usesDropDown() ) {
-	    toolBar->insertAction( ( (QDesignerActionGroup*)action )->widget(), action );
-	    ( (QDesignerActionGroup*)action )->widget()->installEventFilter( toolBar );
+	toolBar->insertAction( ( (TQDesignerAction*)action )->widget(), action );
+	( (TQDesignerAction*)action )->widget()->installEventFilter( toolBar );
+    } else if ( ::tqqt_cast<TQDesignerActionGroup*>(action) ) {
+	if ( ( (TQDesignerActionGroup*)action )->usesDropDown() ) {
+	    toolBar->insertAction( ( (TQDesignerActionGroup*)action )->widget(), action );
+	    ( (TQDesignerActionGroup*)action )->widget()->installEventFilter( toolBar );
 	}
-    } else if ( ::qt_cast<QSeparatorAction*>(action) ) {
-	toolBar->insertAction( ( (QSeparatorAction*)action )->widget(), action );
-	( (QSeparatorAction*)action )->widget()->installEventFilter( toolBar );
+    } else if ( ::tqqt_cast<TQSeparatorAction*>(action) ) {
+	toolBar->insertAction( ( (TQSeparatorAction*)action )->widget(), action );
+	( (TQSeparatorAction*)action )->widget()->installEventFilter( toolBar );
     }
-    if ( !::qt_cast<TQActionGroup*>(action) || ( (TQActionGroup*)action )->usesDropDown()) {
+    if ( !::tqqt_cast<TQActionGroup*>(action) || ( (TQActionGroup*)action )->usesDropDown()) {
 	if ( index == -1 )
 	    toolBar->appendAction( action );
 	else
@@ -1882,17 +1882,18 @@ void AddActionToToolBarCommand::execute()
 	toolBar->reInsert();
 	TQObject::connect( action, TQT_SIGNAL( destroyed() ), toolBar, TQT_SLOT( actionRemoved() ) );
     } else {
-	if ( action->children() ) {
-	    TQObjectListIt it( *action->children() );
+        TQObjectList clo = action->childrenListObject();
+	if ( !clo.isEmpty() ) {
+	    TQObjectListIt it( clo );
 	    int i = 0;
 	    while ( it.current() ) {
 		TQObject *o = it.current();
 		++it;
-		if ( !::qt_cast<TQAction*>(o) )
+		if ( !::tqqt_cast<TQAction*>(o) )
 		    continue;
 		// ### fix it for nested actiongroups
-		if ( ::qt_cast<QDesignerAction*>(o) ) {
-		    QDesignerAction *ac = (QDesignerAction*)o;
+		if ( ::tqqt_cast<TQDesignerAction*>(o) ) {
+		    TQDesignerAction *ac = (TQDesignerAction*)o;
 		    toolBar->insertAction( ac->widget(), ac );
 		    ac->widget()->installEventFilter( toolBar );
 		    if ( index == -1 )
@@ -1911,26 +1912,27 @@ void AddActionToToolBarCommand::execute()
 
 void AddActionToToolBarCommand::unexecute()
 {
-    if ( ::qt_cast<QDesignerAction*>(action) ) {
-	TQString s = ( (QDesignerAction*)action )->widget()->name();
+    if ( ::tqqt_cast<TQDesignerAction*>(action) ) {
+	TQString s = ( (TQDesignerAction*)action )->widget()->name();
 	s.prepend( "qt_dead_widget_" );
-	( (QDesignerAction*)action )->widget()->setName( s );
+	( (TQDesignerAction*)action )->widget()->setName( s );
     }
 
     toolBar->removeAction( action );
     action->removeFrom( toolBar );
     TQObject::disconnect( action, TQT_SIGNAL( destroyed() ), toolBar, TQT_SLOT( actionRemoved() ) );
-    if ( !::qt_cast<TQActionGroup*>(action) || ( (TQActionGroup*)action )->usesDropDown()) {
+    if ( !::tqqt_cast<TQActionGroup*>(action) || ( (TQActionGroup*)action )->usesDropDown()) {
 	action->removeEventFilter( toolBar );
     } else {
-	if ( action->children() ) {
-	    TQObjectListIt it( *action->children() );
+        TQObjectList clo = action->childrenListObject();
+	if ( !clo.isEmpty() ) {
+	    TQObjectListIt it( clo );
 	    while ( it.current() ) {
 		TQObject *o = it.current();
 		++it;
-		if ( !::qt_cast<TQAction*>(o) )
+		if ( !::tqqt_cast<TQAction*>(o) )
 		    continue;
-		if ( ::qt_cast<QDesignerAction*>(o) ) {
+		if ( ::tqqt_cast<TQDesignerAction*>(o) ) {
 		    o->removeEventFilter( toolBar );
 		    toolBar->removeAction( (TQAction*)o );
 		}
@@ -1951,9 +1953,9 @@ AddToolBarCommand::AddToolBarCommand( const TQString &n, FormWindow *fw, TQMainW
 void AddToolBarCommand::execute()
 {
     if ( !toolBar ) {
-	toolBar = new QDesignerToolBar( mainWindow );
+	toolBar = new TQDesignerToolBar( mainWindow );
 	TQString n = "Toolbar";
-	formWindow()->unify( toolBar, n, TRUE );
+	formWindow()->unify( TQT_TQOBJECT(toolBar), n, TRUE );
 	toolBar->setName( n );
 	mainWindow->addToolBar( toolBar, n );
     } else {
@@ -1976,7 +1978,7 @@ void AddToolBarCommand::unexecute()
 
 // ------------------------------------------------------------
 
-#ifdef QT_CONTAINER_CUSTOM_WIDGETS
+#ifdef TQT_CONTAINER_CUSTOM_WIDGETS
 AddContainerPageCommand::AddContainerPageCommand( const TQString &n, FormWindow *fw,
 						  TQWidget *c, const TQString &label )
     : Command( n, fw ), container( c ), index( -1 ), pageLabel( label ), page( 0 )
@@ -1985,7 +1987,7 @@ AddContainerPageCommand::AddContainerPageCommand( const TQString &n, FormWindow
     widgetManager()->queryInterface( WidgetFactory::classNameOf( container ), &iface );
     if ( !iface )
 	return;
-    iface->queryInterface( IID_QWidgetContainer, (QUnknownInterface**)&wiface );
+    iface->queryInterface( IID_TQWidgetContainer, (TQUnknownInterface**)&wiface );
     if ( !wiface )
 	return;
     wClassName = WidgetFactory::classNameOf( container );
@@ -2009,7 +2011,7 @@ void AddContainerPageCommand::execute()
 	wiface->insertPage( wClassName, container, pageLabel, index, page );
 
     MetaDataBase::addEntry( page );
-    formWindow()->emitUpdateProperties( formWindow()->currentWidget() );
+    formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) );
     // #### show and update pages in object hierarchy view
 }
 
@@ -2018,7 +2020,7 @@ void AddContainerPageCommand::unexecute()
     if ( !wiface || !wiface->supportsPages( wClassName ) )
 	return;
     wiface->removePage( wClassName, container, index );
-    formWindow()->emitUpdateProperties( formWindow()->currentWidget() );
+    formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) );
     // #### show and update pages in object hierarchy view
 }
 
@@ -2032,7 +2034,7 @@ DeleteContainerPageCommand::DeleteContainerPageCommand( const TQString &n, FormW
     widgetManager()->queryInterface( WidgetFactory::classNameOf( container ), &iface );
     if ( !iface )
 	return;
-    iface->queryInterface( IID_QWidgetContainer, (QUnknownInterface**)&wiface );
+    iface->queryInterface( IID_TQWidgetContainer, (TQUnknownInterface**)&wiface );
     if ( !wiface )
 	return;
     wClassName = WidgetFactory::classNameOf( container );
@@ -2052,7 +2054,7 @@ void DeleteContainerPageCommand::execute()
 	return;
 
     wiface->removePage( wClassName, container, index );
-    formWindow()->emitUpdateProperties( formWindow()->currentWidget() );
+    formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) );
     // #### show and update pages in object hierarchy view
 }
 
@@ -2064,7 +2066,7 @@ void DeleteContainerPageCommand::unexecute()
 	index = wiface->count( wClassName, container );
 
     wiface->insertPage( wClassName, container, pageLabel, index, page );
-    formWindow()->emitUpdateProperties( formWindow()->currentWidget() );
+    formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) );
     // #### show and update pages in object hierarchy view
 }
 
@@ -2079,7 +2081,7 @@ RenameContainerPageCommand::RenameContainerPageCommand( const TQString &n, FormW
     widgetManager()->queryInterface( WidgetFactory::classNameOf( container ), &iface );
     if ( !iface )
 	return;
-    iface->queryInterface( IID_QWidgetContainer, (QUnknownInterface**)&wiface );
+    iface->queryInterface( IID_TQWidgetContainer, (TQUnknownInterface**)&wiface );
     if ( !wiface )
 	return;
     wClassName = WidgetFactory::classNameOf( container );
@@ -2097,7 +2099,7 @@ void RenameContainerPageCommand::execute()
     if ( !wiface || !wiface->supportsPages( wClassName ) )
 	return;
     wiface->renamePage( wClassName, container, index, newLabel );
-    formWindow()->emitUpdateProperties( formWindow()->currentWidget() );
+    formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) );
     // #### show and update pages in object hierarchy view
 }
 
@@ -2106,10 +2108,10 @@ void RenameContainerPageCommand::unexecute()
     if ( !wiface || !wiface->supportsPages( wClassName ) )
 	return;
     wiface->renamePage( wClassName, container, index, oldLabel );
-    formWindow()->emitUpdateProperties( formWindow()->currentWidget() );
+    formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) );
     // #### show and update pages in object hierarchy view
 }
-#endif // QT_CONTAINER_CUSTOM_WIDGETS
+#endif // TQT_CONTAINER_CUSTOM_WIDGETS
 // ------------------------------------------------------------
 
 AddActionToPopupCommand::AddActionToPopupCommand( const TQString &n,
@@ -2129,7 +2131,7 @@ void AddActionToPopupCommand::execute()
 void AddActionToPopupCommand::unexecute()
 {
     item->hideMenu();
-    int i = menu->find( item->action() );
+    int i = menu->tqfind( item->action() );
     menu->remove( i );
     formWindow()->mainWindow()->objectHierarchy()->rebuild();
 }
@@ -2198,7 +2200,7 @@ RenameActionCommand::RenameActionCommand( const TQString &n,
 void RenameActionCommand::execute()
 {
     TQString actionText = newName;
-    actionText.replace("&&", "&");
+    actionText.tqreplace("&&", "&");
     TQString menuText = newName;
     action->setText( actionText );
     action->setMenuText( menuText );
@@ -2388,8 +2390,8 @@ TQString RenameMenuCommand::makeLegal( const TQString &str )
     // remove illegal characters
     TQString d;
     char c = 0, i = 0;
-    while ( !str.at(i).isNull() ) {
-	c = str.at(i).latin1();
+    while ( !str.tqat(i).isNull() ) {
+	c = str.tqat(i).latin1();
 	if ( c == '-' || c == ' ' )
 	    d += '_';
 	else if ( ( c >= '0' && c <= '9') || ( c >= 'A' && c <= 'Z' )
@@ -2405,7 +2407,7 @@ void RenameMenuCommand::execute()
     PopupMenuEditor *popup = item->menu();
     item->setMenuText( newName );
     TQString legal = makeLegal( newName );
-    formWindow()->unify( popup, legal, TRUE );
+    formWindow()->unify( TQT_TQOBJECT(popup), legal, TRUE );
     popup->setName( legal );
     formWindow()->mainWindow()->objectHierarchy()->rebuild();
 }
@@ -2424,17 +2426,17 @@ AddToolBoxPageCommand::AddToolBoxPageCommand( const TQString &n, FormWindow *fw,
 				      TQToolBox *tw, const TQString &label )
     : Command( n, fw ), toolBox( tw ), toolBoxLabel( label )
 {
-    toolBoxPage = new QDesignerWidget( formWindow(), toolBox, "page" );
+    toolBoxPage = new TQDesignerWidget( formWindow(), toolBox, "page" );
     toolBoxPage->hide();
     index = -1;
-    MetaDataBase::addEntry( toolBoxPage );
+    MetaDataBase::addEntry( TQT_TQOBJECT(toolBoxPage) );
 }
 
 void AddToolBoxPageCommand::execute()
 {
     index = toolBox->insertItem( index, toolBoxPage, toolBoxLabel);
     toolBox->setCurrentIndex( index );
-    formWindow()->emitUpdateProperties( formWindow()->currentWidget() );
+    formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) );
     formWindow()->mainWindow()->objectHierarchy()->rebuild();
 }
 
@@ -2442,7 +2444,7 @@ void AddToolBoxPageCommand::unexecute()
 {
     toolBox->removeItem( toolBoxPage );
     toolBoxPage->hide();
-    formWindow()->emitUpdateProperties( formWindow()->currentWidget() );
+    formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) );
     formWindow()->mainWindow()->objectHierarchy()->rebuild();
 }
 
@@ -2460,7 +2462,7 @@ void DeleteToolBoxPageCommand::execute()
 {
     toolBox->removeItem( toolBoxPage );
     toolBoxPage->hide();
-    formWindow()->emitUpdateProperties( formWindow()->currentWidget() );
+    formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) );
     formWindow()->mainWindow()->objectHierarchy()->rebuild();
 }
 
@@ -2468,6 +2470,6 @@ void DeleteToolBoxPageCommand::unexecute()
 {
     index = toolBox->insertItem( index, toolBoxPage, toolBoxLabel );
     toolBox->setCurrentIndex( index );
-    formWindow()->emitUpdateProperties( formWindow()->currentWidget() );
+    formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) );
     formWindow()->mainWindow()->objectHierarchy()->rebuild();
 }
diff --git a/kdevdesigner/designer/command.h b/kdevdesigner/designer/command.h
index 0279dc50..a44f2431 100644
--- a/kdevdesigner/designer/command.h
+++ b/kdevdesigner/designer/command.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -50,7 +50,7 @@ class TQListBox;
 class TQIconView;
 class TQTable;
 class TQAction;
-class QDesignerToolBar;
+class TQDesignerToolBar;
 class TQMainWindow;
 class TQTextEdit;
 struct LanguageInterface;
@@ -62,7 +62,7 @@ class PopupMenuEditor;
 class PopupMenuEditorItem;
 class ActionEditor;
 
-class Command : public Qt
+class Command : public TQt
 {
 public:
     Command( const TQString &n, FormWindow *fw );
@@ -147,9 +147,10 @@ private:
 
 };
 
-class CommandHistory : public QObject
+class CommandHistory : public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     CommandHistory( int s );
@@ -207,7 +208,7 @@ public:
 
 private:
     TQWidget *widget;
-    TQRect geometry;
+    TQRect tqgeometry;
 
 };
 
@@ -281,7 +282,7 @@ class LayoutHorizontalCommand : public Command
 {
 public:
     LayoutHorizontalCommand( const TQString &n, FormWindow *fw,
-			     TQWidget *parent, TQWidget *layoutBase,
+			     TQWidget *tqparent, TQWidget *tqlayoutBase,
 			     const TQWidgetList &wl );
 
     void execute();
@@ -289,7 +290,7 @@ public:
     Type type() const { return LayoutHorizontal; }
 
 private:
-    HorizontalLayout layout;
+   HorizontalLayout tqlayout;
 
 };
 
@@ -297,7 +298,7 @@ class LayoutHorizontalSplitCommand : public Command
 {
 public:
     LayoutHorizontalSplitCommand( const TQString &n, FormWindow *fw,
-				  TQWidget *parent, TQWidget *layoutBase,
+				  TQWidget *tqparent, TQWidget *tqlayoutBase,
 				  const TQWidgetList &wl );
 
     void execute();
@@ -305,7 +306,7 @@ public:
     Type type() const { return LayoutHorizontalSplitter; }
 
 private:
-    HorizontalLayout layout;
+   HorizontalLayout tqlayout;
 
 };
 
@@ -313,7 +314,7 @@ class LayoutVerticalCommand : public Command
 {
 public:
     LayoutVerticalCommand( const TQString &n, FormWindow *fw,
-			   TQWidget *parent, TQWidget *layoutBase,
+			   TQWidget *tqparent, TQWidget *tqlayoutBase,
 			   const TQWidgetList &wl );
 
     void execute();
@@ -321,7 +322,7 @@ public:
     Type type() const { return LayoutVertical; }
 
 private:
-    VerticalLayout layout;
+   VerticalLayout tqlayout;
 
 };
 
@@ -329,7 +330,7 @@ class LayoutVerticalSplitCommand : public Command
 {
 public:
     LayoutVerticalSplitCommand( const TQString &n, FormWindow *fw,
-				TQWidget *parent, TQWidget *layoutBase,
+				TQWidget *tqparent, TQWidget *tqlayoutBase,
 				const TQWidgetList &wl );
 
     void execute();
@@ -337,7 +338,7 @@ public:
     Type type() const { return LayoutVerticalSplitter; }
 
 private:
-    VerticalLayout layout;
+   VerticalLayout tqlayout;
 
 };
 
@@ -345,7 +346,7 @@ class LayoutGridCommand : public Command
 {
 public:
     LayoutGridCommand( const TQString &n, FormWindow *fw,
-		       TQWidget *parent, TQWidget *layoutBase,
+		       TQWidget *tqparent, TQWidget *tqlayoutBase,
 		       const TQWidgetList &wl, int xres, int yres );
 
     void execute();
@@ -353,7 +354,7 @@ public:
     Type type() const { return LayoutGrid; }
 
 private:
-    GridLayout layout;
+    GridLayout tqlayout;
 
 };
 
@@ -361,14 +362,14 @@ class BreakLayoutCommand : public Command
 {
 public:
     BreakLayoutCommand( const TQString &n, FormWindow *fw,
-			TQWidget *layoutBase, const TQWidgetList &wl );
+			TQWidget *tqlayoutBase, const TQWidgetList &wl );
 
     void execute();
     void unexecute();
     Type type() const { return BreakLayout; }
 
 private:
-    Layout *layout;
+    Layout *tqlayout;
     int spacing;
     int margin;
     TQWidget *lb;
@@ -444,19 +445,19 @@ private:
     TQString tabLabel;
 
 };
-class QDesignerWidgetStack;
+class TQDesignerWidgetStack;
 class AddWidgetStackPageCommand : public Command
 {
 public:
     AddWidgetStackPageCommand( const TQString &n, FormWindow *fw,
-			       QDesignerWidgetStack *ws );
+			       TQDesignerWidgetStack *ws );
 
     void execute();
     void unexecute();
     Type type() const { return AddWidgetStackPage; }
 
 private:
-    QDesignerWidgetStack *widgetStack;
+    TQDesignerWidgetStack *widgetStack;
     int index;
     TQWidget *stackPage;
 };
@@ -465,14 +466,14 @@ class DeleteWidgetStackPageCommand : public Command
 {
 public:
     DeleteWidgetStackPageCommand( const TQString &n, FormWindow *fw,
-				  QDesignerWidgetStack *ws, TQWidget *page );
+				  TQDesignerWidgetStack *ws, TQWidget *page );
 
     void execute();
     void unexecute();
     Type type() const { return DeleteWidgetStackPage; }
 
 private:
-    QDesignerWidgetStack *widgetStack;
+    TQDesignerWidgetStack *widgetStack;
     int index;
     TQWidget *stackPage;
 };
@@ -774,7 +775,7 @@ public:
     {
 	TQString text;
 	TQPixmap pix;
-	Q_DUMMY_COMPARISON_OPERATOR( Item )
+	TQ_DUMMY_COMPARISON_OPERATOR( Item )
     };
 
     PopulateListBoxCommand( const TQString &n, FormWindow *fw,
@@ -798,7 +799,7 @@ public:
     {
 	TQString text;
 	TQPixmap pix;
-	Q_DUMMY_COMPARISON_OPERATOR( Item )
+	TQ_DUMMY_COMPARISON_OPERATOR( Item )
     };
 
     PopulateIconViewCommand( const TQString &n, FormWindow *fw,
@@ -856,7 +857,7 @@ public:
     {
 	TQString text;
 	TQPixmap pix;
-	Q_DUMMY_COMPARISON_OPERATOR( Row )
+	TQ_DUMMY_COMPARISON_OPERATOR( Row )
     };
 
     struct Column
@@ -864,7 +865,7 @@ public:
 	TQString text;
 	TQPixmap pix;
 	TQString field;
-	Q_DUMMY_COMPARISON_OPERATOR( Column )
+	TQ_DUMMY_COMPARISON_OPERATOR( Column )
     };
 
     PopulateTableCommand( const TQString &n, FormWindow *fw, TQTable *t,
@@ -886,7 +887,7 @@ class AddActionToToolBarCommand : public Command
 {
 public:
     AddActionToToolBarCommand( const TQString &n, FormWindow *fw,
-			       TQAction *a, QDesignerToolBar *tb, int idx );
+			       TQAction *a, TQDesignerToolBar *tb, int idx );
 
     void execute();
     void unexecute();
@@ -894,7 +895,7 @@ public:
 
 private:
     TQAction *action;
-    QDesignerToolBar *toolBar;
+    TQDesignerToolBar *toolBar;
     int index;
 
 };
@@ -903,7 +904,7 @@ class RemoveActionFromToolBarCommand : public AddActionToToolBarCommand
 {
 public:
     RemoveActionFromToolBarCommand( const TQString &n, FormWindow *fw,
-				    TQAction *a, QDesignerToolBar *tb, int idx )
+				    TQAction *a, TQDesignerToolBar *tb, int idx )
 	: AddActionToToolBarCommand( n, fw, a, tb, idx ) {}
 
     void execute() { AddActionToToolBarCommand::unexecute(); }
@@ -924,7 +925,7 @@ public:
     Type type() const { return AddToolBar; }
 
 protected:
-    QDesignerToolBar *toolBar;
+    TQDesignerToolBar *toolBar;
     TQMainWindow *mainWindow;
 
 };
@@ -932,7 +933,7 @@ protected:
 class RemoveToolBarCommand : public AddToolBarCommand
 {
 public:
-    RemoveToolBarCommand( const TQString &n, FormWindow *fw, TQMainWindow *mw, QDesignerToolBar *tb )
+    RemoveToolBarCommand( const TQString &n, FormWindow *fw, TQMainWindow *mw, TQDesignerToolBar *tb )
 	: AddToolBarCommand( n, fw, mw ) { toolBar = tb; }
 
     void execute() { AddToolBarCommand::unexecute(); }
@@ -941,7 +942,7 @@ public:
 
 };
 
-struct QWidgetContainerInterfacePrivate;
+struct TQWidgetContainerInterfacePrivate;
 
 class AddContainerPageCommand : public Command
 {
@@ -961,7 +962,7 @@ private:
     int index;
     TQString pageLabel;
     TQWidget *page;
-    QWidgetContainerInterfacePrivate *wiface;
+    TQWidgetContainerInterfacePrivate *wiface;
 
 };
 
@@ -982,7 +983,7 @@ private:
     int index;
     TQString pageLabel;
     TQWidget *page;
-    QWidgetContainerInterfacePrivate *wiface;
+    TQWidgetContainerInterfacePrivate *wiface;
 
 };
 
@@ -1003,7 +1004,7 @@ private:
     TQWidget *container;
     int index;
     TQString oldLabel, newLabel;
-    QWidgetContainerInterfacePrivate *wiface;
+    TQWidgetContainerInterfacePrivate *wiface;
 
 };
 
diff --git a/kdevdesigner/designer/configtoolboxdialog.ui b/kdevdesigner/designer/configtoolboxdialog.ui
index ac19357b..4ff3c19d 100644
--- a/kdevdesigner/designer/configtoolboxdialog.ui
+++ b/kdevdesigner/designer/configtoolboxdialog.ui
@@ -25,7 +25,7 @@
 ** not clear to you.
 **
 *********************************************************************</comment>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>ConfigToolboxDialog</cstring>
     </property>
@@ -44,7 +44,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QLayoutWidget" row="1" column="0" rowspan="1" colspan="2">
+        <widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>Layout2</cstring>
             </property>
@@ -62,14 +62,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>342</width>
                             <height>0</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>PushButton3</cstring>
                     </property>
@@ -80,7 +80,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>PushButton4</cstring>
                     </property>
@@ -90,7 +90,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QLayoutWidget" row="0" column="0">
+        <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
                 <cstring>Layout4</cstring>
             </property>
@@ -98,7 +98,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QPushButton" row="1" column="1">
+                <widget class="TQPushButton" row="1" column="1">
                     <property name="name">
                         <cstring>buttonAdd</cstring>
                     </property>
@@ -119,14 +119,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>111</width>
                             <height>0</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QListView" row="0" column="0" rowspan="1" colspan="2">
+                <widget class="TQListView" row="0" column="0" rowspan="1" colspan="2">
                     <column>
                         <property name="text">
                             <string>Available Tools</string>
@@ -150,7 +150,7 @@
                 </widget>
             </grid>
         </widget>
-        <widget class="QLayoutWidget" row="0" column="1">
+        <widget class="TQLayoutWidget" row="0" column="1">
             <property name="name">
                 <cstring>Layout5</cstring>
             </property>
@@ -158,7 +158,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QPushButton" row="1" column="0">
+                <widget class="TQPushButton" row="1" column="0">
                     <property name="name">
                         <cstring>buttonRemove</cstring>
                     </property>
@@ -169,7 +169,7 @@
                         <string>&amp;Remove</string>
                     </property>
                 </widget>
-                <widget class="QListView" row="0" column="0" rowspan="1" colspan="4">
+                <widget class="TQListView" row="0" column="0" rowspan="1" colspan="4">
                     <column>
                         <property name="text">
                             <string>Common Widgets Page</string>
@@ -191,7 +191,7 @@
                         <enum>LastColumn</enum>
                     </property>
                 </widget>
-                <widget class="QToolButton" row="1" column="3">
+                <widget class="TQToolButton" row="1" column="3">
                     <property name="name">
                         <cstring>buttonDown</cstring>
                     </property>
@@ -215,14 +215,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>41</width>
                             <height>0</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QToolButton" row="1" column="2">
+                <widget class="TQToolButton" row="1" column="2">
                     <property name="name">
                         <cstring>buttonUp</cstring>
                     </property>
@@ -267,15 +267,15 @@
     </connection>
     <connection>
         <sender>listViewTools</sender>
-        <signal>clicked(QListViewItem*)</signal>
+        <signal>clicked(TQListViewItem*)</signal>
         <receiver>ConfigToolboxDialog</receiver>
-        <slot>currentToolChanged(QListViewItem*)</slot>
+        <slot>currentToolChanged(TQListViewItem*)</slot>
     </connection>
     <connection>
         <sender>listViewCommon</sender>
-        <signal>clicked(QListViewItem*)</signal>
+        <signal>clicked(TQListViewItem*)</signal>
         <receiver>ConfigToolboxDialog</receiver>
-        <slot>currentCommonToolChanged(QListViewItem*)</slot>
+        <slot>currentCommonToolChanged(TQListViewItem*)</slot>
     </connection>
     <connection>
         <sender>PushButton3</sender>
@@ -297,7 +297,7 @@
     </connection>
     <connection>
         <sender>listViewTools</sender>
-        <signal>doubleClicked(QListViewItem*)</signal>
+        <signal>doubleClicked(TQListViewItem*)</signal>
         <receiver>ConfigToolboxDialog</receiver>
         <slot>addTool()</slot>
     </connection>
@@ -305,15 +305,15 @@
 <includes>
     <include location="local" impldecl="in implementation">configtoolboxdialog.ui.h</include>
 </includes>
-<slots>
+<Q_SLOTS>
     <slot>addTool()</slot>
     <slot>removeTool()</slot>
     <slot>moveToolUp()</slot>
     <slot>moveToolDown()</slot>
-    <slot>currentToolChanged( QListViewItem * i )</slot>
-    <slot>currentCommonToolChanged( QListViewItem * i )</slot>
+    <slot>currentToolChanged( TQListViewItem * i )</slot>
+    <slot>currentCommonToolChanged( TQListViewItem * i )</slot>
     <slot>ok()</slot>
-</slots>
+</Q_SLOTS>
 <functions>
     <function access="private">init()</function>
 </functions>
@@ -322,5 +322,5 @@
 </includes>
 <pixmapfunction>BarIcon2</pixmapfunction>
 
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kdevdesigner/designer/configtoolboxdialog.ui.h b/kdevdesigner/designer/configtoolboxdialog.ui.h
index 0b176afc..1a2bd1b8 100644
--- a/kdevdesigner/designer/configtoolboxdialog.ui.h
+++ b/kdevdesigner/designer/configtoolboxdialog.ui.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -51,14 +51,14 @@ void ConfigToolboxDialog::init()
 	  a;
 	  a = MainWindow::self->toolActions.prev() ) {
 	TQString grp = ( (WidgetAction*)a )->group();
-	TQListViewItem *parent = groups.find( grp );
-	if ( !parent ) {
-	    parent = new TQListViewItem( listViewTools );
-	    parent->setText( 0, grp );
-	    parent->setOpen( TRUE );
-	    groups.insert( grp, parent );
+	TQListViewItem *tqparent = groups.tqfind( grp );
+	if ( !tqparent ) {
+	    tqparent = new TQListViewItem( listViewTools );
+	    tqparent->setText( 0, grp );
+	    tqparent->setOpen( TRUE );
+	    groups.insert( grp, tqparent );
 	}
-	TQListViewItem *i = new TQListViewItem( parent );
+	TQListViewItem *i = new TQListViewItem( tqparent );
 	i->setText( 0, a->text() );
 	i->setPixmap( 0, a->iconSet().pixmap() );
     }
@@ -87,7 +87,7 @@ void ConfigToolboxDialog::addTool()
 
 	if ( (*it)->isSelected() ) {
 	    if ( (*it)->childCount() == 0 ) {
-		// Selected, no children
+		// Selected, no tqchildren
 		TQListViewItem *i = new TQListViewItem( listViewCommon, listViewCommon->lastItem() );
 		i->setText( 0, (*it)->text(0) );
 		i->setPixmap( 0, *((*it)->pixmap(0)) );
@@ -96,17 +96,17 @@ void ConfigToolboxDialog::addTool()
 	    } else if ( !addKids ) {
 		// Children processing not set, so set it
 		// Also find the item were we shall quit
-		// processing children...if any such item
+		// processing tqchildren...if any such item
 		addKids = TRUE;
 		nextSibling = (*it)->nextSibling();
-		nextParent = (*it)->parent();
+		nextParent = (*it)->tqparent();
 		while ( nextParent && !nextSibling ) {
 		    nextSibling = nextParent->nextSibling();
-		    nextParent = nextParent->parent();
+		    nextParent = nextParent->tqparent();
 		}
 	    }
 	} else if ( ((*it)->childCount() == 0) && addKids ) {
-	    // Leaf node, and we _do_ process children
+	    // Leaf node, and we _do_ process tqchildren
 	    TQListViewItem *i = new TQListViewItem( listViewCommon, listViewCommon->lastItem() );
 	    i->setText( 0, (*it)->text(0) );
 	    i->setPixmap( 0, *((*it)->pixmap(0)) );
diff --git a/kdevdesigner/designer/connectiondialog.ui b/kdevdesigner/designer/connectiondialog.ui
index c8cc9c4f..24b32266 100644
--- a/kdevdesigner/designer/connectiondialog.ui
+++ b/kdevdesigner/designer/connectiondialog.ui
@@ -25,7 +25,7 @@
 ** not clear to you.
 **
 *********************************************************************</comment>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>ConnectionDialog</cstring>
     </property>
@@ -50,7 +50,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QPushButton" row="1" column="1">
+        <widget class="TQPushButton" row="1" column="1">
             <property name="name">
                 <cstring>PushButton1</cstring>
             </property>
@@ -58,7 +58,7 @@
                 <string>&amp;New</string>
             </property>
         </widget>
-        <widget class="QLabel" row="0" column="0">
+        <widget class="TQLabel" row="0" column="0">
             <property name="name">
                 <cstring>TextLabel1</cstring>
             </property>
@@ -77,7 +77,7 @@
                 <cstring>connectionsTable</cstring>
             </property>
         </widget>
-        <widget class="QPushButton" row="2" column="1">
+        <widget class="TQPushButton" row="2" column="1">
             <property name="name">
                 <cstring>PushButton2</cstring>
             </property>
@@ -85,7 +85,7 @@
                 <string>&amp;Delete</string>
             </property>
         </widget>
-        <widget class="QPushButton" row="6" column="1">
+        <widget class="TQPushButton" row="6" column="1">
             <property name="name">
                 <cstring>PushButton3</cstring>
             </property>
@@ -93,7 +93,7 @@
                 <string>&amp;Cancel</string>
             </property>
         </widget>
-        <widget class="QPushButton" row="5" column="1">
+        <widget class="TQPushButton" row="5" column="1">
             <property name="name">
                 <cstring>PushButton7</cstring>
             </property>
@@ -114,14 +114,14 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
                 </size>
             </property>
         </spacer>
-        <widget class="QPushButton" row="3" column="1">
+        <widget class="TQPushButton" row="3" column="1">
             <property name="name">
                 <cstring>buttonEditSlots</cstring>
             </property>
@@ -192,28 +192,28 @@
     </connection>
 </connections>
 <includes>
-    <include location="global" impldecl="in declaration">qptrlist.h</include>
+    <include location="global" impldecl="in declaration">tqptrlist.h</include>
     <include location="local" impldecl="in declaration">connectionitems.h</include>
     <include location="local" impldecl="in implementation">connectiondialog.ui.h</include>
 </includes>
 <variables>
-    <variable>QPtrList&lt;ConnectionContainer&gt; connections;</variable>
-    <variable>QObject *defaultSender;</variable>
-    <variable>QObject *defaultReceiver;</variable>
+    <variable>TQPtrList&lt;ConnectionContainer&gt; connections;</variable>
+    <variable>TQObject *defaultSender;</variable>
+    <variable>TQObject *defaultReceiver;</variable>
 </variables>
-<slots>
+<Q_SLOTS>
     <slot>init()</slot>
     <slot>addConnection()</slot>
-    <slot returnType="ConnectionContainer *">addConnection( QObject * sender, QObject * receiver, const QString &amp; signal, const QString &amp; slot )</slot>
+    <slot returnType="ConnectionContainer *">addConnection( TQObject * sender, TQObject * receiver, const TQString &amp; signal, const TQString &amp; slot )</slot>
     <slot>updateConnectionState( ConnectionContainer * c )</slot>
     <slot>okClicked()</slot>
     <slot>cancelClicked()</slot>
     <slot>deleteClicked()</slot>
     <slot>editSlots()</slot>
-    <slot>setDefault( QObject * sender, QObject * receiver )</slot>
+    <slot>setDefault( TQObject * sender, TQObject * receiver )</slot>
     <slot>updateEditSlotsButton()</slot>
     <slot>updateConnectionContainers()</slot>
     <slot>ensureConnectionVisible()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kdevdesigner/designer/connectiondialog.ui.h b/kdevdesigner/designer/connectiondialog.ui.h
index f8df4230..4969c8fd 100644
--- a/kdevdesigner/designer/connectiondialog.ui.h
+++ b/kdevdesigner/designer/connectiondialog.ui.h
@@ -1,7 +1,7 @@
 /****************************************************************************
 ** ui.h extension file, included from the uic-generated form implementation.
 **
-** If you wish to add, delete or rename slots use Qt Designer which will
+** If you wish to add, delete or rename slots use TQt Designer which will
 ** update this file, preserving your code. Create an init() slot in place of
 ** a constructor, and a destroy() slot in place of a destructor.
 *****************************************************************************/
@@ -81,7 +81,7 @@ void ConnectionDialog::init()
     }
 
     TQValueList<MetaDataBase::Connection> conns =
-	MetaDataBase::connections( MainWindow::self->formWindow() );
+	MetaDataBase::connections( TQT_TQOBJECT(MainWindow::self->formWindow()) );
     for ( TQValueList<MetaDataBase::Connection>::Iterator it = conns.begin();
 	  it != conns.end(); ++it ) {
 	ConnectionContainer *c = addConnection( (*it).sender, (*it).receiver,
@@ -96,7 +96,7 @@ void ConnectionDialog::init()
 
 void ConnectionDialog::addConnection()
 {
-    addConnection( defaultSender, defaultReceiver, TQString::null, TQString::null );
+    addConnection( defaultSender, defaultReceiver, TQString(), TQString() );
     ensureConnectionVisible();
 }
 
@@ -147,14 +147,14 @@ ConnectionContainer *ConnectionDialog::addConnection( TQObject *sender, TQObject
     connect( re, TQT_SIGNAL( currentReceiverChanged( TQObject * ) ),
 	     this, TQT_SLOT( updateEditSlotsButton() ) );
 
-    ConnectionContainer *c = new ConnectionContainer( this, se, si, re, sl, row );
+    ConnectionContainer *c = new ConnectionContainer( TQT_TQOBJECT(this), se, si, re, sl, row );
     connections.append( c );
     connect( c, TQT_SIGNAL( changed( ConnectionContainer * ) ),
 	     this, TQT_SLOT( updateConnectionState( ConnectionContainer * ) ) );
 
     connectionsTable->setCurrentCell( row, 0 );
 
-    connectionsTable->verticalHeader()->setLabel( row, *invalidConnection, TQString::null );
+    connectionsTable->verticalHeader()->setLabel( row, *invalidConnection, TQString() );
 
     if ( sender )
 	se->setSenderEx( sender );
@@ -175,20 +175,20 @@ ConnectionContainer *ConnectionDialog::addConnection( TQObject *sender, TQObject
 
 void ConnectionDialog::updateConnectionState( ConnectionContainer *c )
 {
-    c->repaint();
+    c->tqrepaint();
     if ( c->isValid() )
 	connectionsTable->verticalHeader()->setLabel( c->row(),
-						      *validConnection, TQString::null );
+						      *validConnection, TQString() );
     else
 	connectionsTable->verticalHeader()->setLabel( c->row(),
-						      *invalidConnection, TQString::null );
+						      *invalidConnection, TQString() );
 }
 
 
 void ConnectionDialog::okClicked()
 {
     TQValueList<MetaDataBase::Connection> oldConnections =
-	MetaDataBase::connections( MainWindow::self->formWindow() );
+	MetaDataBase::connections( TQT_TQOBJECT(MainWindow::self->formWindow()) );
     TQPtrList<Command> newConnectionCmds;
     TQPtrList<Command> oldConnectionCmds;
     for ( ConnectionContainer *c = connections.first(); c; c = connections.next() ) {
@@ -215,7 +215,7 @@ void ConnectionDialog::okClicked()
 
 
     TQValueList<MetaDataBase::Connection> conns =
-	MetaDataBase::connections( MainWindow::self->formWindow() );
+	MetaDataBase::connections( TQT_TQOBJECT(MainWindow::self->formWindow()) );
     for ( TQValueList<MetaDataBase::Connection>::Iterator it = conns.begin();
 	  it != conns.end(); ++it ) {
 	RemoveConnectionCommand *cmd = new RemoveConnectionCommand( i18n( "Remove Signal/Slot "
diff --git a/kdevdesigner/designer/connectionitems.cpp b/kdevdesigner/designer/connectionitems.cpp
index 895b35ee..efb2406a 100644
--- a/kdevdesigner/designer/connectionitems.cpp
+++ b/kdevdesigner/designer/connectionitems.cpp
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -49,11 +49,11 @@ static const char* const ignore_slots[] = {
     "update()",
     "update(int,int,int,int)",
     "update(const TQRect&)",
-    "repaint()",
-    "repaint(bool)",
-    "repaint(int,int,int,int,bool)",
-    "repaint(const TQRect&,bool)",
-    "repaint(const TQRegion&,bool)",
+    "tqrepaint()",
+    "tqrepaint(bool)",
+    "tqrepaint(int,int,int,int,bool)",
+    "tqrepaint(const TQRect&,bool)",
+    "tqrepaint(const TQRegion&,bool)",
     "show()",
     "hide()",
     "iconify()",
@@ -170,7 +170,7 @@ void ConnectionItem::paint( TQPainter *p, const TQColorGroup &cg,
 	p->setFont( f );
     }
 
-    p->drawText( x + 2, 0, w - x - 4, h, alignment(), currentText() );
+    p->drawText( x + 2, 0, w - x - 4, h, tqalignment(), currentText() );
     p->setFont( oldf );
 }
 
@@ -183,14 +183,14 @@ void ConnectionItem::setConnection( ConnectionContainer *c )
 
 static void appendChildActions( TQAction *action, TQStringList &lst )
 {
-    TQObjectListIt it( *action->children() );
+    TQObjectListIt it( action->childrenListObject() );
     while ( it.current() ) {
 	TQObject *o = it.current();
 	++it;
-	if ( !::qt_cast<TQAction*>(o) )
+	if ( !::tqqt_cast<TQAction*>(o) )
 	    continue;
 	lst << o->name();
-	if ( o->children() && ::qt_cast<TQActionGroup*>(o) )
+	if ( !o->childrenListObject().isEmpty() && ::tqqt_cast<TQActionGroup*>(o) )
 	    appendChildActions( (TQAction*)o, lst );
     }
 }
@@ -203,7 +203,7 @@ static TQStringList flatActions( const TQPtrList<TQAction> &l )
     while ( it.current() ) {
 	TQAction *action = it.current();
 	lst << action->name();
-	if ( action->children() && ::qt_cast<TQActionGroup*>(action) )
+	if ( !action->childrenListObject().isEmpty() && ::tqqt_cast<TQActionGroup*>(action) )
 	    appendChildActions( action, lst );
 	++it;
     }
@@ -220,14 +220,14 @@ SenderItem::SenderItem( TQTable *table, FormWindow *fw )
 
     TQPtrDictIterator<TQWidget> it( *formWindow->widgets() );
     while ( it.current() ) {
-	if ( lst.find( it.current()->name() ) != lst.end() ) {
+	if ( lst.tqfind( it.current()->name() ) != lst.end() ) {
 	    ++it;
 	    continue;
 	}
 	if ( !TQString( it.current()->name() ).startsWith( "qt_dead_widget_" ) &&
-	     !::qt_cast<QLayoutWidget*>(it.current()) &&
-	     !::qt_cast<Spacer*>(it.current()) &&
-	     !::qt_cast<SizeHandle*>(it.current()) &&
+	     !::tqqt_cast<TQLayoutWidget*>(it.current()) &&
+	     !::tqqt_cast<Spacer*>(it.current()) &&
+	     !::tqqt_cast<SizeHandle*>(it.current()) &&
 	     qstrcmp( it.current()->name(), "central widget" ) != 0 ) {
 	    lst << it.current()->name();
 	}
@@ -277,14 +277,14 @@ ReceiverItem::ReceiverItem( TQTable *table, FormWindow *fw )
 
     TQPtrDictIterator<TQWidget> it( *formWindow->widgets() );
     while ( it.current() ) {
-	if ( lst.find( it.current()->name() ) != lst.end() ) {
+	if ( lst.tqfind( it.current()->name() ) != lst.end() ) {
 	    ++it;
 	    continue;
 	}
 	if ( !TQString( it.current()->name() ).startsWith( "qt_dead_widget_" ) &&
-	     !::qt_cast<QLayoutWidget*>(it.current()) &&
-	     !::qt_cast<Spacer*>(it.current()) &&
-	     !::qt_cast<SizeHandle*>(it.current()) &&
+	     !::tqqt_cast<TQLayoutWidget*>(it.current()) &&
+	     !::tqqt_cast<Spacer*>(it.current()) &&
+	     !::tqqt_cast<SizeHandle*>(it.current()) &&
 	     qstrcmp( it.current()->name(), "central widget" ) != 0 ) {
 	    lst << it.current()->name();
 	}
@@ -338,7 +338,7 @@ SignalItem::SignalItem( TQTable *table, FormWindow *fw )
 
 void SignalItem::senderChanged( TQObject *sender )
 {
-    TQStrList sigs = sender->metaObject()->signalNames( TRUE );
+    TQStrList sigs = sender->tqmetaObject()->signalNames( TRUE );
     sigs.remove( "destroyed()" );
     sigs.remove( "destroyed(TQObject*)" );
     sigs.remove( "accessibilityChanged(int)" );
@@ -346,15 +346,15 @@ void SignalItem::senderChanged( TQObject *sender )
 
     TQStringList lst = TQStringList::fromStrList( sigs );
 
-    if ( ::qt_cast<CustomWidget*>(sender) ) {
+    if ( ::tqqt_cast<CustomWidget*>(sender) ) {
 	MetaDataBase::CustomWidget *w = ( (CustomWidget*)sender )->customWidget();
 	for ( TQValueList<TQCString>::Iterator it = w->lstSignals.begin();
 	      it != w->lstSignals.end(); ++it )
 	    lst << MetaDataBase::normalizeFunction( *it );
     }
 
-    if ( sender == formWindow->mainContainer() ) {
-	TQStringList extra = MetaDataBase::signalList( formWindow );
+    if ( TQT_BASE_OBJECT(sender) == TQT_BASE_OBJECT(formWindow->mainContainer()) ) {
+	TQStringList extra = MetaDataBase::signalList( TQT_TQOBJECT(formWindow) );
 	if ( !extra.isEmpty() )
 	    lst += extra;
     }
@@ -406,9 +406,9 @@ void SlotItem::signalChanged( const TQString &signal )
 
 bool SlotItem::ignoreSlot( const char* slot ) const
 {
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     if ( qstrcmp( slot, "update()" ) == 0 &&
-	 ::qt_cast<TQDataBrowser*>(lastReceiver) )
+	 ::tqqt_cast<TQDataBrowser*>(lastReceiver) )
 	return FALSE;
 #endif
 
@@ -417,14 +417,14 @@ bool SlotItem::ignoreSlot( const char* slot ) const
 	    return TRUE;
     }
 
-    if ( !formWindow->isMainContainer( (TQWidget*)lastReceiver ) ) {
+    if ( !formWindow->isMainContainer( TQT_TQOBJECT(lastReceiver) ) ) {
 	if ( qstrcmp( slot, "close()" ) == 0  )
 	    return TRUE;
     }
 
     if ( qstrcmp( slot, "setFocus()" ) == 0  )
 	if ( lastReceiver->isWidgetType() &&
-	     ( (TQWidget*)lastReceiver )->focusPolicy() == TQWidget::NoFocus )
+	     ( (TQWidget*)lastReceiver )->focusPolicy() == TQ_NoFocus )
 	    return TRUE;
 
     return FALSE;
@@ -441,27 +441,27 @@ void SlotItem::updateSlotList()
     }
 
     TQString signal = MetaDataBase::normalizeFunction( lastSignal );
-    int n = lastReceiver->metaObject()->numSlots( TRUE );
+    int n = lastReceiver->tqmetaObject()->numSlots( TRUE );
     TQStringList slts;
 
     for( int i = 0; i < n; ++i ) {
 	// accept only public slots. For the form window, also accept protected slots
-	const QMetaData* md = lastReceiver->metaObject()->slot( i, TRUE );
-	if ( ( (lastReceiver->metaObject()->slot( i, TRUE )->access == QMetaData::Public) ||
-	       (formWindow->isMainContainer( (TQWidget*)lastReceiver ) &&
-		lastReceiver->metaObject()->slot(i, TRUE)->access ==
-		QMetaData::Protected) ) &&
-	     !ignoreSlot( md->name ) &&
-	     checkConnectArgs( signal.latin1(), lastReceiver, md->name ) )
-	    if ( lst.find( md->name ) == lst.end() )
-		lst << MetaDataBase::normalizeFunction( md->name );
+	const TQMetaData* md = lastReceiver->tqmetaObject()->slot( i, TRUE );
+	if ( ( (lastReceiver->tqmetaObject()->slot( i, TRUE )->tqt_mo_access == TQMetaData::Public) ||
+	       (formWindow->isMainContainer( TQT_TQOBJECT(lastReceiver) ) &&
+		lastReceiver->tqmetaObject()->slot(i, TRUE)->tqt_mo_access ==
+		TQMetaData::Protected) ) &&
+	     !ignoreSlot( md->tqt_mo_ci_name ) &&
+	     checkConnectArgs( signal.latin1(), lastReceiver, md->tqt_mo_ci_name ) )
+	    if ( lst.tqfind( md->tqt_mo_ci_name ) == lst.end() )
+		lst << MetaDataBase::normalizeFunction( md->tqt_mo_ci_name );
     }
 
     LanguageInterface *iface =
 	MetaDataBase::languageInterface( formWindow->project()->language() );
     if ( !iface || iface->supports( LanguageInterface::ConnectionsToCustomSlots ) ) {
-	if ( formWindow->isMainContainer( (TQWidget*)lastReceiver ) ) {
-	    TQValueList<MetaDataBase::Function> moreSlots = MetaDataBase::slotList( formWindow );
+	if ( formWindow->isMainContainer( TQT_TQOBJECT(lastReceiver) ) ) {
+	    TQValueList<MetaDataBase::Function> moreSlots = MetaDataBase::slotList( TQT_TQOBJECT(formWindow) );
 	    if ( !moreSlots.isEmpty() ) {
 		for ( TQValueList<MetaDataBase::Function>::Iterator it = moreSlots.begin();
 		      it != moreSlots.end(); ++it ) {
@@ -470,7 +470,7 @@ void SlotItem::updateSlotList()
 			continue;
 		    s = MetaDataBase::normalizeFunction( s );
 		    if ( checkConnectArgs( signal.latin1(), lastReceiver, s ) ) {
-			if ( lst.find( (*it).function ) == lst.end() )
+			if ( lst.tqfind( (*it).function ) == lst.end() )
 			    lst << s;
 		    }
 		}
@@ -478,7 +478,7 @@ void SlotItem::updateSlotList()
 	}
     }
 
-    if ( ::qt_cast<CustomWidget*>(lastReceiver) ) {
+    if ( ::tqqt_cast<CustomWidget*>(lastReceiver) ) {
 	MetaDataBase::CustomWidget *w = ( (CustomWidget*)lastReceiver )->customWidget();
 	for ( TQValueList<MetaDataBase::Function>::Iterator it = w->lstSlots.begin();
 	      it != w->lstSlots.end(); ++it ) {
@@ -487,7 +487,7 @@ void SlotItem::updateSlotList()
 		continue;
 	    s = MetaDataBase::normalizeFunction( s );
 	    if ( checkConnectArgs( signal.latin1(), lastReceiver, s ) ) {
-		if ( lst.find( (*it).function ) == lst.end() )
+		if ( lst.tqfind( (*it).function ) == lst.end() )
 		    lst << s;
 	    }
 	}
diff --git a/kdevdesigner/designer/connectionitems.h b/kdevdesigner/designer/connectionitems.h
index 2af42b6b..39045ba6 100644
--- a/kdevdesigner/designer/connectionitems.h
+++ b/kdevdesigner/designer/connectionitems.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -39,9 +39,10 @@ class ConnectionContainer;
 
 
 class ConnectionItem : public TQObject,
-		       public QComboTableItem
+		       public TQComboTableItem
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     ConnectionItem( TQTable *table, FormWindow *fw );
@@ -77,6 +78,7 @@ private:
 class SenderItem : public ConnectionItem
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     SenderItem( TQTable *table, FormWindow *fw );
@@ -96,6 +98,7 @@ private slots:
 class ReceiverItem : public ConnectionItem
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     ReceiverItem( TQTable *table, FormWindow *fw );
@@ -115,6 +118,7 @@ private slots:
 class SignalItem : public ConnectionItem
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     SignalItem( TQTable *table, FormWindow *fw );
@@ -132,6 +136,7 @@ signals:
 class SlotItem : public ConnectionItem
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     SlotItem( TQTable *table, FormWindow *fw );
@@ -157,14 +162,15 @@ private:
 
 // ------------------------------------------------------------------
 
-class ConnectionContainer : public QObject
+class ConnectionContainer : public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    ConnectionContainer( TQObject *parent, SenderItem *i1, SignalItem *i2,
+    ConnectionContainer( TQObject *tqparent, SenderItem *i1, SignalItem *i2,
 			 ReceiverItem *i3, SlotItem *i4, int r )
-	: TQObject( parent ), mod( FALSE ), se( i1 ), si( i2 ),
+	: TQObject( tqparent ), mod( FALSE ), se( i1 ), si( i2 ),
 	  re( i3 ), sl( i4 ), rw ( r ) {
 	      i1->setConnection( this );
 	      i2->setConnection( this );
@@ -177,7 +183,7 @@ public:
     }
 
     bool isModified() const { return mod; }
-    void setModified( bool b ) { mod = b; repaint(); }
+    void setModified( bool b ) { mod = b; tqrepaint(); }
     bool isValid() const {
 	return se->currentText()[0] != '<' &&
 		si->currentText()[0] != '<' &&
@@ -185,7 +191,7 @@ public:
 		sl->currentText()[0] != '<';
     }
 
-    void repaint() {
+    void tqrepaint() {
 	se->table()->updateCell( se->row(), se->col() );
 	si->table()->updateCell( si->row(), si->col() );
 	re->table()->updateCell( re->row(), re->col() );
diff --git a/kdevdesigner/designer/connectiontable.cpp b/kdevdesigner/designer/connectiontable.cpp
index 3cfdb057..ce1cabb7 100644
--- a/kdevdesigner/designer/connectiontable.cpp
+++ b/kdevdesigner/designer/connectiontable.cpp
@@ -1,15 +1,15 @@
  /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -28,8 +28,8 @@
 
 #include <klocale.h>
 
-ConnectionTable::ConnectionTable( TQWidget *parent, const char *name )
-    : TQTable( 0, 4, parent, name )
+ConnectionTable::ConnectionTable( TQWidget *tqparent, const char *name )
+    : TQTable( 0, 4, tqparent, name )
 {
     setSorting( TRUE );
     setShowGrid( FALSE );
diff --git a/kdevdesigner/designer/connectiontable.h b/kdevdesigner/designer/connectiontable.h
index 4db4bf51..d3b28900 100644
--- a/kdevdesigner/designer/connectiontable.h
+++ b/kdevdesigner/designer/connectiontable.h
@@ -1,15 +1,15 @@
  /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -29,12 +29,13 @@
 
 #include <tqtable.h>
 
-class ConnectionTable : public QTable
+class ConnectionTable : public TQTable
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    ConnectionTable( TQWidget *parent, const char *name );
+    ConnectionTable( TQWidget *tqparent, const char *name );
 
     void sortColumn( int col, bool ascending, bool wholeRows );
 
diff --git a/kdevdesigner/designer/createtemplate.ui b/kdevdesigner/designer/createtemplate.ui
index 761873cc..255a9301 100644
--- a/kdevdesigner/designer/createtemplate.ui
+++ b/kdevdesigner/designer/createtemplate.ui
@@ -25,7 +25,7 @@
 ** not clear to you.
 **
 *********************************************************************</comment>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>CreateTemplate</cstring>
     </property>
@@ -53,7 +53,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QLabel" row="0" column="0">
+        <widget class="TQLabel" row="0" column="0">
             <property name="name">
                 <cstring>TextLabel1</cstring>
             </property>
@@ -75,7 +75,7 @@
                 <string>Enter the name of the new template</string>
             </property>
         </widget>
-        <widget class="QListBox" row="1" column="1" rowspan="2" colspan="1">
+        <widget class="TQListBox" row="1" column="1" rowspan="2" colspan="1">
             <property name="name">
                 <cstring>listClass</cstring>
             </property>
@@ -86,7 +86,7 @@
                 <string>Enter the name of the class which should be used as the template's base class</string>
             </property>
         </widget>
-        <widget class="QLayoutWidget" row="3" column="0" rowspan="1" colspan="2">
+        <widget class="TQLayoutWidget" row="3" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>Layout1</cstring>
             </property>
@@ -110,14 +110,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonCreate</cstring>
                     </property>
@@ -131,7 +131,7 @@
                         <string>Creates the new template</string>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>PushButton1</cstring>
                     </property>
@@ -144,7 +144,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QLabel" row="1" column="0">
+        <widget class="TQLabel" row="1" column="0">
             <property name="name">
                 <cstring>TextLabel2</cstring>
             </property>
@@ -165,7 +165,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
@@ -188,7 +188,7 @@
         <slot>reject()</slot>
     </connection>
 </connections>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klineedit.h</includehint>
 </includehints>
diff --git a/kdevdesigner/designer/customwidgeteditor.ui b/kdevdesigner/designer/customwidgeteditor.ui
index 4d0e301a..7ba5dd29 100644
--- a/kdevdesigner/designer/customwidgeteditor.ui
+++ b/kdevdesigner/designer/customwidgeteditor.ui
@@ -25,7 +25,7 @@
 ** not clear to you.
 **
 *********************************************************************</comment>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>CustomWidgetEditorBase</cstring>
     </property>
@@ -56,7 +56,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QListBox" row="0" column="0" rowspan="5" colspan="1">
+        <widget class="TQListBox" row="0" column="0" rowspan="5" colspan="1">
             <property name="name">
                 <cstring>boxWidgets</cstring>
             </property>
@@ -64,7 +64,7 @@
                 <string>The list of all custom widgets known to Qt Designer.</string>
             </property>
         </widget>
-        <widget class="QPushButton" row="0" column="1">
+        <widget class="TQPushButton" row="0" column="1">
             <property name="name">
                 <cstring>buttonNewWidget</cstring>
             </property>
@@ -78,7 +78,7 @@
                 <string>&lt;b&gt;Create an empty custom widget and add it to the list.&lt;/b&gt;&lt;p&gt;New custom widgets have a default name and header file, which must both be changed to appropriate values.&lt;/p&gt;</string>
             </property>
         </widget>
-        <widget class="QPushButton" row="1" column="1">
+        <widget class="TQPushButton" row="1" column="1">
             <property name="name">
                 <cstring>buttonDeleteWidget</cstring>
             </property>
@@ -92,7 +92,7 @@
                 <string>&lt;b&gt;Delete the selected custom widget.&lt;/b&gt;&lt;p&gt;You can only delete widgets that are not used in any open form.&lt;/p&gt;</string>
             </property>
         </widget>
-        <widget class="QLayoutWidget" row="5" column="0" rowspan="1" colspan="3">
+        <widget class="TQLayoutWidget" row="5" column="0" rowspan="1" colspan="3">
             <property name="name">
                 <cstring>Layout1</cstring>
             </property>
@@ -106,7 +106,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>helpButton</cstring>
                     </property>
@@ -127,14 +127,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonCancel</cstring>
                     </property>
@@ -160,14 +160,14 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
                 </size>
             </property>
         </spacer>
-        <widget class="QPushButton" row="3" column="1">
+        <widget class="TQPushButton" row="3" column="1">
             <property name="name">
                 <cstring>buttonLoad</cstring>
             </property>
@@ -182,7 +182,7 @@
 &lt;p&gt;Since it is a lot of work to type in all the information for custom widgets, you should consider using the createcw tool which is in $QTDIR/tools/designer/tools/createcw. Using createcw you can create custom widget description files for your custom widgets without the need to type in all the information manually. For more information about the README file in the createcw directory&lt;/p&gt;</string>
             </property>
         </widget>
-        <widget class="QPushButton" row="4" column="1">
+        <widget class="TQPushButton" row="4" column="1">
             <property name="name">
                 <cstring>buttonSave</cstring>
             </property>
@@ -196,14 +196,14 @@
                 <string>&lt;b&gt;Save Descriptions&lt;/b&gt;&lt;p&gt;Saves all the descriptions of the shown custom widgets to a file which can then be used to import the custom widgets elsewhere.</string>
             </property>
         </widget>
-        <widget class="QTabWidget" row="0" column="2" rowspan="5" colspan="1">
+        <widget class="TQTabWidget" row="0" column="2" rowspan="5" colspan="1">
             <property name="name">
                 <cstring>TabWidget1</cstring>
             </property>
             <property name="whatsThis" stdset="0">
                 <string>Change the properties of the selected custom widget.</string>
             </property>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>Widget2</cstring>
                 </property>
@@ -220,7 +220,7 @@
                     <property name="spacing">
                         <number>6</number>
                     </property>
-                    <widget class="QLayoutWidget" row="2" column="1" rowspan="1" colspan="2">
+                    <widget class="TQLayoutWidget" row="2" column="1" rowspan="1" colspan="2">
                         <property name="name">
                             <cstring>Layout4</cstring>
                         </property>
@@ -234,7 +234,7 @@
                             <property name="spacing">
                                 <number>6</number>
                             </property>
-                            <widget class="QLabel">
+                            <widget class="TQLabel">
                                 <property name="name">
                                     <cstring>previewPixmap</cstring>
                                 </property>
@@ -242,11 +242,11 @@
                                     <string></string>
                                 </property>
                             </widget>
-                            <widget class="QPushButton">
+                            <widget class="TQPushButton">
                                 <property name="name">
                                     <cstring>buttonChoosePixmap</cstring>
                                 </property>
-                                <property name="maximumSize">
+                                <property name="tqmaximumSize">
                                     <size>
                                         <width>30</width>
                                         <height>22</height>
@@ -264,7 +264,7 @@
                             </widget>
                         </hbox>
                     </widget>
-                    <widget class="QLayoutWidget" row="1" column="1" rowspan="1" colspan="2">
+                    <widget class="TQLayoutWidget" row="1" column="1" rowspan="1" colspan="2">
                         <property name="name">
                             <cstring>Layout5</cstring>
                         </property>
@@ -289,11 +289,11 @@
                                     <string>&lt;b&gt;Change the header file's name for the selected custom widget.&lt;/b&gt;&lt;p&gt;The header file will be included by forms using the widget.&lt;/p&gt;</string>
                                 </property>
                             </widget>
-                            <widget class="QPushButton">
+                            <widget class="TQPushButton">
                                 <property name="name">
                                     <cstring>buttonChooseHeader</cstring>
                                 </property>
-                                <property name="maximumSize">
+                                <property name="tqmaximumSize">
                                     <size>
                                         <width>30</width>
                                         <height>22</height>
@@ -309,7 +309,7 @@
                                     <string>Look for the header file using a file dialog.</string>
                                 </property>
                             </widget>
-                            <widget class="QComboBox">
+                            <widget class="TQComboBox">
                                 <item>
                                     <property name="text">
                                         <string>Global</string>
@@ -343,7 +343,7 @@
                             <string>&lt;b&gt;Enter the classname for the selected custom widget.&lt;/b&gt;&lt;p&gt;A class of that name must be defined in the header file.&lt;/p&gt;</string>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="1" column="0">
+                    <widget class="TQLabel" row="1" column="0">
                         <property name="name">
                             <cstring>Label11</cstring>
                         </property>
@@ -354,7 +354,7 @@
                             <cstring>editHeader</cstring>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="0" column="0">
+                    <widget class="TQLabel" row="0" column="0">
                         <property name="name">
                             <cstring>Label10</cstring>
                         </property>
@@ -365,7 +365,7 @@
                             <cstring>editClass</cstring>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="2" column="0">
+                    <widget class="TQLabel" row="2" column="0">
                         <property name="name">
                             <cstring>Label2</cstring>
                         </property>
@@ -373,7 +373,7 @@
                             <string>Pixmap:</string>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="3" column="0">
+                    <widget class="TQLabel" row="3" column="0">
                         <property name="name">
                             <cstring>Label7</cstring>
                         </property>
@@ -384,7 +384,7 @@
                             <cstring>spinWidth</cstring>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="4" column="0">
+                    <widget class="TQLabel" row="4" column="0">
                         <property name="name">
                             <cstring>TextLabel1_2</cstring>
                         </property>
@@ -395,7 +395,7 @@
                             <cstring>sizeHor</cstring>
                         </property>
                     </widget>
-                    <widget class="QComboBox" row="4" column="2">
+                    <widget class="TQComboBox" row="4" column="2">
                         <item>
                             <property name="text">
                                 <string>Fixed</string>
@@ -433,10 +433,10 @@
                             <string>Vertical Sizepolicy</string>
                         </property>
                         <property name="whatsThis" stdset="0">
-                            <string>Choose the Vertical size policy</string>
+                            <string>Choose theQt::Vertical size policy</string>
                         </property>
                     </widget>
-                    <widget class="QSpinBox" row="3" column="1">
+                    <widget class="TQSpinBox" row="3" column="1">
                         <property name="name">
                             <cstring>spinWidth</cstring>
                         </property>
@@ -456,7 +456,7 @@
                             <string>&lt;b&gt;Set the size hint for the selected widget.&lt;/b&gt;&lt;p&gt;The size hint provides the recommended size for the widget. Enter a sizehint of -1/-1 if no size is recommended.&lt;/p&gt;</string>
                         </property>
                     </widget>
-                    <widget class="QSpinBox" row="3" column="2">
+                    <widget class="TQSpinBox" row="3" column="2">
                         <property name="name">
                             <cstring>spinHeight</cstring>
                         </property>
@@ -476,7 +476,7 @@
                             <string>&lt;b&gt;Set the size hint for the selected widget.&lt;/b&gt;&lt;p&gt;The size hint provides the recommended size for the widget. Enter a sizehint of -1/-1 if no size is recommended.&lt;/p&gt;</string>
                         </property>
                     </widget>
-                    <widget class="QComboBox" row="4" column="1">
+                    <widget class="TQComboBox" row="4" column="1">
                         <item>
                             <property name="text">
                                 <string>Fixed</string>
@@ -527,14 +527,14 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
                             </size>
                         </property>
                     </spacer>
-                    <widget class="QCheckBox" row="5" column="1">
+                    <widget class="TQCheckBox" row="5" column="1">
                         <property name="name">
                             <cstring>checkContainer</cstring>
                         </property>
@@ -546,12 +546,12 @@
                         </property>
                         <property name="whatsThis" stdset="0">
                             <string>&lt;p&gt;&lt;b&gt;Container Widget&lt;/b&gt;&lt;/p&gt;
-&lt;p&gt;If this custom widget is able to contain other widgets (children), check this checkbox.&lt;/p&gt;</string>
+&lt;p&gt;If this custom widget is able to contain other widgets (tqchildren), check this checkbox.&lt;/p&gt;</string>
                         </property>
                     </widget>
                 </grid>
             </widget>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>Widget3</cstring>
                 </property>
@@ -568,15 +568,15 @@
                     <property name="spacing">
                         <number>6</number>
                     </property>
-                    <widget class="QListBox">
+                    <widget class="TQListBox">
                         <property name="name">
                             <cstring>listSignals</cstring>
                         </property>
                         <property name="whatsThis" stdset="0">
-                            <string>The list of all the signals that the selected widget can emit.</string>
+                            <string>The list of all the Q_SIGNALS that the selected widget can emit.</string>
                         </property>
                     </widget>
-                    <widget class="QLayoutWidget">
+                    <widget class="TQLayoutWidget">
                         <property name="name">
                             <cstring>Layout40</cstring>
                         </property>
@@ -600,14 +600,14 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>20</height>
                                     </size>
                                 </property>
                             </spacer>
-                            <widget class="QPushButton">
+                            <widget class="TQPushButton">
                                 <property name="name">
                                     <cstring>buttonAddSignal</cstring>
                                 </property>
@@ -624,7 +624,7 @@
                                     <string>&lt;b&gt;Add a new signal for the current custom widget.&lt;/b&gt;&lt;p&gt;An argument list should be provided in the signal's name, and the name must be unique.&lt;/p&gt;</string>
                                 </property>
                             </widget>
-                            <widget class="QPushButton">
+                            <widget class="TQPushButton">
                                 <property name="name">
                                     <cstring>buttonRemoveSignal</cstring>
                                 </property>
@@ -643,7 +643,7 @@
                             </widget>
                         </hbox>
                     </widget>
-                    <widget class="QLayoutWidget">
+                    <widget class="TQLayoutWidget">
                         <property name="name">
                             <cstring>Layout38</cstring>
                         </property>
@@ -657,7 +657,7 @@
                             <property name="spacing">
                                 <number>6</number>
                             </property>
-                            <widget class="QLabel">
+                            <widget class="TQLabel">
                                 <property name="name">
                                     <cstring>TextLabel1</cstring>
                                 </property>
@@ -683,7 +683,7 @@
                     </widget>
                 </vbox>
             </widget>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>Widget4</cstring>
                 </property>
@@ -700,7 +700,7 @@
                     <property name="spacing">
                         <number>6</number>
                     </property>
-                    <widget class="QListView" row="0" column="0" rowspan="1" colspan="4">
+                    <widget class="TQListView" row="0" column="0" rowspan="1" colspan="4">
                         <column>
                             <property name="text">
                                 <string>Slot</string>
@@ -733,10 +733,10 @@
                             <bool>true</bool>
                         </property>
                         <property name="whatsThis" stdset="0">
-                            <string>The list of all the custom widget's slots.</string>
+                            <string>The list of all the custom widget's Q_SLOTS.</string>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="2" column="0">
+                    <widget class="TQLabel" row="2" column="0">
                         <property name="name">
                             <cstring>TextLabel2</cstring>
                         </property>
@@ -758,7 +758,7 @@
                             <string>&lt;b&gt;Change the name of the selected slot.&lt;/b&gt;&lt;p&gt;An argument list should be provided in the signal's name, and the name must be unique.&lt;/p&gt;</string>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="2" column="2">
+                    <widget class="TQLabel" row="2" column="2">
                         <property name="name">
                             <cstring>TextLabel3</cstring>
                         </property>
@@ -769,7 +769,7 @@
                             <cstring>comboAccess</cstring>
                         </property>
                     </widget>
-                    <widget class="QComboBox" row="2" column="3">
+                    <widget class="TQComboBox" row="2" column="3">
                         <item>
                             <property name="text">
                                 <string>public</string>
@@ -787,10 +787,10 @@
                             <string>Change slot access</string>
                         </property>
                         <property name="whatsThis" stdset="0">
-                            <string>&lt;b&gt;Change the slot's access policy.&lt;/b&gt;&lt;p&gt;You can only connect to the widget's public slots.&lt;/p&gt;</string>
+                            <string>&lt;b&gt;Change the slot's access policy.&lt;/b&gt;&lt;p&gt;You can only connect to the widget's public Q_SLOTS.&lt;/p&gt;</string>
                         </property>
                     </widget>
-                    <widget class="QLayoutWidget" row="1" column="0" rowspan="1" colspan="4">
+                    <widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="4">
                         <property name="name">
                             <cstring>Layout7</cstring>
                         </property>
@@ -814,14 +814,14 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>20</height>
                                     </size>
                                 </property>
                             </spacer>
-                            <widget class="QPushButton">
+                            <widget class="TQPushButton">
                                 <property name="name">
                                     <cstring>buttonAddSlot</cstring>
                                 </property>
@@ -838,7 +838,7 @@
                                     <string>&lt;b&gt;Add a new slot to the current custom widget.&lt;/b&gt;&lt;p&gt;An argument list should be provided in the signal's name, and the name must be unique.&lt;/p&gt;</string>
                                 </property>
                             </widget>
-                            <widget class="QPushButton">
+                            <widget class="TQPushButton">
                                 <property name="name">
                                     <cstring>buttonRemoveSlot</cstring>
                                 </property>
@@ -859,7 +859,7 @@
                     </widget>
                 </grid>
             </widget>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>Widget5</cstring>
                 </property>
@@ -876,7 +876,7 @@
                     <property name="spacing">
                         <number>6</number>
                     </property>
-                    <widget class="QLayoutWidget" row="1" column="0" rowspan="1" colspan="4">
+                    <widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="4">
                         <property name="name">
                             <cstring>Layout7_2</cstring>
                         </property>
@@ -900,14 +900,14 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>20</height>
                                     </size>
                                 </property>
                             </spacer>
-                            <widget class="QPushButton">
+                            <widget class="TQPushButton">
                                 <property name="name">
                                     <cstring>buttonAddProperty</cstring>
                                 </property>
@@ -924,7 +924,7 @@
                                     <string>&lt;b&gt;Add a new property to the current custom widget.&lt;/b&gt;&lt;p&gt;The properties must be implemented in the class using Qt's property system.&lt;/p&gt;</string>
                                 </property>
                             </widget>
-                            <widget class="QPushButton">
+                            <widget class="TQPushButton">
                                 <property name="name">
                                     <cstring>buttonRemoveProperty</cstring>
                                 </property>
@@ -943,7 +943,7 @@
                             </widget>
                         </hbox>
                     </widget>
-                    <widget class="QComboBox" row="2" column="3">
+                    <widget class="TQComboBox" row="2" column="3">
                         <item>
                             <property name="text">
                                 <string>String</string>
@@ -1029,7 +1029,7 @@
                             <string>&lt;b&gt;Select the type of the property.&lt;/b&gt;&lt;p&gt;The property must be implemented in the class using Qt's property system.&lt;/p&gt;&lt;p&gt;You can use integer types to support enumeration properties in the property editor.&lt;/p&gt;</string>
                         </property>
                     </widget>
-                    <widget class="QListView" row="0" column="0" rowspan="1" colspan="4">
+                    <widget class="TQListView" row="0" column="0" rowspan="1" colspan="4">
                         <column>
                             <property name="text">
                                 <string>Property</string>
@@ -1076,7 +1076,7 @@
                             <string>&lt;b&gt;Enter a name for the property.&lt;/b&gt;&lt;p&gt;The properties must be implemented in the class using Qt's property system.&lt;/p&gt;</string>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="2" column="0">
+                    <widget class="TQLabel" row="2" column="0">
                         <property name="name">
                             <cstring>TextLabel2_2</cstring>
                         </property>
@@ -1087,7 +1087,7 @@
                             <cstring>editProperty</cstring>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="2" column="2">
+                    <widget class="TQLabel" row="2" column="2">
                         <property name="name">
                             <cstring>TextLabel3_2</cstring>
                         </property>
@@ -1106,15 +1106,15 @@
 <connections>
     <connection>
         <sender>boxWidgets</sender>
-        <signal>selectionChanged(QListBoxItem*)</signal>
+        <signal>selectionChanged(TQListBoxItem*)</signal>
         <receiver>CustomWidgetEditorBase</receiver>
-        <slot>currentWidgetChanged(QListBoxItem*)</slot>
+        <slot>currentWidgetChanged(TQListBoxItem*)</slot>
     </connection>
     <connection>
         <sender>boxWidgets</sender>
-        <signal>currentChanged(QListBoxItem*)</signal>
+        <signal>currentChanged(TQListBoxItem*)</signal>
         <receiver>CustomWidgetEditorBase</receiver>
-        <slot>currentWidgetChanged(QListBoxItem*)</slot>
+        <slot>currentWidgetChanged(TQListBoxItem*)</slot>
     </connection>
     <connection>
         <sender>buttonNewWidget</sender>
@@ -1178,15 +1178,15 @@
     </connection>
     <connection>
         <sender>listSignals</sender>
-        <signal>currentChanged(QListBoxItem*)</signal>
+        <signal>currentChanged(TQListBoxItem*)</signal>
         <receiver>CustomWidgetEditorBase</receiver>
-        <slot>currentSignalChanged(QListBoxItem*)</slot>
+        <slot>currentSignalChanged(TQListBoxItem*)</slot>
     </connection>
     <connection>
         <sender>listSignals</sender>
-        <signal>selectionChanged(QListBoxItem*)</signal>
+        <signal>selectionChanged(TQListBoxItem*)</signal>
         <receiver>CustomWidgetEditorBase</receiver>
-        <slot>currentSignalChanged(QListBoxItem*)</slot>
+        <slot>currentSignalChanged(TQListBoxItem*)</slot>
     </connection>
     <connection>
         <sender>buttonRemoveSignal</sender>
@@ -1202,15 +1202,15 @@
     </connection>
     <connection>
         <sender>listSlots</sender>
-        <signal>currentChanged(QListViewItem*)</signal>
+        <signal>currentChanged(TQListViewItem*)</signal>
         <receiver>CustomWidgetEditorBase</receiver>
-        <slot>currentSlotChanged(QListViewItem*)</slot>
+        <slot>currentSlotChanged(TQListViewItem*)</slot>
     </connection>
     <connection>
         <sender>listSlots</sender>
-        <signal>selectionChanged(QListViewItem*)</signal>
+        <signal>selectionChanged(TQListViewItem*)</signal>
         <receiver>CustomWidgetEditorBase</receiver>
-        <slot>currentSlotChanged(QListViewItem*)</slot>
+        <slot>currentSlotChanged(TQListViewItem*)</slot>
     </connection>
     <connection>
         <sender>buttonRemoveSlot</sender>
@@ -1232,15 +1232,15 @@
     </connection>
     <connection>
         <sender>listProperties</sender>
-        <signal>currentChanged(QListViewItem*)</signal>
+        <signal>currentChanged(TQListViewItem*)</signal>
         <receiver>CustomWidgetEditorBase</receiver>
-        <slot>currentPropertyChanged(QListViewItem*)</slot>
+        <slot>currentPropertyChanged(TQListViewItem*)</slot>
     </connection>
     <connection>
         <sender>listProperties</sender>
-        <signal>selectionChanged(QListViewItem*)</signal>
+        <signal>selectionChanged(TQListViewItem*)</signal>
         <receiver>CustomWidgetEditorBase</receiver>
-        <slot>currentPropertyChanged(QListViewItem*)</slot>
+        <slot>currentPropertyChanged(TQListViewItem*)</slot>
     </connection>
     <connection>
         <sender>buttonRemoveProperty</sender>
@@ -1316,10 +1316,10 @@
     <slot access="protected" language="C++" returnType="void">chooseHeader()</slot>
     <slot access="protected" language="C++" returnType="void">classNameChanged( const QString &amp; )</slot>
     <slot access="protected" language="C++" returnType="void">closeClicked()</slot>
-    <slot access="protected" language="C++" returnType="void">currentPropertyChanged( QListViewItem * )</slot>
-    <slot access="protected" language="C++" returnType="void">currentSignalChanged( QListBoxItem * )</slot>
-    <slot access="protected" language="C++" returnType="void">currentSlotChanged( QListViewItem * )</slot>
-    <slot access="protected" language="C++" returnType="void">currentWidgetChanged( QListBoxItem * )</slot>
+    <slot access="protected" language="C++" returnType="void">currentPropertyChanged( TQListViewItem * )</slot>
+    <slot access="protected" language="C++" returnType="void">currentSignalChanged( TQListBoxItem * )</slot>
+    <slot access="protected" language="C++" returnType="void">currentSlotChanged( TQListViewItem * )</slot>
+    <slot access="protected" language="C++" returnType="void">currentWidgetChanged( TQListBoxItem * )</slot>
     <slot access="protected" language="C++" returnType="void">deleteWidgetClicked()</slot>
     <slot access="protected" language="C++" returnType="void">headerFileChanged( const QString &amp; )</slot>
     <slot access="protected" language="C++" returnType="void">heightChanged( int )</slot>
diff --git a/kdevdesigner/designer/customwidgeteditorimpl.cpp b/kdevdesigner/designer/customwidgeteditorimpl.cpp
index 99fa00fd..3a1437ab 100644
--- a/kdevdesigner/designer/customwidgeteditorimpl.cpp
+++ b/kdevdesigner/designer/customwidgeteditorimpl.cpp
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -55,8 +55,8 @@
 
 #include <klocale.h>
 
-CustomWidgetEditor::CustomWidgetEditor( TQWidget *parent, MainWindow *mw )
-    : CustomWidgetEditorBase( parent, 0, TRUE ), mainWindow( mw )
+CustomWidgetEditor::CustomWidgetEditor( TQWidget *tqparent, MainWindow *mw )
+    : CustomWidgetEditorBase( tqparent, 0, TRUE ), mainWindow( mw )
 {
     connect( helpButton, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) );
     checkTimer = new TQTimer( this );
@@ -73,10 +73,10 @@ CustomWidgetEditor::CustomWidgetEditor( TQWidget *parent, MainWindow *mw )
     sizeVer->setEnabled( FALSE );
     checkContainer->setEnabled( FALSE );
     localGlobalCombo->setEnabled( FALSE );
-    editClass->setValidator( new AsciiValidator( TQString(":"), editClass ) );
-    editSignal->setValidator( new AsciiValidator( TRUE, editSignal ) );
-    editSlot->setValidator( new AsciiValidator( TRUE, editSignal ) );
-    editProperty->setValidator( new AsciiValidator( editSignal ) );
+    editClass->setValidator( new AsciiValidator( TQString(":"), TQT_TQOBJECT(editClass) ) );
+    editSignal->setValidator( new AsciiValidator( TRUE, TQT_TQOBJECT(editSignal) ) );
+    editSlot->setValidator( new AsciiValidator( TRUE, TQT_TQOBJECT(editSignal) ) );
+    editProperty->setValidator( new AsciiValidator( TQT_TQOBJECT(editSignal) ) );
     editSignal->setEnabled( FALSE );
     buttonRemoveSignal->setEnabled( FALSE );
 
@@ -199,8 +199,8 @@ void CustomWidgetEditor::currentWidgetChanged( TQListBoxItem *i )
 	previewPixmap->setPixmap( *w->pixmap );
     else
 	previewPixmap->setText( "" );
-    spinWidth->setValue( w->sizeHint.width() );
-    spinHeight->setValue( w->sizeHint.height() );
+    spinWidth->setValue( w->tqsizeHint.width() );
+    spinHeight->setValue( w->tqsizeHint.height() );
     sizeHor->setCurrentItem( size_type_to_int( w->sizePolicy.horData() ) );
     sizeVer->setCurrentItem( size_type_to_int( w->sizePolicy.verData() ) );
     checkContainer->setChecked( w->isContainer );
@@ -222,7 +222,7 @@ void CustomWidgetEditor::addWidgetClicked()
 	TQMessageBox::information( this, i18n( "Adding Custom Widget" ),
 				  i18n( "Custom widget names must be unique.\n"
 				      "A custom widget called '%1' already exists, so it is not possible "
-				      "to add another widget with this name." ).arg( s ) );
+				      "to add another widget with this name." ).tqarg( s ) );
 	return;
     }
 
@@ -310,7 +310,7 @@ void CustomWidgetEditor::heightChanged( int h )
     if ( !i || !w )
 	return;
 
-    w->sizeHint.setHeight( h );
+    w->tqsizeHint.setHeight( h );
     updateCustomWidgetSizes();
 }
 
@@ -354,7 +354,7 @@ void CustomWidgetEditor::widthChanged( int wid )
     if ( !i || !w )
 	return;
 
-    w->sizeHint.setWidth( wid );
+    w->tqsizeHint.setWidth( wid );
     updateCustomWidgetSizes();
 }
 
@@ -363,7 +363,7 @@ MetaDataBase::CustomWidget *CustomWidgetEditor::findWidget( TQListBoxItem *i )
     if ( !i )
 	return 0;
 
-    TQMap<TQListBoxItem*, MetaDataBase::CustomWidget*>::Iterator it = customWidgets.find( i );
+    TQMap<TQListBoxItem*, MetaDataBase::CustomWidget*>::Iterator it = customWidgets.tqfind( i );
     if ( it == customWidgets.end() )
 	return 0;
     return *it;
@@ -376,7 +376,7 @@ void CustomWidgetEditor::chooseHeader()
     if ( !i || !w )
 	return;
 
-    TQString h = KFileDialog::getOpenFileName( TQString::null, i18n( "*.h *.h++ *.hxx *.hh|Header Files" ), this );
+    TQString h = KFileDialog::getOpenFileName( TQString(), i18n( "*.h *.h++ *.hxx *.hh|Header Files" ), this );
     if ( h.isEmpty() )
 	return;
     editHeader->setText( h );
@@ -397,10 +397,10 @@ void CustomWidgetEditor::checkWidgetName()
 	TQMessageBox::information( this, i18n( "Renaming Custom Widget" ),
 				  i18n( "Custom widget names must be unique.\n"
 				      "A custom widget called '%1' already exists, so it is not possible "
-				      "to rename this widget with this name." ).arg( s ) );
+				      "to rename this widget with this name." ).tqarg( s ) );
 	if ( i != boxWidgets->item( boxWidgets->currentItem() ) ) {
 	    boxWidgets->setCurrentItem( i );
-	    qApp->processEvents();
+	    tqApp->processEvents();
 	}
 	editClass->setText( w->className );
 	classNameChanged( w->className );
@@ -461,7 +461,7 @@ void CustomWidgetEditor::signalNameChanged( const TQString &s )
     if ( !w || listSignals->currentItem() == -1 )
 	return;
 
-    TQValueList<TQCString>::Iterator it = w->lstSignals.find( listSignals->currentText().latin1() );
+    TQValueList<TQCString>::Iterator it = w->lstSignals.tqfind( listSignals->currentText().latin1() );
     if ( it != w->lstSignals.end() )
 	w->lstSignals.remove( it );
     listSignals->blockSignals( TRUE );
@@ -479,7 +479,7 @@ void CustomWidgetEditor::slotAccessChanged( const TQString &s )
     MetaDataBase::Function slot;
     slot.function = listSlots->currentItem()->text( 0 );
     slot.access = listSlots->currentItem()->text( 1 );
-    TQValueList<MetaDataBase::Function>::Iterator it = w->lstSlots.find( slot );
+    TQValueList<MetaDataBase::Function>::Iterator it = w->lstSlots.tqfind( slot );
     if ( it != w->lstSlots.end() )
 	w->lstSlots.remove( it );
     listSlots->currentItem()->setText( 1, s );
@@ -498,7 +498,7 @@ void CustomWidgetEditor::slotNameChanged( const TQString &s )
     slot.function = listSlots->currentItem()->text( 0 );
     slot.access = listSlots->currentItem()->text( 1 );
     slot.type = "slot";
-    TQValueList<MetaDataBase::Function>::Iterator it = w->lstSlots.find( slot );
+    TQValueList<MetaDataBase::Function>::Iterator it = w->lstSlots.tqfind( slot );
     if ( it != w->lstSlots.end() )
 	w->lstSlots.remove( it );
     listSlots->currentItem()->setText( 0, s );
@@ -574,7 +574,7 @@ void CustomWidgetEditor::propertyTypeChanged( const TQString &s )
     MetaDataBase::Property property;
     property.property = listProperties->currentItem()->text( 0 );
     property.type = listProperties->currentItem()->text( 1 );
-    TQValueList<MetaDataBase::Property>::Iterator it = w->lstProperties.find( property );
+    TQValueList<MetaDataBase::Property>::Iterator it = w->lstProperties.tqfind( property );
     if ( it != w->lstProperties.end() )
 	w->lstProperties.remove( it );
     listProperties->currentItem()->setText( 1, s );
@@ -592,7 +592,7 @@ void CustomWidgetEditor::propertyNameChanged( const TQString &s )
     MetaDataBase::Property property;
     property.property = listProperties->currentItem()->text( 0 );
     property.type = listProperties->currentItem()->text( 1 );
-    TQValueList<MetaDataBase::Property>::Iterator it = w->lstProperties.find( property );
+    TQValueList<MetaDataBase::Property>::Iterator it = w->lstProperties.tqfind( property );
     if ( it != w->lstProperties.end() )
 	w->lstProperties.remove( it );
     listProperties->currentItem()->setText( 0, s );
@@ -671,17 +671,17 @@ static TQString makeIndent2( int indent )
 static TQString entitize2( const TQString &s )
 {
     TQString s2 = s;
-    s2 = s2.replace( "\"", "&quot;" );
-    s2 = s2.replace( "&", "&amp;" );
-    s2 = s2.replace( ">", "&gt;" );
-    s2 = s2.replace( "<", "&lt;" );
-    s2 = s2.replace( "'", "&apos;" );
+    s2 = s2.tqreplace( "\"", "&quot;" );
+    s2 = s2.tqreplace( "&", "&amp;" );
+    s2 = s2.tqreplace( ">", "&gt;" );
+    s2 = s2.tqreplace( "<", "&lt;" );
+    s2 = s2.tqreplace( "'", "&apos;" );
     return s2;
 }
 
 void CustomWidgetEditor::saveDescription()
 {
-    TQString fn = KFileDialog::getSaveFileName( TQString::null, i18n( "*.cw|Custom-Widget Description\n*|All Files" ), this );
+    TQString fn = KFileDialog::getSaveFileName( TQString(), i18n( "*.cw|Custom-Widget Description\n*|All Files" ), this );
     if ( fn.isEmpty() )
 	return;
 
@@ -710,8 +710,8 @@ void CustomWidgetEditor::saveDescription()
 	   << "\">" << w->includeFile << "</header>" << endl;
 	ts << makeIndent2( indent ) << "<sizehint>" << endl;
 	indent++;
-	ts << makeIndent2( indent ) << "<width>" << w->sizeHint.width() << "</width>" << endl;
-	ts << makeIndent2( indent ) << "<height>" << w->sizeHint.height() << "</height>" << endl;
+	ts << makeIndent2( indent ) << "<width>" << w->tqsizeHint.width() << "</width>" << endl;
+	ts << makeIndent2( indent ) << "<height>" << w->tqsizeHint.height() << "</height>" << endl;
 	indent--;
 	ts << makeIndent2( indent ) << "</sizehint>" << endl;
 	ts << makeIndent2( indent ) << "<container>" << (int)w->isContainer << "</container>" << endl;
@@ -749,7 +749,7 @@ void CustomWidgetEditor::saveDescription()
 
 void CustomWidgetEditor::loadDescription()
 {
-    TQString fn = KFileDialog::getOpenFileName( TQString::null, i18n( "*.cw|Custom-Widget Description\n*|All Files" ), this );
+    TQString fn = KFileDialog::getOpenFileName( TQString(), i18n( "*.cw|Custom-Widget Description\n*|All Files" ), this );
     if ( fn.isEmpty() )
 	return;
 
@@ -802,7 +802,7 @@ void CustomWidgetEditor::horDataChanged( int a )
 	CustomWidget *cw = (CustomWidget*)o;
 	if ( cw->realClassName() == boxWidgets->currentText() ) {
 	    if ( cw->sizePolicy() == osp )
-		cw->setSizePolicy( w->sizePolicy );
+		cw->tqsetSizePolicy( w->sizePolicy );
 	}
     }
 }
@@ -823,7 +823,7 @@ void CustomWidgetEditor::verDataChanged( int a )
 	CustomWidget *cw = (CustomWidget*)o;
 	if ( cw->realClassName() == boxWidgets->currentText() ) {
 	    if ( cw->sizePolicy() == osp )
-		cw->setSizePolicy( w->sizePolicy );
+		cw->tqsetSizePolicy( w->sizePolicy );
 	}
     }
 }
diff --git a/kdevdesigner/designer/customwidgeteditorimpl.h b/kdevdesigner/designer/customwidgeteditorimpl.h
index 8386ae2f..aca6bb8d 100644
--- a/kdevdesigner/designer/customwidgeteditorimpl.h
+++ b/kdevdesigner/designer/customwidgeteditorimpl.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -40,9 +40,10 @@ class MainWindow;
 class CustomWidgetEditor : public CustomWidgetEditorBase
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    CustomWidgetEditor( TQWidget *parent , MainWindow *mw);
+    CustomWidgetEditor( TQWidget *tqparent , MainWindow *mw);
 
 protected slots:
     void addWidgetClicked();
diff --git a/kdevdesigner/designer/database.cpp b/kdevdesigner/designer/database.cpp
index c9621604..b426e9dd 100644
--- a/kdevdesigner/designer/database.cpp
+++ b/kdevdesigner/designer/database.cpp
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -30,7 +30,7 @@
 #include "database2.h"
 #endif
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 
 #if defined(DESIGNER)
 #include "formwindow.h"
@@ -46,7 +46,7 @@ DatabaseSupport::DatabaseSupport()
 {
     con = 0;
     frm = 0;
-    parent = 0;
+    tqparent = 0;
 }
 
 void DatabaseSupport::initPreview( const TQString &connection, const TQString &table, TQObject *o,
@@ -54,7 +54,7 @@ void DatabaseSupport::initPreview( const TQString &connection, const TQString &t
 {
     tbl = table;
     dbControls = databaseControls;
-    parent = o;
+    tqparent = o;
 
     if ( connection != "(default)" )
 	con = TQSqlDatabase::database( connection );
@@ -62,19 +62,19 @@ void DatabaseSupport::initPreview( const TQString &connection, const TQString &t
 	con = TQSqlDatabase::database();
     frm = new TQSqlForm( o, table );
     for ( TQMap<TQString, TQString>::Iterator it = dbControls.begin(); it != dbControls.end(); ++it ) {
-	TQObject *chld = parent->child( it.key(), "TQWidget" );
+	TQObject *chld = tqparent->child( it.key(), TQWIDGET_OBJECT_NAME_STRING );
 	if ( !chld )
 	    continue;
 	frm->insert( (TQWidget*)chld, *it );
     }
 }
 
-QDesignerDataBrowser::QDesignerDataBrowser( TQWidget *parent, const char *name )
-    : TQDataBrowser( parent, name )
+TQDesignerDataBrowser::TQDesignerDataBrowser( TQWidget *tqparent, const char *name )
+    : TQDataBrowser( tqparent, name )
 {
 }
 
-bool QDesignerDataBrowser::event( TQEvent* e )
+bool TQDesignerDataBrowser::event( TQEvent* e )
 {
     bool b = TQDataBrowser::event( e );
 #if defined(DESIGNER)
@@ -96,12 +96,12 @@ bool QDesignerDataBrowser::event( TQEvent* e )
     return b;
 }
 
-QDesignerDataView::QDesignerDataView( TQWidget *parent, const char *name )
-    : TQDataView( parent, name )
+TQDesignerDataView::TQDesignerDataView( TQWidget *tqparent, const char *name )
+    : TQDataView( tqparent, name )
 {
 }
 
-bool QDesignerDataView::event( TQEvent* e )
+bool TQDesignerDataView::event( TQEvent* e )
 {
     bool b = TQDataView::event( e );
 #if defined(DESIGNER)
diff --git a/kdevdesigner/designer/database.h b/kdevdesigner/designer/database.h
index 0de0ad3f..8ff9bec3 100644
--- a/kdevdesigner/designer/database.h
+++ b/kdevdesigner/designer/database.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -29,7 +29,7 @@
 
 #include "tqfeatures.h"
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 #include <tqdataview.h>
 #include <tqdatabrowser.h>
 #include <tqsqlcursor.h>
@@ -52,27 +52,29 @@ protected:
     TQSqlForm* frm;
     TQString tbl;
     TQMap<TQString, TQString> dbControls;
-    TQObject *parent;
+    TQObject *tqparent;
 
 };
 
-class QDesignerDataBrowser : public TQDataBrowser, public DatabaseSupport
+class TQDesignerDataBrowser : public TQDataBrowser, public DatabaseSupport
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    QDesignerDataBrowser( TQWidget *parent, const char *name );
+    TQDesignerDataBrowser( TQWidget *tqparent, const char *name );
 
 protected:
     bool event( TQEvent* e );
 };
 
-class QDesignerDataView : public TQDataView, public DatabaseSupport
+class TQDesignerDataView : public TQDataView, public DatabaseSupport
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    QDesignerDataView( TQWidget *parent, const char *name );
+    TQDesignerDataView( TQWidget *tqparent, const char *name );
 
 protected:
     bool event( TQEvent* e );
diff --git a/kdevdesigner/designer/dbconnection.ui b/kdevdesigner/designer/dbconnection.ui
index 19a0e216..1ad273a9 100644
--- a/kdevdesigner/designer/dbconnection.ui
+++ b/kdevdesigner/designer/dbconnection.ui
@@ -25,7 +25,7 @@
 ** not clear to you.
 **
 *********************************************************************</comment>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>DatabaseConnectionWidget</cstring>
     </property>
@@ -50,7 +50,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QLabel" row="2" column="0">
+        <widget class="TQLabel" row="2" column="0">
             <property name="name">
                 <cstring>TextLabel3</cstring>
             </property>
@@ -61,7 +61,7 @@
                 <cstring>editDatabase</cstring>
             </property>
         </widget>
-        <widget class="QLabel" row="3" column="0">
+        <widget class="TQLabel" row="3" column="0">
             <property name="name">
                 <cstring>TextLabel4</cstring>
             </property>
@@ -72,7 +72,7 @@
                 <cstring>editUsername</cstring>
             </property>
         </widget>
-        <widget class="QLabel" row="4" column="0">
+        <widget class="TQLabel" row="4" column="0">
             <property name="name">
                 <cstring>TextLabel4_2</cstring>
             </property>
@@ -83,7 +83,7 @@
                 <cstring>editPassword</cstring>
             </property>
         </widget>
-        <widget class="QLabel" row="1" column="0">
+        <widget class="TQLabel" row="1" column="0">
             <property name="name">
                 <cstring>TextLabel2</cstring>
             </property>
@@ -102,7 +102,7 @@
                 <bool>false</bool>
             </property>
         </widget>
-        <widget class="QLabel" row="5" column="0">
+        <widget class="TQLabel" row="5" column="0">
             <property name="name">
                 <cstring>TextLabel5</cstring>
             </property>
@@ -113,7 +113,7 @@
                 <cstring>editHostname</cstring>
             </property>
         </widget>
-        <widget class="QComboBox" row="1" column="1">
+        <widget class="TQComboBox" row="1" column="1">
             <property name="name">
                 <cstring>comboDriver</cstring>
             </property>
@@ -124,7 +124,7 @@
                 <bool>true</bool>
             </property>
         </widget>
-        <widget class="QLabel" row="0" column="0">
+        <widget class="TQLabel" row="0" column="0">
             <property name="name">
                 <cstring>TextLabel1</cstring>
             </property>
@@ -143,7 +143,7 @@
                 <bool>false</bool>
             </property>
         </widget>
-        <widget class="QLabel" row="6" column="0">
+        <widget class="TQLabel" row="6" column="0">
             <property name="name">
                 <cstring>TextLabel1_2</cstring>
             </property>
@@ -181,7 +181,7 @@
                 <bool>false</bool>
             </property>
         </widget>
-        <widget class="QSpinBox" row="6" column="1">
+        <widget class="TQSpinBox" row="6" column="1">
             <property name="name">
                 <cstring>editPort</cstring>
             </property>
@@ -214,9 +214,9 @@
     <tabstop>editHostname</tabstop>
     <tabstop>editPort</tabstop>
 </tabstops>
-<slots>
+<Q_SLOTS>
     <slot access="protected">init()</slot>
     <slot access="protected">destroy()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kdevdesigner/designer/dbconnectioneditor.ui b/kdevdesigner/designer/dbconnectioneditor.ui
index 64b77387..abf8beed 100644
--- a/kdevdesigner/designer/dbconnectioneditor.ui
+++ b/kdevdesigner/designer/dbconnectioneditor.ui
@@ -25,7 +25,7 @@
 ** not clear to you.
 **
 *********************************************************************</comment>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>DatabaseConnectionEditorBase</cstring>
     </property>
@@ -50,7 +50,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QPushButton" row="1" column="2">
+        <widget class="TQPushButton" row="1" column="2">
             <property name="name">
                 <cstring>PushButton2</cstring>
             </property>
@@ -58,7 +58,7 @@
                 <string>&amp;Cancel</string>
             </property>
         </widget>
-        <widget class="QPushButton" row="1" column="1">
+        <widget class="TQPushButton" row="1" column="1">
             <property name="name">
                 <cstring>PushButton1</cstring>
             </property>
@@ -79,14 +79,14 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
                 </size>
             </property>
         </spacer>
-        <widget class="QGroupBox" row="0" column="0" rowspan="1" colspan="3">
+        <widget class="TQGroupBox" row="0" column="0" rowspan="1" colspan="3">
             <property name="name">
                 <cstring>grp</cstring>
             </property>
@@ -113,7 +113,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
diff --git a/kdevdesigner/designer/dbconnectionimpl.cpp b/kdevdesigner/designer/dbconnectionimpl.cpp
index fb5697ca..d326df8a 100644
--- a/kdevdesigner/designer/dbconnectionimpl.cpp
+++ b/kdevdesigner/designer/dbconnectionimpl.cpp
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -35,9 +35,9 @@
 #include <tqlayout.h>
 #include <tqsqldatabase.h>
 
-DatabaseConnectionEditor::DatabaseConnectionEditor( DatabaseConnection* connection, TQWidget* parent,
+DatabaseConnectionEditor::DatabaseConnectionEditor( DatabaseConnection* connection, TQWidget* tqparent,
 						    const char* name, bool modal, WFlags fl )
-    : DatabaseConnectionEditorBase( parent, name, modal, fl ), conn( connection )
+    : DatabaseConnectionEditorBase( tqparent, name, modal, fl ), conn( connection )
 {
     connectionWidget = new DatabaseConnectionWidget( grp );
     grpLayout->addWidget( connectionWidget, 0, 0 );
@@ -50,7 +50,7 @@ DatabaseConnectionEditor::~DatabaseConnectionEditor()
 
 void DatabaseConnectionEditor::accept()
 {
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     conn->setUsername( connectionWidget->editUsername->text() );
     conn->setPassword( connectionWidget->editPassword->text() );
     conn->setHostname( connectionWidget->editHostname->text() );
@@ -61,7 +61,7 @@ void DatabaseConnectionEditor::accept()
 void DatabaseConnectionEditor::init()
 {
     connectionWidget->editName->setEnabled( FALSE );
-    connectionWidget->editName->setValidator( new AsciiValidator( connectionWidget->editName ) );
+    connectionWidget->editName->setValidator( new AsciiValidator( TQT_TQOBJECT(connectionWidget->editName) ) );
     connectionWidget->editName->setText( conn->name() );
     connectionWidget->comboDriver->setEnabled( FALSE );
     connectionWidget->comboDriver->lineEdit()->setText( conn->driver() );
diff --git a/kdevdesigner/designer/dbconnectionimpl.h b/kdevdesigner/designer/dbconnectionimpl.h
index b6055109..a8bc0f68 100644
--- a/kdevdesigner/designer/dbconnectionimpl.h
+++ b/kdevdesigner/designer/dbconnectionimpl.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -36,9 +36,10 @@ class TQGridLayout;
 class DatabaseConnectionEditor : public DatabaseConnectionEditorBase
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    DatabaseConnectionEditor( DatabaseConnection* connection, TQWidget* parent = 0,
+    DatabaseConnectionEditor( DatabaseConnection* connection, TQWidget* tqparent = 0,
 			       const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
     ~DatabaseConnectionEditor();
 
diff --git a/kdevdesigner/designer/dbconnections.ui b/kdevdesigner/designer/dbconnections.ui
index 847c00b1..e373b2be 100644
--- a/kdevdesigner/designer/dbconnections.ui
+++ b/kdevdesigner/designer/dbconnections.ui
@@ -25,7 +25,7 @@
 ** not clear to you.
 **
 *********************************************************************</comment>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>DatabaseConnectionBase</cstring>
     </property>
@@ -53,7 +53,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QPushButton" row="0" column="1">
+        <widget class="TQPushButton" row="0" column="1">
             <property name="name">
                 <cstring>buttonNew</cstring>
             </property>
@@ -61,12 +61,12 @@
                 <string>&amp;New Connection</string>
             </property>
         </widget>
-        <widget class="QListBox" row="0" column="0" rowspan="5" colspan="1">
+        <widget class="TQListBox" row="0" column="0" rowspan="5" colspan="1">
             <property name="name">
                 <cstring>listConnections</cstring>
             </property>
         </widget>
-        <widget class="QPushButton" row="1" column="1">
+        <widget class="TQPushButton" row="1" column="1">
             <property name="name">
                 <cstring>buttonDelete</cstring>
             </property>
@@ -74,7 +74,7 @@
                 <string>&amp;Delete Connection</string>
             </property>
         </widget>
-        <widget class="QLayoutWidget" row="5" column="0" rowspan="1" colspan="3">
+        <widget class="TQLayoutWidget" row="5" column="0" rowspan="1" colspan="3">
             <property name="name">
                 <cstring>Layout5</cstring>
             </property>
@@ -88,7 +88,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonHelp</cstring>
                     </property>
@@ -109,14 +109,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonClose</cstring>
                     </property>
@@ -142,14 +142,14 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
                 </size>
             </property>
         </spacer>
-        <widget class="QGroupBox" row="0" column="2" rowspan="3" colspan="1">
+        <widget class="TQGroupBox" row="0" column="2" rowspan="3" colspan="1">
             <property name="name">
                 <cstring>grp</cstring>
             </property>
@@ -176,7 +176,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -185,7 +185,7 @@
                 </spacer>
             </grid>
         </widget>
-        <widget class="QLayoutWidget" row="3" column="2">
+        <widget class="TQLayoutWidget" row="3" column="2">
             <property name="name">
                 <cstring>Layout4</cstring>
             </property>
@@ -209,14 +209,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonConnect</cstring>
                     </property>
@@ -237,7 +237,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -256,7 +256,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
diff --git a/kdevdesigner/designer/dbconnectionsimpl.cpp b/kdevdesigner/designer/dbconnectionsimpl.cpp
index 1d3c1a0b..00fb13eb 100644
--- a/kdevdesigner/designer/dbconnectionsimpl.cpp
+++ b/kdevdesigner/designer/dbconnectionsimpl.cpp
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -45,25 +45,25 @@
 static bool blockChanges = FALSE;
 
 /*
- *  Constructs a DatabaseConnectionsEditor which is a child of 'parent', with the
+ *  Constructs a DatabaseConnectionsEditor which is a child of 'tqparent', with the
  *  name 'name' and widget flags set to 'f'
  *
  *  The dialog will by default be modeless, unless you set 'modal' to
  *  TRUE to construct a modal dialog.
  */
-DatabaseConnectionsEditor::DatabaseConnectionsEditor( Project *pro, TQWidget* parent,  const char* name, bool modal, WFlags fl )
-    : DatabaseConnectionBase( parent, name, modal, fl ), project( pro )
+DatabaseConnectionsEditor::DatabaseConnectionsEditor( Project *pro, TQWidget* tqparent,  const char* name, bool modal, WFlags fl )
+    : DatabaseConnectionBase( tqparent, name, modal, fl ), project( pro )
 {
     connect( buttonHelp, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) );
     connectionWidget = new DatabaseConnectionWidget( grp );
     grpLayout->addWidget( connectionWidget, 0, 0 );
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     TQPtrList<DatabaseConnection> lst = project->databaseConnections();
     for ( DatabaseConnection *conn = lst.first(); conn; conn = lst.next() )
 	listConnections->insertItem( conn->name() );
     connectionWidget->comboDriver->insertStringList( TQSqlDatabase::drivers() );
 #endif
-    connectionWidget->editName->setValidator( new AsciiValidator( connectionWidget->editName ) );
+    connectionWidget->editName->setValidator( new AsciiValidator(  TQT_TQOBJECT(connectionWidget->editName) ) );
     enableAll( FALSE );
 }
 
@@ -107,7 +107,7 @@ void DatabaseConnectionsEditor::newConnection()
 
 void DatabaseConnectionsEditor::doConnect()
 {
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     if ( listConnections->currentItem() == -1 ||
 	 !listConnections->item( listConnections->currentItem() )->isSelected() ) { // new connection
 	// ### do error checking for duplicated connection names
@@ -149,7 +149,7 @@ void DatabaseConnectionsEditor::doConnect()
 
 void DatabaseConnectionsEditor::currentConnectionChanged( const TQString &s )
 {
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     DatabaseConnection *conn = project->databaseConnection( s );
     blockChanges = TRUE;
     enableAll( conn != 0 );
diff --git a/kdevdesigner/designer/dbconnectionsimpl.h b/kdevdesigner/designer/dbconnectionsimpl.h
index 220e24a8..a12f4dce 100644
--- a/kdevdesigner/designer/dbconnectionsimpl.h
+++ b/kdevdesigner/designer/dbconnectionsimpl.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -35,9 +35,10 @@ class Project;
 class DatabaseConnectionsEditor : public DatabaseConnectionBase
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    DatabaseConnectionsEditor( Project *pro, TQWidget* parent = 0,
+    DatabaseConnectionsEditor( Project *pro, TQWidget* tqparent = 0,
 			       const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
     ~DatabaseConnectionsEditor();
 
diff --git a/kdevdesigner/designer/defs.cpp b/kdevdesigner/designer/defs.cpp
index de1c7dfc..c1aa36de 100644
--- a/kdevdesigner/designer/defs.cpp
+++ b/kdevdesigner/designer/defs.cpp
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
diff --git a/kdevdesigner/designer/defs.h b/kdevdesigner/designer/defs.h
index e79d676c..45143b81 100644
--- a/kdevdesigner/designer/defs.h
+++ b/kdevdesigner/designer/defs.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
diff --git a/kdevdesigner/designer/designer_pch.h b/kdevdesigner/designer/designer_pch.h
index 883a7a7c..fa840181 100644
--- a/kdevdesigner/designer/designer_pch.h
+++ b/kdevdesigner/designer/designer_pch.h
@@ -1,6 +1,6 @@
 /*
  * This is a precompiled header file for use in Xcode / Mac GCC / 
- * GCC >= 3.4 / VC to greatly speed the building of Qt Designer. It may 
+ * GCC >= 3.4 / VC to greatly speed the building of TQt Designer. It may 
  * also be of use to people developing their own project, but it is 
  * probably better to define your own header.  Use of this header is 
  * currently UNSUPPORTED.
@@ -8,7 +8,7 @@
 
 #if defined __cplusplus
 
-#include <private/qucomextra_p.h>
+#include <private/tqucomextra_p.h>
 #include <tqaction.h>
 #include <tqapplication.h>
 #include <tqcheckbox.h>
diff --git a/kdevdesigner/designer/designeraction.cpp b/kdevdesigner/designer/designeraction.cpp
index 129bf3e5..66ecb438 100644
--- a/kdevdesigner/designer/designeraction.cpp
+++ b/kdevdesigner/designer/designeraction.cpp
@@ -35,14 +35,4 @@ void DesignerAction::setEnabled( bool e )
     emit actionEnabled(e);
 }
 
-#if QT_VERSION < 0x030300
-void DesignerAction::activate()
-{
-    if ( isToggleAction() ) {
-        return;
-    }
-    emit activated();
-}
-#endif
-
 #include "designeraction.moc"
diff --git a/kdevdesigner/designer/designeraction.h b/kdevdesigner/designer/designeraction.h
index 0efd69dd..b49874f0 100644
--- a/kdevdesigner/designer/designeraction.h
+++ b/kdevdesigner/designer/designeraction.h
@@ -22,29 +22,27 @@
 
 #include <tqaction.h>
 
-class DesignerAction : public QAction
+class DesignerAction : public TQAction
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-    DesignerAction(TQObject *parent = 0, const char *name = 0)
-            :TQAction(parent, name) {}
-    DesignerAction ( const TQString & menuText, TQKeySequence accel, TQObject * parent, const char * name = 0 )
-            :TQAction(menuText, accel, parent, name) {}
-    DesignerAction ( const TQIconSet & icon, const TQString & menuText, TQKeySequence accel, TQObject * parent, const char * name = 0 )
-            :TQAction(icon, menuText, accel, parent, name) {}
-    DesignerAction ( const TQString & text, const TQIconSet & icon, const TQString & menuText, TQKeySequence accel, TQObject * parent, const char * name = 0, bool toggle = FALSE ) 
-            :TQAction(text, icon, menuText, accel, parent, name, toggle) {}
-    DesignerAction ( const TQString & text, const TQString & menuText, TQKeySequence accel, TQObject * parent, const char * name = 0, bool toggle = FALSE )
-            :TQAction(text, menuText, accel, parent, name, toggle) {}
-    DesignerAction ( TQObject * parent, const char * name, bool toggle ) 
-            :TQAction(parent, name, toggle) {}
+    DesignerAction(TQObject *tqparent = 0, const char *name = 0)
+            :TQAction(tqparent, name) {}
+    DesignerAction ( const TQString & menuText, TQKeySequence accel, TQObject * tqparent, const char * name = 0 )
+            :TQAction(menuText, accel, tqparent, name) {}
+    DesignerAction ( const TQIconSet & icon, const TQString & menuText, TQKeySequence accel, TQObject * tqparent, const char * name = 0 )
+            :TQAction(icon, menuText, accel, tqparent, name) {}
+    DesignerAction ( const TQString & text, const TQIconSet & icon, const TQString & menuText, TQKeySequence accel, TQObject * tqparent, const char * name = 0, bool toggle = FALSE ) 
+            :TQAction(text, icon, menuText, accel, tqparent, name, toggle) {}
+    DesignerAction ( const TQString & text, const TQString & menuText, TQKeySequence accel, TQObject * tqparent, const char * name = 0, bool toggle = FALSE )
+            :TQAction(text, menuText, accel, tqparent, name, toggle) {}
+    DesignerAction ( TQObject * tqparent, const char * name, bool toggle ) 
+            :TQAction(tqparent, name, toggle) {}
     ~DesignerAction();
     
     virtual void setEnabled(bool e);
     virtual void setDisabled(bool d);
-#if QT_VERSION < 0x030300
-    virtual void activate();
-#endif
 
 signals:
     void actionEnabled(bool e);
diff --git a/kdevdesigner/designer/designerapp.cpp b/kdevdesigner/designer/designerapp.cpp
index 3a0016c4..ebe10a70 100644
--- a/kdevdesigner/designer/designerapp.cpp
+++ b/kdevdesigner/designer/designerapp.cpp
@@ -1,15 +1,15 @@
  /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -36,8 +36,8 @@
 #include <tqsettings.h>
 #include <tqsplashscreen.h>
 
-#ifdef Q_WS_WIN
-#include <qt_windows.h>
+#ifdef TQ_WS_WIN
+#include <tqt_windows.h>
 #include <process.h>
 #endif
 
@@ -48,19 +48,19 @@ void set_splash_status( const TQString &txt )
     if ( !splash )
 	return;
     TQString splashText = "Licensed to "
-			 + TQString::fromLatin1( QT_PRODUCT_LICENSEE ) + "\n"
+			 + TQString::tqfromLatin1( TQT_PRODUCT_LICENSEE ) + "\n"
 			 + txt;
-    splash->message( splashText, Qt::AlignRight|Qt::AlignTop );
+    splash->message( splashText, TQt::AlignRight|TQt::AlignTop );
 }
 
 DesignerApplication::DesignerApplication( int &argc, char **argv )
     : TQApplication( argc, argv )
 {
-#if defined(Q_WS_WIN)
-    if ( winVersion() & Qt::WV_NT_based )
-	DESIGNER_OPENFILE = RegisterWindowMessage((TCHAR*)"QT_DESIGNER_OPEN_FILE");
+#if defined(TQ_WS_WIN)
+    if ( winVersion() & TQt::WV_NT_based )
+	DESIGNER_OPENFILE = RegisterWindowMessage((TCHAR*)"TQT_DESIGNER_OPEN_FILE");
     else
-	DESIGNER_OPENFILE = RegisterWindowMessageA("QT_DESIGNER_OPEN_FILE");
+	DESIGNER_OPENFILE = RegisterWindowMessageA("TQT_DESIGNER_OPEN_FILE");
 #endif
 }
 
@@ -99,24 +99,24 @@ static TQString *old_settings_key = 0;
 TQString DesignerApplication::settingsKey()
 {
     if ( !settings_key )
-	settings_key = new TQString( "/Qt Designer/" +
-				    TQString::number( (QT_VERSION >> 16) & 0xff ) +
-	                            "." + TQString::number( (QT_VERSION >> 8) & 0xff ) + "/" );
+	settings_key = new TQString( "/TQt Designer/" +
+				    TQString::number( (TQT_VERSION >> 16) & 0xff ) +
+	                            "." + TQString::number( (TQT_VERSION >> 8) & 0xff ) + "/" );
     return *settings_key;
 }
 
 TQString DesignerApplication::oldSettingsKey()
 {
     if ( !old_settings_key ) {
-	int majorVer = (QT_VERSION >> 16) & 0xff;
-	int minorVer = (QT_VERSION >> 8) & 0xff;
+	int majorVer = (TQT_VERSION >> 16) & 0xff;
+	int minorVer = (TQT_VERSION >> 8) & 0xff;
 
 	// If minorVer is 0 (e.g. 4.0) then we don't want to read the
 	// old settings, too much might have changed.
 	if ( !minorVer == 0 )
 	    minorVer--;
 
-	old_settings_key = new TQString( "/Qt Designer/" +
+	old_settings_key = new TQString( "/TQt Designer/" +
 				    TQString::number( majorVer ) +
 	                            "." + TQString::number( minorVer ) + "/" );
     }
@@ -131,7 +131,7 @@ void DesignerApplication::setSettingsKey( const TQString &key )
 	*settings_key = key;
 }
 
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
 bool DesignerApplication::winEventFilter( MSG *msg )
 {
     if ( msg->message == DESIGNER_OPENFILE ) {
diff --git a/kdevdesigner/designer/designerapp.h b/kdevdesigner/designer/designerapp.h
index 66201471..b3c62a11 100644
--- a/kdevdesigner/designer/designerapp.h
+++ b/kdevdesigner/designer/designerapp.h
@@ -1,15 +1,15 @@
  /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -31,7 +31,7 @@ class TQSplashScreen;
 
 #include <tqapplication.h>
 
-class DesignerApplication : public QApplication
+class DesignerApplication : public TQApplication
 {
 public:
     const char *className() const { return "DesignerApplication"; }
@@ -48,7 +48,7 @@ public:
 protected:
     TQDateTime lastMod;
 
-#if defined(Q_WS_WIN)
+#if defined(TQ_WS_WIN)
     bool winEventFilter( MSG *msg );
     uint DESIGNER_OPENFILE;
 #endif
diff --git a/kdevdesigner/designer/designerappiface.cpp b/kdevdesigner/designer/designerappiface.cpp
index dca4bbd8..5c7fa739 100644
--- a/kdevdesigner/designer/designerappiface.cpp
+++ b/kdevdesigner/designer/designerappiface.cpp
@@ -1,15 +1,15 @@
  /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -51,21 +51,21 @@ DesignerInterfaceImpl::DesignerInterfaceImpl( MainWindow *mw )
 {
 }
 
-QRESULT DesignerInterfaceImpl::queryInterface( const QUuid &uuid, QUnknownInterface** iface )
+TQRESULT DesignerInterfaceImpl::queryInterface( const TQUuid &uuid, TQUnknownInterface** iface )
 {
     *iface = 0;
 
-    if ( uuid == IID_QUnknown )
-	*iface = (QUnknownInterface*)this;
-    else if ( uuid == IID_QComponentInformation )
-	*iface = (QComponentInformationInterface*)this;
+    if ( uuid == IID_TQUnknown )
+	*iface = (TQUnknownInterface*)this;
+    else if ( uuid == IID_TQComponentInformation )
+	*iface = (TQComponentInformationInterface*)this;
     else if ( uuid == IID_Designer )
 	*iface = (DesignerInterface*)this;
     else
-	return QE_NOINTERFACE;
+	return TQE_NOINTERFACE;
 
     (*iface)->addRef();
-    return QS_OK;
+    return TQS_OK;
 }
 
 
@@ -146,7 +146,7 @@ bool DesignerInterfaceImpl::singleProjectMode() const
 void DesignerInterfaceImpl::showError( TQWidget *widget,
 				       int line, const TQString &message )
 {
-    mainWindow->showErrorMessage( widget, line, message );
+    mainWindow->showErrorMessage( TQT_TQOBJECT(widget), line, message );
 }
 
 void DesignerInterfaceImpl::runFinished()
@@ -156,12 +156,12 @@ void DesignerInterfaceImpl::runFinished()
 
 void DesignerInterfaceImpl::showStackFrame( TQWidget *w, int line )
 {
-    mainWindow->showStackFrame( w, line );
+    mainWindow->showStackFrame( TQT_TQOBJECT(w), line );
 }
 
 void DesignerInterfaceImpl::showDebugStep( TQWidget *w, int line )
 {
-    mainWindow->showDebugStep( w, line );
+    mainWindow->showDebugStep( TQT_TQOBJECT(w), line );
 }
 
 void DesignerInterfaceImpl::runProjectPrecondition()
@@ -190,7 +190,7 @@ TQPtrList<DesignerFormWindow> DesignerProjectImpl::formList() const
     while ( it.current() ) {
 	TQObject *obj = it.current();
 	++it;
-	TQWidget *par = ::qt_cast<FormWindow*>(obj->parent());
+	TQWidget *par = ::tqqt_cast<FormWindow*>(obj->tqparent());
 	if ( !obj->isWidgetType() || !par )
 	    continue;
 
@@ -208,7 +208,7 @@ TQString DesignerProjectImpl::formFileName( const TQString &form ) const
 	if ( TQString( forms.current()->formName() ) == form )
 	    return forms.current()->fileName();
     }
-    return TQString::null;
+    return TQString();
 }
 
 TQStringList DesignerProjectImpl::formNames() const
@@ -252,7 +252,7 @@ void DesignerProjectImpl::setProjectName( const TQString & )
 
 TQString DesignerProjectImpl::databaseFile() const
 {
-    return TQString::null;
+    return TQString();
 }
 
 void DesignerProjectImpl::setDatabaseFile( const TQString & )
@@ -267,7 +267,7 @@ void DesignerProjectImpl::setupDatabases() const
 TQPtrList<DesignerDatabase> DesignerProjectImpl::databaseConnections() const
 {
     TQPtrList<DesignerDatabase> lst;
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     TQPtrList<DatabaseConnection> conns = project->databaseConnections();
     for ( DatabaseConnection *d = conns.first(); d; d = conns.next() )
 	lst.append( d->iFace() );
@@ -304,9 +304,9 @@ void DesignerProjectImpl::setCustomSetting( const TQString &key, const TQString
 
 TQString DesignerProjectImpl::customSetting( const TQString &key ) const
 {
-    if ( key == "QTSCRIPT_PACKAGES" ) {
-	TQString s = getenv( "QTSCRIPT_PACKAGES" );
-	TQString s2 = project->customSetting( "QUICK_PACKAGES" );
+    if ( key == "TQTSCRIPT_PACKAGES" ) {
+	TQString s = getenv( "TQTSCRIPT_PACKAGES" );
+	TQString s2 = project->customSetting( "TQUICK_PACKAGES" );
 	if ( !s.isEmpty() && !s2.isEmpty() )
 #if defined(Q_OS_WIN32)
 	    s += ";";
@@ -335,7 +335,7 @@ void DesignerProjectImpl::breakPoints( TQMap<TQString, TQValueList<uint> > &bps
     for ( TQPtrListIterator<FormFile> forms = project->formFiles();
 	  forms.current(); ++forms ) {
 	if ( forms.current()->formWindow() )
-	    bps.insert( TQString( forms.current()->formWindow()->name() ) + " <Form>", MetaDataBase::breakPoints( forms.current()->formWindow() ) );
+	    bps.insert( TQString( forms.current()->formWindow()->name() ) + " <Form>", MetaDataBase::breakPoints( TQT_TQOBJECT(forms.current()->formWindow()) ) );
     }
 }
 
@@ -360,7 +360,7 @@ void DesignerProjectImpl::clearAllBreakpoints() const
     for ( TQPtrListIterator<FormFile> forms = project->formFiles();
 	  forms.current(); ++forms ) {
 	if ( forms.current()->formWindow() )
-	    MetaDataBase::setBreakPoints( forms.current()->formWindow(), empty );
+	    MetaDataBase::setBreakPoints( TQT_TQOBJECT(forms.current()->formWindow()), empty );
 	MainWindow::self->resetBreakPoints();
     }
 }
@@ -426,7 +426,7 @@ bool DesignerProjectImpl::isGenericObject( TQObject *o ) const
 
 
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 DesignerDatabaseImpl::DesignerDatabaseImpl( DatabaseConnection *d )
     : db( d )
 {
@@ -535,7 +535,7 @@ void DesignerPixmapCollectionImpl::addPixmap( const TQPixmap &p, const TQString
     pixCollection->addPixmap( pix, force );
     FormWindow *fw = MainWindow::self->formWindow();
     if ( fw )
-	MetaDataBase::setPixmapKey( fw, p.serialNumber(), name );
+	MetaDataBase::setPixmapKey( TQT_TQOBJECT(fw), p.serialNumber(), name );
 }
 
 TQPixmap DesignerPixmapCollectionImpl::pixmap( const TQString &name ) const
@@ -582,11 +582,11 @@ void DesignerFormWindowImpl::insertWidget( TQWidget * )
 {
 }
 
-TQWidget *DesignerFormWindowImpl::create( const char *className, TQWidget *parent, const char *name )
+TQWidget *DesignerFormWindowImpl::create( const char *className, TQWidget *tqparent, const char *name )
 {
-    TQWidget *w = WidgetFactory::create( WidgetDatabase::idFromClassName( className ), parent, name );
+    TQWidget *w = WidgetFactory::create( WidgetDatabase::idFromClassName( className ), tqparent, name );
     formWindow->insertWidget( w, TRUE );
-    formWindow->killAccels( formWindow->mainContainer() );
+    formWindow->killAccels( TQT_TQOBJECT(formWindow->mainContainer()) );
     return w;
 }
 
@@ -631,41 +631,41 @@ void DesignerFormWindowImpl::checkAccels()
 {
 }
 
-void DesignerFormWindowImpl::layoutH()
+void DesignerFormWindowImpl::tqlayoutH()
 {
-    formWindow->layoutHorizontal();
+    formWindow->tqlayoutHorizontal();
 }
 
-void DesignerFormWindowImpl::layoutV()
+void DesignerFormWindowImpl::tqlayoutV()
 {
 }
 
-void DesignerFormWindowImpl::layoutHSplit()
+void DesignerFormWindowImpl::tqlayoutHSplit()
 {
 }
 
-void DesignerFormWindowImpl::layoutVSplit()
+void DesignerFormWindowImpl::tqlayoutVSplit()
 {
 }
 
-void DesignerFormWindowImpl::layoutG()
+void DesignerFormWindowImpl::tqlayoutG()
 {
-    formWindow->layoutGrid();
+    formWindow->tqlayoutGrid();
 }
 
-void DesignerFormWindowImpl::layoutHContainer( TQWidget* w )
+void DesignerFormWindowImpl::tqlayoutHContainer( TQWidget* w )
 {
-    formWindow->layoutHorizontalContainer( w );
+    formWindow->tqlayoutHorizontalContainer( w );
 }
 
-void DesignerFormWindowImpl::layoutVContainer( TQWidget* w )
+void DesignerFormWindowImpl::tqlayoutVContainer( TQWidget* w )
 {
-    formWindow->layoutVerticalContainer( w );
+    formWindow->tqlayoutVerticalContainer( w );
 }
 
-void DesignerFormWindowImpl::layoutGContainer( TQWidget* w )
+void DesignerFormWindowImpl::tqlayoutGContainer( TQWidget* w )
 {
-    formWindow->layoutGridContainer( w );
+    formWindow->tqlayoutGridContainer( w );
 }
 
 void DesignerFormWindowImpl::breakLayout()
@@ -674,7 +674,7 @@ void DesignerFormWindowImpl::breakLayout()
 
 void DesignerFormWindowImpl::selectWidget( TQWidget * w )
 {
-    formWindow->selectWidget( w, TRUE );
+    formWindow->selectWidget( TQT_TQOBJECT(w), TRUE );
 }
 
 void DesignerFormWindowImpl::selectAll()
@@ -717,9 +717,9 @@ TQPtrList<TQAction> DesignerFormWindowImpl::actionList() const
 }
 
 TQAction *DesignerFormWindowImpl::createAction( const TQString& text, const TQIconSet& icon, const TQString& menuText, int accel,
-					       TQObject* parent, const char* name, bool toggle )
+					       TQObject* tqparent, const char* name, bool toggle )
 {
-    QDesignerAction *a = new QDesignerAction( parent );
+    TQDesignerAction *a = new TQDesignerAction( tqparent );
     a->setName( name );
     a->setText( text );
     if ( !icon.isNull() && !icon.pixmap().isNull() )
@@ -732,7 +732,7 @@ TQAction *DesignerFormWindowImpl::createAction( const TQString& text, const TQIc
 
 void DesignerFormWindowImpl::addAction( TQAction *a )
 {
-    if ( formWindow->actionList().findRef( a ) != -1 )
+    if ( formWindow->actionList().tqfindRef( a ) != -1 )
 	return;
     formWindow->actionList().append( a );
     MetaDataBase::addEntry( a );
@@ -755,14 +755,14 @@ void DesignerFormWindowImpl::preview() const
 
 void DesignerFormWindowImpl::addConnection( TQObject *sender, const char *signal, TQObject *receiver, const char *slot )
 {
-    MetaDataBase::addConnection( formWindow, sender, signal, receiver, slot );
+    MetaDataBase::addConnection( TQT_TQOBJECT(formWindow), sender, signal, receiver, slot );
 }
 
 void DesignerFormWindowImpl::addFunction( const TQCString &function, const TQString &specifier,
 					  const TQString &access, const TQString &type,
 					  const TQString &language, const TQString &returnType )
 {
-    MetaDataBase::addFunction( formWindow, function, specifier, access, type, language, returnType );
+    MetaDataBase::addFunction( TQT_TQOBJECT(formWindow), function, specifier, access, type, language, returnType );
     formWindow->mainWindow()->functionsChanged();
 }
 
@@ -770,8 +770,8 @@ void DesignerFormWindowImpl::addFunction( const TQCString &function, const TQStr
 
 void DesignerFormWindowImpl::setProperty( TQObject *o, const char *property, const TQVariant &value )
 {
-    int id = o->metaObject()->findProperty( property, TRUE );
-    const TQMetaProperty* p = o->metaObject()->property( id, TRUE );
+    int id = o->tqmetaObject()->tqfindProperty( property, TRUE );
+    const TQMetaProperty* p = o->tqmetaObject()->property( id, TRUE );
     if ( p && p->isValid() )
 	o->setProperty( property, value );
     else
@@ -780,8 +780,8 @@ void DesignerFormWindowImpl::setProperty( TQObject *o, const char *property, con
 
 TQVariant DesignerFormWindowImpl::property( TQObject *o, const char *prop ) const
 {
-    int id = o->metaObject()->findProperty( prop, TRUE );
-    const TQMetaProperty* p = o->metaObject()->property( id, TRUE );
+    int id = o->tqmetaObject()->tqfindProperty( prop, TRUE );
+    const TQMetaProperty* p = o->tqmetaObject()->property( id, TRUE );
     if ( p && p->isValid() )
 	return o->property( prop );
     return MetaDataBase::fakeProperty( o, prop );
@@ -804,7 +804,7 @@ void DesignerFormWindowImpl::setColumnFields( TQObject *o, const TQMap<TQString,
 
 TQStringList DesignerFormWindowImpl::implementationIncludes() const
 {
-    TQValueList<MetaDataBase::Include> includes = MetaDataBase::includes( formWindow );
+    TQValueList<MetaDataBase::Include> includes = MetaDataBase::includes( TQT_TQOBJECT(formWindow) );
     TQStringList lst;
     for ( TQValueList<MetaDataBase::Include>::Iterator it = includes.begin(); it != includes.end(); ++it ) {
 	MetaDataBase::Include inc = *it;
@@ -825,7 +825,7 @@ TQStringList DesignerFormWindowImpl::implementationIncludes() const
 
 TQStringList DesignerFormWindowImpl::declarationIncludes() const
 {
-    TQValueList<MetaDataBase::Include> includes = MetaDataBase::includes( formWindow );
+    TQValueList<MetaDataBase::Include> includes = MetaDataBase::includes( TQT_TQOBJECT(formWindow) );
     TQStringList lst;
     for ( TQValueList<MetaDataBase::Include>::Iterator it = includes.begin(); it != includes.end(); ++it ) {
 	MetaDataBase::Include inc = *it;
@@ -846,7 +846,7 @@ TQStringList DesignerFormWindowImpl::declarationIncludes() const
 
 void DesignerFormWindowImpl::setImplementationIncludes( const TQStringList &lst )
 {
-    TQValueList<MetaDataBase::Include> oldIncludes = MetaDataBase::includes( formWindow );
+    TQValueList<MetaDataBase::Include> oldIncludes = MetaDataBase::includes( TQT_TQOBJECT(formWindow) );
     TQValueList<MetaDataBase::Include> includes;
     for ( TQValueList<MetaDataBase::Include>::Iterator it = oldIncludes.begin(); it != oldIncludes.end(); ++it ) {
 	MetaDataBase::Include inc = *it;
@@ -882,13 +882,13 @@ void DesignerFormWindowImpl::setImplementationIncludes( const TQStringList &lst
 	    includes << inc;
 	}
     }
-    MetaDataBase::setIncludes( formWindow, includes );
+    MetaDataBase::setIncludes( TQT_TQOBJECT(formWindow), includes );
     formWindow->mainWindow()->objectHierarchy()->formDefinitionView()->setup();
 }
 
 void DesignerFormWindowImpl::setDeclarationIncludes( const TQStringList &lst )
 {
-    TQValueList<MetaDataBase::Include> oldIncludes = MetaDataBase::includes( formWindow );
+    TQValueList<MetaDataBase::Include> oldIncludes = MetaDataBase::includes( TQT_TQOBJECT(formWindow) );
     TQValueList<MetaDataBase::Include> includes;
     for ( TQValueList<MetaDataBase::Include>::Iterator it = oldIncludes.begin(); it != oldIncludes.end(); ++it ) {
 	MetaDataBase::Include inc = *it;
@@ -924,29 +924,29 @@ void DesignerFormWindowImpl::setDeclarationIncludes( const TQStringList &lst )
 	    includes << inc;
 	}
     }
-    MetaDataBase::setIncludes( formWindow, includes );
+    MetaDataBase::setIncludes( TQT_TQOBJECT(formWindow), includes );
     formWindow->mainWindow()->objectHierarchy()->formDefinitionView()->setup();
 }
 
 TQStringList DesignerFormWindowImpl::forwardDeclarations() const
 {
-    return MetaDataBase::forwards( formWindow );
+    return MetaDataBase::forwards( TQT_TQOBJECT(formWindow) );
 }
 
 void DesignerFormWindowImpl::setForwardDeclarations( const TQStringList &lst )
 {
-    MetaDataBase::setForwards( formWindow, lst );
+    MetaDataBase::setForwards( TQT_TQOBJECT(formWindow), lst );
     formWindow->mainWindow()->objectHierarchy()->formDefinitionView()->setup();
 }
 
 TQStringList DesignerFormWindowImpl::signalList() const
 {
-    return MetaDataBase::signalList( formWindow );
+    return MetaDataBase::signalList( TQT_TQOBJECT(formWindow) );
 }
 
 void DesignerFormWindowImpl::setSignalList( const TQStringList &lst )
 {
-    MetaDataBase::setSignalList( formWindow, lst );
+    MetaDataBase::setSignalList( TQT_TQOBJECT(formWindow), lst );
     formWindow->mainWindow()->objectHierarchy()->formDefinitionView()->setup();
 }
 
@@ -957,27 +957,27 @@ void DesignerFormWindowImpl::onModificationChange( TQObject *receiver, const cha
 
 void DesignerFormWindowImpl::addMenu( const TQString &text, const TQString &name )
 {
-    if ( !::qt_cast<TQMainWindow*>(formWindow->mainContainer()) )
+    if ( !::tqqt_cast<TQMainWindow*>(formWindow->mainContainer()) )
 	return;
 
     TQMainWindow *mw = (TQMainWindow*)formWindow->mainContainer();
     PopupMenuEditor *popup = new PopupMenuEditor( formWindow, mw );
     TQString n = name;
-    formWindow->unify( popup, n, TRUE );
+    formWindow->unify(  TQT_TQOBJECT(popup), n, TRUE );
     popup->setName( n );
     MenuBarEditor *mb = (MenuBarEditor *)mw->child( 0, "MenuBarEditor" );
     if ( !mb ) {
 	mb = new MenuBarEditor( formWindow, mw );
 	mb->setName( "MenuBar" );
-	MetaDataBase::addEntry( mb );
+	MetaDataBase::addEntry( TQT_TQOBJECT(mb) );
     }
     mb->insertItem( text, popup );
-    MetaDataBase::addEntry( popup );
+    MetaDataBase::addEntry( TQT_TQOBJECT(popup) );
 }
 
 void DesignerFormWindowImpl::addMenuAction( const TQString &menu, TQAction *a )
 {
-    if ( !::qt_cast<TQMainWindow*>(formWindow->mainContainer()) )
+    if ( !::tqqt_cast<TQMainWindow*>(formWindow->mainContainer()) )
 	return;
     TQMainWindow *mw = (TQMainWindow*)formWindow->mainContainer();
     if ( !mw->child( 0, "MenuBarEditor" ) )
@@ -990,7 +990,7 @@ void DesignerFormWindowImpl::addMenuAction( const TQString &menu, TQAction *a )
 
 void DesignerFormWindowImpl::addMenuSeparator( const TQString &menu )
 {
-    if ( !::qt_cast<TQMainWindow*>(formWindow->mainContainer()) )
+    if ( !::tqqt_cast<TQMainWindow*>(formWindow->mainContainer()) )
 	return;
     TQMainWindow *mw = (TQMainWindow*)formWindow->mainContainer();
     if ( !mw->child( 0, "MenuBarEditor" ) )
@@ -998,28 +998,28 @@ void DesignerFormWindowImpl::addMenuSeparator( const TQString &menu )
     PopupMenuEditor *popup = (PopupMenuEditor*)mw->child( menu, "PopupMenuEditor" );
     if ( !popup )
 	return;
-    TQAction *a = new QSeparatorAction( 0 );
+    TQAction *a = new TQSeparatorAction( 0 );
     popup->insert( a );
 }
 
 void DesignerFormWindowImpl::addToolBar( const TQString &text, const TQString &name )
 {
-    if ( !::qt_cast<TQMainWindow*>(formWindow->mainContainer()) )
+    if ( !::tqqt_cast<TQMainWindow*>(formWindow->mainContainer()) )
 	return;
     TQMainWindow *mw = (TQMainWindow*)formWindow->mainContainer();
-    TQToolBar *tb = new QDesignerToolBar( mw );
+    TQToolBar *tb = new TQDesignerToolBar( mw );
     TQString n = name;
-    formWindow->unify( tb, n, TRUE );
+    formWindow->unify(  TQT_TQOBJECT(tb), n, TRUE );
     tb->setName( n );
     mw->addToolBar( tb, text );
 }
 
 void DesignerFormWindowImpl::addToolBarAction( const TQString &tbn, TQAction *a )
 {
-    if ( !::qt_cast<TQMainWindow*>(formWindow->mainContainer()) )
+    if ( !::tqqt_cast<TQMainWindow*>(formWindow->mainContainer()) )
 	return;
     TQMainWindow *mw = (TQMainWindow*)formWindow->mainContainer();
-    QDesignerToolBar *tb = (QDesignerToolBar*)mw->child( tbn, "QDesignerToolBar" );
+    TQDesignerToolBar *tb = (TQDesignerToolBar*)mw->child( tbn, "TQDesignerToolBar" );
     if ( !tb )
 	return;
     a->addTo( tb );
@@ -1028,13 +1028,13 @@ void DesignerFormWindowImpl::addToolBarAction( const TQString &tbn, TQAction *a
 
 void DesignerFormWindowImpl::addToolBarSeparator( const TQString &tbn )
 {
-    if ( !::qt_cast<TQMainWindow*>(formWindow->mainContainer()) )
+    if ( !::tqqt_cast<TQMainWindow*>(formWindow->mainContainer()) )
 	return;
     TQMainWindow *mw = (TQMainWindow*)formWindow->mainContainer();
-    QDesignerToolBar *tb = (QDesignerToolBar*)mw->child( tbn, "QDesignerToolBar" );
+    TQDesignerToolBar *tb = (TQDesignerToolBar*)mw->child( tbn, "TQDesignerToolBar" );
     if ( !tb )
 	return;
-    TQAction *a = new QSeparatorAction( 0 );
+    TQAction *a = new TQSeparatorAction( 0 );
     a->addTo( tb );
     tb->addAction( a );
 }
diff --git a/kdevdesigner/designer/designerappiface.h b/kdevdesigner/designer/designerappiface.h
index 4e14da4e..25b5b896 100644
--- a/kdevdesigner/designer/designerappiface.h
+++ b/kdevdesigner/designer/designerappiface.h
@@ -1,15 +1,15 @@
  /**********************************************************************
 ** Copyright (C) 2000-2001 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -63,8 +63,8 @@ public:
     void runProjectPostcondition( TQObjectList *l );
 
 
-    QRESULT queryInterface( const QUuid &uuid, QUnknownInterface** iface );
-    Q_REFCOUNT
+    TQRESULT queryInterface( const TQUuid &uuid, TQUnknownInterface** iface );
+    TQ_REFCOUNT
 
 private:
     MainWindow *mainWindow;
@@ -118,7 +118,7 @@ private:
 
 };
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 class TQSqlDatabase;
 
 class DesignerDatabaseImpl: public DesignerDatabase
@@ -175,7 +175,7 @@ public:
     void save() const;
     bool isModified() const;
     void insertWidget( TQWidget * );
-    TQWidget *create( const char *className, TQWidget *parent, const char *name );
+    TQWidget *create( const char *className, TQWidget *tqparent, const char *name );
     void removeWidget( TQWidget * );
     TQWidgetList widgets() const;
     void undo();
@@ -186,14 +186,14 @@ public:
     void adjustSize();
     void editConnections();
     void checkAccels();
-    void layoutH();
-    void layoutV();
-    void layoutHSplit();
-    void layoutVSplit();
-    void layoutG();
-    void layoutHContainer( TQWidget* w );
-    void layoutVContainer( TQWidget* w );
-    void layoutGContainer( TQWidget* w );
+    void tqlayoutH();
+    void tqlayoutV();
+    void tqlayoutHSplit();
+    void tqlayoutVSplit();
+    void tqlayoutG();
+    void tqlayoutHContainer( TQWidget* w );
+    void tqlayoutVContainer( TQWidget* w );
+    void tqlayoutGContainer( TQWidget* w );
     void breakLayout();
     void selectWidget( TQWidget * );
     void selectAll();
@@ -205,7 +205,7 @@ public:
     void setCurrentWidget( TQWidget * );
     TQPtrList<TQAction> actionList() const;
     TQAction *createAction( const TQString& text, const TQIconSet& icon, const TQString& menuText, int accel,
-			   TQObject* parent, const char* name = 0, bool toggle = FALSE );
+			   TQObject* tqparent, const char* name = 0, bool toggle = FALSE );
     void addAction( TQAction * );
     void removeAction( TQAction * );
     void preview() const;
diff --git a/kdevdesigner/designer/editfunctions.ui b/kdevdesigner/designer/editfunctions.ui
index 2cecdcb1..91a7fadf 100644
--- a/kdevdesigner/designer/editfunctions.ui
+++ b/kdevdesigner/designer/editfunctions.ui
@@ -25,7 +25,7 @@
 ** not clear to you.
 **
 *********************************************************************</comment>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>EditFunctionsBase</cstring>
     </property>
@@ -44,7 +44,7 @@
         <bool>true</bool>
     </property>
     <property name="whatsThis" stdset="0">
-        <string>&lt;b&gt;Edit Functions&lt;/b&gt;&lt;p&gt;Add, edit or delete the current form's slots or functions.&lt;/p&gt;&lt;p&gt;Click the &lt;b&gt;Add Function&lt;/b&gt;-button to create a new function; enter a name, choose an access mode and specify if it should be a slot or normal function.&lt;/p&gt;&lt;p&gt;Select an entry from the list and click the &lt;b&gt;Delete Function&lt;/b&gt;-button to remove a function; in case of a slot all connections using this slot will also be removed.&lt;/p&gt;</string>
+        <string>&lt;b&gt;Edit Functions&lt;/b&gt;&lt;p&gt;Add, edit or delete the current form's Q_SLOTS or functions.&lt;/p&gt;&lt;p&gt;Click the &lt;b&gt;Add Function&lt;/b&gt;-button to create a new function; enter a name, choose an access mode and specify if it should be a slot or normal function.&lt;/p&gt;&lt;p&gt;Select an entry from the list and click the &lt;b&gt;Delete Function&lt;/b&gt;-button to remove a function; in case of a slot all connections using this slot will also be removed.&lt;/p&gt;</string>
     </property>
     <vbox>
         <property name="name">
@@ -56,7 +56,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QListView">
+        <widget class="TQListView">
             <column>
                 <property name="text">
                     <string>Function</string>
@@ -150,7 +150,7 @@
                 <string>&lt;b&gt;This form's functions.&lt;/b&gt;&lt;p&gt;Select the function you want to change or delete.&lt;/p&gt;</string>
             </property>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>Layout11</cstring>
             </property>
@@ -161,7 +161,7 @@
                 <property name="margin">
                     <number>6</number>
                 </property>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>showOnlySlots</cstring>
                     </property>
@@ -169,13 +169,13 @@
                         <enum>StrongFocus</enum>
                     </property>
                     <property name="text">
-                        <string>Only d&amp;isplay slots</string>
+                        <string>Only d&amp;isplay Q_SLOTS</string>
                     </property>
                     <property name="toolTip" stdset="0">
                         <string>Change displaying mode for functions</string>
                     </property>
                     <property name="whatsThis" stdset="0">
-                        <string>&lt;b&gt;Check this button if only the slots should be displayed&lt;/b&gt;&lt;p&gt;Otherwise all functions, i.e. normal C++ functions and slots are displayed.&lt;/p&gt;
+                        <string>&lt;b&gt;Check this button if only the Q_SLOTS should be displayed&lt;/b&gt;&lt;p&gt;Otherwise all functions, i.e. normal C++ functions and Q_SLOTS are displayed.&lt;/p&gt;
 </string>
                     </property>
                 </widget>
@@ -189,14 +189,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>addFunction</cstring>
                     </property>
@@ -210,7 +210,7 @@
                         <string>&lt;b&gt;Add a new function.&lt;/b&gt;&lt;p&gt;New functions have a default name and public access.&lt;/p&gt;</string>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>deleteFunction</cstring>
                     </property>
@@ -226,7 +226,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>boxProperties</cstring>
             </property>
@@ -251,7 +251,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
                         <cstring>Layout14</cstring>
                     </property>
@@ -262,7 +262,7 @@
                         <property name="margin">
                             <number>0</number>
                         </property>
-                        <widget class="QLayoutWidget">
+                        <widget class="TQLayoutWidget">
                             <property name="name">
                                 <cstring>Layout5</cstring>
                             </property>
@@ -276,14 +276,14 @@
                                 <property name="spacing">
                                     <number>6</number>
                                 </property>
-                                <widget class="QLabel">
+                                <widget class="TQLabel">
                                     <property name="name">
                                         <cstring>Label8</cstring>
                                     </property>
                                     <property name="text">
                                         <string>&amp;Function:</string>
                                     </property>
-                                    <property name="alignment">
+                                    <property name="tqalignment">
                                         <set>AlignVCenter|AlignRight</set>
                                     </property>
                                     <property name="buddy" stdset="0">
@@ -309,14 +309,14 @@
                                         <string>&lt;b&gt;Change the name of the selected function.&lt;/b&gt;&lt;p&gt;The name should include the argument list and must be syntactically correct.&lt;/p&gt;</string>
                                     </property>
                                 </widget>
-                                <widget class="QLabel">
+                                <widget class="TQLabel">
                                     <property name="name">
                                         <cstring>labelType</cstring>
                                     </property>
                                     <property name="text">
                                         <string>&amp;Return type:</string>
                                     </property>
-                                    <property name="alignment">
+                                    <property name="tqalignment">
                                         <set>AlignVCenter|AlignRight</set>
                                     </property>
                                     <property name="buddy" stdset="0">
@@ -354,14 +354,14 @@
                             <property name="sizeType">
                                 <enum>Fixed</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>16</height>
                                 </size>
                             </property>
                         </spacer>
-                        <widget class="QLayoutWidget">
+                        <widget class="TQLayoutWidget">
                             <property name="name">
                                 <cstring>Layout13</cstring>
                             </property>
@@ -372,21 +372,21 @@
                                 <property name="margin">
                                     <number>0</number>
                                 </property>
-                                <widget class="QLabel">
+                                <widget class="TQLabel">
                                     <property name="name">
                                         <cstring>Label9_2</cstring>
                                     </property>
                                     <property name="text">
                                         <string>S&amp;pecifier:</string>
                                     </property>
-                                    <property name="alignment">
+                                    <property name="tqalignment">
                                         <set>AlignVCenter|AlignRight</set>
                                     </property>
                                     <property name="buddy" stdset="0">
                                         <cstring>functionSpecifier</cstring>
                                     </property>
                                 </widget>
-                                <widget class="QComboBox">
+                                <widget class="TQComboBox">
                                     <item>
                                         <property name="text">
                                             <string>non virtual</string>
@@ -425,21 +425,21 @@
                                         <string>&lt;b&gt;Change the access policy of the function&lt;/b&gt;&lt;p&gt;All functions are created virtual and should be reimplemented in subclasses.&lt;/p&gt;</string>
                                     </property>
                                 </widget>
-                                <widget class="QLabel">
+                                <widget class="TQLabel">
                                     <property name="name">
                                         <cstring>TextLabel1</cstring>
                                     </property>
                                     <property name="text">
                                         <string>&amp;Access:</string>
                                     </property>
-                                    <property name="alignment">
+                                    <property name="tqalignment">
                                         <set>WordBreak|AlignVCenter|AlignRight</set>
                                     </property>
                                     <property name="buddy" stdset="0">
                                         <cstring>functionAccess</cstring>
                                     </property>
                                 </widget>
-                                <widget class="QComboBox">
+                                <widget class="TQComboBox">
                                     <item>
                                         <property name="text">
                                             <string>public</string>
@@ -473,21 +473,21 @@
                                         <string>&lt;b&gt;Change the access policy of the function&lt;/b&gt;&lt;p&gt;All functions are created virtual and should be reimplemented in subclasses.&lt;/p&gt;</string>
                                     </property>
                                 </widget>
-                                <widget class="QLabel">
+                                <widget class="TQLabel">
                                     <property name="name">
                                         <cstring>TextLabel1_2</cstring>
                                     </property>
                                     <property name="text">
                                         <string>&amp;Type:</string>
                                     </property>
-                                    <property name="alignment">
+                                    <property name="tqalignment">
                                         <set>AlignVCenter|AlignRight</set>
                                     </property>
                                     <property name="buddy" stdset="0">
                                         <cstring>functionType</cstring>
                                     </property>
                                 </widget>
-                                <widget class="QComboBox">
+                                <widget class="TQComboBox">
                                     <item>
                                         <property name="text">
                                             <string>slot</string>
@@ -518,7 +518,7 @@
                                     <property name="sizeType">
                                         <enum>Expanding</enum>
                                     </property>
-                                    <property name="sizeHint">
+                                    <property name="tqsizeHint">
                                         <size>
                                             <width>20</width>
                                             <height>20</height>
@@ -531,7 +531,7 @@
                 </widget>
             </vbox>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>Layout1</cstring>
             </property>
@@ -545,7 +545,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>helpButton</cstring>
                     </property>
@@ -566,14 +566,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>okButton</cstring>
                     </property>
@@ -590,7 +590,7 @@
                         <string>Close the dialog and apply all the changes.</string>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>cancelButton</cstring>
                     </property>
@@ -635,45 +635,45 @@
     </connection>
     <connection>
         <sender>functionName</sender>
-        <signal>textChanged(const QString&amp;)</signal>
+        <signal>textChanged(const TQString&amp;)</signal>
         <receiver>EditFunctionsBase</receiver>
-        <slot>currentTextChanged(const QString&amp;)</slot>
+        <slot>currentTextChanged(const TQString&amp;)</slot>
     </connection>
     <connection>
         <sender>functionListView</sender>
-        <signal>selectionChanged(QListViewItem*)</signal>
+        <signal>selectionChanged(TQListViewItem*)</signal>
         <receiver>EditFunctionsBase</receiver>
-        <slot>currentItemChanged(QListViewItem*)</slot>
+        <slot>currentItemChanged(TQListViewItem*)</slot>
     </connection>
     <connection>
         <sender>functionListView</sender>
-        <signal>currentChanged(QListViewItem*)</signal>
+        <signal>currentChanged(TQListViewItem*)</signal>
         <receiver>EditFunctionsBase</receiver>
-        <slot>currentItemChanged(QListViewItem*)</slot>
+        <slot>currentItemChanged(TQListViewItem*)</slot>
     </connection>
     <connection>
         <sender>editType</sender>
-        <signal>textChanged(const QString&amp;)</signal>
+        <signal>textChanged(const TQString&amp;)</signal>
         <receiver>EditFunctionsBase</receiver>
-        <slot>currentReturnTypeChanged(const QString&amp;)</slot>
+        <slot>currentReturnTypeChanged(const TQString&amp;)</slot>
     </connection>
     <connection>
         <sender>functionSpecifier</sender>
-        <signal>activated(const QString&amp;)</signal>
+        <signal>activated(const TQString&amp;)</signal>
         <receiver>EditFunctionsBase</receiver>
-        <slot>currentSpecifierChanged(const QString&amp;)</slot>
+        <slot>currentSpecifierChanged(const TQString&amp;)</slot>
     </connection>
     <connection>
         <sender>functionAccess</sender>
-        <signal>activated(const QString&amp;)</signal>
+        <signal>activated(const TQString&amp;)</signal>
         <receiver>EditFunctionsBase</receiver>
-        <slot>currentAccessChanged(const QString&amp;)</slot>
+        <slot>currentAccessChanged(const TQString&amp;)</slot>
     </connection>
     <connection>
         <sender>functionType</sender>
-        <signal>activated(const QString&amp;)</signal>
+        <signal>activated(const TQString&amp;)</signal>
         <receiver>EditFunctionsBase</receiver>
-        <slot>currentTypeChanged(const QString&amp;)</slot>
+        <slot>currentTypeChanged(const TQString&amp;)</slot>
     </connection>
     <connection>
         <sender>showOnlySlots</sender>
@@ -696,19 +696,19 @@
     <tabstop>addFunction</tabstop>
     <tabstop>deleteFunction</tabstop>
 </tabstops>
-<slots>
-    <slot access="protected">currentItemChanged( QListViewItem * )</slot>
-    <slot access="protected">currentSpecifierChanged( const QString &amp; )</slot>
-    <slot access="protected">currentTextChanged( const QString &amp; )</slot>
-    <slot access="protected">currentReturnTypeChanged( const QString &amp; )</slot>
+<Q_SLOTS>
+    <slot access="protected">currentItemChanged( TQListViewItem * )</slot>
+    <slot access="protected">currentSpecifierChanged( const TQString &amp; )</slot>
+    <slot access="protected">currentTextChanged( const TQString &amp; )</slot>
+    <slot access="protected">currentReturnTypeChanged( const TQString &amp; )</slot>
     <slot access="protected">destroy()</slot>
     <slot access="protected">init()</slot>
-    <slot access="protected">currentAccessChanged( const QString &amp; )</slot>
-    <slot access="protected">currentTypeChanged( const QString &amp; )</slot>
+    <slot access="protected">currentAccessChanged( const TQString &amp; )</slot>
+    <slot access="protected">currentTypeChanged( const TQString &amp; )</slot>
     <slot access="protected">okClicked()</slot>
     <slot access="protected">functionAdd()</slot>
     <slot access="protected">functionRemove()</slot>
     <slot access="protected">displaySlots( bool )</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kdevdesigner/designer/editfunctionsimpl.cpp b/kdevdesigner/designer/editfunctionsimpl.cpp
index 44490811..8a91c9f6 100644
--- a/kdevdesigner/designer/editfunctionsimpl.cpp
+++ b/kdevdesigner/designer/editfunctionsimpl.cpp
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -49,15 +49,15 @@
 
 #include <klocale.h>
 
-EditFunctions::EditFunctions( TQWidget *parent, FormWindow *fw, bool justSlots )
-    : EditFunctionsBase( parent, 0, TRUE ), formWindow( fw )
+EditFunctions::EditFunctions( TQWidget *tqparent, FormWindow *fw, bool justSlots )
+    : EditFunctionsBase( tqparent, 0, TRUE ), formWindow( fw )
 {
     connect( helpButton, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) );
 
     id = 0;
     functList.clear();
 
-    TQValueList<MetaDataBase::Function> functionList = MetaDataBase::functionList( fw );
+    TQValueList<MetaDataBase::Function> functionList = MetaDataBase::functionList( TQT_TQOBJECT(fw) );
     for ( TQValueList<MetaDataBase::Function>::Iterator it = functionList.begin(); it != functionList.end(); ++it ) {
 	TQListViewItem *i = new TQListViewItem( functionListView );
 
@@ -86,7 +86,7 @@ EditFunctions::EditFunctions( TQWidget *parent, FormWindow *fw, bool justSlots )
 	id++;
 
 	if ( (*it).type == "slot" ) {
-	    if ( MetaDataBase::isSlotUsed( formWindow, MetaDataBase::normalizeFunction( (*it).function ).latin1() ) )
+	    if ( MetaDataBase::isSlotUsed( TQT_TQOBJECT(formWindow), MetaDataBase::normalizeFunction( (*it).function ).latin1() ) )
 		i->setText( 5, i18n( "Yes" ) );
 	    else
 		i->setText( 5, i18n( "No" ) );
@@ -96,7 +96,7 @@ EditFunctions::EditFunctions( TQWidget *parent, FormWindow *fw, bool justSlots )
     }
 
     boxProperties->setEnabled( FALSE );
-    functionName->setValidator( new AsciiValidator( TRUE, functionName ) );
+    functionName->setValidator( new AsciiValidator( TRUE, TQT_TQOBJECT(functionName) ) );
 
     if ( functionListView->firstChild() )
 	functionListView->setCurrentItem( functionListView->firstChild() );
@@ -104,7 +104,7 @@ EditFunctions::EditFunctions( TQWidget *parent, FormWindow *fw, bool justSlots )
     showOnlySlots->setChecked( justSlots );
     lastType = "function";
 
-    // Enable rename for all QListViewItems
+    // Enable rename for all TQListViewItems
     TQListViewItemIterator lvit = functionListView->firstChild();
     for ( ; *lvit; lvit++ )
 	(*lvit)->setRenameEnabled( 0, TRUE );
@@ -116,7 +116,7 @@ EditFunctions::EditFunctions( TQWidget *parent, FormWindow *fw, bool justSlots )
 		      TQT_SLOT( emitItemRenamed(TQListViewItem*, int, const TQString&) ) );
 
     // Connect signal-relay to TQLineEdit "functionName"
-    TQObjectList *l = parent->queryList( TQLINEEDIT_OBJECT_NAME_STRING, "functionName" );
+    TQObjectList *l = tqparent->queryList( TQLINEEDIT_OBJECT_NAME_STRING, "functionName" );
     TQObject *obj;
     TQObjectListIt itemsLineEditIt( *l );
     while ( (obj = itemsLineEditIt.current()) != 0 ) {
@@ -131,8 +131,8 @@ EditFunctions::EditFunctions( TQWidget *parent, FormWindow *fw, bool justSlots )
 
 void EditFunctions::okClicked()
 {
-    TQValueList<MetaDataBase::Function> functionList = MetaDataBase::functionList( formWindow );
-    TQString n = i18n( "Add/Remove functions of '%1'" ).arg( formWindow->name() );
+    TQValueList<MetaDataBase::Function> functionList = MetaDataBase::functionList( TQT_TQOBJECT(formWindow) );
+    TQString n = i18n( "Add/Remove functions of '%1'" ).tqarg( formWindow->name() );
     TQPtrList<Command> commands;
     TQValueList<MetaDataBase::Function>::Iterator fit;
     if ( !functionList.isEmpty() ) {
@@ -175,10 +175,10 @@ void EditFunctions::okClicked()
 	    TQString s = function.function;
 	    s = s.simplifyWhiteSpace();
 	    bool startNum = s[ 0 ] >= '0' && s[ 0 ] <= '9';
-	    bool noParens = s.contains( '(' ) != 1 || s.contains( ')' ) != 1;
-	    bool illegalSpace = s.find( ' ' ) != -1 && s.find( ' ' ) < s.find( '(' );
+	    bool noParens = s.tqcontains( '(' ) != 1 || s.tqcontains( ')' ) != 1;
+	    bool illegalSpace = s.tqfind( ' ' ) != -1 && s.tqfind( ' ' ) < s.tqfind( '(' );
 
-	    if ( startNum || noParens || illegalSpace || lst.find( function.function ) != -1 ) {
+	    if ( startNum || noParens || illegalSpace || lst.tqfind( function.function ) != -1 ) {
 		invalidFunctions = TRUE;
 		invalidItems.append( (*it) );
 		continue;
@@ -291,7 +291,7 @@ void EditFunctions::functionAdd( const TQString &access, const TQString &type )
 
     if ( i->text( 4 ) == "slot" ) {
 	i->setText( 0, "newSlot()" );
-	if ( MetaDataBase::isSlotUsed( formWindow, "newSlot()" ) )
+	if ( MetaDataBase::isSlotUsed( TQT_TQOBJECT(formWindow), "newSlot()" ) )
 	    i->setText( 5, i18n( "Yes" ) );
 	else
 	    i->setText( 5, i18n( "No" ) );
@@ -398,7 +398,7 @@ void EditFunctions::currentTextChanged( const TQString &txt )
     functionListView->currentItem()->setText( 0, txt );
 
     if ( functionListView->currentItem()->text( 4 ) == "slot" ) {
-	if ( MetaDataBase::isSlotUsed( formWindow, MetaDataBase::normalizeFunction( txt.latin1() ).latin1() ) )
+	if ( MetaDataBase::isSlotUsed( TQT_TQOBJECT(formWindow), MetaDataBase::normalizeFunction( txt.latin1() ).latin1() ) )
 	    functionListView->currentItem()->setText( 5, i18n( "Yes" ) );
 	else
 	    functionListView->currentItem()->setText( 5, i18n( "No" ) );
@@ -441,7 +441,7 @@ void EditFunctions::currentTypeChanged( const TQString &type )
     lastType = type;
     functionListView->currentItem()->setText( 4, type );
     if ( type == "slot" ) {
-	if ( MetaDataBase::isSlotUsed( formWindow,
+	if ( MetaDataBase::isSlotUsed( TQT_TQOBJECT(formWindow),
 		MetaDataBase::normalizeFunction( functionListView->currentItem()->text( 0 ).latin1() ).latin1() ) )
 	    functionListView->currentItem()->setText( 5, i18n( "Yes" ) );
 	else
@@ -454,7 +454,7 @@ void EditFunctions::currentTypeChanged( const TQString &type )
 void EditFunctions::changeItem( TQListViewItem *item, Attribute a, const TQString &nV )
 {
     int itemId;
-    TQMap<TQListViewItem*, int>::Iterator fit = functionIds.find( item );
+    TQMap<TQListViewItem*, int>::Iterator fit = functionIds.tqfind( item );
     if ( fit != functionIds.end() )
 	itemId = *fit;
     else
@@ -515,7 +515,7 @@ void EditFunctions::displaySlots( bool justSlots )
 	i->setText( 4, (*it).type );
 
 	if ( (*it).type == "slot" ) {
-	    if ( MetaDataBase::isSlotUsed( formWindow, MetaDataBase::normalizeFunction( (*it).newName ).latin1() ) )
+	    if ( MetaDataBase::isSlotUsed( TQT_TQOBJECT(formWindow), MetaDataBase::normalizeFunction( (*it).newName ).latin1() ) )
 		i->setText( 5, i18n( "Yes" ) );
 	    else
 		i->setText( 5, i18n( "No" ) );
diff --git a/kdevdesigner/designer/editfunctionsimpl.h b/kdevdesigner/designer/editfunctionsimpl.h
index 27d1523e..03a59b09 100644
--- a/kdevdesigner/designer/editfunctionsimpl.h
+++ b/kdevdesigner/designer/editfunctionsimpl.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -38,13 +38,14 @@ class TQListViewItem;
 class EditFunctions : public EditFunctionsBase
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    EditFunctions( TQWidget *parent, FormWindow *fw, bool showOnlySlots = FALSE );
+    EditFunctions( TQWidget *tqparent, FormWindow *fw, bool showOnlySlots = FALSE );
 
     void setCurrentFunction( const TQString &function );
-    void functionAdd( const TQString &access = TQString::null,
-		      const TQString &type = TQString::null  );
+    void functionAdd( const TQString &access = TQString(),
+		      const TQString &type = TQString()  );
     void functionAdd() { functionAdd( "public" ); }
 
 signals:
@@ -77,7 +78,7 @@ private:
 	TQString type;
 	TQString oldType;
 
-	Q_DUMMY_COMPARISON_OPERATOR( FunctItem )
+	TQ_DUMMY_COMPARISON_OPERATOR( FunctItem )
     };
 
     void changeItem( TQListViewItem *item, Attribute a, const TQString &nV );
diff --git a/kdevdesigner/designer/filechooser.cpp b/kdevdesigner/designer/filechooser.cpp
index 9f1287e0..864bab7a 100644
--- a/kdevdesigner/designer/filechooser.cpp
+++ b/kdevdesigner/designer/filechooser.cpp
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2001 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -32,21 +32,21 @@
 
 #include <kfiledialog.h>
 
-FileChooser::FileChooser( TQWidget *parent, const char *name )
-    : TQWidget( parent, name ), md( File )
+FileChooser::FileChooser( TQWidget *tqparent, const char *name )
+    : TQWidget( tqparent, name ), md( File )
 {
-    TQHBoxLayout *layout = new TQHBoxLayout( this );
-    layout->setMargin( 0 );
+    TQHBoxLayout *tqlayout = new TQHBoxLayout( this );
+    tqlayout->setMargin( 0 );
 
     lineEdit = new TQLineEdit( this, "filechooser_lineedit" );
-    layout->addWidget( lineEdit );
+    tqlayout->addWidget( lineEdit );
 
     connect( lineEdit, TQT_SIGNAL( textChanged( const TQString & ) ),
 	     this, TQT_SIGNAL( fileNameChanged( const TQString & ) ) );
 
     button = new TQPushButton( "...", this, "filechooser_button" );
     button->setFixedWidth( button->fontMetrics().width( " ... " ) );
-    layout->addWidget( button );
+    tqlayout->addWidget( button );
 
     connect( button, TQT_SIGNAL( clicked() ),
 	     this, TQT_SLOT( chooseFile() ) );
@@ -78,7 +78,7 @@ void FileChooser::chooseFile()
 {
     TQString fn;
     if ( mode() == File )
-	fn = KFileDialog::getOpenFileName( lineEdit->text(), TQString::null, this );
+	fn = KFileDialog::getOpenFileName( lineEdit->text(), TQString(), this );
     else
 	fn = KFileDialog::getExistingDirectory( lineEdit->text(),this );
 
diff --git a/kdevdesigner/designer/filechooser.h b/kdevdesigner/designer/filechooser.h
index cd511765..8137b031 100644
--- a/kdevdesigner/designer/filechooser.h
+++ b/kdevdesigner/designer/filechooser.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2001 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -32,16 +32,17 @@
 class TQLineEdit;
 class TQPushButton;
 
-class FileChooser : public QWidget
+class FileChooser : public TQWidget
 {
     Q_OBJECT
+  TQ_OBJECT
 
     Q_ENUMS( Mode )
-    Q_PROPERTY( Mode mode READ mode WRITE setMode )
-    Q_PROPERTY( TQString fileName READ fileName WRITE setFileName )
+    TQ_PROPERTY( Mode mode READ mode WRITE setMode )
+    TQ_PROPERTY( TQString fileName READ fileName WRITE setFileName )
 
 public:
-    FileChooser( TQWidget *parent = 0, const char *name = 0);
+    FileChooser( TQWidget *tqparent = 0, const char *name = 0);
 
     enum Mode { File, Directory };
 
diff --git a/kdevdesigner/designer/finddialog.ui b/kdevdesigner/designer/finddialog.ui
index 3923d1ef..39a4c74a 100644
--- a/kdevdesigner/designer/finddialog.ui
+++ b/kdevdesigner/designer/finddialog.ui
@@ -25,7 +25,7 @@
 ** not clear to you.
 **
 *********************************************************************</comment>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>FindDialog</cstring>
     </property>
@@ -50,7 +50,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QLayoutWidget" row="0" column="0" rowspan="1" colspan="2">
+        <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>Layout1</cstring>
             </property>
@@ -64,7 +64,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>TextLabel1</cstring>
                     </property>
@@ -75,7 +75,7 @@
                         <cstring>comboFind</cstring>
                     </property>
                 </widget>
-                <widget class="QComboBox">
+                <widget class="TQComboBox">
                     <property name="name">
                         <cstring>comboFind</cstring>
                     </property>
@@ -93,7 +93,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QLayoutWidget" row="2" column="0" rowspan="1" colspan="2">
+        <widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>Layout2</cstring>
             </property>
@@ -117,14 +117,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>PushButton1</cstring>
                     </property>
@@ -135,7 +135,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>PushButton2</cstring>
                     </property>
@@ -145,7 +145,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QButtonGroup" row="1" column="1">
+        <widget class="TQButtonGroup" row="1" column="1">
             <property name="name">
                 <cstring>ButtonGroup2</cstring>
             </property>
@@ -162,7 +162,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QRadioButton">
+                <widget class="TQRadioButton">
                     <property name="name">
                         <cstring>radioForward</cstring>
                     </property>
@@ -173,7 +173,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QRadioButton">
+                <widget class="TQRadioButton">
                     <property name="name">
                         <cstring>radioBackward</cstring>
                     </property>
@@ -183,7 +183,7 @@
                 </widget>
             </vbox>
         </widget>
-        <widget class="QButtonGroup" row="1" column="0">
+        <widget class="TQButtonGroup" row="1" column="0">
             <property name="name">
                 <cstring>ButtonGroup1</cstring>
             </property>
@@ -200,7 +200,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>checkWords</cstring>
                     </property>
@@ -208,7 +208,7 @@
                         <string>&amp;Whole words only</string>
                     </property>
                 </widget>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>checkCase</cstring>
                     </property>
@@ -216,7 +216,7 @@
                         <string>Case &amp;sensitive</string>
                     </property>
                 </widget>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>checkBegin</cstring>
                     </property>
@@ -253,7 +253,7 @@
     <tabstop>PushButton2</tabstop>
 </tabstops>
 <includes>
-    <include location="global" impldecl="in implementation">qlineedit.h</include>
+    <include location="global" impldecl="in implementation">tqlineedit.h</include>
     <include location="local" impldecl="in implementation">../interfaces/editorinterface.h</include>
     <include location="local" impldecl="in implementation">finddialog.ui.h</include>
 </includes>
@@ -262,13 +262,13 @@
 </forwards>
 <variables>
     <variable>EditorInterface *editor;</variable>
-    <variable>QObject *formWindow;</variable>
+    <variable>TQObject *formWindow;</variable>
 </variables>
-<slots>
+<Q_SLOTS>
     <slot>init()</slot>
     <slot>destroy()</slot>
     <slot>doFind()</slot>
-    <slot>setEditor( EditorInterface * e, QObject * fw )</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+    <slot>setEditor( EditorInterface * e, TQObject * fw )</slot>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kdevdesigner/designer/finddialog.ui.h b/kdevdesigner/designer/finddialog.ui.h
index 0abde994..063d9156 100644
--- a/kdevdesigner/designer/finddialog.ui.h
+++ b/kdevdesigner/designer/finddialog.ui.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2001 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -41,7 +41,7 @@ void FindDialog::doFind()
     if ( !editor )
 	return;
     
-    if ( !editor->find( comboFind->currentText(), checkCase->isChecked(),
+    if ( !editor->tqfind( comboFind->currentText(), checkCase->isChecked(),
 	checkWords->isChecked(), radioForward->isChecked(), !checkBegin->isChecked() ) )
 	checkBegin->setChecked( TRUE );
     else
diff --git a/kdevdesigner/designer/formfile.cpp b/kdevdesigner/designer/formfile.cpp
index e65ed706..1e9c489d 100644
--- a/kdevdesigner/designer/formfile.cpp
+++ b/kdevdesigner/designer/formfile.cpp
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -50,17 +50,17 @@
 static TQString make_func_pretty( const TQString &s )
 {
     TQString res = s;
-    if ( res.find( ")" ) - res.find( "(" ) == 1 )
+    if ( res.tqfind( ")" ) - res.tqfind( "(" ) == 1 )
 	return res;
-    res.replace( "(", "( " );
-    res.replace( ")", " )" );
-    res.replace( "&", " &" );
-    res.replace( "*", " *" );
-    res.replace( ",", ", " );
-    res.replace( ":", " : " );
+    res.tqreplace( "(", "( " );
+    res.tqreplace( ")", " )" );
+    res.tqreplace( "&", " &" );
+    res.tqreplace( "*", " *" );
+    res.tqreplace( ",", ", " );
+    res.tqreplace( ":", " : " );
     res = res.simplifyWhiteSpace();
-    res.replace( " : : ", "::" );
-    res.replace( ">>", "> >" );
+    res.tqreplace( " : : ", "::" );
+    res.tqreplace( ">>", "> >" );
     return res;
 }
 
@@ -77,13 +77,13 @@ FormFile::FormFile( const TQString &fn, bool temp, Project *p, const char *name
     if ( !temp )
 	checkFileName( FALSE );
     
-    connect(this, TQT_SIGNAL(somethingChanged(FormFile* )), this, TQT_SLOT(emitNewStatus(FormFile* )));
+    connect(this, TQT_SIGNAL(somethingChanged(FormFile* )), this, TQT_SLOT(emitNewtqStatus(FormFile* )));
 }
 
 FormFile::~FormFile()
 {
     pro->removeFormFile( this );
-    if ( formWindow() )
+    if ( TQT_TQOBJECT(formWindow()) )
 	formWindow()->setFormFile( 0 );
 }
 
@@ -111,7 +111,7 @@ void FormFile::setFileName( const TQString &fn )
 	return;
     if ( fn.isEmpty() ) {
 	fileNameTemp = TRUE;
-	if ( filename.find( "unnamed" ) != 0 )
+	if ( filename.tqfind( "unnamed" ) != 0 )
 	    filename = createUnnamedFileName();
 	return;
     } else {
@@ -170,7 +170,7 @@ bool FormFile::save( bool withMsgBox, bool ignoreModified )
     if ( ed )
 	ed->save();
 
-    if ( formWindow() && isModified( WFormWindow ) ) {
+    if ( TQT_TQOBJECT(formWindow()) && isModified( WFormWindow ) ) {
 	if ( withMsgBox ) {
 	    if ( !formWindow()->checkCustomWidgets() )
 		return FALSE;
@@ -192,7 +192,7 @@ bool FormFile::save( bool withMsgBox, bool ignoreModified )
 		    f2.writeBlock( data );
 		} else {
 		    TQMessageBox::warning( MainWindow::self, i18n( "Save" ),
-                                  i18n( "The file %1 could not be saved" ).arg( codeFile() ) );
+                                  i18n( "The file %1 could not be saved" ).tqarg( codeFile() ) );
 		}
 	    }
 	}
@@ -213,21 +213,21 @@ bool FormFile::save( bool withMsgBox, bool ignoreModified )
 		    TQCString data( f.size() );
 		    f.readBlock( data.data(), f.size() );
 		    f2.writeBlock( data );
-		} else if ( qApp->type() != TQApplication::Tty ) {
+		} else if ( tqApp->type() != TQApplication::Tty ) {
             TQMessageBox::warning( MainWindow::self, i18n( "Save" ),
-                                  i18n( "The file %1 could not be saved" ).arg( codeFile() ) );
+                                  i18n( "The file %1 could not be saved" ).tqarg( codeFile() ) );
 		}
 	    }
 	}
     }
 
-    if ( formWindow() ) {
+    if ( TQT_TQOBJECT(formWindow()) ) {
 	Resource resource( MainWindow::self );
 	resource.setWidget( formWindow() );
 	bool formCodeOnly = isModified( WFormCode ) && !isModified( WFormWindow );
 	if ( !resource.save( pro->makeAbsolute( filename ), formCodeOnly ) ) {
 	    if ( MainWindow::self )
-		MainWindow::self->statusMessage( i18n( "Failed to save file '%1'.").arg( formCodeOnly ? codeFile(): filename ) );
+		MainWindow::self->statusMessage( i18n( "Failed to save file '%1'.").tqarg( formCodeOnly ? codeFile(): filename ) );
 	    if ( formCodeOnly )
 		return FALSE;
 	    return saveAs();
@@ -247,23 +247,23 @@ bool FormFile::save( bool withMsgBox, bool ignoreModified )
 bool FormFile::saveAs( bool ignoreModified )
 {
     TQString f = pro->makeAbsolute( fileName() );
-    if ( fileNameTemp && formWindow() ) {
+    if ( fileNameTemp && TQT_TQOBJECT(formWindow()) ) {
 	f = TQString( formWindow()->name() ).lower();
-	f.replace( "::", "_" );
+	f.tqreplace( "::", "_" );
 	f = pro->makeAbsolute( f + ".ui" );
     }
     bool saved = FALSE;
     if ( ignoreModified ) {
-	TQString dir = TQStringList::split( ':', pro->iFace()->customSetting( "QTSCRIPT_PACKAGES" ) ).first();
+	TQString dir = TQStringList::split( ':', pro->iFace()->customSetting( "TQTSCRIPT_PACKAGES" ) ).first();
 	f = TQFileInfo( f ).fileName();
 	f.prepend( dir + "/" );
     }
     TQString fn;
     while ( !saved ) {
 	fn = KFileDialog::getSaveFileName( f,
-					   i18n( "*.ui|Qt User-Interface Files" ) + "\n" +
+					   i18n( "*.ui|TQt User-Interface Files" ) + "\n" +
 					   i18n( "*|All Files" ), MainWindow::self, /*0,*/
-					   i18n( "Save Form '%1' As").arg( formName() )/*,
+					   i18n( "Save Form '%1' As").tqarg( formName() )/*,
 					   MainWindow::self ? &MainWindow::self->lastSaveFilter : 0*/ );
 	if ( fn.isEmpty() )
 	    return FALSE;
@@ -293,8 +293,8 @@ bool FormFile::saveAs( bool ignoreModified )
     }
     pro->setModified( TRUE );
     timeStamp.setFileName( pro->makeAbsolute( codeFile() ) );
-    if ( ed && formWindow() )
-	ed->setCaption( i18n( "Edit %1" ).arg( formWindow()->name() ) );
+    if ( ed && TQT_TQOBJECT(formWindow()) )
+	ed->setCaption( i18n( "Edit %1" ).tqarg( formWindow()->name() ) );
     setModified( TRUE );
     if ( pro->isDummy() )
 	fw->mainWindow()->addRecentlyOpenedFile( fn );
@@ -307,7 +307,7 @@ bool FormFile::close()
 	editor()->save();
 	editor()->close();
     }
-    if ( formWindow() )
+    if ( TQT_TQOBJECT(formWindow()) )
 	return formWindow()->close();
     return TRUE;
 }
@@ -326,7 +326,7 @@ bool FormFile::closeEvent()
 	editor()->save();
 
     switch ( TQMessageBox::warning( MainWindow::self, i18n( "Save Form" ),
-				   i18n( "Save changes to form '%1'?" ).arg( filename ),
+				   i18n( "Save changes to form '%1'?" ).tqarg( filename ),
 				   i18n( "&Yes" ), i18n( "&No" ), i18n( "&Cancel" ), 0, 2 ) ) {
     case 0: // save
 	if ( !save() )
@@ -372,7 +372,7 @@ bool FormFile::isModified( int who )
 
 bool FormFile::isFormWindowModified() const
 {
-    if ( !formWindow()  || !formWindow()->commandHistory() )
+    if ( !TQT_TQOBJECT(formWindow())  || !formWindow()->commandHistory() )
 	return FALSE;
     return formWindow()->commandHistory()->isModified();
 }
@@ -389,7 +389,7 @@ void FormFile::setFormWindowModified( bool m )
     bool b = isFormWindowModified();
     if ( m == b )
 	return;
-    if ( !formWindow() || !formWindow()->commandHistory() )
+    if ( !TQT_TQOBJECT(formWindow()) || !formWindow()->commandHistory() )
 	return;
     formWindow()->commandHistory()->setModified( m );
     emit somethingChanged( this );
@@ -411,13 +411,13 @@ void FormFile::showFormWindow()
 {
     if ( !MainWindow::self )
 	return;
-    if ( formWindow() ) {
+    if ( TQT_TQOBJECT(formWindow()) ) {
 	if ( ( formWindow()->hasFocus() ||
-	      MainWindow::self->qWorkspace()->activeWindow() == formWindow() ) &&
-	     MainWindow::self->propertyeditor()->formWindow() != formWindow() ) {
-	    MainWindow::self->propertyeditor()->setWidget( formWindow()->currentWidget(), formWindow() );
+	      TQT_BASE_OBJECT(MainWindow::self->qWorkspace()->activeWindow()) == TQT_BASE_OBJECT(formWindow()) ) &&
+	     TQT_BASE_OBJECT(MainWindow::self->propertyeditor()->formWindow()) != TQT_BASE_OBJECT(formWindow()) ) {
+	    MainWindow::self->propertyeditor()->setWidget( TQT_TQOBJECT(formWindow()->currentWidget()), formWindow() );
 	    MainWindow::self->objectHierarchy()->setFormWindow( formWindow(),
-								formWindow()->currentWidget() );
+								TQT_TQOBJECT(formWindow()->currentWidget()) );
 	}
 	formWindow()->setFocus();
 	return;
@@ -493,7 +493,7 @@ TQString FormFile::codeComment() const
     "** ui.h extension file, included from the uic-generated form implementation.\n"
     "**\n"
     "** If you want to add, delete, or rename functions or slots, use\n"
-    "** Qt Designer to update this file, preserving your code.\n"
+    "** TQt Designer to update this file, preserving your code.\n"
     "**\n"
     "** You should not define a constructor or destructor in this file.\n"
     "** Instead, write your code in functions called init() and destroy().\n"
@@ -519,14 +519,14 @@ void FormFile::setCodeFileState( UihState s )
 
 void FormFile::createFormCode()
 {
-    if ( !formWindow() )
+    if ( !TQT_TQOBJECT(formWindow()) )
 	return;
     LanguageInterface *iface = MetaDataBase::languageInterface( pro->language() );
     if ( !iface )
 	return;
     if ( pro->isCpp() )
 	cod = codeComment();
-    TQValueList<MetaDataBase::Function> functionList = MetaDataBase::functionList( formWindow() );
+    TQValueList<MetaDataBase::Function> functionList = MetaDataBase::functionList( TQT_TQOBJECT(formWindow()) );
     for ( TQValueList<MetaDataBase::Function>::Iterator it = functionList.begin(); it != functionList.end(); ++it ) {
 	cod += (!cod.isEmpty() ? "\n\n" : "") +
 	       iface->createFunctionStart( formWindow()->name(), make_func_pretty((*it).function),
@@ -573,14 +573,14 @@ void FormFile::setCodeEdited( bool b )
 
 void FormFile::parseCode( const TQString &txt, bool allowModify )
 {
-    if ( !formWindow() )
+    if ( !TQT_TQOBJECT(formWindow()) )
 	return;
     LanguageInterface *iface = MetaDataBase::languageInterface( pro->language() );
     if ( !iface )
 	return;
     TQValueList<LanguageInterface::Function> functions;
     TQValueList<MetaDataBase::Function> newFunctions, oldFunctions;
-    oldFunctions = MetaDataBase::functionList( formWindow() );
+    oldFunctions = MetaDataBase::functionList( TQT_TQOBJECT(formWindow()) );
     iface->functions( txt, &functions );
     TQMap<TQString, TQString> funcs;
     for ( TQValueList<LanguageInterface::Function>::Iterator it = functions.begin();
@@ -634,7 +634,7 @@ void FormFile::parseCode( const TQString &txt, bool allowModify )
     if ( allowModify && oldFunctions.count() > 0 )
 	setFormWindowModified( TRUE );
 
-    MetaDataBase::setFunctionList( formWindow(), newFunctions );
+    MetaDataBase::setFunctionList( TQT_TQOBJECT(formWindow()), newFunctions );
 }
 
 void FormFile::syncCode()
@@ -651,9 +651,9 @@ void FormFile::checkTimeStamp()
 	return;
     timeStamp.update();
     if ( codeEdited ) {
-	if ( TQMessageBox::information( MainWindow::self, i18n( "Qt Designer" ),
-				       i18n( "File '%1' has been changed outside Qt Designer.\n"
-					   "Do you want to reload it?" ).arg( timeStamp.fileName() ),
+	if ( TQMessageBox::information( MainWindow::self, i18n( "TQt Designer" ),
+				       i18n( "File '%1' has been changed outside TQt Designer.\n"
+					   "Do you want to reload it?" ).tqarg( timeStamp.fileName() ),
 				       i18n( "&Yes" ), i18n( "&No" ) ) == 0 ) {
 	    TQFile f( timeStamp.fileName() );
 	    if ( f.open( IO_ReadOnly ) ) {
@@ -704,7 +704,7 @@ void FormFile::addFunctionCode( MetaDataBase::Function function )
     if ( !hasFunc ) {
 	if ( !codeEdited && !timeStamp.isUpToDate() )
 	    loadCode();
-	MetaDataBase::MetaInfo mi = MetaDataBase::metaInfo( formWindow() );
+	MetaDataBase::MetaInfo mi = MetaDataBase::metaInfo( TQT_TQOBJECT(formWindow()) );
 	TQString cn;
 	if ( mi.classNameChanged )
 	    cn = mi.className;
@@ -745,7 +745,7 @@ void FormFile::removeFunctionCode( MetaDataBase::Function function )
 	    int line = 0;
 	    int start = 0;
 	    while ( line < (*fit).start - 1 ) {
-		start = sourceCode.find( '\n', start );
+		start = sourceCode.tqfind( '\n', start );
 		if ( start == -1 )
 		    return;
 		start++;
@@ -755,7 +755,7 @@ void FormFile::removeFunctionCode( MetaDataBase::Function function )
 	        return;
 	    int end = start;
 	    while ( line < (*fit).end + 1 ) {
-		end = sourceCode.find( '\n', end );
+		end = sourceCode.tqfind( '\n', end );
 		if ( end == -1 ) {
 		    if ( line <= (*fit).end )
 			end = sourceCode.length() - 1;
@@ -777,7 +777,7 @@ void FormFile::functionNameChanged( const TQString &oldName, const TQString &new
 {
     if ( !cod.isEmpty() ) {
 	TQString funcStart = TQString( formWindow()->name() ) + TQString( "::" );
-	int i = cod.find( funcStart + oldName );
+	int i = cod.tqfind( funcStart + oldName );
 	if ( i != -1 ) {
 	    cod.remove( i + funcStart.length(), oldName.length() );
 	    cod.insert( i + funcStart.length(), newName );
@@ -791,7 +791,7 @@ void FormFile::functionRetTypeChanged( const TQString &fuName, const TQString &o
 	TQString oldFunct = oldType + " " + TQString( formWindow()->name() ) + "::" + fuName;
 	TQString newFunct = newType + " " + TQString( formWindow()->name() ) + "::" + fuName;
 
-	int i = cod.find( oldFunct );
+	int i = cod.tqfind( oldFunct );
 	if ( i != -1 ) {
 	    cod.remove( i, oldFunct.length() );
 	    cod.insert( i, newFunct );
@@ -802,7 +802,7 @@ void FormFile::functionRetTypeChanged( const TQString &fuName, const TQString &o
 TQString FormFile::formName() const
 {
     FormFile* that = (FormFile*) this;
-    if ( formWindow() ) {
+    if ( TQT_TQOBJECT(formWindow()) ) {
 	that->cachedFormName = formWindow()->name();
 	return cachedFormName;
     }
@@ -816,7 +816,7 @@ TQString FormFile::formName() const
 	while ( !ts.eof() ) {
 	    line = ts.readLine();
 	    if ( !className.isEmpty() ) {
-		int end = line.find( "</class>" );
+		int end = line.tqfind( "</class>" );
 		if ( end == -1 ) {
 		    className += line;
 		} else {
@@ -826,8 +826,8 @@ TQString FormFile::formName() const
 		continue;
 	    }
 	    int start;
-	    if ( ( start = line.find( "<class>" ) ) != -1 ) {
-		int end = line.find( "</class>" );
+	    if ( ( start = line.tqfind( "<class>" ) ) != -1 ) {
+		int end = line.tqfind( "</class>" );
 		if ( end == -1 ) {
 		    className = line.mid( start + 7 );
 		} else {
@@ -854,12 +854,12 @@ bool FormFile::checkFileName( bool allowBreak )
     if ( ff )
 	TQMessageBox::warning( MainWindow::self, i18n( "Invalid Filename" ),
 			      i18n( "The project already contains a form with a\n"
-				  "filename of '%1'. Please choose a new filename." ).arg( filename ) );
+				  "filename of '%1'. Please choose a new filename." ).tqarg( filename ) );
     while ( ff ) {
 	TQString fn;
 	while ( fn.isEmpty() ) {
 	    fn = KFileDialog::getSaveFileName( pro->makeAbsolute( fileName() ),
-					       i18n( "*.ui|Qt User-Interface Files" ) + "\n" +
+					       i18n( "*.ui|TQt User-Interface Files" ) + "\n" +
 					       i18n( "*|All Files" ), MainWindow::self,/* 0,*/
 					       i18n( "Save Form '%1' As").
 					       arg( formWindow()->name() )/*,
@@ -899,7 +899,7 @@ void FormFile::notifyFormWindowChange()
 	pro->formOpened( fw );
 }
 
-void FormFile::emitNewStatus(FormFile *file)
+void FormFile::emitNewtqStatus(FormFile *file)
 {
-    fw->mainWindow()->part()->emitNewStatus(fileName(), isModified());
+    fw->mainWindow()->part()->emitNewtqStatus(fileName(), isModified());
 }
diff --git a/kdevdesigner/designer/formfile.h b/kdevdesigner/designer/formfile.h
index a2767d33..097beff4 100644
--- a/kdevdesigner/designer/formfile.h
+++ b/kdevdesigner/designer/formfile.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -35,9 +35,10 @@ class Project;
 class FormWindow;
 class SourceEditor;
 
-class FormFile : public QObject
+class FormFile : public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
     friend class SourceEditor;
 
 public:
@@ -115,7 +116,7 @@ signals:
 private slots:
     void formWindowChangedSomehow();
     void notifyFormWindowChange();
-    void emitNewStatus(FormFile* file);
+    void emitNewtqStatus(FormFile* file);
 
 private:
     bool isFormWindowModified() const;
diff --git a/kdevdesigner/designer/formsettings.ui b/kdevdesigner/designer/formsettings.ui
index c1d6be27..dd6b9d19 100644
--- a/kdevdesigner/designer/formsettings.ui
+++ b/kdevdesigner/designer/formsettings.ui
@@ -25,7 +25,7 @@
 ** not clear to you.
 **
 *********************************************************************</comment>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>FormSettingsBase</cstring>
     </property>
@@ -56,7 +56,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QButtonGroup" row="1" column="0">
+        <widget class="TQButtonGroup" row="1" column="0">
             <property name="name">
                 <cstring>ButtonGroup1</cstring>
             </property>
@@ -73,7 +73,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QRadioButton" row="0" column="0">
+                <widget class="TQRadioButton" row="0" column="0">
                     <property name="name">
                         <cstring>radioPixmapInline</cstring>
                     </property>
@@ -90,7 +90,7 @@
                         <string>&lt;b&gt;Save Inline&lt;/b&gt;&lt;p&gt;Saves the pixmaps as binary data in the .ui files. Pixmaps saved like this are not shared between forms. We recommend using Project image files instead.</string>
                     </property>
                 </widget>
-                <widget class="QRadioButton" row="2" column="0">
+                <widget class="TQRadioButton" row="2" column="0">
                     <property name="name">
                         <cstring>radioProjectImageFile</cstring>
                     </property>
@@ -113,13 +113,13 @@
                         <bool>false</bool>
                     </property>
                     <property name="toolTip" stdset="0">
-                        <string>Specify Pixmap-Loader function (only the function's name, no parentheses.)</string>
+                        <string>Specify Pixmap-Loader function (only the function's name, no tqparentheses.)</string>
                     </property>
                     <property name="whatsThis" stdset="0">
-                        <string>&lt;b&gt;Specify Pixmap-Loader function&lt;/b&gt;&lt;p&gt;Specify the function which should be used for loading a pixmap in the generated code. &lt;em&gt;Only enter the function's name, without parentheses.&lt;/em&gt;</string>
+                        <string>&lt;b&gt;Specify Pixmap-Loader function&lt;/b&gt;&lt;p&gt;Specify the function which should be used for loading a pixmap in the generated code. &lt;em&gt;Only enter the function's name, without tqparentheses.&lt;/em&gt;</string>
                     </property>
                 </widget>
-                <widget class="QRadioButton" row="1" column="0">
+                <widget class="TQRadioButton" row="1" column="0">
                     <property name="name">
                         <cstring>radioPixmapFunction</cstring>
                     </property>
@@ -135,7 +135,7 @@
                 </widget>
             </grid>
         </widget>
-        <widget class="QGroupBox" row="0" column="0" rowspan="1" colspan="2">
+        <widget class="TQGroupBox" row="0" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>GroupBox1</cstring>
             </property>
@@ -169,7 +169,7 @@
                         <string>&lt;b&gt;Enter the name of the class that will be created.&lt;/b&gt;&lt;p&gt;&lt;em&gt;classname.h&lt;/em&gt; and &lt;em&gt;classname.cpp&lt;/em&gt; will be generated as C++ output when it is compiled by uic.&lt;/p&gt;</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="3" column="0">
+                <widget class="TQLabel" row="3" column="0">
                     <property name="name">
                         <cstring>TextLabel1_2</cstring>
                     </property>
@@ -191,7 +191,7 @@
                         <string>Enter your name.</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="0" column="0">
+                <widget class="TQLabel" row="0" column="0">
                     <property name="name">
                         <cstring>TextLabel1</cstring>
                     </property>
@@ -202,7 +202,7 @@
                         <cstring>editClassName</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="1" column="0">
+                <widget class="TQLabel" row="1" column="0">
                     <property name="name">
                         <cstring>TextLabel2</cstring>
                     </property>
@@ -213,7 +213,7 @@
                         <cstring>editComment</cstring>
                     </property>
                 </widget>
-                <widget class="QMultiLineEdit" row="1" column="1" rowspan="2" colspan="1">
+                <widget class="TQMultiLineEdit" row="1" column="1" rowspan="2" colspan="1">
                     <property name="name">
                         <cstring>editComment</cstring>
                     </property>
@@ -234,7 +234,7 @@
                 </spacer>
             </grid>
         </widget>
-        <widget class="QGroupBox" row="1" column="1">
+        <widget class="TQGroupBox" row="1" column="1">
             <property name="name">
                 <cstring>GroupBox2</cstring>
             </property>
@@ -251,7 +251,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QSpinBox" row="0" column="2">
+                <widget class="TQSpinBox" row="0" column="2">
                     <property name="name">
                         <cstring>spinMargin</cstring>
                     </property>
@@ -270,7 +270,7 @@
                         <enum>Expanding</enum>
                     </property>
                 </spacer>
-                <widget class="QLabel" row="1" column="0" rowspan="1" colspan="2">
+                <widget class="TQLabel" row="1" column="0" rowspan="1" colspan="2">
                     <property name="name">
                         <cstring>TextLabel2_2</cstring>
                     </property>
@@ -281,7 +281,7 @@
                         <cstring>spinSpacing</cstring>
                     </property>
                 </widget>
-                <widget class="QCheckBox" row="2" column="0" rowspan="1" colspan="2">
+                <widget class="TQCheckBox" row="2" column="0" rowspan="1" colspan="2">
                     <property name="name">
                         <cstring>checkLayoutFunctions</cstring>
                     </property>
@@ -295,7 +295,7 @@
                         <string>&lt;b&gt;Use a given function for margin and/or spacing&lt;/b&gt;&lt;p&gt;If you choose this option you must define functions in the line edit below which will be used in the generated code for getting the margin and spacing value. &lt;i&gt;Qt Designer&lt;/i&gt; cannot preview the correct margin or spacing if you use your own function. Instead, the default values will be used for preview.</string>
                     </property>
                 </widget>
-                <widget class="QSpinBox" row="1" column="2">
+                <widget class="TQSpinBox" row="1" column="2">
                     <property name="name">
                         <cstring>spinSpacing</cstring>
                     </property>
@@ -314,7 +314,7 @@
                         <enum>Expanding</enum>
                     </property>
                 </spacer>
-                <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2">
+                <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="2">
                     <property name="name">
                         <cstring>TextLabel1_3</cstring>
                     </property>
@@ -325,7 +325,7 @@
                         <cstring>spinMargin</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="4" column="0">
+                <widget class="TQLabel" row="4" column="0">
                     <property name="name">
                         <cstring>spaFuLabel</cstring>
                     </property>
@@ -339,7 +339,7 @@
                         <cstring>editSpacingFunction</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="3" column="0">
+                <widget class="TQLabel" row="3" column="0">
                     <property name="name">
                         <cstring>marFuLabel</cstring>
                     </property>
@@ -380,10 +380,10 @@
                         <bool>false</bool>
                     </property>
                     <property name="toolTip" stdset="0">
-                        <string>Specify spacing function (only the function's name, no parentheses.)</string>
+                        <string>Specify spacing function (only the function's name, no tqparentheses.)</string>
                     </property>
                     <property name="whatsThis" stdset="0">
-                        <string>&lt;b&gt;Specify spacing function&lt;/b&gt;&lt;p&gt;Specify the function which should be used for getting the spacing in the generated code. &lt;em&gt;Only enter the function's name, without parentheses.&lt;/em&gt;</string>
+                        <string>&lt;b&gt;Specify spacing function&lt;/b&gt;&lt;p&gt;Specify the function which should be used for getting the spacing in the generated code. &lt;em&gt;Only enter the function's name, without tqparentheses.&lt;/em&gt;</string>
                     </property>
                 </widget>
                 <widget class="KLineEdit" row="3" column="1" rowspan="1" colspan="3">
@@ -402,15 +402,15 @@
                         </sizepolicy>
                     </property>
                     <property name="toolTip" stdset="0">
-                        <string>Specify margin function (only the function's name, no parentheses.)</string>
+                        <string>Specify margin function (only the function's name, no tqparentheses.)</string>
                     </property>
                     <property name="whatsThis" stdset="0">
-                        <string>&lt;b&gt;Specify margin function&lt;/b&gt;&lt;p&gt;Specify the function which should be used for getting the margin in the generated code. &lt;em&gt;Only enter the function's name, without parentheses.&lt;/em&gt;</string>
+                        <string>&lt;b&gt;Specify margin function&lt;/b&gt;&lt;p&gt;Specify the function which should be used for getting the margin in the generated code. &lt;em&gt;Only enter the function's name, without tqparentheses.&lt;/em&gt;</string>
                     </property>
                 </widget>
             </grid>
         </widget>
-        <widget class="QLayoutWidget" row="2" column="0" rowspan="1" colspan="2">
+        <widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>Layout4</cstring>
             </property>
@@ -424,7 +424,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonHelp</cstring>
                     </property>
@@ -446,7 +446,7 @@
                         <enum>Expanding</enum>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonOk</cstring>
                     </property>
@@ -463,7 +463,7 @@
                         <string>Close the dialog and apply all the changes.</string>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonCancel</cstring>
                     </property>
@@ -542,8 +542,8 @@
     <tabstop>buttonCancel</tabstop>
     <tabstop>buttonHelp</tabstop>
 </tabstops>
-<slots>
+<Q_SLOTS>
     <slot>okClicked()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kdevdesigner/designer/formsettingsimpl.cpp b/kdevdesigner/designer/formsettingsimpl.cpp
index edbb8134..2878d62d 100644
--- a/kdevdesigner/designer/formsettingsimpl.cpp
+++ b/kdevdesigner/designer/formsettingsimpl.cpp
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -40,11 +40,11 @@
 #include <tqspinbox.h>
 #include <tqcheckbox.h>
 
-FormSettings::FormSettings( TQWidget *parent, FormWindow *fw )
-    : FormSettingsBase( parent, 0, TRUE ), formwindow( fw )
+FormSettings::FormSettings( TQWidget *tqparent, FormWindow *fw )
+    : FormSettingsBase( tqparent, 0, TRUE ), formwindow( fw )
 {
     connect( buttonHelp, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) );
-    MetaDataBase::MetaInfo info = MetaDataBase::metaInfo( fw );
+    MetaDataBase::MetaInfo info = MetaDataBase::metaInfo( TQT_TQOBJECT(fw) );
     if ( info.classNameChanged && !info.className.isEmpty() )
 	editClassName->setText( info.className );
     else
@@ -52,8 +52,8 @@ FormSettings::FormSettings( TQWidget *parent, FormWindow *fw )
     editComment->setText( info.comment );
     editAuthor->setText( info.author );
 
-    editClassName->setValidator( new AsciiValidator( TQString( ":" ), editClassName ) );
-    editPixmapFunction->setValidator( new AsciiValidator( TQString( ":" ), editPixmapFunction ) );
+    editClassName->setValidator( new AsciiValidator( TQString( ":" ), TQT_TQOBJECT(editClassName) ) );
+    editPixmapFunction->setValidator( new AsciiValidator( TQString( ":" ), TQT_TQOBJECT(editPixmapFunction) ) );
 
     if ( formwindow->savePixmapInline() )
 	radioPixmapInline->setChecked( TRUE );
@@ -63,10 +63,10 @@ FormSettings::FormSettings( TQWidget *parent, FormWindow *fw )
 	radioPixmapFunction->setChecked( TRUE );
     editPixmapFunction->setText( formwindow->pixmapLoaderFunction() );
     radioProjectImageFile->setEnabled( !fw->project()->isDummy() );
-    spinSpacing->setValue( formwindow->layoutDefaultSpacing() );
-    spinMargin->setValue( formwindow->layoutDefaultMargin() );
-    editSpacingFunction->setValidator( new AsciiValidator( TQString( ":" ), editSpacingFunction ) );
-    editMarginFunction->setValidator( new AsciiValidator( TQString( ":" ), editMarginFunction ) ); 
+    spinSpacing->setValue( formwindow->tqlayoutDefaultSpacing() );
+    spinMargin->setValue( formwindow->tqlayoutDefaultMargin() );
+    editSpacingFunction->setValidator( new AsciiValidator( TQString( ":" ), TQT_TQOBJECT(editSpacingFunction) ) );
+    editMarginFunction->setValidator( new AsciiValidator( TQString( ":" ), TQT_TQOBJECT(editMarginFunction) ) ); 
     checkLayoutFunctions->setChecked( formwindow->hasLayoutFunctions() );
     editSpacingFunction->setText( formwindow->spacingFunction() );
     editMarginFunction->setText( formwindow->marginFunction() );
@@ -79,17 +79,17 @@ void FormSettings::okClicked()
     info.classNameChanged = info.className != TQString( formwindow->name() );
     info.comment = editComment->text();
     info.author = editAuthor->text();
-    MetaDataBase::setMetaInfo( formwindow, info );
+    MetaDataBase::setMetaInfo( TQT_TQOBJECT(formwindow), info );
 
     formwindow->commandHistory()->setModified( TRUE );
 
     if ( formwindow->savePixmapInline() ) {
-	MetaDataBase::clearPixmapArguments( formwindow );
-	MetaDataBase::clearPixmapKeys( formwindow );
+	MetaDataBase::clearPixmapArguments( TQT_TQOBJECT(formwindow) );
+	MetaDataBase::clearPixmapKeys( TQT_TQOBJECT(formwindow) );
     } else if ( formwindow->savePixmapInProject() ) {
-	MetaDataBase::clearPixmapArguments( formwindow );
+	MetaDataBase::clearPixmapArguments( TQT_TQOBJECT(formwindow) );
     } else {
-	MetaDataBase::clearPixmapKeys( formwindow );
+	MetaDataBase::clearPixmapKeys( TQT_TQOBJECT(formwindow) );
     }
 
     if ( radioPixmapInline->isChecked() ) {
diff --git a/kdevdesigner/designer/formsettingsimpl.h b/kdevdesigner/designer/formsettingsimpl.h
index d8944ae5..75aa5cbd 100644
--- a/kdevdesigner/designer/formsettingsimpl.h
+++ b/kdevdesigner/designer/formsettingsimpl.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -34,9 +34,10 @@ class FormWindow;
 class FormSettings : public FormSettingsBase
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    FormSettings( TQWidget *parent, FormWindow *fw );
+    FormSettings( TQWidget *tqparent, FormWindow *fw );
 
 protected slots:
     void okClicked();
diff --git a/kdevdesigner/designer/formwindow.cpp b/kdevdesigner/designer/formwindow.cpp
index b34a49e1..cd097c54 100644
--- a/kdevdesigner/designer/formwindow.cpp
+++ b/kdevdesigner/designer/formwindow.cpp
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -31,7 +31,7 @@
 #include "sizehandle.h"
 #include "metadatabase.h"
 #include "resource.h"
-#include "layout.h"
+#include "tqlayout.h"
 #include "connectiondialog.h"
 #include <widgetdatabase.h>
 #include "pixmapchooser.h"
@@ -84,10 +84,10 @@
 static void setCursorToAll( const TQCursor &c, TQWidget *start )
 {
     start->setCursor( c );
-    TQObjectList *l = (TQObjectList*)start->children();
-    if ( l ) {
-	for ( TQObject *o = l->first(); o; o = l->next() ) {
-	    if ( o->isWidgetType() && !::qt_cast<SizeHandle*>(o) )
+    TQObjectList l = start->childrenListObject();
+    if ( !l.isEmpty() ) {
+	for ( TQObject *o = l.first(); o; o = l.next() ) {
+	    if ( o->isWidgetType() && !::tqqt_cast<SizeHandle*>(o) )
 		setCursorToAll( c, ( (TQWidget*)o ) );
 	}
     }
@@ -95,21 +95,21 @@ static void setCursorToAll( const TQCursor &c, TQWidget *start )
 
 static void restoreCursors( TQWidget *start, FormWindow *fw )
 {
-    if ( fw->widgets()->find( start ) )
+    if ( fw->widgets()->tqfind( start ) )
 	start->setCursor( MetaDataBase::cursor( start ) );
     else
-	start->setCursor( Qt::ArrowCursor );
-    TQObjectList *l = (TQObjectList*)start->children();
-    if ( l ) {
-	for ( TQObject *o = l->first(); o; o = l->next() ) {
-	    if ( o->isWidgetType() && !::qt_cast<SizeHandle*>(o) )
+	start->setCursor( TQt::ArrowCursor );
+    TQObjectList l = start->childrenListObject();
+    if ( !l.isEmpty() ) {
+	for ( TQObject *o = l.first(); o; o = l.next() ) {
+	    if ( o->isWidgetType() && !::tqqt_cast<SizeHandle*>(o) )
 		restoreCursors( ( (TQWidget*)o ), fw );
 	}
     }
 }
 
-#if defined(Q_WS_WIN32) // #### needed for the workaround for repaint problem on windows
-#include <qt_windows.h>
+#if defined(TQ_WS_WIN32) // #### needed for the workaround for tqrepaint problem on windows
+#include <tqt_windows.h>
 static void flickerfree_update( TQWidget *w )
 {
     InvalidateRect( w->winId(), 0, FALSE );
@@ -134,8 +134,8 @@ static void flickerfree_update( TQWidget *w )
   event filter which is implemented in MainWindow::eventFilter().
 */
 
-FormWindow::FormWindow( FormFile *f, MainWindow *mw, TQWidget *parent, const char *name )
-    : TQWidget( parent, name, WDestructiveClose ), mainwindow( mw ),
+FormWindow::FormWindow( FormFile *f, MainWindow *mw, TQWidget *tqparent, const char *name )
+    : TQWidget( tqparent, name, WDestructiveClose ), mainwindow( mw ),
       commands( 100 ), pixInline( TRUE ), pixProject( FALSE )
 {
     ff = f;
@@ -143,8 +143,8 @@ FormWindow::FormWindow( FormFile *f, MainWindow *mw, TQWidget *parent, const cha
     initSlots();
 }
 
-FormWindow::FormWindow( FormFile *f, TQWidget *parent, const char *name )
-    : TQWidget( parent, name, WDestructiveClose ), mainwindow( 0 ),
+FormWindow::FormWindow( FormFile *f, TQWidget *tqparent, const char *name )
+    : TQWidget( tqparent, name, WDestructiveClose ), mainwindow( 0 ),
       commands( 100 ), pixInline( TRUE )
 {
     ff = f;
@@ -153,10 +153,10 @@ FormWindow::FormWindow( FormFile *f, TQWidget *parent, const char *name )
 
 void FormWindow::init()
 {
-    setWFlags(getWFlags() & Qt::WStyle_Maximize);
+    setWFlags(getWFlags() & TQt::WStyle_Maximize);
 
     fake = qstrcmp( name(), "qt_fakewindow" ) == 0;
-    MetaDataBase::addEntry( this );
+    MetaDataBase::addEntry( TQT_TQOBJECT(this) );
     ff->setFormWindow( this );
     iface = 0;
     proj = 0;
@@ -169,7 +169,7 @@ void FormWindow::init()
     unclippedPainter = 0;
     widgetPressed = FALSE;
     drawRubber = FALSE;
-    setFocusPolicy( ClickFocus );
+    setFocusPolicy( TQ_ClickFocus );
     sizePreviewLabel = 0;
     checkSelectionsTimer = new TQTimer( this, "checkSelectionsTimer" );
     connect( checkSelectionsTimer, TQT_SIGNAL( timeout() ),
@@ -200,7 +200,7 @@ void FormWindow::init()
 
     TQWidget *w = WidgetFactory::create( WidgetDatabase::idFromClassName( TQFRAME_OBJECT_NAME_STRING ), this );
     setMainContainer( w );
-    propertyWidget = w;
+    propertyWidget = TQT_TQOBJECT(w);
     targetContainer = 0;
     hadOwnPalette = FALSE;
 
@@ -212,7 +212,7 @@ void FormWindow::init()
 void FormWindow::setMainWindow( MainWindow *w )
 {
     mainwindow = w;
-    MetaDataBase::addEntry( this );
+    MetaDataBase::addEntry( TQT_TQOBJECT(this) );
     initSlots();
 }
 
@@ -236,7 +236,7 @@ FormWindow::~FormWindow()
     if ( MainWindow::self && MainWindow::self->objectHierarchy()->formWindow() == this )
 	MainWindow::self->objectHierarchy()->setFormWindow( 0, 0 );
 
-    MetaDataBase::clear( this );
+    MetaDataBase::clear( TQT_TQOBJECT(this) );
     if ( ff )
 	ff->setFormWindow( 0 );
     delete iface;
@@ -258,19 +258,19 @@ void FormWindow::paintGrid( TQWidget *w, TQPaintEvent *e )
     TQPixmap grid;
     TQString grid_name;
     grid_name.sprintf("FormWindowGrid_%d_%d", mainWindow()->grid().x(), mainWindow()->grid().y());
-    if( !TQPixmapCache::find( grid_name, grid ) ) {
+    if( !TQPixmapCache::tqfind( grid_name, grid ) ) {
 	grid = TQPixmap( 350 + ( 350 % mainWindow()->grid().x() ), 350 + ( 350 % mainWindow()->grid().y() ) );
-	grid.fill( colorGroup().color( TQColorGroup::Foreground ) );
-	TQBitmap mask( grid.width(), grid.height() );
-	mask.fill( color0 );
-	TQPainter p( &mask );
+	grid.fill( tqcolorGroup().color( TQColorGroup::Foreground ) );
+	TQBitmap tqmask( grid.width(), grid.height() );
+	tqmask.fill( color0 );
+	TQPainter p( &tqmask );
 	p.setPen( color1 );
 	for ( int y = 0; y < grid.width(); y += mainWindow()->grid().y()) {
 	    for ( int x = 0; x < grid.height(); x += mainWindow()->grid().x() ) {
 		p.drawPoint( x, y );
 	    }
 	}
-	grid.setMask( mask );
+	grid.setMask( tqmask );
 	TQPixmapCache::insert( grid_name, grid );
     }
     TQPainter p( w );
@@ -321,7 +321,7 @@ TQPoint FormWindow::gridPoint( const TQPoint &p )
 void FormWindow::drawSizePreview( const TQPoint &pos, const TQString& text )
 {
     unclippedPainter->save();
-    unclippedPainter->setPen( TQPen( colorGroup().foreground(), 1  ));
+    unclippedPainter->setPen( TQPen( tqcolorGroup().foreground(), 1  ));
     unclippedPainter->setRasterOp( CopyROP );
     if ( !sizePreviewPixmap.isNull() )
 	unclippedPainter->drawPixmap( sizePreviewPos, sizePreviewPixmap );
@@ -353,7 +353,7 @@ void FormWindow::insertWidget()
 	return;
 
     bool useSizeHint = !oldRectValid || ( currRect.width() < 2 && currRect.height() < 2 );
-    Orientation orient = Horizontal;
+    Qt::Orientation orient =Qt::Horizontal;
     TQString n = WidgetDatabase::className( currTool );
     if (  useSizeHint && ( n == "Spacer" || n == TQSLIDER_OBJECT_NAME_STRING || n == "Line" || n == TQSCROLLBAR_OBJECT_NAME_STRING ) ) {
 	TQPopupMenu m( mainWindow() );
@@ -361,7 +361,7 @@ void FormWindow::insertWidget()
 	int ver = m.insertItem( i18n( "&Vertical" ) );
 	int r = m.exec( TQCursor::pos() );
 	if ( r == ver )
-	    orient = Vertical;
+	    orient =Qt::Vertical;
     }
 
 
@@ -375,25 +375,25 @@ void FormWindow::insertWidget()
 	pix.convertFromImage( SmallIcon( "designer_image.png" , KDevDesignerPartFactory::instance()).convertToImage() );
 	( (TQLabel*)w )->setPixmap( pix );
     }
-    int id = WidgetDatabase::idFromClassName( WidgetFactory::classNameOf(w) );
+    int id = WidgetDatabase::idFromClassName( WidgetFactory::classNameOf(TQT_TQOBJECT(w)) );
     if ( WidgetDatabase::isCustomWidget( id ) ) {
 	TQWhatsThis::add( w, i18n("<b>A %1 (custom widget)</b> "
 			    "<p>Click <b>Edit Custom Widgets...</b> in the <b>Tools|Custom</b> "
 			    "menu to add and change custom widgets. You can add "
 			    "properties as well as signals and slots to integrate custom widgets into "
-			    "<i>Qt Designer</i>, and provide a pixmap which will be used to represent "
+			    "<i>TQt Designer</i>, and provide a pixmap which will be used to represent "
 			    "the widget on the form.</p>")
-			    .arg(WidgetDatabase::toolTip( id )) );
-	TQToolTip::add( w, i18n("A %1 (custom widget)").arg(WidgetDatabase::toolTip( id )) );
+			    .tqarg(WidgetDatabase::toolTip( id )) );
+	TQToolTip::add( w, i18n("A %1 (custom widget)").tqarg(WidgetDatabase::toolTip( id )) );
     } else {
 	TQString tt = WidgetDatabase::toolTip( id );
 	TQString wt = WidgetDatabase::whatsThis( id );
 	if ( !wt.isEmpty() && !tt.isEmpty() )
-	    TQWhatsThis::add( w, TQString("<b>A %1</b><p>%2</p>").arg( tt ).arg( wt ) );
+	    TQWhatsThis::add( w, TQString("<b>A %1</b><p>%2</p>").tqarg( tt ).tqarg( wt ) );
     }
 
     TQString s = w->name();
-    unify( w, s, TRUE );
+    unify( TQT_TQOBJECT(w), s, TRUE );
     w->setName( s );
     insertWidget( w );
     TQRect r( currRect );
@@ -408,7 +408,7 @@ void FormWindow::insertWidget()
 
     if ( useSizeHint ) {
 	if ( n == "Spacer" ) {
-	    if ( orient == Vertical ) {
+	    if ( orient ==Qt::Vertical ) {
 		r.setWidth( 20 );
 		r.setHeight( 40 );
 	    } else {
@@ -416,8 +416,8 @@ void FormWindow::insertWidget()
 		r.setHeight( 20 );
 	    }
 	} else {
-	    r.setWidth( w->sizeHint().width() );
-	    r.setHeight( w->sizeHint().height() );
+	    r.setWidth( w->tqsizeHint().width() );
+	    r.setHeight( w->tqsizeHint().height() );
 	}
     }
 
@@ -426,19 +426,19 @@ void FormWindow::insertWidget()
     if ( r.height() < 2 * grid().y() )
 	r.setHeight( 2 * grid().y() );
 
-    const TQObjectList *l = insertParent->children();
-    TQObjectListIt it( *l );
+    const TQObjectList l = insertParent->childrenListObject();
+    TQObjectListIt it( l );
     TQWidgetList lst;
-    if ( WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( w ) ) ) ) {
+    if ( WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(w) ) ) ) ) {
 	for ( ; it.current(); ) {
 	    TQObject *o = it.current();
 	    ++it;
 	    if ( o->isWidgetType() &&
 		 ( (TQWidget*)o )->isVisibleTo( this ) &&
-		 insertedWidgets.find( (TQWidget*)o ) && o != w ) {
+		 insertedWidgets.tqfind( TQT_TQWIDGET(o) ) && TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(w) ) {
 		TQRect r2( ( (TQWidget*)o )->pos(),
 			  ( (TQWidget*)o )->size() );
-		if ( r.contains( r2 ) )
+		if ( r.tqcontains( r2 ) )
 		    lst.append( (TQWidget*)o );
 	    }
 	}
@@ -455,7 +455,7 @@ void FormWindow::insertWidget()
                 np.append( pos );
             }
             
-            MoveCommand *mv = new MoveCommand( i18n( "Reparent Widgets" ), this,
+            MoveCommand *mv = new MoveCommand( i18n( "Retqparent Widgets" ), this,
                                                lst, op, np, insertParent, pw );
 
             if ( !toolFixed )
@@ -463,13 +463,13 @@ void FormWindow::insertWidget()
             else
                 setCursorToAll( CrossCursor, w );
             
-            InsertCommand *cmd = new InsertCommand( i18n( "Insert %1" ).arg( w->name() ), this, w, r );
+            InsertCommand *cmd = new InsertCommand( i18n( "Insert %1" ).tqarg( w->name() ), this, w, r );
             
             TQPtrList<Command> commands;
             commands.append( mv );
             commands.append( cmd );
             
-            MacroCommand *mc = new MacroCommand( i18n( "Insert %1" ).arg( w->name() ), this, commands );
+            MacroCommand *mc = new MacroCommand( i18n( "Insert %1" ).tqarg( w->name() ), this, commands );
             commandHistory()->addCommand( mc );
             mc->execute();
         }
@@ -479,7 +479,7 @@ void FormWindow::insertWidget()
 	else
 	    setCursorToAll( CrossCursor, w );
 
-	InsertCommand *cmd = new InsertCommand( i18n( "Insert %1" ).arg( w->name() ), this, w, r );
+	InsertCommand *cmd = new InsertCommand( i18n( "Insert %1" ).tqarg( w->name() ), this, w, r );
 	commandHistory()->addCommand( cmd );
 	cmd->execute();
     }
@@ -497,26 +497,26 @@ void FormWindow::insertWidget( TQWidget *w, bool checkName )
 	return;
     if ( checkName ) {
 	TQString s = w->name();
-	unify( w, s, TRUE );
+	unify( TQT_TQOBJECT(w), s, TRUE );
 	w->setName( s );
     }
 
-    MetaDataBase::addEntry( w );
-    int id = WidgetDatabase::idFromClassName( WidgetFactory::classNameOf(w) );
+    MetaDataBase::addEntry( TQT_TQOBJECT(w) );
+    int id = WidgetDatabase::idFromClassName( WidgetFactory::classNameOf(TQT_TQOBJECT(w)) );
     if ( WidgetDatabase::isCustomWidget( id ) ) {
 	TQWhatsThis::add( w, i18n("<b>A %1 (custom widget)</b> "
 			    "<p>Click <b>Edit Custom Widgets...</b> in the <b>Tools|Custom</b> "
 			    "menu to add and change custom widgets. You can add "
 			    "properties as well as signals and slots to integrate custom widgets into "
-			    "<i>Qt Designer</i>, and provide a pixmap which will be used to represent "
+			    "<i>TQt Designer</i>, and provide a pixmap which will be used to represent "
 			    "the widget on the form.</p>")
-			    .arg(WidgetDatabase::toolTip( id )) );
-	TQToolTip::add( w, i18n("A %1 (custom widget)").arg(WidgetDatabase::toolTip( id )) );
+			    .tqarg(WidgetDatabase::toolTip( id )) );
+	TQToolTip::add( w, i18n("A %1 (custom widget)").tqarg(WidgetDatabase::toolTip( id )) );
     } else {
 	TQString tt = WidgetDatabase::toolTip( id );
 	TQString wt = WidgetDatabase::whatsThis( id );
 	if ( !wt.isEmpty() && !tt.isEmpty() )
-	    TQWhatsThis::add( w, TQString("<b>A %1</b><p>%2</p>").arg( tt ).arg( wt ) );
+	    TQWhatsThis::add( w, TQString("<b>A %1</b><p>%2</p>").tqarg( tt ).tqarg( wt ) );
     }
 
     restoreCursors( w, this );
@@ -526,7 +526,7 @@ void FormWindow::insertWidget( TQWidget *w, bool checkName )
 
 void FormWindow::removeWidget( TQWidget *w )
 {
-    MetaDataBase::removeEntry( w );
+    MetaDataBase::removeEntry( TQT_TQOBJECT(w) );
     widgets()->take( w );
 }
 
@@ -535,16 +535,16 @@ void FormWindow::handleContextMenu( TQContextMenuEvent *e, TQWidget *w )
     CHECK_MAINWINDOW;
     switch ( currTool ) {
     case POINTER_TOOL: {
-	if ( !isMainContainer( w ) && qstrcmp( w->name(), "central widget" ) != 0 ) { // press on a child widget
+	if ( !isMainContainer( TQT_TQOBJECT(w) ) && qstrcmp( w->name(), "central widget" ) != 0 ) { // press on a child widget
 	    raiseChildSelections( w ); // raise selections and select widget
-	    selectWidget( w );
+	    selectWidget( TQT_TQOBJECT(w) );
 	    // if widget is laid out, find the first non-laid out super-widget
 	    TQWidget *realWidget = w; // but store the original one
-	    while ( w->parentWidget() &&
-		    ( WidgetFactory::layoutType( w->parentWidget()) != WidgetFactory::NoLayout ||
-		      !insertedWidgets.find(w) ) )
-		w = w->parentWidget();
-	    if ( ::qt_cast<TQMainWindow*>(mainContainer()) && ((TQMainWindow*)mainContainer())->centralWidget() == realWidget ) {
+	    while ( w->tqparentWidget() &&
+		    ( WidgetFactory::tqlayoutType( w->tqparentWidget()) != WidgetFactory::NoLayout ||
+		      !insertedWidgets.tqfind(w) ) )
+		w = w->tqparentWidget();
+	    if ( ::tqqt_cast<TQMainWindow*>(mainContainer()) && ((TQMainWindow*)mainContainer())->centralWidget() == realWidget ) {
 		e->accept();
 		mainwindow->popupFormWindowMenu( e->globalPos(), this );
 	    } else {
@@ -576,9 +576,9 @@ void FormWindow::handleMousePress( TQMouseEvent *e, TQWidget *w )
 
     switch ( currTool ) {
     case POINTER_TOOL:
-	if ( !isMainContainer( w ) && qstrcmp( w->name(), "central widget" ) != 0 ) { // press on a child widget
-	    // if the clicked widget is not in a layout, raise it
-	    if ( !w->parentWidget() || WidgetFactory::layoutType( w->parentWidget() ) == WidgetFactory::NoLayout )
+	if ( !isMainContainer( TQT_TQOBJECT(w) ) && qstrcmp( w->name(), "central widget" ) != 0 ) { // press on a child widget
+	    // if the clicked widget is not in a tqlayout, raise it
+	    if ( !w->tqparentWidget() || WidgetFactory::tqlayoutType( w->tqparentWidget() ) == WidgetFactory::NoLayout )
 		w->raise();
 	    if ( ( e->state() & ControlButton ) ) { // with control pressed, always start rubber band selection
 		drawRubber = TRUE;
@@ -587,63 +587,63 @@ void FormWindow::handleMousePress( TQMouseEvent *e, TQWidget *w )
 		break;
 	    }
 
-	    bool sel = isWidgetSelected( w );
+	    bool sel = isWidgetSelected( TQT_TQOBJECT(w) );
 	    if ( !( ( e->state() & ControlButton ) || ( e->state() & ShiftButton ) ) ) { // control not pressed...
 		if ( !sel ) { // ...and widget no selectted: unselect all
 		    clearSelection( FALSE );
 		} else { // ...widget selected
-		    // only if widget has a layout (it is a layout meta widget or a laid out container!), unselect its childs
-		    if ( WidgetFactory::layoutType( w ) != WidgetFactory::NoLayout ) {
+		    // only if widget has a tqlayout (it is a tqlayout meta widget or a laid out container!), unselect its childs
+		    if ( WidgetFactory::tqlayoutType( w ) != WidgetFactory::NoLayout ) {
 			TQObjectList *l = w->queryList( TQWIDGET_OBJECT_NAME_STRING );
 			setPropertyShowingBlocked( TRUE );
 			for ( TQObject *o = l->first(); o; o = l->next() ) {
 			    if ( !o->isWidgetType() )
 				continue;
-			    if ( insertedWidgets.find( (TQWidget*)o ) )
-				selectWidget( (TQWidget*)o, FALSE );
+			    if ( insertedWidgets.tqfind( (TQWidget*)o ) )
+				selectWidget( TQT_TQOBJECT(o), FALSE );
 			}
 			setPropertyShowingBlocked( FALSE );
 			delete l;
 		    }
 		}
-		qApp->processEvents();
+		tqApp->processEvents();
 	    }
 	    if ( ( ( e->state() & ControlButton ) || ( e->state() & ShiftButton ) ) &&
-		 sel && e->button() == LeftButton ) { // control pressed and selected, unselect widget
-		selectWidget( w, FALSE );
+		 sel && e->button() == Qt::LeftButton ) { // control pressed and selected, unselect widget
+		selectWidget( TQT_TQOBJECT(w), FALSE );
 		break;
 	    }
 
 	    raiseChildSelections( w ); // raise selections and select widget
-	    selectWidget( w );
+	    selectWidget( TQT_TQOBJECT(w) );
 
 	    // if widget is laid out, find the first non-laid out super-widget
-	    while ( w->parentWidget() &&
-		    ( WidgetFactory::layoutType( w->parentWidget()) != WidgetFactory::NoLayout || !insertedWidgets.find(w) ) )
-		w = w->parentWidget();
+	    while ( w->tqparentWidget() &&
+		    ( WidgetFactory::tqlayoutType( w->tqparentWidget()) != WidgetFactory::NoLayout || !insertedWidgets.tqfind(w) ) )
+		w = w->tqparentWidget();
 
-	    if ( e->button() == LeftButton ) { // left button: store original geometry and more as the widget might start moving
+	    if ( e->button() == Qt::LeftButton ) { // left button: store original tqgeometry and more as the widget might start moving
 		widgetPressed = TRUE;
 		widgetGeom = TQRect( w->pos(), w->size() );
 		oldPressPos = w->mapFromGlobal( e->globalPos() );
 		origPressPos = oldPressPos;
 		checkedSelectionsForMove = FALSE;
 		moving.clear();
-		if ( w->parentWidget() && !isMainContainer( w->parentWidget() ) && !isCentralWidget( w->parentWidget() ) ) {
-		    targetContainer = w->parentWidget();
-		    hadOwnPalette = w->parentWidget()->ownPalette();
-		    restorePalette = w->parentWidget()->palette();
+		if ( w->tqparentWidget() && !isMainContainer( TQT_TQOBJECT(w->tqparentWidget()) ) && !isCentralWidget( TQT_TQOBJECT(w->tqparentWidget()) ) ) {
+		    targetContainer = w->tqparentWidget();
+		    hadOwnPalette = w->tqparentWidget()->ownPalette();
+		    restorePalette = w->tqparentWidget()->palette();
 		}
 	    }
 	} else { // press was on the formwindow
-	    if ( e->button() == LeftButton ) { // left button: start rubber selection and show formwindow properties
+	    if ( e->button() == Qt::LeftButton ) { // left button: start rubber selection and show formwindow properties
 		drawRubber = TRUE;
 		if ( !( ( e->state() & ControlButton ) || ( e->state() & ShiftButton ) ) ) {
 		    clearSelection( FALSE );
 		    TQObject *opw = propertyWidget;
-		    propertyWidget = mainContainer();
+		    propertyWidget = TQT_TQOBJECT(mainContainer());
 		    if ( opw->isWidgetType() )
-			repaintSelection( (TQWidget*)opw );
+			tqrepaintSelection( (TQWidget*)opw );
 		}
 		currRect = TQRect( 0, 0, -1, -1 );
 		startRectDraw( mapFromGlobal( e->globalPos() ), e->globalPos(), this, Rubber );
@@ -652,32 +652,32 @@ void FormWindow::handleMousePress( TQMouseEvent *e, TQWidget *w )
 	break;
     case CONNECT_TOOL:
     case BUDDY_TOOL:
-	if ( e->button() != LeftButton )
+	if ( e->button() != Qt::LeftButton )
 	    break;
 	validForBuddy = FALSE;
 	if ( currTool == BUDDY_TOOL ) {
-	    if ( !::qt_cast<TQLabel*>(w) )
+	    if ( !::tqqt_cast<TQLabel*>(w) )
 		break;
 	    clearSelection( FALSE );
 	    validForBuddy = TRUE;
-	    mainWindow()->statusMessage( i18n( "Set buddy for '%1' to..." ).arg( w->name() ) );
+	    mainWindow()->statusMessage( i18n( "Set buddy for '%1' to..." ).tqarg( w->name() ) );
 	} else {
-	    mainWindow()->statusMessage( i18n( "Connect '%1' with..." ).arg( w->name() ) );
+	    mainWindow()->statusMessage( i18n( "Connect '%1' with..." ).tqarg( w->name() ) );
 	}
 	saveBackground();
 	startPos = mapFromGlobal( e->globalPos() );
 	currentPos = startPos;
-	startWidget = designerWidget( w );
+	startWidget = designerWidget( TQT_TQOBJECT(w) );
 	endWidget = startWidget;
 	beginUnclippedPainter( FALSE );
 	drawConnectionLine();
 	break;
     case ORDER_TOOL:
-	if ( !isMainContainer( w ) ) { // press on a child widget
+	if ( !isMainContainer( TQT_TQOBJECT(w) ) ) { // press on a child widget
 	    orderedWidgets.removeRef( w );
 	    orderedWidgets.append( w );
 	    for ( TQWidget *wid = orderedWidgets.last(); wid; wid = orderedWidgets.prev() ) {
-		int i = stackedWidgets.findRef( wid );
+		int i = stackedWidgets.tqfindRef( wid );
 		if ( i != -1 ) {
 		    stackedWidgets.removeRef( wid );
 		    stackedWidgets.insert( 0, wid );
@@ -691,18 +691,18 @@ void FormWindow::handleMousePress( TQMouseEvent *e, TQWidget *w )
 	}
 	break;
     default: // any insert widget tool
-	if ( e->button() == LeftButton ) {
-	    insertParent = WidgetFactory::containerOfWidget( mainContainer() ); // default parent for new widget is the formwindow
-	    if ( !isMainContainer( w ) ) { // press was not on formwindow, check if we can find another parent
+	if ( e->button() == Qt::LeftButton ) {
+	    insertParent = WidgetFactory::containerOfWidget( mainContainer() ); // default tqparent for new widget is the formwindow
+	    if ( !isMainContainer( TQT_TQOBJECT(w) ) ) { // press was not on formwindow, check if we can find another tqparent
 		TQWidget *wid = w;
 		for (;;) {
-		    int id = WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( wid ) );
+		    int id = WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(wid) ) );
 		    if ( ( WidgetDatabase::isContainer( id ) || wid == mainContainer() ) &&
-			 !::qt_cast<QLayoutWidget*>(wid) && !::qt_cast<TQSplitter*>(wid) ) {
-			insertParent = WidgetFactory::containerOfWidget( wid ); // found another parent, store it
+			 !::tqqt_cast<TQLayoutWidget*>(wid) && !::tqqt_cast<TQSplitter*>(wid) ) {
+			insertParent = WidgetFactory::containerOfWidget( wid ); // found another tqparent, store it
 			break;
 		    } else {
-			wid = wid->parentWidget();
+			wid = wid->tqparentWidget();
 			if ( !wid )
 			    break;
 		    }
@@ -719,11 +719,11 @@ void FormWindow::handleMouseDblClick( TQMouseEvent *, TQWidget *w )
     CHECK_MAINWINDOW;
     switch ( currTool ) {
     case ORDER_TOOL:
-	if ( !isMainContainer( w ) ) { // press on a child widget
+	if ( !isMainContainer( TQT_TQOBJECT(w) ) ) { // press on a child widget
 	    orderedWidgets.clear();
 	    orderedWidgets.append( w );
 	    for ( TQWidget *wid = orderedWidgets.last(); wid; wid = orderedWidgets.prev() ) {
-		int i = stackedWidgets.findRef( wid );
+		int i = stackedWidgets.tqfindRef( wid );
 		if ( i != -1 ) {
 		    stackedWidgets.removeRef( wid );
 		    stackedWidgets.insert( 0, wid );
@@ -736,8 +736,8 @@ void FormWindow::handleMouseDblClick( TQMouseEvent *, TQWidget *w )
 	    updateOrderIndicators();
 	}
     default:
-	if ( !WidgetFactory::isPassiveInteractor( w ) &&
-	     ( isMainContainer( w ) || w == this ) )
+	if ( !WidgetFactory::isPassiveInteractor( TQT_TQOBJECT(w) ) &&
+	     ( isMainContainer( TQT_TQOBJECT(w) ) || TQT_BASE_OBJECT(w) == TQT_BASE_OBJECT(this) ) )
 	    mainWindow()->editSource();
 	break;
     }
@@ -746,7 +746,7 @@ void FormWindow::handleMouseDblClick( TQMouseEvent *, TQWidget *w )
 void FormWindow::handleMouseMove( TQMouseEvent *e, TQWidget *w )
 {
     CHECK_MAINWINDOW;
-    if ( ( e->state() & LeftButton ) != LeftButton )
+    if ( ( e->state() & Qt::LeftButton ) != Qt::LeftButton )
 	return;
 
     TQWidget *newendWidget = endWidget, *oldendWidget = endWidget, *wid;
@@ -756,9 +756,9 @@ void FormWindow::handleMouseMove( TQMouseEvent *e, TQWidget *w )
 	if ( widgetPressed && allowMove( w ) ) { // we are prepated for a move
 
 	    // if widget is laid out, find the first non-laid out super-widget
-	    while ( w->parentWidget() &&
-		    ( WidgetFactory::layoutType( w->parentWidget() ) != WidgetFactory::NoLayout || !insertedWidgets.find(w ) ) )
-		w = w->parentWidget();
+	    while ( w->tqparentWidget() &&
+		    ( WidgetFactory::tqlayoutType( w->tqparentWidget() ) != WidgetFactory::NoLayout || !insertedWidgets.tqfind(w ) ) )
+		w = w->tqparentWidget();
 
 	    // calc correct position
 	    TQPoint pos = w->mapFromGlobal( e->globalPos() );
@@ -770,17 +770,17 @@ void FormWindow::handleMouseMove( TQMouseEvent *e, TQWidget *w )
 		pos.setX( w->mapFromParent( TQPoint( 0, mpos.y() ) ).x() );
 	    if ( mpos.y() < 0 )
 		pos.setY( w->mapFromParent( TQPoint( mpos.x(), 0 ) ).y() );
-	    if ( mpos.x() > w->parentWidget()->width() )
-		pos.setX( w->mapFromParent( TQPoint( w->parentWidget()->width(), mpos.y() ) ).x() );
-	    if ( mpos.y() > w->parentWidget()->height() )
-		pos.setY( w->mapFromParent( TQPoint( mpos.x(), w->parentWidget()->height() ) ).y() );
+	    if ( mpos.x() > w->tqparentWidget()->width() )
+		pos.setX( w->mapFromParent( TQPoint( w->tqparentWidget()->width(), mpos.y() ) ).x() );
+	    if ( mpos.y() > w->tqparentWidget()->height() )
+		pos.setY( w->mapFromParent( TQPoint( mpos.x(), w->tqparentWidget()->height() ) ).y() );
 #endif
 
 	    // calc move distance and store it
 	    TQPoint d = oldPressPos - pos;
-	    if ( QABS( d.x() ) < grid().x() )
+	    if ( TQABS( d.x() ) < grid().x() )
 		d.setX( 0 );
-	    if ( QABS( d.y() ) < grid().y() )
+	    if ( TQABS( d.y() ) < grid().y() )
 		d.setY( 0 );
 	    if ( d.x() == 0 )
 		pos.setX( oldPressPos.x() );
@@ -799,18 +799,18 @@ void FormWindow::handleMouseMove( TQMouseEvent *e, TQWidget *w )
 
 	    if ( x - p.x() != 0 || y - p.y() != 0 ) { // if we actually have to move
 		if ( !checkedSelectionsForMove ) { // if not checked yet, check if the correct widget are selected...
-		    if ( !isWidgetSelected( w ) ) {	// and unselect others. Only siblings can be moved at the same time
+		    if ( !isWidgetSelected( TQT_TQOBJECT(w) ) ) {	// and unselect others. Only siblings can be moved at the same time
 			setPropertyShowingBlocked( TRUE );
-			selectWidget( w );
+			selectWidget( TQT_TQOBJECT(w) );
 			setPropertyShowingBlocked( FALSE );
 		    }
 		    checkSelectionsForMove( w );
 		}
 
-		// check whether we would have to reparent the selection and highlight the possible new parent container
+		// check whether we would have to reparent the selection and highlight the possible new tqparent container
 		TQMapConstIterator<TQWidget*, TQPoint> it = moving.begin();
 		TQWidget* wa = containerAt( e->globalPos(), it.key() );
-		if ( wa  && !isMainContainer( wa ) && !isCentralWidget( wa ) ) {
+		if ( wa  && !isMainContainer( TQT_TQOBJECT(wa) ) && !isCentralWidget( TQT_TQOBJECT(wa) ) ) {
 		    wa = WidgetFactory::containerOfWidget( wa );
 		    // ok, looks like we moved onto a container
 
@@ -824,7 +824,7 @@ void FormWindow::handleMouseMove( TQMouseEvent *e, TQWidget *w )
 			targetContainer = wa;
 			hadOwnPalette = wa->ownPalette();
 			restorePalette = wa->palette();
-			wa->setPaletteBackgroundColor( wa->colorGroup().midlight() );
+			wa->setPaletteBackgroundColor( wa->tqcolorGroup().midlight() );
 		    }
 		}
 		else if ( targetContainer ) {
@@ -837,14 +837,14 @@ void FormWindow::handleMouseMove( TQMouseEvent *e, TQWidget *w )
 
 		// finally move the selected widgets and show/update preview label
 		moveSelectedWidgets( x - p.x(), y - p.y() );
-		sizePreviewLabel->setText( i18n( "%1/%2" ).arg( w->pos().x() ).arg( w->pos().y() ) );
+		sizePreviewLabel->setText( i18n( "%1/%2" ).tqarg( w->pos().x() ).tqarg( w->pos().y() ) );
 		sizePreviewLabel->adjustSize();
 		TQRect lg( mapFromGlobal( e->globalPos() ) + TQPoint( 16, 16 ), sizePreviewLabel->size() );
 		checkPreviewGeometry( lg );
 		sizePreviewLabel->setGeometry( lg );
 		sizePreviewLabel->raise();
 		sizePreviewLabel->show();
-#if defined(Q_WS_WIN32)
+#if defined(TQ_WS_WIN32)
 		windowsRepaintWorkaroundTimer->start( 100, TRUE );
 #endif
 	    } else { // if we don't need to move, do some indication
@@ -860,23 +860,23 @@ void FormWindow::handleMouseMove( TQMouseEvent *e, TQWidget *w )
 	break;
     case CONNECT_TOOL:
 	restoreConnectionLine();
-	wid = qApp->widgetAt( e->globalPos(), TRUE );
+	wid = tqApp->widgetAt( e->globalPos(), TRUE );
 	if ( wid )
-	    wid = designerWidget( wid );
-	if ( wid && ( isMainContainer( wid ) || insertedWidgets.find( wid ) ) && wid->isVisibleTo( this ) )
+	    wid = designerWidget( TQT_TQOBJECT(wid) );
+	if ( wid && ( isMainContainer( TQT_TQOBJECT(wid) ) || insertedWidgets.tqfind( wid ) ) && wid->isVisibleTo( this ) )
 	    newendWidget = wid;
-	if ( ::qt_cast<QLayoutWidget*>(newendWidget) || ::qt_cast<Spacer*>(newendWidget) )
+	if ( ::tqqt_cast<TQLayoutWidget*>(newendWidget) || ::tqqt_cast<Spacer*>(newendWidget) )
 	    newendWidget = (TQWidget*)endWidget;
 	drawRecRect = newendWidget != endWidget;
 	if ( newendWidget &&
-	     ( isMainContainer( newendWidget ) || insertedWidgets.find( newendWidget ) ) && !isCentralWidget( newendWidget ) )
+	     ( isMainContainer( TQT_TQOBJECT(newendWidget) ) || insertedWidgets.tqfind( newendWidget ) ) && !isCentralWidget( TQT_TQOBJECT(newendWidget) ) )
 	    endWidget = newendWidget;
-	mainWindow()->statusMessage( i18n( "Connect '%1' to '%2'" ).arg( startWidget->name() ).
+	mainWindow()->statusMessage( i18n( "Connect '%1' to '%2'" ).tqarg( startWidget->name() ).
 					    arg( endWidget->name() ) );
 	currentPos = mapFromGlobal( e->globalPos() );
-	qApp->processEvents();
+	tqApp->processEvents();
 	if ( drawRecRect )
-	    restoreRect( TQRect( mapToForm( ( (TQWidget*)oldendWidget )->parentWidget(), ( (TQWidget*)oldendWidget )->pos() ),
+	    restoreRect( TQRect( mapToForm( ( (TQWidget*)oldendWidget )->tqparentWidget(), ( (TQWidget*)oldendWidget )->pos() ),
 			 ( (TQWidget*)oldendWidget )->size() ) );
 	drawConnectionLine();
 	break;
@@ -884,29 +884,29 @@ void FormWindow::handleMouseMove( TQMouseEvent *e, TQWidget *w )
 	if ( !validForBuddy )
 	    break;
 	restoreConnectionLine();
-	wid = qApp->widgetAt( e->globalPos(), TRUE );
+	wid = tqApp->widgetAt( e->globalPos(), TRUE );
 	if ( wid )
-	    wid = designerWidget( wid );
+	    wid = designerWidget( TQT_TQOBJECT(wid) );
 	if ( wid && canBeBuddy( wid ) && wid->isVisibleTo( this ) )
 	    newendWidget = wid;
 	else
 	    newendWidget = 0;
-	if ( ::qt_cast<QLayoutWidget*>(newendWidget) || ::qt_cast<Spacer*>(newendWidget) )
+	if ( ::tqqt_cast<TQLayoutWidget*>(newendWidget) || ::tqqt_cast<Spacer*>(newendWidget) )
 	    newendWidget = (TQWidget*)endWidget;
 	drawRecRect = newendWidget != endWidget;
 	if ( !newendWidget )
 	    endWidget = newendWidget;
-	else if ( insertedWidgets.find( newendWidget ) && !isCentralWidget( newendWidget ) )
+	else if ( insertedWidgets.tqfind( newendWidget ) && !isCentralWidget( TQT_TQOBJECT(newendWidget) ) )
 	    endWidget = newendWidget;
 	if ( endWidget )
-	    mainWindow()->statusMessage( i18n( "Set buddy '%1' to '%2'" ).arg( startWidget->name() ).
+	    mainWindow()->statusMessage( i18n( "Set buddy '%1' to '%2'" ).tqarg( startWidget->name() ).
 						arg( endWidget->name() ) );
 	else
-	    mainWindow()->statusMessage( i18n( "Set buddy '%1' to ..." ).arg( startWidget->name() ) );
+	    mainWindow()->statusMessage( i18n( "Set buddy '%1' to ..." ).tqarg( startWidget->name() ) );
 	currentPos = mapFromGlobal( e->globalPos() );
-	qApp->processEvents();
+	tqApp->processEvents();
 	if ( drawRecRect && oldendWidget )
-	    restoreRect( TQRect( mapToForm( ( (TQWidget*)oldendWidget )->parentWidget(), ( (TQWidget*)oldendWidget )->pos() ),
+	    restoreRect( TQRect( mapToForm( ( (TQWidget*)oldendWidget )->tqparentWidget(), ( (TQWidget*)oldendWidget )->pos() ),
 			 ( (TQWidget*)oldendWidget )->size() ) );
 	drawConnectionLine();
 	break;
@@ -922,7 +922,7 @@ void FormWindow::handleMouseMove( TQMouseEvent *e, TQWidget *w )
 void FormWindow::handleMouseRelease( TQMouseEvent *e, TQWidget *w )
 {
     CHECK_MAINWINDOW;
-    if ( e->button() != LeftButton )
+    if ( e->button() != Qt::LeftButton )
 	return;
 
     switch ( currTool ) {
@@ -930,7 +930,7 @@ void FormWindow::handleMouseRelease( TQMouseEvent *e, TQWidget *w )
 	if ( widgetPressed && allowMove( w ) ) { // we moved the widget
 	    sizePreviewLabel->hide();
 
-	    if ( moving.isEmpty() || w->pos() == *moving.find(w) )
+	    if ( moving.isEmpty() || w->pos() == *moving.tqfind(w) )
 		break;
 
 	    // restore targetContainer
@@ -946,7 +946,7 @@ void FormWindow::handleMouseRelease( TQMouseEvent *e, TQWidget *w )
 		emitUpdateProperties( propertyWidget );
 
 	    TQMapConstIterator<TQWidget*,TQPoint> it = moving.begin();
-	    TQWidget *oldParent = it.key()->parentWidget();
+	    TQWidget *oldParent = it.key()->tqparentWidget();
 	    TQWidget *newParent = oldParent;
 	    // check whether we have to reparent the selection
 	    TQWidget* wa = containerAt( e->globalPos(), it.key() );
@@ -954,19 +954,19 @@ void FormWindow::handleMouseRelease( TQMouseEvent *e, TQWidget *w )
 		wa = WidgetFactory::containerOfWidget( wa );
 		// ok, looks like we moved onto a container
 
-		// check whether we really have different parents.
-		if ( wa == it.key()->parentWidget() )
+		// check whether we really have different tqparents.
+		if ( wa == it.key()->tqparentWidget() )
 		    goto make_move_command;
 
-		// break layout if necessary
-		if ( WidgetFactory::layoutType( wa ) != WidgetFactory::NoLayout ) {
+		// break tqlayout if necessary
+		if ( WidgetFactory::tqlayoutType( wa ) != WidgetFactory::NoLayout ) {
 		    if ( TQMessageBox::information( mainWindow(), i18n( "Inserting Widget" ),
 						   i18n( "You tried to insert a widget into the "
-						       "layout Container Widget '%1'.\n"
+						       "tqlayout Container Widget '%1'.\n"
 						       "This is not possible. "
-						       "In order to insert the widget, the layout of '%1'\n"
+						       "In order to insert the widget, the tqlayout of '%1'\n"
 						       "must first be broken.\n"
-						       "Break the layout or cancel the operation?" ).
+						       "Break the tqlayout or cancel the operation?" ).
 						   arg( wa->name() ).
 						   arg( wa->name() ), i18n( "&Break Layout" ), i18n( "&Cancel" ) ) )
 			goto make_move_command; // cancel
@@ -977,25 +977,25 @@ void FormWindow::handleMouseRelease( TQMouseEvent *e, TQWidget *w )
 		bool emitSelChanged = FALSE;
 		for ( TQMap<TQWidget*, TQPoint>::Iterator it = moving.begin(); it != moving.end(); ++it ) {
 		    TQWidget *i = it.key();
-		    if ( !emitSelChanged && ::qt_cast<TQButton*>(i) ) {
-			if ( ::qt_cast<TQButtonGroup*>(i->parentWidget()) || ::qt_cast<TQButtonGroup*>(wa) )
+		    if ( !emitSelChanged && ::tqqt_cast<TQButton*>(i) ) {
+			if ( ::tqqt_cast<TQButtonGroup*>(i->tqparentWidget()) || ::tqqt_cast<TQButtonGroup*>(wa) )
 			    emitSelChanged = TRUE;
-			if ( !::qt_cast<TQButtonGroup*>(wa) ) {
-			    MetaDataBase::setPropertyChanged( i, "buttonGroupId", FALSE );
-			    if ( ::qt_cast<TQButtonGroup*>(i->parentWidget()) )
-				( (TQButtonGroup*)i->parentWidget() )->remove( (TQButton*)i );
+			if ( !::tqqt_cast<TQButtonGroup*>(wa) ) {
+			    MetaDataBase::setPropertyChanged( TQT_TQOBJECT(i), "buttonGroupId", FALSE );
+			    if ( ::tqqt_cast<TQButtonGroup*>(i->tqparentWidget()) )
+				( (TQButtonGroup*)i->tqparentWidget() )->remove( (TQButton*)i );
 			}
 		    }
 		    TQPoint pos = wa->mapFromGlobal( i->mapToGlobal( TQPoint(0,0) ) );
 		    i->reparent( wa, pos, TRUE );
 		    raiseSelection( i );
 		    raiseChildSelections( i );
-		    widgetChanged( i );
+		    widgetChanged( TQT_TQOBJECT(i) );
 		    mainWindow()->objectHierarchy()->widgetRemoved( i );
 		    mainWindow()->objectHierarchy()->widgetInserted( i );
 		}
 		if ( emitSelChanged ) {
-		    emit showProperties( wa );
+		    emit showProperties( TQT_TQOBJECT(wa) );
 		    emit showProperties( propertyWidget );
 		}
 		newParent = wa;
@@ -1027,15 +1027,15 @@ void FormWindow::handleMouseRelease( TQMouseEvent *e, TQWidget *w )
     case BUDDY_TOOL:
 	restoreConnectionLine();
 	if ( startWidget )
-	    restoreRect( TQRect( mapToForm( ( (TQWidget*)startWidget )->parentWidget(),
+	    restoreRect( TQRect( mapToForm( ( (TQWidget*)startWidget )->tqparentWidget(),
 					   ( (TQWidget*)startWidget )->pos() ),
 				((TQWidget*)startWidget )->size() ) );
 	if ( endWidget )
-	    restoreRect( TQRect( mapToForm( ( (TQWidget*)endWidget )->parentWidget(),
+	    restoreRect( TQRect( mapToForm( ( (TQWidget*)endWidget )->tqparentWidget(),
 					   ( (TQWidget*)endWidget )->pos() ),
 				( (TQWidget*)endWidget )->size() ) );
 	endUnclippedPainter();
-	qApp->processEvents();
+	tqApp->processEvents();
 
 	if ( startWidget && endWidget ) {
 	    if ( currTool == CONNECT_TOOL )
@@ -1044,14 +1044,14 @@ void FormWindow::handleMouseRelease( TQMouseEvent *e, TQWidget *w )
 		TQString oldBuddy = startWidget->property( "buddy" ).toString();
 		if ( oldBuddy.isNull() )
 		    oldBuddy = "";
-		SetPropertyCommand *cmd = new SetPropertyCommand( i18n( "Set Buddy for %1" ).arg( startWidget->name() ),
-								  this, startWidget, mainWindow()->propertyeditor(),
+		SetPropertyCommand *cmd = new SetPropertyCommand( i18n( "Set Buddy for %1" ).tqarg( startWidget->name() ),
+								  this, TQT_TQOBJECT(startWidget), mainWindow()->propertyeditor(),
 								  "buddy", startWidget->property( "buddy" ),
 								  endWidget->name(), endWidget->name(),
 								  oldBuddy );
 		commandHistory()->addCommand( cmd, TRUE );
 		cmd->execute();
-		emitUpdateProperties( startWidget );
+		emitUpdateProperties( TQT_TQOBJECT(startWidget) );
 	    }
 	}
 	if ( !toolFixed )
@@ -1064,14 +1064,14 @@ void FormWindow::handleMouseRelease( TQMouseEvent *e, TQWidget *w )
     default: // any insert widget tool is active
 	if ( insertParent ) { // we should insert the new widget now
 	    endRectDraw();
-	    if ( WidgetFactory::layoutType( insertParent ) != WidgetFactory::NoLayout ) {
+	    if ( WidgetFactory::tqlayoutType( insertParent ) != WidgetFactory::NoLayout ) {
 		if ( TQMessageBox::information( mainWindow(), i18n( "Inserting Widget" ),
 					       i18n( "You tried to insert a widget into the "
-						   "layout Container Widget '%1'.\n"
+						   "tqlayout Container Widget '%1'.\n"
 						   "This is not possible. "
-						   "In order to insert the widget, the layout of '%1'\n"
+						   "In order to insert the widget, the tqlayout of '%1'\n"
 						   "must first be broken.\n"
-						   "Break the layout or cancel the operation?" ).
+						   "Break the tqlayout or cancel the operation?" ).
 					       arg( insertParent->name() ).
 					       arg( insertParent->name() ), i18n( "&Break Layout" ), i18n( "&Cancel" ) ) == 0 ) {
 		    breakLayout( insertParent );
@@ -1163,7 +1163,7 @@ void FormWindow::handleKeyPress( TQKeyEvent *e, TQWidget *w )
 	TQObjectList *l = queryList( TQWIDGET_OBJECT_NAME_STRING );
 	if ( !l )
 	    return;
-	if ( l->find( w ) != -1 )
+	if ( l->tqfind( TQT_TQOBJECT(w) ) != -1 )
 	    e->accept();
 	delete l;
     }
@@ -1185,35 +1185,35 @@ void FormWindow::selectWidget( TQObject *o, bool select )
 
     TQWidget *w = (TQWidget*)o;
 
-    if ( isMainContainer( w ) ) {
+    if ( isMainContainer( TQT_TQOBJECT(w) ) ) {
 	TQObject *opw = propertyWidget;
-	propertyWidget = mainContainer();
+	propertyWidget = TQT_TQOBJECT(mainContainer());
 	if ( opw->isWidgetType() )
-	    repaintSelection( (TQWidget*)opw );
+	    tqrepaintSelection( (TQWidget*)opw );
 	emitShowProperties( propertyWidget );
 	return;
     }
 
-    if ( ::qt_cast<TQMainWindow*>(mainContainer()) && w == ( (TQMainWindow*)mainContainer() )->centralWidget() ) {
+    if ( ::tqqt_cast<TQMainWindow*>(mainContainer()) && w == ( (TQMainWindow*)mainContainer() )->centralWidget() ) {
 	TQObject *opw = propertyWidget;
-	propertyWidget = mainContainer();
+	propertyWidget = TQT_TQOBJECT(mainContainer());
 	if ( opw->isWidgetType() )
-	    repaintSelection( (TQWidget*)opw );
+	    tqrepaintSelection( (TQWidget*)opw );
 	emitShowProperties( propertyWidget );
 	return;
     }
 
-    if ( ::qt_cast<QDesignerToolBar*>(o) )
+    if ( ::tqqt_cast<TQDesignerToolBar*>(o) )
 	return;
 
     if ( select ) {
 	TQObject *opw = propertyWidget;
-	propertyWidget = w;
+	propertyWidget = TQT_TQOBJECT(w);
 	if ( opw->isWidgetType() )
-	    repaintSelection( (TQWidget*)opw );
+	    tqrepaintSelection( (TQWidget*)opw );
 	if ( !isPropertyShowingBlocked() )
 	    emitShowProperties( propertyWidget );
-	WidgetSelection *s = usedSelections.find( w );
+	WidgetSelection *s = usedSelections.tqfind( w );
 	if ( s ) {
 	    s->show();
 	    return;
@@ -1233,16 +1233,16 @@ void FormWindow::selectWidget( TQObject *o, bool select )
 	s->setWidget( w );
 	emitSelectionChanged();
     } else {
-	WidgetSelection *s = usedSelections.find( w );
+	WidgetSelection *s = usedSelections.tqfind( w );
 	if ( s )
 	    s->setWidget( 0 );
 	TQObject *opw = propertyWidget;
 	if ( !usedSelections.isEmpty() )
-	    propertyWidget = TQPtrDictIterator<WidgetSelection>( usedSelections ).current()->widget();
+	    propertyWidget = TQT_TQOBJECT(TQPtrDictIterator<WidgetSelection>( usedSelections ).current()->widget());
 	else
-	    propertyWidget = mainContainer();
+	    propertyWidget = TQT_TQOBJECT(mainContainer());
 	if ( opw->isWidgetType() )
-	    repaintSelection( (TQWidget*)opw );
+	    tqrepaintSelection( (TQWidget*)opw );
 	if ( !isPropertyShowingBlocked() )
 	    emitShowProperties( propertyWidget );
 	emitSelectionChanged();
@@ -1258,23 +1258,23 @@ TQPoint FormWindow::grid() const
 
 void FormWindow::updateSelection( TQWidget *w )
 {
-    WidgetSelection *s = usedSelections.find( w );
+    WidgetSelection *s = usedSelections.tqfind( w );
     if ( !w->isVisibleTo( this ) )
-	selectWidget( w, FALSE );
+	selectWidget( TQT_TQOBJECT(w), FALSE );
     else if ( s )
 	s->updateGeometry();
 }
 
 void FormWindow::raiseSelection( TQWidget *w )
 {
-    WidgetSelection *s = usedSelections.find( w );
+    WidgetSelection *s = usedSelections.tqfind( w );
     if ( s )
 	s->show();
 }
 
-void FormWindow::repaintSelection( TQWidget *w )
+void FormWindow::tqrepaintSelection( TQWidget *w )
 {
-    WidgetSelection *s = usedSelections.find( w );
+    WidgetSelection *s = usedSelections.tqfind( w );
     if ( s )
 	s->update();
 }
@@ -1288,9 +1288,9 @@ void FormWindow::clearSelection( bool changePropertyDisplay )
     usedSelections.clear();
     if ( changePropertyDisplay ) {
 	TQObject *opw = propertyWidget;
-	propertyWidget = mainContainer();
+	propertyWidget = TQT_TQOBJECT(mainContainer());
 	if ( opw->isWidgetType() )
-	    repaintSelection( (TQWidget*)opw );
+	    tqrepaintSelection( (TQWidget*)opw );
 	emitShowProperties( propertyWidget );
     }
     emitSelectionChanged();
@@ -1327,7 +1327,7 @@ void FormWindow::continueRectDraw( const TQPoint &p, const TQPoint &global, TQWi
 
     if ( currRect == r ) {
 	TQString t = i18n( "%1/%2" );
-	t = t.arg( r.width() - 1 ).arg( r.height() - 1 );
+	t = t.tqarg( r.width() - 1 ).tqarg( r.height() - 1 );
 	drawSizePreview( pos, t );
 	return;
     }
@@ -1339,7 +1339,7 @@ void FormWindow::continueRectDraw( const TQPoint &p, const TQPoint &global, TQWi
 	currRect = r;
 	if ( t == Insert ) {
 	    TQString t = i18n( "%1/%2" );
-	    t = t.arg( r.width() - 1 ).arg( r.height() - 1 );
+	    t = t.tqarg( r.width() - 1 ).tqarg( r.height() - 1 );
 	    drawSizePreview( pos, t );
 	}
 	unclippedPainter->setClipRegion( TQRegion( rect() ).subtract( TQRect( sizePreviewPos, sizePreviewPixmap.size() ) ) );
@@ -1359,7 +1359,7 @@ void FormWindow::endRectDraw()
 
     if ( oldRectValid )
 	unclippedPainter->drawRect( currRect );
-    drawSizePreview( TQPoint(-1,-1), TQString::null );
+    drawSizePreview( TQPoint(-1,-1), TQString() );
     endUnclippedPainter();
 }
 
@@ -1373,8 +1373,8 @@ void FormWindow::selectWidgets()
 		TQPoint p = ( (TQWidget*)o )->mapToGlobal( TQPoint(0,0) );
 		p = mapFromGlobal( p );
 		TQRect r( p, ( (TQWidget*)o )->size() );
-		if ( r.intersects( currRect ) && !r.contains( currRect ) )
-		    selectWidget( (TQWidget*)o );
+		if ( r.intersects( currRect ) && !r.tqcontains( currRect ) )
+		    selectWidget( TQT_TQOBJECT(o) );
 	    }
 	}
 	delete l;
@@ -1385,8 +1385,8 @@ void FormWindow::selectWidgets()
 bool FormWindow::isWidgetSelected( TQObject *w )
 {
     if ( w->isWidgetType() )
-	return usedSelections.find( (TQWidget*)w ) != 0;
-    return FALSE; // #### do stuff for QObjects
+	return usedSelections.tqfind( (TQWidget*)w ) != 0;
+    return FALSE; // #### do stuff for TQObjects
 }
 
 void FormWindow::moveSelectedWidgets( int dx, int dy )
@@ -1395,7 +1395,7 @@ void FormWindow::moveSelectedWidgets( int dx, int dy )
     for ( ; it.current(); ++it ) {
 	WidgetSelection *s = it.current();
 	TQWidget *w = s->widget();
-	if ( w->parentWidget() && WidgetFactory::layoutType( w->parentWidget() ) != WidgetFactory::NoLayout )
+	if ( w->tqparentWidget() && WidgetFactory::tqlayoutType( w->tqparentWidget() ) != WidgetFactory::NoLayout )
 	    continue;
 	w->move( w->x() + dx, w->y() + dy );
 	s->updateGeometry();
@@ -1428,7 +1428,7 @@ void FormWindow::raiseChildSelections( TQWidget *w )
 
     TQPtrDictIterator<WidgetSelection> it( usedSelections );
     for ( ; it.current(); ++it ) {
-	if ( l->findRef( it.current()->widget() ) != -1 )
+	if ( l->tqfindRef( TQT_TQOBJECT(it.current()->widget()) ) != -1 )
 	    it.current()->show();
     }
     delete l;
@@ -1440,7 +1440,7 @@ void FormWindow::updateChildSelections( TQWidget *w )
     if ( l ) {
 	for ( TQObject *o = l->first(); o; o = l->next() ) {
 	    if ( o->isWidgetType() &&
-		 insertedWidgets.find( (TQWidget*)o ) )
+		 insertedWidgets.tqfind( (TQWidget*)o ) )
 		updateSelection( (TQWidget*)o );
 	}
 	delete l;
@@ -1451,7 +1451,7 @@ void FormWindow::checkSelectionsForMove( TQWidget *w )
 {
     checkedSelectionsForMove = TRUE;
 
-    TQObjectList *l = w->parentWidget()->queryList( TQWIDGET_OBJECT_NAME_STRING, 0, FALSE, FALSE );
+    TQObjectList *l = w->tqparentWidget()->queryList( TQWIDGET_OBJECT_NAME_STRING, 0, FALSE, FALSE );
     moving.clear();
     if ( l ) {
 	TQPtrDictIterator<WidgetSelection> it( usedSelections );
@@ -1460,11 +1460,11 @@ void FormWindow::checkSelectionsForMove( TQWidget *w )
 	    if ( it.current()->widget() == mainContainer() )
 		continue;
 	    ++it;
-	    if ( l->find( sel->widget() ) == -1 ) {
-		if ( WidgetFactory::layoutType( w ) == WidgetFactory::NoLayout )
+	    if ( l->tqfind( TQT_TQOBJECT(sel->widget()) ) == -1 ) {
+		if ( WidgetFactory::tqlayoutType( w ) == WidgetFactory::NoLayout )
 		    sel->setWidget( 0 );
 	    } else {
-		if ( WidgetFactory::layoutType( sel->widget()->parentWidget() ) == WidgetFactory::NoLayout ) {
+		if ( WidgetFactory::tqlayoutType( sel->widget()->tqparentWidget() ) == WidgetFactory::NoLayout ) {
 		    moving.insert( sel->widget(), sel->widget()->pos() );
 		    sel->widget()->raise();
 		    raiseChildSelections( sel->widget() );
@@ -1483,10 +1483,10 @@ void FormWindow::deleteWidgets()
     TQPtrDictIterator<WidgetSelection> it( usedSelections );
     for ( ; it.current(); ++it ) {
 	TQWidget *tb = 0;
-	if ( !( tb = mainWindow()->isAToolBarChild( it.current()->widget() ) ) )
+	if ( !( tb = mainWindow()->isAToolBarChild( TQT_TQOBJECT(it.current()->widget()) ) ) )
 	     widgets.append( it.current()->widget() );
 	else
-	    ( (QDesignerToolBar*)tb )->removeWidget( it.current()->widget() );
+	    ( (TQDesignerToolBar*)tb )->removeWidget( it.current()->widget() );
     }
 
     if ( widgets.isEmpty() )
@@ -1502,13 +1502,13 @@ void FormWindow::editAdjustSize()
     TQPtrList<Command> commands;
     TQWidgetList widgets = selectedWidgets();
     if ( widgets.isEmpty() ) {
-	TQRect oldr = geometry();
+	TQRect oldr = tqgeometry();
 	mainContainer()->adjustSize();
 	resize( mainContainer()->size() );
 	// check whether our own size constraint hit us
 	if ( size() != mainContainer()->size() )
 	    mainContainer()->resize( size() );
-	TQRect nr = geometry();
+	TQRect nr = tqgeometry();
 	if ( oldr != nr ) {
 	    ResizeCommand *cmd = new ResizeCommand( i18n( "Adjust Size" ), this, this, oldr, nr );
 	    commandHistory()->addCommand( cmd );
@@ -1516,11 +1516,11 @@ void FormWindow::editAdjustSize()
 	return;
     }
     for ( TQWidget* w = widgets.first(); w; w = widgets.next() ) {
-	if ( w->parentWidget() && WidgetFactory::layoutType( w->parentWidget() ) != WidgetFactory::NoLayout )
+	if ( w->tqparentWidget() && WidgetFactory::tqlayoutType( w->tqparentWidget() ) != WidgetFactory::NoLayout )
 	    continue;
-	TQRect oldr = w->geometry();
+	TQRect oldr = w->tqgeometry();
 	w->adjustSize();
-	TQRect nr = w->geometry();
+	TQRect nr = w->tqgeometry();
 	if ( oldr != nr )
 	    commands.append( new ResizeCommand( i18n("Adjust Size"), this, w, oldr, nr ) );
     }
@@ -1569,7 +1569,7 @@ void FormWindow::invalidCheckedSelections()
 
 void FormWindow::checkPreviewGeometry( TQRect &r )
 {
-    if ( !rect().contains( r ) ) {
+    if ( !TQT_TQRECT_OBJECT(rect()).tqcontains( r ) ) {
 	if ( r.left() < rect().left() )
 	    r.moveTopLeft( TQPoint( 0, r.top() ) );
 	if ( r.right() > rect().right()  )
@@ -1591,9 +1591,9 @@ void FormWindow::focusOutEvent( TQFocusEvent * )
 {
     if ( propertyWidget && !isMainContainer( propertyWidget ) && !isWidgetSelected( propertyWidget ) ) {
 	TQObject *opw = propertyWidget;
-	propertyWidget = mainContainer();
+	propertyWidget = TQT_TQOBJECT(mainContainer());
 	if ( opw->isWidgetType() )
-	    repaintSelection( (TQWidget*)opw );
+	    tqrepaintSelection( (TQWidget*)opw );
     }
 }
 
@@ -1605,14 +1605,14 @@ void FormWindow::resizeEvent( TQResizeEvent *e )
     if ( isVisible() )
 	formFile()->setModified( TRUE, FormFile::WFormWindow );
 
-#if defined(Q_WS_WIN32)
+#if defined(TQ_WS_WIN32)
     windowsRepaintWorkaroundTimer->start( 100, TRUE );
 #endif
 }
 
 void FormWindow::windowsRepaintWorkaroundTimerTimeout()
 {
-#if defined(Q_WS_WIN32)
+#if defined(TQ_WS_WIN32)
     TQObjectList *l = queryList( TQWIDGET_OBJECT_NAME_STRING );
     for ( TQObject *o = l->first(); o; o = l->next() ) {
 	flickerfree_update( (TQWidget*)o );
@@ -1632,8 +1632,8 @@ TQWidget *FormWindow::designerWidget( TQObject *o ) const
     if ( !o || !o->isWidgetType() )
 	return 0;
     TQWidget *w = (TQWidget*)o;
-    while ( w && !isMainContainer( w ) && !insertedWidgets[ (void*)w ] || isCentralWidget( w ) )
-	w = (TQWidget*)w->parent();
+    while ( w && !isMainContainer( TQT_TQOBJECT(w) ) && !insertedWidgets[ (void*)w ] || isCentralWidget( TQT_TQOBJECT(w) ) )
+	w = (TQWidget*)w->tqparent();
     return w;
 }
 
@@ -1643,7 +1643,7 @@ void FormWindow::emitShowProperties( TQObject *w )
 	TQObject *opw = propertyWidget;
 	propertyWidget = w;
 	if ( opw->isWidgetType() )
-	    repaintSelection( (TQWidget*)opw );
+	    tqrepaintSelection( (TQWidget*)opw );
     }
     showPropertiesTimer->stop();
 //    showPropertiesTimer->start( 0, TRUE );
@@ -1700,11 +1700,11 @@ void FormWindow::currentToolChanged()
     case BUDDY_TOOL:
 	restoreConnectionLine();
 	if ( startWidget )
-	    restoreRect( TQRect( mapToForm( ( (TQWidget*)startWidget )->parentWidget(),
+	    restoreRect( TQRect( mapToForm( ( (TQWidget*)startWidget )->tqparentWidget(),
 					   ( (TQWidget*)startWidget )->pos() ),
 				( (TQWidget*)startWidget )->size() ) );
 	if ( endWidget )
-	    restoreRect( TQRect( mapToForm( ( (TQWidget*)endWidget )->parentWidget(),
+	    restoreRect( TQRect( mapToForm( ( (TQWidget*)endWidget )->tqparentWidget(),
 					   ( (TQWidget*)endWidget )->pos() ),
 				( (TQWidget*)endWidget )->size() ) );
 	endUnclippedPainter();
@@ -1735,7 +1735,7 @@ void FormWindow::currentToolChanged()
     switch ( currTool ) {
     case POINTER_TOOL:
 	if ( propertyWidget && !isMainContainer( propertyWidget ) && !isWidgetSelected( propertyWidget ) )
-	    emitShowProperties( mainContainer() );
+	    emitShowProperties( TQT_TQOBJECT(mainContainer()) );
 	restoreCursors( this, this );
 	break;
     case ORDER_TOOL:
@@ -1744,7 +1744,7 @@ void FormWindow::currentToolChanged()
 	    orderedWidgets.clear();
 	    showOrderIndicators();
 	    if ( mainWindow()->formWindow() == this )
-		emitShowProperties( mainContainer() );
+		emitShowProperties( TQT_TQOBJECT(mainContainer()) );
 	    setCursorToAll( ArrowCursor, this );
 	}
 	break;
@@ -1756,13 +1756,13 @@ void FormWindow::currentToolChanged()
 	    mainWindow()->statusMessage( i18n( "Drag a line to set a buddy...") );
 	setCursorToAll( CrossCursor, this );
 	if ( mainWindow()->formWindow() == this )
-	    emitShowProperties( mainContainer() );
+	    emitShowProperties( TQT_TQOBJECT(mainContainer()) );
 	break;
     default:
-	mainWindow()->statusMessage( i18n( "Click on the form to insert a %1..." ).arg( WidgetDatabase::toolTip( currTool ).lower() ) );
+	mainWindow()->statusMessage( i18n( "Click on the form to insert a %1..." ).tqarg( WidgetDatabase::toolTip( currTool ).lower() ) );
 	setCursorToAll( CrossCursor, this );
 	if ( mainWindow()->formWindow() == this )
-	    emitShowProperties( mainContainer() );
+	    emitShowProperties( TQT_TQOBJECT(mainContainer()) );
 	break;
     }
 }
@@ -1779,10 +1779,10 @@ void FormWindow::showOrderIndicators()
 	    TQWidget* w = (TQWidget*) o;
 	    if ( w->isShown() &&
 		 insertedWidgets[ (void*)w ]  &&
-		 w->focusPolicy() != NoFocus ) {
+		 w->focusPolicy() != TQ_NoFocus ) {
 		OrderIndicator* ind = new OrderIndicator( order++, w, this );
 		orderIndicators.append( ind );
-		if ( stackedWidgets.findRef( w ) == -1 )
+		if ( stackedWidgets.tqfindRef( w ) == -1 )
 		    stackedWidgets.append( w );
 	    }
 	}
@@ -1824,7 +1824,7 @@ bool FormWindow::checkCustomWidgets()
     TQPtrDictIterator<TQWidget> it( insertedWidgets );
     for ( ; it.current(); ++it ) {
 	if ( it.current()->isA( "CustomWidget" ) ) {
-	    TQString className = WidgetFactory::classNameOf( it.current() );
+	    TQString className = WidgetFactory::classNameOf( TQT_TQOBJECT(it.current()) );
 	    if ( !MetaDataBase::hasCustomWidget( className ) )
 		missingCustomWidgets << className;
 	}
@@ -1832,7 +1832,7 @@ bool FormWindow::checkCustomWidgets()
 
     if ( !missingCustomWidgets.isEmpty() ) {
 	TQString txt = i18n( "The following custom widgets are used in '%1',\n"
-			  "but are not known to Qt Designer:\n" ).arg( name() );
+			  "but are not known to TQt Designer:\n" ).tqarg( name() );
 	for ( TQStringList::Iterator sit = missingCustomWidgets.begin(); sit != missingCustomWidgets.end(); ++sit )
 	    txt += "   " + *sit + "\n";
 	txt += i18n( "If you save this form and generate code for it using uic, \n"
@@ -1861,7 +1861,7 @@ int FormWindow::numSelectedWidgets() const
 
 TQString FormWindow::copy()
 {
-    CHECK_MAINWINDOW_VALUE( TQString::null );
+    CHECK_MAINWINDOW_VALUE( TQString() );
     Resource resource( mainWindow() );
     resource.setWidget( this );
     return resource.copy();
@@ -1881,14 +1881,14 @@ void FormWindow::lowerWidgets()
 
 void find_accel( const TQString &txt, TQMap<TQChar, TQWidgetList > &accels, TQWidget *w )
 {
-    int i = txt.find( "&" );
+    int i = txt.tqfind( "&" );
     if ( i == -1 )
 	return;
     TQChar c = txt[ i + 1 ];
     if ( c.isNull() || c == '&' )
 	return;
     c = c.lower();
-    TQMap<TQChar, TQWidgetList >::Iterator it = accels.find( c );
+    TQMap<TQChar, TQWidgetList >::Iterator it = accels.tqfind( c );
     if ( it == accels.end() ) {
 	TQWidgetList wl;
 	wl.append( w );
@@ -1910,18 +1910,18 @@ void FormWindow::checkAccels()
 		 insertedWidgets[ (void*)o ] ) {
 		TQWidget *w = (TQWidget*)o;
 		const TQMetaProperty* text =
-		    w->metaObject()->property( w->metaObject()->findProperty( "text", TRUE ), TRUE );
+		    w->tqmetaObject()->property( w->tqmetaObject()->tqfindProperty( "text", TRUE ), TRUE );
 		const TQMetaProperty* title =
-		    w->metaObject()->property( w->metaObject()->findProperty( "title", TRUE ), TRUE );
+		    w->tqmetaObject()->property( w->tqmetaObject()->tqfindProperty( "title", TRUE ), TRUE );
 		const TQMetaProperty* pageTitle =
-		    w->metaObject()->property( w->metaObject()->findProperty( "pageTitle", TRUE ), TRUE );
+		    w->tqmetaObject()->property( w->tqmetaObject()->tqfindProperty( "pageTitle", TRUE ), TRUE );
 		if ( text )
 		    find_accel( w->property( "text" ).toString(), accels, w );
 		if ( title )
 		    find_accel( w->property( "title" ).toString(), accels, w );
 		if ( pageTitle )
 		    find_accel( w->property( "pageTitle" ).toString(), accels, w );
-	    } else if ( ::qt_cast<MenuBarEditor*>(o) ) {
+	    } else if ( ::tqqt_cast<MenuBarEditor*>(o) ) {
 		((MenuBarEditor *)o)->checkAccels( accels );
 	    }
 	}
@@ -1935,13 +1935,13 @@ void FormWindow::checkAccels()
 	    ok = FALSE;
 	    switch ( TQMessageBox::information( mainWindow(), i18n( "Check Accelerators" ),
 					       i18n( "Accelerator '%1' is used once.", "Accelerator '%1' is used %n times.", (*it).count()
-						   ).arg( it.key().upper() ),
+						   ).tqarg( it.key().upper() ),
 					       i18n( "&Select" ),
-					       i18n( "&Cancel" ), TQString::null, 2 ) ) {
+					       i18n( "&Cancel" ), TQString(), 2 ) ) {
 	    case 0: // select
 		clearSelection( FALSE );
 		for ( wid = (*it).first(); wid; wid = (*it).next() )
-		    selectWidget( wid, TRUE );
+		    selectWidget( TQT_TQOBJECT(wid), TRUE );
 		return;
 	    case 1: // cancel
 		return;
@@ -1966,12 +1966,12 @@ void FormWindow::raiseWidgets()
     commandHistory()->addCommand( cmd );
 }
 
-void FormWindow::paste( const TQString &cb, TQWidget *parent )
+void FormWindow::paste( const TQString &cb, TQWidget *tqparent )
 {
     CHECK_MAINWINDOW;
     Resource resource( mainWindow() );
     resource.setWidget( this );
-    resource.paste( cb, parent );
+    resource.paste( cb, tqparent );
 }
 
 void FormWindow::selectAll()
@@ -1983,7 +1983,7 @@ void FormWindow::selectAll()
 	for ( TQObject *o = l->first(); o; o = l->next() ) {
 	    if ( ( (TQWidget*)o )->isVisibleTo( this ) &&
 		 insertedWidgets[ (void*)o ] ) {
-		selectWidget( (TQWidget*)o );
+		selectWidget( TQT_TQOBJECT(o) );
 	    }
 	}
 	delete l;
@@ -1996,47 +1996,47 @@ void FormWindow::selectAll()
     emitSelectionChanged();
 }
 
-void FormWindow::layoutHorizontal()
+void FormWindow::tqlayoutHorizontal()
 {
     TQWidgetList widgets( selectedWidgets() );
-    LayoutHorizontalCommand *cmd = new LayoutHorizontalCommand( i18n( "Lay Out Horizontally" ),
+    LayoutHorizontalCommand *cmd = new LayoutHorizontalCommand( i18n( "Lay OutQt::Horizontally" ),
 								this, mainContainer(), 0, widgets );
     clearSelection( FALSE );
     commandHistory()->addCommand( cmd );
     cmd->execute();
 }
 
-void FormWindow::layoutVertical()
+void FormWindow::tqlayoutVertical()
 {
     TQWidgetList widgets( selectedWidgets() );
-    LayoutVerticalCommand *cmd = new LayoutVerticalCommand( i18n( "Lay Out Vertically" ),
+    LayoutVerticalCommand *cmd = new LayoutVerticalCommand( i18n( "Lay OutQt::Vertically" ),
 							    this, mainContainer(), 0, widgets );
     clearSelection( FALSE );
     commandHistory()->addCommand( cmd );
     cmd->execute();
 }
 
-void FormWindow::layoutHorizontalSplit()
+void FormWindow::tqlayoutHorizontalSplit()
 {
     TQWidgetList widgets( selectedWidgets() );
-    LayoutHorizontalSplitCommand *cmd = new LayoutHorizontalSplitCommand( i18n( "Lay Out Horizontally (in splitter)" ),
+    LayoutHorizontalSplitCommand *cmd = new LayoutHorizontalSplitCommand( i18n( "Lay OutQt::Horizontally (in splitter)" ),
 									  this, mainContainer(), 0, widgets );
     clearSelection( FALSE );
     commandHistory()->addCommand( cmd );
     cmd->execute();
 }
 
-void FormWindow::layoutVerticalSplit()
+void FormWindow::tqlayoutVerticalSplit()
 {
     TQWidgetList widgets( selectedWidgets() );
-    LayoutVerticalSplitCommand *cmd = new LayoutVerticalSplitCommand( i18n( "Lay Out Vertically (in splitter)" ),
+    LayoutVerticalSplitCommand *cmd = new LayoutVerticalSplitCommand( i18n( "Lay OutQt::Vertically (in splitter)" ),
 								      this, mainContainer(), 0, widgets );
     clearSelection( FALSE );
     commandHistory()->addCommand( cmd );
     cmd->execute();
 }
 
-void FormWindow::layoutGrid()
+void FormWindow::tqlayoutGrid()
 {
     int xres = grid().x();
     int yres = grid().y();
@@ -2049,63 +2049,63 @@ void FormWindow::layoutGrid()
     cmd->execute();
 }
 
-void FormWindow::layoutHorizontalContainer( TQWidget *w )
+void FormWindow::tqlayoutHorizontalContainer( TQWidget *w )
 {
     if ( w == this )
 	w = mainContainer();
-    TQObjectList *l = (TQObjectList*)WidgetFactory::containerOfWidget(w)->children();
-    if ( !l )
+    TQObjectList l = WidgetFactory::containerOfWidget(w)->childrenListObject();
+    if ( l.isEmpty() )
 	return;
     TQWidgetList widgets;
-    for ( TQObject *o = l->first(); o; o = l->next() ) {
+    for ( TQObject *o = l.first(); o; o = l.next() ) {
 	if ( o->isWidgetType() &&
 	     ( (TQWidget*)o )->isVisibleTo( this ) &&
-	     insertedWidgets.find( (TQWidget*)o ) )
+	     insertedWidgets.tqfind( (TQWidget*)o ) )
 	    widgets.append( (TQWidget*)o );
     }
-    LayoutHorizontalCommand *cmd = new LayoutHorizontalCommand( i18n( "Lay Out Children Horizontally" ),
+    LayoutHorizontalCommand *cmd = new LayoutHorizontalCommand( i18n( "Lay Out ChildrenQt::Horizontally" ),
 								this, mainContainer(), w, widgets );
     clearSelection( FALSE );
     commandHistory()->addCommand( cmd );
     cmd->execute();
 }
 
-void FormWindow::layoutVerticalContainer( TQWidget *w )
+void FormWindow::tqlayoutVerticalContainer( TQWidget *w )
 {
     if ( w == this )
 	w = mainContainer();
-    TQObjectList *l = (TQObjectList*)WidgetFactory::containerOfWidget(w)->children();
-    if ( !l )
+    TQObjectList l = WidgetFactory::containerOfWidget(w)->childrenListObject();
+    if ( l.isEmpty() )
 	return;
     TQWidgetList widgets;
-    for ( TQObject *o = l->first(); o; o = l->next() ) {
+    for ( TQObject *o = l.first(); o; o = l.next() ) {
 	if ( o->isWidgetType() &&
 	     ( (TQWidget*)o )->isVisibleTo( this ) &&
-	     insertedWidgets.find( (TQWidget*)o ) )
+	     insertedWidgets.tqfind( (TQWidget*)o ) )
 	    widgets.append( (TQWidget*)o );
     }
-    LayoutVerticalCommand *cmd = new LayoutVerticalCommand( i18n( "Lay Out Children Vertically" ),
+    LayoutVerticalCommand *cmd = new LayoutVerticalCommand( i18n( "Lay Out ChildrenQt::Vertically" ),
 							    this, mainContainer(), w, widgets );
     clearSelection( FALSE );
     commandHistory()->addCommand( cmd );
     cmd->execute();
 }
 
-void FormWindow::layoutGridContainer( TQWidget *w )
+void FormWindow::tqlayoutGridContainer( TQWidget *w )
 {
     if ( w == this )
 	w = mainContainer();
     int xres = grid().x();
     int yres = grid().y();
 
-    TQObjectList *l = (TQObjectList*)WidgetFactory::containerOfWidget(w)->children();
-    if ( !l )
+    TQObjectList l = WidgetFactory::containerOfWidget(w)->childrenListObject();
+    if ( l.isEmpty() )
 	return;
     TQWidgetList widgets;
-    for ( TQObject *o = l->first(); o; o = l->next() ) {
+    for ( TQObject *o = l.first(); o; o = l.next() ) {
 	if ( o->isWidgetType() &&
 	     ( (TQWidget*)o )->isVisibleTo( this ) &&
-	     insertedWidgets.find( (TQWidget*)o ) )
+	     insertedWidgets.tqfind( (TQWidget*)o ) )
 	    widgets.append( (TQWidget*)o );
     }
     LayoutGridCommand *cmd = new LayoutGridCommand( i18n( "Lay Out Children in a Grid" ),
@@ -2125,15 +2125,15 @@ void FormWindow::breakLayout( TQWidget *w )
     for (;;) {
 	if ( !w || w == this )
 	    break;
-	if ( WidgetFactory::layoutType( w ) != WidgetFactory::NoLayout &&
-	     WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( w ) ) ) ) {
+	if ( WidgetFactory::tqlayoutType( w ) != WidgetFactory::NoLayout &&
+	     WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(w) ) ) ) ) {
 	    Command *cmd = breakLayoutCommand( w );
 	    if ( cmd )
 		commands.insert( 0, cmd );
-	    if ( !::qt_cast<QLayoutWidget*>(w) && !::qt_cast<TQSplitter*>(w) )
+	    if ( !::tqqt_cast<TQLayoutWidget*>(w) && !::tqqt_cast<TQSplitter*>(w) )
 		break;
 	}
-	w = w->parentWidget();
+	w = w->tqparentWidget();
     }
 
     if ( commands.isEmpty() )
@@ -2148,16 +2148,16 @@ void FormWindow::breakLayout( TQWidget *w )
 BreakLayoutCommand *FormWindow::breakLayoutCommand( TQWidget *w )
 {
     CHECK_MAINWINDOW_VALUE( 0 );
-    TQObjectList *l = (TQObjectList*)w->children();
-    if ( !l )
+    TQObjectList l = w->childrenListObject();
+    if ( l.isEmpty() )
 	return 0;
 
     TQWidgetList widgets;
-    for ( TQObject *o = l->first(); o; o = l->next() ) {
+    for ( TQObject *o = l.first(); o; o = l.next() ) {
 	if ( o->isWidgetType() &&
-	     !mainWindow()->isAToolBarChild( (TQWidget*)o ) &&
+	     !mainWindow()->isAToolBarChild( TQT_TQOBJECT(o) ) &&
 	     ( (TQWidget*)o )->isVisibleTo( this ) &&
-	     insertedWidgets.find( (TQWidget*)o ) )
+	     insertedWidgets.tqfind( (TQWidget*)o ) )
 	    widgets.append( (TQWidget*)o );
     }
     return new BreakLayoutCommand( i18n( "Break Layout" ), this, WidgetFactory::widgetOfContainer( w ), widgets );
@@ -2190,7 +2190,7 @@ bool FormWindow::hasInsertedChildren( TQWidget *w ) const
     for ( TQObject *o = l->first(); o; o = l->next() ) {
 	if ( o->isWidgetType() &&
 	     ( (TQWidget*)o )->isVisibleTo( (FormWindow*)this ) &&
-	     insertedWidgets.find( (TQWidget*)o ) ) {
+	     insertedWidgets.tqfind( (TQWidget*)o ) ) {
 	    delete l;
 	    return TRUE;
 	}
@@ -2202,11 +2202,11 @@ bool FormWindow::hasInsertedChildren( TQWidget *w ) const
 
 bool FormWindow::allowMove( TQWidget *w )
 {
-    w = w->parentWidget();
+    w = w->tqparentWidget();
     while ( w ) {
-	if ( ( isMainContainer( w ) || insertedWidgets.find( w ) ) && WidgetFactory::layoutType( w ) == WidgetFactory::NoLayout )
+	if ( ( isMainContainer( TQT_TQOBJECT(w) ) || insertedWidgets.tqfind( w ) ) && WidgetFactory::tqlayoutType( w ) == WidgetFactory::NoLayout )
 	    return TRUE;
-	w = w->parentWidget();
+	w = w->tqparentWidget();
     }
     return FALSE;
 }
@@ -2221,7 +2221,7 @@ void FormWindow::editConnections()
 
     ConnectionDialog dlg( mainwindow );
     mainWindow()->statusMessage( i18n( "Edit connections...") );
-    dlg.addConnection( startWidget, endWidget, TQString::null, TQString::null );
+    dlg.addConnection( TQT_TQOBJECT(startWidget), TQT_TQOBJECT(endWidget), TQString(), TQString() );
     TQTimer::singleShot( 0, &dlg, TQT_SLOT(ensureConnectionVisible()) );
     dlg.exec();
 }
@@ -2239,8 +2239,8 @@ void FormWindow::restoreConnectionLine()
     if (!unclippedPainter || !buffer) // designer will occasionally crash if buffer is not tested to be non-zero
 	return;
 
-    int a =QABS( startPos.x() - currentPos.x() );
-    int b = QABS( startPos.y() - currentPos.y() );
+    int a =TQABS( startPos.x() - currentPos.x() );
+    int b = TQABS( startPos.y() - currentPos.y() );
     TQRect r( startPos, currentPos );
 
     if ( a < 32 || b < 32 ) { // special case: vertical or horizontal line
@@ -2280,7 +2280,7 @@ void FormWindow::restoreConnectionLine()
 
     w = h = 64;
     r = r.normalize();
-    while ( r.contains( p ) ) {
+    while ( r.tqcontains( p ) ) {
 	unclippedPainter->drawPixmap( p, *buffer, TQRect( p, TQSize( w, h ) ) );
 	unclippedPainter->setPen( red );
 	p.setX( p.x() + dx );
@@ -2361,7 +2361,7 @@ bool FormWindow::unify( TQObject *w, TQString &s, bool changeIt )
 	int num  = 1;
 	TQPtrDictIterator<TQWidget> it( insertedWidgets );
 	for ( ; it.current();) {
-	    if ( it.current() != w &&
+	    if ( TQT_BASE_OBJECT(it.current()) != TQT_BASE_OBJECT(w) &&
 		 qstrcmp( it.current()->name(), s.latin1() ) == 0 ) {
 		found = TRUE;
 		if ( !changeIt )
@@ -2393,7 +2393,7 @@ bool FormWindow::unify( TQObject *w, TQString &s, bool changeIt )
 		}
 	    }
 	}
-	if ( ::qt_cast<TQMainWindow*>(mainContainer()) && !found ) {
+	if ( ::tqqt_cast<TQMainWindow*>(mainContainer()) && !found ) {
 	    TQObjectList *l = mainContainer()->queryList( "PopupMenuEditor" );
 	    for ( TQObject *o = l->first(); o; o = l->next() ) {
 		if ( o != w &&
@@ -2407,7 +2407,7 @@ bool FormWindow::unify( TQObject *w, TQString &s, bool changeIt )
 	    }
 	    delete l;
 	}
-	if ( ::qt_cast<TQMainWindow*>(mainContainer()) ) {
+	if ( ::tqqt_cast<TQMainWindow*>(mainContainer()) ) {
 	    if ( !found ) {
 		TQObjectList *l = mainContainer()->queryList( TQDOCKWINDOW_OBJECT_NAME_STRING, 0, TRUE );
 		for ( TQObject *o = l->first(); o; o = l->next() ) {
@@ -2435,7 +2435,7 @@ bool FormWindow::isCustomWidgetUsed( MetaDataBase::CustomWidget *w )
     TQPtrDictIterator<TQWidget> it( insertedWidgets );
     for ( ; it.current(); ++it ) {
 	if ( it.current()->isA( "CustomWidget" ) ) {
-	    if ( qstrcmp( WidgetFactory::classNameOf( it.current() ), w->className.utf8() ) == 0 )
+	    if ( qstrcmp( WidgetFactory::classNameOf( TQT_TQOBJECT(it.current()) ), w->className.utf8() ) == 0 )
 		return TRUE;
 	}
     }
@@ -2445,13 +2445,13 @@ bool FormWindow::isCustomWidgetUsed( MetaDataBase::CustomWidget *w )
 
 bool FormWindow::isDatabaseWidgetUsed() const
 {
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     TQStringList dbClasses;
     dbClasses << TQDATATABLE_OBJECT_NAME_STRING; // add more here
     TQPtrDictIterator<TQWidget> it( insertedWidgets );
     for ( ; it.current(); ++it ) {
 	TQString c( it.current()->className() );
-	if ( dbClasses.contains( c ) > 0 ) {
+	if ( dbClasses.tqcontains( c ) > 0 ) {
 	    return TRUE;
 	}
     }
@@ -2461,8 +2461,8 @@ bool FormWindow::isDatabaseWidgetUsed() const
 
 bool FormWindow::isDatabaseAware() const
 {
-#ifndef QT_NO_SQL
-    if ( TQString(mContainer->className()) == "QDesignerDataBrowser" || TQString(mContainer->className()) == "QDesignerDataView" )
+#ifndef TQT_NO_SQL
+    if ( TQString(mContainer->className()) == "TQDesignerDataBrowser" || TQString(mContainer->className()) == "TQDesignerDataView" )
 	return TRUE;
     return isDatabaseWidgetUsed();
 #else
@@ -2473,7 +2473,7 @@ bool FormWindow::isDatabaseAware() const
 void FormWindow::visibilityChanged()
 {
     if ( currTool != ORDER_TOOL ) {
-	emitUpdateProperties( currentWidget() );
+	emitUpdateProperties( TQT_TQOBJECT(currentWidget()) );
     } else {
 	updateOrderIndicators();
 	repositionOrderIndicators();
@@ -2491,9 +2491,9 @@ TQPoint FormWindow::mapToForm( const TQWidget* w, const TQPoint&  pos ) const
 {
     TQPoint p = pos;
     const TQWidget* i = w;
-    while ( i && !i->isTopLevel() && !isMainContainer( (TQWidget*)i ) ) {
+    while ( i && !i->isTopLevel() && !isMainContainer( TQT_TQOBJECT(const_cast<TQWidget*>(i)) ) ) {
 	p = i->mapToParent( p );
-	i = i->parentWidget();
+	i = i->tqparentWidget();
     }
     return mapFromGlobal( w->mapToGlobal( pos ) );
 }
@@ -2503,7 +2503,7 @@ static int widgetDepth( TQWidget *w )
     int d = -1;
     while ( w && !w->isTopLevel() ) {
 	d++;
-	w = w->parentWidget();
+	w = w->tqparentWidget();
     }
 
     return d;
@@ -2514,7 +2514,7 @@ static bool isChildOf( TQWidget *c, TQWidget *p )
     while ( c && !c->isTopLevel() ) {
 	if ( c == p )
 	    return TRUE;
-	c = c->parentWidget();
+	c = c->tqparentWidget();
     }
     return FALSE;
 }
@@ -2525,36 +2525,36 @@ TQWidget *FormWindow::containerAt( const TQPoint &pos, TQWidget *notParentOf )
     TQWidget *container = 0;
     int depth = -1;
     TQWidgetList selected = selectedWidgets();
-    if ( rect().contains( mapFromGlobal( pos ) ) ) {
+    if ( TQT_TQRECT_OBJECT(rect()).tqcontains( mapFromGlobal( pos ) ) ) {
 	container = mainContainer();
 	depth = widgetDepth( container );
     }
 
     for ( ; it.current(); ++it ) {
-	if ( ::qt_cast<QLayoutWidget*>(it.current())
-	  || ::qt_cast<TQSplitter*>(it.current()) )
+	if ( ::tqqt_cast<TQLayoutWidget*>(it.current())
+	  || ::tqqt_cast<TQSplitter*>(it.current()) )
 	    continue;
 	if ( !it.current()->isVisibleTo( this ) )
 	    continue;
-	if ( selected.find( it.current() ) != -1 )
+	if ( selected.tqfind( it.current() ) != -1 )
 	    continue;
-	if ( !WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( it.current() ) ) ) &&
+	if ( !WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(it.current()) ) ) ) &&
 	     it.current() != mainContainer() )
 	    continue;
 
 	// the rectangles of all ancestors of the container must contain the insert position
 	TQWidget *w = it.current();
 	while ( w && !w->isTopLevel() ) {
-	    if ( !w->rect().contains( ( w->mapFromGlobal( pos ) ) ) )
+	    if ( !TQT_TQRECT_OBJECT(w->rect()).tqcontains( ( w->mapFromGlobal( pos ) ) ) )
 		break;
-	    w = w->parentWidget();
+	    w = w->tqparentWidget();
 	}
 	if ( !( w == 0 || w->isTopLevel() ) ) continue; // we did not get through the full while loop
 
 	int wd = widgetDepth( it.current() );
 	if ( wd == depth && container ) {
-	    if ( ( (TQObjectList*)it.current()->parentWidget()->children() )->find( it.current() ) >
-		 ( (TQObjectList*)container->parentWidget()->children() )->find( container ) )
+	    if ( ( it.current()->tqparentWidget()->childrenListObject() ).tqfind( TQT_TQOBJECT(it.current()) ) >
+		 ( container->tqparentWidget()->childrenListObject() ).tqfind( TQT_TQOBJECT(container) ) )
 		wd++;
 	}
 	if ( wd > depth && !isChildOf( it.current(), notParentOf ) ) {
@@ -2568,7 +2568,7 @@ TQWidget *FormWindow::containerAt( const TQPoint &pos, TQWidget *notParentOf )
 
 bool FormWindow::isMainContainer( TQObject *w ) const
 {
-    return w && w->isWidgetType() && ( w == (TQWidget*)this || w == mainContainer() );
+    return w && w->isWidgetType() && ( TQT_BASE_OBJECT(w) == this || TQT_BASE_OBJECT(w) == mainContainer() );
 }
 
 void FormWindow::setMainContainer( TQWidget *w )
@@ -2576,34 +2576,34 @@ void FormWindow::setMainContainer( TQWidget *w )
     bool resetPropertyWidget = isMainContainer( propertyWidget );
     if ( mContainer )
 	insertedWidgets.remove( mContainer );
-    if ( propertyWidget == mContainer )
+    if ( TQT_BASE_OBJECT(propertyWidget) == TQT_BASE_OBJECT(mContainer) )
 	propertyWidget = 0;
     delete mContainer;
     mContainer = w;
     insertedWidgets.insert( mContainer, mContainer );
-    delete layout();
+    delete tqlayout();
     TQHBoxLayout *l = new TQHBoxLayout( this );
     l->addWidget( w );
     if ( resetPropertyWidget ) {
 	TQObject *opw = propertyWidget;
-	propertyWidget = mContainer;
+	propertyWidget = TQT_TQOBJECT(mContainer);
 	if ( opw && opw->isWidgetType() )
-	    repaintSelection( (TQWidget*)opw );
+	    tqrepaintSelection( (TQWidget*)opw );
     }
     if ( project() ) {
 	LanguageInterface *iface = MetaDataBase::languageInterface( project()->language() );
 	if ( iface && !project()->isCpp() && !isFake() ) {
-	    if ( !MetaDataBase::hasFunction( this, "init()" ) )
-		MetaDataBase::addFunction( this, "init()", "", "private", "function",
+	    if ( !MetaDataBase::hasFunction( TQT_TQOBJECT(this), "init()" ) )
+		MetaDataBase::addFunction( TQT_TQOBJECT(this), "init()", "", "private", "function",
 					   project()->language(), "void" );
-	    if ( !MetaDataBase::hasFunction( this, "destroy()" ) )
-		MetaDataBase::addFunction( this, "destroy()", "", "private", "function",
+	    if ( !MetaDataBase::hasFunction( TQT_TQOBJECT(this), "destroy()" ) )
+		MetaDataBase::addFunction( TQT_TQOBJECT(this), "destroy()", "", "private", "function",
 					   project()->language(), "void" );
-	    if ( !MetaDataBase::hasConnection( this, mainContainer(), "shown()", mainContainer(), "init" ) )
-		MetaDataBase::addConnection( this, mainContainer(), "shown()", mainContainer(), "init" );
-	    if ( !MetaDataBase::hasConnection( this, mainContainer(), "destroyed()", mainContainer(), "destroy"  ) )
-		MetaDataBase::addConnection( this, mainContainer(), "destroyed()",
-					     mainContainer(), "destroy" );
+	    if ( !MetaDataBase::hasConnection( TQT_TQOBJECT(this), TQT_TQOBJECT(mainContainer()), "shown()", TQT_TQOBJECT(mainContainer()), "init" ) )
+		MetaDataBase::addConnection( TQT_TQOBJECT(this), TQT_TQOBJECT(mainContainer()), "shown()", TQT_TQOBJECT(mainContainer()), "init" );
+	    if ( !MetaDataBase::hasConnection( TQT_TQOBJECT(this), TQT_TQOBJECT(mainContainer()), "destroyed()", TQT_TQOBJECT(mainContainer()), "destroy"  ) )
+		MetaDataBase::addConnection( TQT_TQOBJECT(this), TQT_TQOBJECT(mainContainer()), "destroyed()",
+					     TQT_TQOBJECT(mainContainer()), "destroy" );
 	}
     }
 }
@@ -2689,17 +2689,17 @@ DesignerFormWindow *FormWindow::iFace()
 
 bool FormWindow::isCentralWidget( TQObject *w ) const
 {
-    if ( !::qt_cast<TQMainWindow*>(mainContainer()) )
+    if ( !::tqqt_cast<TQMainWindow*>(mainContainer()) )
 	return FALSE;
-    return w == ( (TQMainWindow*)mainContainer() )->centralWidget();
+    return TQT_BASE_OBJECT(w) == TQT_BASE_OBJECT(( (TQMainWindow*)mainContainer() )->centralWidget());
 }
 
-int FormWindow::layoutDefaultSpacing() const
+int FormWindow::tqlayoutDefaultSpacing() const
 {
     return defSpacing;
 }
 
-int FormWindow::layoutDefaultMargin() const
+int FormWindow::tqlayoutDefaultMargin() const
 {
     return defMargin;
 }
@@ -2758,17 +2758,15 @@ void FormWindow::setFormFile( FormFile *f )
 
 bool FormWindow::canBeBuddy( const TQWidget *w ) const
 {
-    return w->focusPolicy() != TQWidget::NoFocus;
+    return w->focusPolicy() != TQ_NoFocus;
 }
 
 bool FormWindow::event( TQEvent *e )
 {
     if (e->type() == TQEvent::ShowMaximized)
     {
-#if QT_VERSION >= 0x030300
         if ( isMaximized() )
             setWindowState( windowState() & ~WindowMaximized | WindowActive);
-#endif
         return true;
     }
     return TQWidget::event(e);
diff --git a/kdevdesigner/designer/formwindow.h b/kdevdesigner/designer/formwindow.h
index c241621b..e6d9c65e 100644
--- a/kdevdesigner/designer/formwindow.h
+++ b/kdevdesigner/designer/formwindow.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -56,20 +56,21 @@ class Project;
 struct DesignerFormWindow;
 class FormFile;
 
-#if defined(Q_CC_MSVC) || defined(Q_FULL_TEMPLATE_INSTANTIATION)
+#if defined(TQ_CC_MSVC) || defined(TQ_FULL_TEMPLATE_INSTANTIATION)
 #include "orderindicator.h"
 #else
 class OrderIndicator;
 #endif
 
-class FormWindow : public QWidget
+class FormWindow : public TQWidget
 {
     Q_OBJECT
-    Q_PROPERTY( TQString fileName READ fileName WRITE setFileName )
+  TQ_OBJECT
+    TQ_PROPERTY( TQString fileName READ fileName WRITE setFileName )
 
 public:
-    FormWindow( FormFile *f, MainWindow *mw, TQWidget *parent, const char *name = 0 );
-    FormWindow( FormFile *f, TQWidget *parent, const char *name = 0 );
+    FormWindow( FormFile *f, MainWindow *mw, TQWidget *tqparent, const char *name = 0 );
+    FormWindow( FormFile *f, TQWidget *tqparent, const char *name = 0 );
     ~FormWindow();
 
     void init();
@@ -86,20 +87,20 @@ public:
     virtual void undo();
     virtual void redo();
     virtual TQString copy();
-    virtual void paste( const TQString &cb, TQWidget *parent );
+    virtual void paste( const TQString &cb, TQWidget *tqparent );
     virtual void lowerWidgets();
     virtual void raiseWidgets();
     virtual void checkAccels();
 
-    virtual void layoutHorizontal();
-    virtual void layoutVertical();
-    virtual void layoutHorizontalSplit();
-    virtual void layoutVerticalSplit();
-    virtual void layoutGrid();
+    virtual void tqlayoutHorizontal();
+    virtual void tqlayoutVertical();
+    virtual void tqlayoutHorizontalSplit();
+    virtual void tqlayoutVerticalSplit();
+    virtual void tqlayoutGrid();
 
-    virtual void layoutHorizontalContainer( TQWidget *w );
-    virtual void layoutVerticalContainer( TQWidget *w );
-    virtual void layoutGridContainer( TQWidget *w );
+    virtual void tqlayoutHorizontalContainer( TQWidget *w );
+    virtual void tqlayoutVerticalContainer( TQWidget *w );
+    virtual void tqlayoutGridContainer( TQWidget *w );
 
     virtual void breakLayout( TQWidget *w );
 
@@ -107,7 +108,7 @@ public:
     virtual void selectAll();
     virtual void updateSelection( TQWidget *w );
     virtual void raiseSelection( TQWidget *w );
-    virtual void repaintSelection( TQWidget *w );
+    virtual void tqrepaintSelection( TQWidget *w );
     virtual void clearSelection( bool changePropertyDisplay = TRUE );
     virtual void selectWidgets();
     bool isWidgetSelected( TQObject *w );
@@ -191,8 +192,8 @@ public:
 
     DesignerFormWindow *iFace();
 
-    int layoutDefaultSpacing() const;
-    int layoutDefaultMargin() const;
+    int tqlayoutDefaultSpacing() const;
+    int tqlayoutDefaultMargin() const;
     void setLayoutDefaultSpacing( int s );
     void setLayoutDefaultMargin( int s );
     TQString spacingFunction() const;
diff --git a/kdevdesigner/designer/gotolinedialog.ui b/kdevdesigner/designer/gotolinedialog.ui
index f2acf011..dbd319c8 100644
--- a/kdevdesigner/designer/gotolinedialog.ui
+++ b/kdevdesigner/designer/gotolinedialog.ui
@@ -29,8 +29,8 @@
 <include location="local" implDecl="in declaration">gotolinedialog.ui.h</include>
 <forward>struct EditorInterface;</forward>
 <variable>EditorInterface *editor;</variable>
-<layoutdefaults spacing="6" margin="11"/>
-<widget class="QDialog">
+<tqlayoutdefaults spacing="6" margin="11"/>
+<widget class="TQDialog">
     <property name="name">
         <cstring>GotoLineDialog</cstring>
     </property>
@@ -55,7 +55,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QLabel" row="0" column="0">
+        <widget class="TQLabel" row="0" column="0">
             <property name="name">
                 <cstring>TextLabel1</cstring>
             </property>
@@ -66,7 +66,7 @@
                 <cstring>spinLine</cstring>
             </property>
         </widget>
-        <widget class="QSpinBox" row="0" column="1">
+        <widget class="TQSpinBox" row="0" column="1">
             <property name="name">
                 <cstring>spinLine</cstring>
             </property>
@@ -77,7 +77,7 @@
                 </sizepolicy>
             </property>
         </widget>
-        <widget class="QLayoutWidget" row="2" column="0" rowspan="1" colspan="2">
+        <widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>Layout1</cstring>
             </property>
@@ -101,14 +101,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>PushButton2</cstring>
                     </property>
@@ -119,7 +119,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>PushButton1</cstring>
                     </property>
@@ -139,7 +139,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
diff --git a/kdevdesigner/designer/gotolinedialog.ui.h b/kdevdesigner/designer/gotolinedialog.ui.h
index 9ee0ef39..4ddf4114 100644
--- a/kdevdesigner/designer/gotolinedialog.ui.h
+++ b/kdevdesigner/designer/gotolinedialog.ui.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2001 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
diff --git a/kdevdesigner/designer/hierarchyview.cpp b/kdevdesigner/designer/hierarchyview.cpp
index bda24784..7428e883 100644
--- a/kdevdesigner/designer/hierarchyview.cpp
+++ b/kdevdesigner/designer/hierarchyview.cpp
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000-2001 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -66,17 +66,17 @@
 
 TQListViewItem *newItem = 0;
 
-static QPluginManager<ClassBrowserInterface> *classBrowserInterfaceManager = 0;
+static TQPluginManager<ClassBrowserInterface> *classBrowserInterfaceManager = 0;
 
-HierarchyItem::HierarchyItem( Type type, TQListViewItem *parent, TQListViewItem *after,
+HierarchyItem::HierarchyItem( Type type, TQListViewItem *tqparent, TQListViewItem *after,
 			      const TQString &txt1, const TQString &txt2, const TQString &txt3 )
-    : TQListViewItem( parent, after, txt1, txt2, txt3 ), typ( type )
+    : TQListViewItem( tqparent, after, txt1, txt2, txt3 ), typ( type )
 {
 }
 
-HierarchyItem::HierarchyItem( Type type, TQListView *parent, TQListViewItem *after,
+HierarchyItem::HierarchyItem( Type type, TQListView *tqparent, TQListViewItem *after,
 			      const TQString &txt1, const TQString &txt2, const TQString &txt3 )
-    : TQListViewItem( parent, after, txt1, txt2, txt3 ), typ( type )
+    : TQListViewItem( tqparent, after, txt1, txt2, txt3 ), typ( type )
 {
 }
 
@@ -84,8 +84,8 @@ void HierarchyItem::paintCell( TQPainter *p, const TQColorGroup &cg, int column,
 {
     TQColorGroup g( cg );
     g.setColor( TQColorGroup::Base, backgroundColor() );
-    g.setColor( TQColorGroup::Foreground, Qt::black );
-    g.setColor( TQColorGroup::Text, Qt::black );
+    g.setColor( TQColorGroup::Foreground, TQt::black );
+    g.setColor( TQColorGroup::Text, TQt::black );
     TQString txt = text( 0 );
     if ( rtti() == Function &&
 	 MainWindow::self->currProject()->isCpp() &&
@@ -172,8 +172,8 @@ void HierarchyItem::cancelRename( int col )
 
 
 
-HierarchyList::HierarchyList( TQWidget *parent, FormWindow *fw, bool doConnects )
-    : TQListView( parent ), formWindow( fw )
+HierarchyList::HierarchyList( TQWidget *tqparent, FormWindow *fw, bool doConnects )
+    : TQListView( tqparent ), formWindow( fw )
 {
     DesignerFormPix = SmallIcon( "designer_form.png" , KDevDesignerPartFactory::instance());
     DesignerLayoutPix = SmallIcon( "designer_layout.png" , KDevDesignerPartFactory::instance());
@@ -249,39 +249,39 @@ TQObject *HierarchyList::handleObjectClick( TQListViewItem *i )
     TQObject *o = findObject( i );
     if ( !o )
 	return 0;
-    if ( formWindow == o ) {
+    if ( TQT_BASE_OBJECT(formWindow) == TQT_BASE_OBJECT(o) ) {
 	if ( deselect )
 	    formWindow->clearSelection( FALSE );
-	formWindow->emitShowProperties( formWindow );
+	formWindow->emitShowProperties( TQT_TQOBJECT(formWindow) );
 	return 0;
     }
     if ( o->isWidgetType() ) {
 	TQWidget *w = (TQWidget*)o;
-	if ( !formWindow->widgets()->find( w ) ) {
-	    if ( ::qt_cast<TQWidgetStack*>(w->parent()) ) {
-		if (::qt_cast<TQTabWidget*>(w->parent()->parent()) ) {
-		    ((TQTabWidget*)w->parent()->parent())->showPage( w );
-		    o = (TQWidget*)w->parent()->parent();
-		    formWindow->emitUpdateProperties( formWindow->currentWidget() );
-		} else if ( ::qt_cast<TQWizard*>(w->parent()->parent()) ) {
-		    ((QDesignerWizard*)w->parent()->parent())->
-			setCurrentPage( ( (QDesignerWizard*)w->parent()->parent() )->pageNum( w ) );
-		    o = (TQWidget*)w->parent()->parent();
-		    formWindow->emitUpdateProperties( formWindow->currentWidget() );
+	if ( !formWindow->widgets()->tqfind( w ) ) {
+	    if ( ::tqqt_cast<TQWidgetStack*>(w->tqparent()) ) {
+		if (::tqqt_cast<TQTabWidget*>(w->tqparent()->tqparent()) ) {
+		    ((TQTabWidget*)w->tqparent()->tqparent())->showPage( w );
+		    o = TQT_TQOBJECT((TQWidget*)w->tqparent()->tqparent());
+		    formWindow->emitUpdateProperties( TQT_TQOBJECT(formWindow->currentWidget()) );
+		} else if ( ::tqqt_cast<TQWizard*>(w->tqparent()->tqparent()) ) {
+		    ((TQDesignerWizard*)w->tqparent()->tqparent())->
+			setCurrentPage( ( (TQDesignerWizard*)w->tqparent()->tqparent() )->pageNum( w ) );
+		    o = TQT_TQOBJECT((TQWidget*)w->tqparent()->tqparent());
+		    formWindow->emitUpdateProperties( TQT_TQOBJECT(formWindow->currentWidget()) );
 		} else {
-		    ( (TQWidgetStack*)w->parent() )->raiseWidget( w );
-		    if ( (TQWidgetStack*)w->parent()->isA( "QDesignerWidgetStack" ) )
-			( (QDesignerWidgetStack*)w->parent() )->updateButtons();
+		    ( (TQWidgetStack*)w->tqparent() )->raiseWidget( w );
+		    if ( (TQWidgetStack*)w->tqparent()->isA( "TQDesignerWidgetStack" ) )
+			( (TQDesignerWidgetStack*)w->tqparent() )->updateButtons();
 		}
-	    } else if ( ::qt_cast<TQMenuBar*>(w) || ::qt_cast<TQDockWindow*>(w) ) {
-		formWindow->setActiveObject( w );
-	    } else if ( ::qt_cast<TQPopupMenu*>(w) ) {
+	    } else if ( ::tqqt_cast<TQMenuBar*>(w) || ::tqqt_cast<TQDockWindow*>(w) ) {
+		formWindow->setActiveObject( TQT_TQOBJECT(w) );
+	    } else if ( ::tqqt_cast<TQPopupMenu*>(w) ) {
 		return 0; // ### we could try to find our menu bar and change the currentMenu to our index
 	    } else {
 		return 0;
 	    }
 	}
-    } else if ( ::qt_cast<TQAction*>(o) ) {
+    } else if ( ::tqqt_cast<TQAction*>(o) ) {
 	MainWindow::self->actioneditor()->setCurrentAction( (TQAction*)o );
 	deselect = TRUE;
     }
@@ -300,10 +300,10 @@ void HierarchyList::objectDoubleClicked( TQListViewItem *i )
 	return;
     if ( o->isWidgetType() && ( (TQWidget*)o )->isVisibleTo( formWindow ) ) {
 	TQWidget *w = (TQWidget*)o;
-	if ( !w->parentWidget() ||
-	     WidgetFactory::layoutType( w->parentWidget() ) == WidgetFactory::NoLayout )
+	if ( !w->tqparentWidget() ||
+	     WidgetFactory::tqlayoutType( w->tqparentWidget() ) == WidgetFactory::NoLayout )
 	    w->raise();
-	formWindow->selectWidget( w, TRUE );
+	formWindow->selectWidget( TQT_TQOBJECT(w), TRUE );
     }
 }
 
@@ -314,7 +314,7 @@ void HierarchyList::objectClicked( TQListViewItem *i )
 	return;
     if ( o->isWidgetType() && ( (TQWidget*)o )->isVisibleTo( formWindow ) ) {
 	TQWidget *w = (TQWidget*)o;
-	formWindow->selectWidget( w, TRUE );
+	formWindow->selectWidget( TQT_TQOBJECT(w), TRUE );
     }
 }
 
@@ -352,7 +352,7 @@ void HierarchyList::changeNameOf( TQObject *o, const TQString &name )
 
 void HierarchyList::changeDatabaseOf( TQObject *o, const TQString &info )
 {
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     if ( !formWindow->isDatabaseAware() )
 	return;
     TQListViewItem *item = findItem( o );
@@ -370,7 +370,7 @@ void HierarchyList::setup()
 	return;
     clear();
     TQWidget *w = formWindow->mainContainer();
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     if ( formWindow->isDatabaseAware() ) {
 	if ( columns() == 2 ) {
 	    addColumn( i18n( "Database" ) );
@@ -388,7 +388,7 @@ void HierarchyList::setup()
     if ( !widgetStacks )
 	widgetStacks = new TQPtrList<TQWidgetStack>;
     if ( w )
-	insertObject( w, 0 );
+	insertObject( TQT_TQOBJECT(w), 0 );
     widgetStacks->clear();
 }
 
@@ -397,13 +397,13 @@ void HierarchyList::setOpen( TQListViewItem *i, bool b )
     TQListView::setOpen( i, b );
 }
 
-void HierarchyList::insertObject( TQObject *o, TQListViewItem *parent )
+void HierarchyList::insertObject( TQObject *o, TQListViewItem *tqparent )
 {
     if ( TQString( o->name() ).startsWith( "qt_dead_widget_" ) )
 	return;
     bool fakeMainWindow = FALSE;
-    if ( ::qt_cast<TQMainWindow*>(o) ) {
-	TQObject *cw = ( (TQMainWindow*)o )->centralWidget();
+    if ( ::tqqt_cast<TQMainWindow*>(o) ) {
+	TQObject *cw = TQT_TQOBJECT(( (TQMainWindow*)o )->centralWidget());
 	if ( cw ) {
 	    o = cw;
 	    fakeMainWindow = TRUE;
@@ -411,8 +411,8 @@ void HierarchyList::insertObject( TQObject *o, TQListViewItem *parent )
     }
     TQListViewItem *item = 0;
     TQString className = WidgetFactory::classNameOf( o );
-    if ( ::qt_cast<QLayoutWidget*>(o) ) {
-	switch ( WidgetFactory::layoutType( (TQWidget*)o ) ) {
+    if ( ::tqqt_cast<TQLayoutWidget*>(o) ) {
+	switch ( WidgetFactory::tqlayoutType( (TQWidget*)o ) ) {
 	case WidgetFactory::HBox:
 	    className = "HBox";
 	    break;
@@ -428,73 +428,73 @@ void HierarchyList::insertObject( TQObject *o, TQListViewItem *parent )
     }
 
     TQString dbInfo;
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     dbInfo = MetaDataBase::fakeProperty( o, "database" ).toStringList().join(".");
 #endif
 
     TQString name = o->name();
-    if ( ::qt_cast<TQWidgetStack*>(o->parent()) ) {
-	if ( ::qt_cast<TQTabWidget*>(o->parent()->parent()) )
-	    name = ( (TQTabWidget*)o->parent()->parent() )->tabLabel( (TQWidget*)o );
-	else if ( ::qt_cast<TQWizard*>(o->parent()->parent()) )
-	    name = ( (TQWizard*)o->parent()->parent() )->title( (TQWidget*)o );
+    if ( ::tqqt_cast<TQWidgetStack*>(o->tqparent()) ) {
+	if ( ::tqqt_cast<TQTabWidget*>(o->tqparent()->tqparent()) )
+	    name = ( (TQTabWidget*)o->tqparent()->tqparent() )->tabLabel( (TQWidget*)o );
+	else if ( ::tqqt_cast<TQWizard*>(o->tqparent()->tqparent()) )
+	    name = ( (TQWizard*)o->tqparent()->tqparent() )->title( (TQWidget*)o );
     }
 
     TQToolBox *tb;
-    if ( o->parent() && o->parent()->parent() &&
-	 (tb = ::qt_cast<TQToolBox*>(o->parent()->parent()->parent())) )
+    if ( o->tqparent() && o->tqparent()->tqparent() &&
+	 (tb = ::tqqt_cast<TQToolBox*>(o->tqparent()->tqparent()->tqparent())) )
 	name = tb->itemLabel( tb->indexOf((TQWidget*)o) );
 
     if ( fakeMainWindow ) {
-	name = o->parent()->name();
+	name = o->tqparent()->name();
 	className = TQMAINWINDOW_OBJECT_NAME_STRING;
     }
 
-    if ( !parent )
+    if ( !tqparent )
 	item = new HierarchyItem( HierarchyItem::Widget, this, 0, name, className, dbInfo );
     else
-	item = new HierarchyItem( HierarchyItem::Widget, parent, 0, name, className, dbInfo );
+	item = new HierarchyItem( HierarchyItem::Widget, tqparent, 0, name, className, dbInfo );
     item->setOpen( TRUE );
-    if ( !parent )
+    if ( !tqparent )
 	item->setPixmap( 0, DesignerFormPix );
-    else if ( ::qt_cast<QLayoutWidget*>(o) )
+    else if ( ::tqqt_cast<TQLayoutWidget*>(o) )
 	item->setPixmap( 0, DesignerLayoutPix );
     else
 	item->setPixmap( 0, WidgetDatabase::iconSet(
 		    WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( o ) ) ).
 			 pixmap( TQIconSet::Small, TQIconSet::Normal ) );
-    if ( ::qt_cast<TQAction*>(o) )
+    if ( ::tqqt_cast<TQAction*>(o) )
 	item->setPixmap( 0, ( (TQAction*)o )->iconSet().pixmap() );
 
     ( (HierarchyItem*)item )->setObject( o );
-    const TQObjectList *l = o->children();
-    if ( ::qt_cast<QDesignerToolBar*>(o) )
-	l = 0;
-    if ( l ) {
-	TQObjectListIt it( *l );
+    TQObjectList l = o->childrenListObject();
+    if ( ::tqqt_cast<TQDesignerToolBar*>(o) )
+	l.clear();
+    if ( !l.isEmpty() ) {
+	TQObjectListIt it( l );
 	it.toLast();
 	for ( ; it.current(); --it ) {
 	    if ( !it.current()->isWidgetType() ||
 		 ( (TQWidget*)it.current() )->isHidden() )
 		continue;
-	    if ( !formWindow->widgets()->find( (TQWidget*)it.current() ) ) {
-		if ( ::qt_cast<TQWidgetStack*>(it.current()->parent()) ||
-		     ::qt_cast<TQWidgetStack*>(it.current()) ) {
+	    if ( !formWindow->widgets()->tqfind( (TQWidget*)it.current() ) ) {
+		if ( ::tqqt_cast<TQWidgetStack*>(it.current()->tqparent()) ||
+		     ::tqqt_cast<TQWidgetStack*>(it.current()) ) {
 		    TQObject *obj = it.current();
-		    QDesignerTabWidget *tw = ::qt_cast<QDesignerTabWidget*>(it.current()->parent());
-		    QDesignerWizard *dw = ::qt_cast<QDesignerWizard*>(it.current()->parent());
+		    TQDesignerTabWidget *tw = ::tqqt_cast<TQDesignerTabWidget*>(it.current()->tqparent());
+		    TQDesignerWizard *dw = ::tqqt_cast<TQDesignerWizard*>(it.current()->tqparent());
 		    TQWidgetStack *stack = 0;
-		    if ( dw || tw || ::qt_cast<TQWidgetStack*>(obj) )
+		    if ( dw || tw || ::tqqt_cast<TQWidgetStack*>(obj) )
 			stack = (TQWidgetStack*)obj;
 		    else
-			stack = (TQWidgetStack*)obj->parent();
-		    if ( widgetStacks->findRef( stack ) != -1 )
+			stack = (TQWidgetStack*)obj->tqparent();
+		    if ( widgetStacks->tqfindRef( stack ) != -1 )
 			continue;
 		    widgetStacks->append( stack );
 		    TQObjectList *l2 = stack->queryList( TQWIDGET_OBJECT_NAME_STRING, 0, TRUE, FALSE );
 		    for ( obj = l2->last(); obj; obj = l2->prev() ) {
 			if ( qstrcmp( obj->className(),
-				      "QWidgetStackPrivate::Invisible" ) == 0 ||
+				      "TQWidgetStackPrivate::Invisible" ) == 0 ||
 			     ( tw && !tw->tabBar()->tab( stack->id( (TQWidget*)obj ) ) ) ||
 			     ( dw && dw->isPageRemoved( (TQWidget*)obj ) ) )
 			    continue;
@@ -505,12 +505,12 @@ void HierarchyList::insertObject( TQObject *o, TQListViewItem *parent )
 			insertObject( obj, item );
 		    }
 		    delete l2;
-		} else if ( ::qt_cast<TQToolBox*>(it.current()->parent()) ) {
-		    if ( !::qt_cast<TQScrollView*>(it.current()) )
+		} else if ( ::tqqt_cast<TQToolBox*>(it.current()->tqparent()) ) {
+		    if ( !::tqqt_cast<TQScrollView*>(it.current()) )
 			continue;
-		    TQToolBox *tb = (TQToolBox*)it.current()->parent();
+		    TQToolBox *tb = (TQToolBox*)it.current()->tqparent();
 		    for ( int i = tb->count() - 1; i >= 0; --i )
-			insertObject( tb->item( i ), item );
+			insertObject( TQT_TQOBJECT(tb->item( i )), item );
 		}
 		continue;
 	    }
@@ -519,19 +519,19 @@ void HierarchyList::insertObject( TQObject *o, TQListViewItem *parent )
     }
 
     if ( fakeMainWindow ) {
-	TQObjectList *l = o->parent()->queryList( "QDesignerToolBar" );
+	TQObjectList *l = o->tqparent()->queryList( "TQDesignerToolBar" );
 	TQObject *obj;
 	for ( obj = l->first(); obj; obj = l->next() )
 	    insertObject( obj, item );
 	delete l;
-	l = o->parent()->queryList( "MenuBarEditor" );
+	l = o->tqparent()->queryList( "MenuBarEditor" );
 	for ( obj = l->first(); obj; obj = l->next() )
 	    insertObject( obj, item );
 	delete l;
-    } else if ( ::qt_cast<QDesignerToolBar*>(o) || ::qt_cast<PopupMenuEditor*>(o) ) {
+    } else if ( ::tqqt_cast<TQDesignerToolBar*>(o) || ::tqqt_cast<PopupMenuEditor*>(o) ) {
 	TQPtrList<TQAction> actions;
-	if ( ::qt_cast<QDesignerToolBar*>(o) )
-	    actions = ( (QDesignerToolBar*)o )->insertedActions();
+	if ( ::tqqt_cast<TQDesignerToolBar*>(o) )
+	    actions = ( (TQDesignerToolBar*)o )->insertedActions();
 	else
 	    ( (PopupMenuEditor*)o )->insertedActions( actions );
 
@@ -539,37 +539,37 @@ void HierarchyList::insertObject( TQObject *o, TQListViewItem *parent )
 	it.toLast();
 	while ( it.current() ) {
 	    TQAction *a = it.current();
-	    if ( ::qt_cast<QDesignerAction*>(a) ) {
-		QDesignerAction *da = (QDesignerAction*)a;
+	    if ( ::tqqt_cast<TQDesignerAction*>(a) ) {
+		TQDesignerAction *da = (TQDesignerAction*)a;
 		if ( da->supportsMenu() )
 		    insertObject( da, item );
 		else
-		    insertObject( da->widget(), item );
-	    } else if ( ::qt_cast<QDesignerActionGroup*>(a) ) {
+		    insertObject( TQT_TQOBJECT(da->widget()), item );
+	    } else if ( ::tqqt_cast<TQDesignerActionGroup*>(a) ) {
 		insertObject( a, item );
 	    }
 	    --it;
 	}
-    } else if ( ::qt_cast<QDesignerActionGroup*>(o) && o->children() ) {
-	TQObjectList *l = (TQObjectList*)o->children();
-	for ( TQObject *obj = l->last(); obj; obj = l->prev() ) {
-	    if ( ::qt_cast<QDesignerAction*>(obj) ) {
-		QDesignerAction *da = (QDesignerAction*)obj;
+    } else if ( ::tqqt_cast<TQDesignerActionGroup*>(o) && !o->childrenListObject().isEmpty() ) {
+	TQObjectList l = o->childrenListObject();
+	for ( TQObject *obj = l.last(); obj; obj = l.prev() ) {
+	    if ( ::tqqt_cast<TQDesignerAction*>(obj) ) {
+		TQDesignerAction *da = (TQDesignerAction*)obj;
 		if ( da->supportsMenu() )
 		    insertObject( da, item );
 		else
-		    insertObject( da->widget(), item );
-	    } else if ( ::qt_cast<QDesignerActionGroup*>(obj) ) {
+		    insertObject( TQT_TQOBJECT(da->widget()), item );
+	    } else if ( ::tqqt_cast<TQDesignerActionGroup*>(obj) ) {
 		insertObject( obj, item );
 	    }
 	}
-    } else if ( ::qt_cast<MenuBarEditor*>(o) ) {
+    } else if ( ::tqqt_cast<MenuBarEditor*>(o) ) {
 	MenuBarEditor *mb = (MenuBarEditor*)o;
 	for ( int i = mb->count() -1; i >= 0; --i ) {
 	    MenuBarEditorItem *md = mb->item( i );
 	    if ( !md || !md->menu() )
 		continue;
-	    insertObject( md->menu(), item );
+	    insertObject( TQT_TQOBJECT(md->menu()), item );
 	}
     }
 }
@@ -599,12 +599,12 @@ void HierarchyList::showRMBMenu( TQListViewItem *i, const TQPoint & p )
 	return;
 
     if ( !o->isWidgetType() ||
-	 ( o != formWindow && !formWindow->widgets()->find( (TQWidget*)o ) ) )
+	 ( TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(formWindow) && !formWindow->widgets()->tqfind( (TQWidget*)o ) ) )
 	return;
 
     TQWidget *w = (TQWidget*)o;
     if ( w->isVisibleTo( formWindow ) ) {
-	if ( !::qt_cast<TQTabWidget*>(w) && !::qt_cast<TQWizard*>(w) ) {
+	if ( !::tqqt_cast<TQTabWidget*>(w) && !::tqqt_cast<TQWizard*>(w) ) {
 	    if ( !normalMenu )
 		normalMenu = formWindow->mainWindow()->setupNormalHierarchyMenu( this );
 	    normalMenu->popup( p );
@@ -625,14 +625,14 @@ void HierarchyList::addTabPage()
     if ( !o || !o->isWidgetType() )
 	return;
     TQWidget *w = (TQWidget*)o;
-    if ( ::qt_cast<TQTabWidget*>(w) ) {
+    if ( ::tqqt_cast<TQTabWidget*>(w) ) {
 	TQTabWidget *tw = (TQTabWidget*)w;
 	AddTabPageCommand *cmd = new AddTabPageCommand( i18n( "Add Page to %1" ).
 							arg( tw->name() ), formWindow,
 							tw, "Tab" );
 	formWindow->commandHistory()->addCommand( cmd );
 	cmd->execute();
-    } else if ( ::qt_cast<TQWizard*>(w) ) {
+    } else if ( ::tqqt_cast<TQWizard*>(w) ) {
 	TQWizard *wiz = (TQWizard*)formWindow->mainContainer();
 	AddWizardPageCommand *cmd = new AddWizardPageCommand( i18n( "Add Page to %1" ).
 							      arg( wiz->name() ), formWindow,
@@ -648,24 +648,24 @@ void HierarchyList::removeTabPage()
     if ( !o || !o->isWidgetType() )
 	return;
     TQWidget *w = (TQWidget*)o;
-    if ( ::qt_cast<TQTabWidget*>(w) ) {
+    if ( ::tqqt_cast<TQTabWidget*>(w) ) {
 	TQTabWidget *tw = (TQTabWidget*)w;
 	if ( tw->currentPage() ) {
-	    QDesignerTabWidget *dtw = (QDesignerTabWidget*)tw;
+	    TQDesignerTabWidget *dtw = (TQDesignerTabWidget*)tw;
 	    DeleteTabPageCommand *cmd =
 		new DeleteTabPageCommand( i18n( "Delete Page %1 of %2" ).
-					  arg( dtw->pageTitle() ).arg( tw->name() ),
+					  tqarg( dtw->pageTitle() ).tqarg( tw->name() ),
 					  formWindow, tw, tw->currentPage() );
 	    formWindow->commandHistory()->addCommand( cmd );
 	    cmd->execute();
 	}
-    } else if ( ::qt_cast<TQWizard*>(w) ) {
+    } else if ( ::tqqt_cast<TQWizard*>(w) ) {
 	TQWizard *wiz = (TQWizard*)formWindow->mainContainer();
 	if ( wiz->currentPage() ) {
-	    QDesignerWizard *dw = (QDesignerWizard*)wiz;
+	    TQDesignerWizard *dw = (TQDesignerWizard*)wiz;
 	    DeleteWizardPageCommand *cmd =
 		new DeleteWizardPageCommand( i18n( "Delete Page %1 of %2" ).
-					     arg( dw->pageTitle() ).arg( wiz->name() ),
+					     tqarg( dw->pageTitle() ).tqarg( wiz->name() ),
 					     formWindow, wiz,
 					     wiz->indexOf( wiz->currentPage() ), TRUE );
 	    formWindow->commandHistory()->addCommand( cmd );
@@ -676,8 +676,8 @@ void HierarchyList::removeTabPage()
 
 // ------------------------------------------------------------
 
-FormDefinitionView::FormDefinitionView( TQWidget *parent, FormWindow *fw )
-    : HierarchyList( parent, fw, TRUE )
+FormDefinitionView::FormDefinitionView( TQWidget *tqparent, FormWindow *fw )
+    : HierarchyList( tqparent, fw, TRUE )
 {
     header()->hide();
     removeColumn( 1 );
@@ -708,7 +708,7 @@ void FormDefinitionView::setup()
 	TQStringList defs = lIface->definitions();
 	for ( TQStringList::Iterator dit = defs.begin(); dit != defs.end(); ++dit ) {
 	    HierarchyItem *itemDef = new HierarchyItem( HierarchyItem::DefinitionParent, this, 0,
-							i18n( *dit ), TQString::null, TQString::null );
+							i18n( *dit ), TQString(), TQString() );
 	    itemDef->setPixmap( 0, DesignerFolderPix );
 	    itemDef->setOpen( TRUE );
 	    TQStringList entries =
@@ -716,7 +716,7 @@ void FormDefinitionView::setup()
 	    HierarchyItem *item = 0;
 	    for ( TQStringList::Iterator eit = entries.begin(); eit != entries.end(); ++eit ) {
 		item = new HierarchyItem( HierarchyItem::Definition,
-					  itemDef, item, *eit, TQString::null, TQString::null );
+					  itemDef, item, *eit, TQString(), TQString() );
 		item->setRenameEnabled( 0, TRUE );
 	    }
 	}
@@ -751,31 +751,31 @@ void FormDefinitionView::setupVariables()
     }
 
     HierarchyItem *itemVar = new HierarchyItem( HierarchyItem::VarParent, this, 0, i18n( "Class Variables" ),
-						TQString::null, TQString::null );
+						TQString(), TQString() );
     itemVar->setPixmap( 0, DesignerFolderPix );
     itemVar->setOpen( TRUE );
 
     itemVarPriv = new HierarchyItem( HierarchyItem::VarPrivate, itemVar, 0, i18n( "private" ),
-				     TQString::null, TQString::null );
+				     TQString(), TQString() );
     itemVarProt = new HierarchyItem( HierarchyItem::VarProtected, itemVar, 0, i18n( "protected" ),
-				     TQString::null, TQString::null );
+				     TQString(), TQString() );
     itemVarPubl = new HierarchyItem( HierarchyItem::VarPublic, itemVar, 0, i18n( "public" ),
-				     TQString::null, TQString::null );
+				     TQString(), TQString() );
 
-    TQValueList<MetaDataBase::Variable> varList = MetaDataBase::variables( formWindow );
+    TQValueList<MetaDataBase::Variable> varList = MetaDataBase::variables( TQT_TQOBJECT(formWindow) );
     TQValueList<MetaDataBase::Variable>::Iterator it = --( varList.end() );
     if ( !varList.isEmpty() && itemVar ) {
 	for (;;) {
 	    TQListViewItem *item = 0;
 	    if ( (*it).varAccess == "public" )
 		item = new HierarchyItem( HierarchyItem::Variable, itemVarPubl, 0, (*it).varName,
-					  TQString::null, TQString::null );
+					  TQString(), TQString() );
 	    else if ( (*it).varAccess == "private" )
 		item = new HierarchyItem( HierarchyItem::Variable, itemVarPriv, 0, (*it).varName,
-					  TQString::null, TQString::null );
+					  TQString(), TQString() );
 	    else // default is protected
 		item = new HierarchyItem( HierarchyItem::Variable, itemVarProt, 0, (*it).varName,
-					  TQString::null, TQString::null );
+					  TQString(), TQString() );
 	    item->setPixmap( 0, DesignerEditSlotsPix );
 	    if ( it == varList.begin() )
 		break;
@@ -832,27 +832,27 @@ void FormDefinitionView::refresh()
 
 
     itemFunct = new HierarchyItem( HierarchyItem::FunctParent,
-				   this, 0, i18n( "Functions" ), TQString::null, TQString::null );
+				   this, 0, i18n( "Functions" ), TQString(), TQString() );
     itemFunct->moveItem( i );
     itemFunct->setPixmap( 0, DesignerFolderPix );
     itemFunctPriv = new HierarchyItem( HierarchyItem::FunctPrivate, itemFunct, 0,
-				       i18n( "private" ), TQString::null, TQString::null );
+				       i18n( "private" ), TQString(), TQString() );
     itemFunctProt = new HierarchyItem( HierarchyItem::FunctProtected, itemFunct, 0,
-				       i18n( "protected" ), TQString::null, TQString::null );
+				       i18n( "protected" ), TQString(), TQString() );
     itemFunctPubl = new HierarchyItem( HierarchyItem::FunctPublic, itemFunct, 0,
-				       i18n( "public" ), TQString::null, TQString::null );
+				       i18n( "public" ), TQString(), TQString() );
 
     itemSlots = new HierarchyItem( HierarchyItem::SlotParent,
-				   this, 0, i18n( "Slots" ), TQString::null, TQString::null );
+				   this, 0, i18n( "Slots" ), TQString(), TQString() );
     itemSlots->setPixmap( 0, DesignerFolderPix );
     itemPrivate = new HierarchyItem( HierarchyItem::SlotPrivate, itemSlots, 0, i18n( "private" ),
-				     TQString::null, TQString::null );
+				     TQString(), TQString() );
     itemProtected = new HierarchyItem( HierarchyItem::SlotProtected, itemSlots, 0, i18n( "protected" ),
-				       TQString::null, TQString::null );
+				       TQString(), TQString() );
     itemPublic = new HierarchyItem( HierarchyItem::SlotPublic, itemSlots, 0, i18n( "public" ),
-				    TQString::null, TQString::null );
+				    TQString(), TQString() );
 
-    TQValueList<MetaDataBase::Function> functionList = MetaDataBase::functionList( formWindow );
+    TQValueList<MetaDataBase::Function> functionList = MetaDataBase::functionList( TQT_TQOBJECT(formWindow) );
     TQValueList<MetaDataBase::Function>::Iterator it = --( functionList.end() );
     if ( !functionList.isEmpty() && itemFunct ) {
 	for (;;) {
@@ -860,23 +860,23 @@ void FormDefinitionView::refresh()
 	    if ( (*it).type == "slot" ) {
 		if ( (*it).access == "protected" )
 		    item = new HierarchyItem( HierarchyItem::Slot, itemProtected, 0, (*it).function,
-					      TQString::null, TQString::null );
+					      TQString(), TQString() );
 		else if ( (*it).access == "private" )
 		    item = new HierarchyItem( HierarchyItem::Slot, itemPrivate, 0, (*it).function,
-					      TQString::null, TQString::null );
+					      TQString(), TQString() );
 		else // default is public
 		    item = new HierarchyItem( HierarchyItem::Slot, itemPublic, 0, (*it).function,
-					      TQString::null, TQString::null );
+					      TQString(), TQString() );
 	    } else {
 		if ( (*it).access == "protected" )
 		    item = new HierarchyItem( HierarchyItem::Function, itemFunctProt, 0, (*it).function,
-					      TQString::null, TQString::null );
+					      TQString(), TQString() );
 		else if ( (*it).access == "private" )
 		    item = new HierarchyItem( HierarchyItem::Function, itemFunctPriv, 0, (*it).function,
-					      TQString::null, TQString::null );
+					      TQString(), TQString() );
 		else // default is public
 		    item = new HierarchyItem( HierarchyItem::Function, itemFunctPubl, 0, (*it).function,
-					      TQString::null, TQString::null );
+					      TQString(), TQString() );
 	    }
 	    item->setPixmap( 0, DesignerEditSlotsPix );
 	    if ( it == functionList.begin() )
@@ -953,13 +953,13 @@ void HierarchyList::insertEntry( TQListViewItem *i, const TQPixmap &pix, const T
     while ( after && after->nextSibling() )
 	after = after->nextSibling();
     HierarchyItem *item = new HierarchyItem( getChildType( i->rtti() ), i, after, s,
-					     TQString::null, TQString::null );
+					     TQString(), TQString() );
     if ( !pix.isNull() )
 	item->setPixmap( 0, pix );
     item->setRenameEnabled( 0, TRUE );
     setCurrentItem( item );
     ensureItemVisible( item );
-    qApp->processEvents();
+    tqApp->processEvents();
     newItem = item;
     item->startRename( 0 );
 }
@@ -976,7 +976,7 @@ void FormDefinitionView::contentsMouseDoubleClickEvent( TQMouseEvent *e )
 
     HierarchyItem::Type t = getChildType( i->rtti() );
     if ( (int)t == i->rtti() )
-	i = i->parent();
+	i = i->tqparent();
 
     if ( formWindow->project()->isCpp() )
 	switch( i->rtti() ) {
@@ -1100,13 +1100,13 @@ void FormDefinitionView::showRMBMenu( TQListViewItem *i, const TQPoint &pos )
 	    if ( !lIface )
 		return;
 	    if ( i->rtti() == HierarchyItem::Definition )
-		i = i->parent();
+		i = i->tqparent();
 	    ListEditor dia( this, 0, TRUE );
-	    dia.setCaption( i18n( "Edit %1" ).arg( i->text( 0 ) ) );
+	    dia.setCaption( i18n( "Edit %1" ).tqarg( i->text( 0 ) ) );
 	    TQStringList entries = lIface->definitionEntries( i->text( 0 ), MainWindow::self->designerInterface() );
 	    dia.setList( entries );
 	    dia.exec();
-	    Command *cmd = new EditDefinitionsCommand( i18n( "Edit %1" ).arg( i->text( 0 )), formWindow,
+	    Command *cmd = new EditDefinitionsCommand( i18n( "Edit %1" ).tqarg( i->text( 0 )), formWindow,
 						       lIface, i->text( 0 ), dia.items() );
 	    formWindow->commandHistory()->addCommand( cmd );
 	    cmd->execute();
@@ -1114,7 +1114,7 @@ void FormDefinitionView::showRMBMenu( TQListViewItem *i, const TQPoint &pos )
     } else if ( res == NEW ) {
 	HierarchyItem::Type t = getChildType( i->rtti() );
 	if ( (int)t == i->rtti() )
-	    i = i->parent();
+	    i = i->tqparent();
 	switch( i->rtti() ) {
 	case HierarchyItem::SlotPublic:
 	    execFunctionDialog( "public", "slot", TRUE );
@@ -1142,8 +1142,8 @@ void FormDefinitionView::showRMBMenu( TQListViewItem *i, const TQPoint &pos )
 
 	    TQCString funct( MetaDataBase::normalizeFunction( i->text( 0 ) ).latin1() );
 	    Command *cmd = new RemoveFunctionCommand( i18n( "Remove Function" ), formWindow, funct,
-						     TQString::null, TQString::null, TQString::null,
-						     TQString::null, formWindow->project()->language() );
+						     TQString(), TQString(), TQString(),
+						     TQString(), formWindow->project()->language() );
 	    formWindow->commandHistory()->addCommand( cmd );
 	    cmd->execute();
 	    formWindow->mainWindow()->objectHierarchy()->updateFormDefinitionView();
@@ -1153,7 +1153,7 @@ void FormDefinitionView::showRMBMenu( TQListViewItem *i, const TQPoint &pos )
 	    formWindow->commandHistory()->addCommand( cmd );
 	    cmd->execute();
 	} else {
-	    TQListViewItem *p = i->parent();
+	    TQListViewItem *p = i->tqparent();
 	    delete i;
 	    save( p, 0 );
 	}
@@ -1178,9 +1178,9 @@ void FormDefinitionView::renamed( TQListViewItem *i )
 {
     if ( newItem == i )
 	newItem = 0;
-    if ( !i->parent() )
+    if ( !i->tqparent() )
 	return;
-    save( i->parent(), i );
+    save( i->tqparent(), i );
 }
 
 
@@ -1197,7 +1197,7 @@ void FormDefinitionView::save( TQListViewItem *p, TQListViewItem *i )
 	varName = varName.simplifyWhiteSpace();
 	if ( varName[(int)varName.length() - 1] != ';' )
 	    varName += ";";
-	if ( MetaDataBase::hasVariable( formWindow, varName ) ) {
+	if ( MetaDataBase::hasVariable( TQT_TQOBJECT(formWindow), varName ) ) {
 	    TQMessageBox::information( this, i18n( "Edit Variables" ),
 				      i18n( "This variable has already been declared." ) );
 	} else {
@@ -1218,7 +1218,7 @@ void FormDefinitionView::save( TQListViewItem *p, TQListViewItem *i )
 	    lst << i->text( 0 );
 	    i = i->nextSibling();
 	}
-	Command *cmd = new EditDefinitionsCommand( i18n( "Edit %1" ).arg( p->text( 0 ) ), formWindow,
+	Command *cmd = new EditDefinitionsCommand( i18n( "Edit %1" ).tqarg( p->text( 0 ) ), formWindow,
 						   lIface, p->text( 0 ), lst );
 	formWindow->commandHistory()->addCommand( cmd );
 	cmd->execute();
@@ -1235,8 +1235,8 @@ void FormDefinitionView::addVariable( const TQString &varName, const TQString &a
 
 // ------------------------------------------------------------
 
-HierarchyView::HierarchyView( TQWidget *parent )
-    : TQTabWidget( parent, 0, WStyle_Customize | WStyle_NormalBorder | WStyle_Title |
+HierarchyView::HierarchyView( TQWidget *tqparent )
+    : TQTabWidget( tqparent, 0, WStyle_Customize | WStyle_NormalBorder | WStyle_Title |
 		  WStyle_Tool |WStyle_MinMax | WStyle_SysMenu )
 {
     formwindow = 0;
@@ -1255,20 +1255,20 @@ HierarchyView::HierarchyView( TQWidget *parent )
 
     if ( !classBrowserInterfaceManager ) {
 	classBrowserInterfaceManager =
-	    new QPluginManager<ClassBrowserInterface>( IID_ClassBrowser, TQApplication::libraryPaths(),
+	    new TQPluginManager<ClassBrowserInterface>( IID_ClassBrowser, TQApplication::libraryPaths(),
 						       MainWindow::self->pluginDirectory() );
     }
 
     classBrowsers = new TQMap<TQString, ClassBrowser>();
     TQStringList langs = MetaDataBase::languages();
     for ( TQStringList::Iterator it = langs.begin(); it != langs.end(); ++it ) {
-	QInterfacePtr<ClassBrowserInterface> ciface = 0;
+	TQInterfacePtr<ClassBrowserInterface> ciface = 0;
 	classBrowserInterfaceManager->queryInterface( *it, &ciface );
 	if ( ciface ) {
 	    ClassBrowser cb( ciface->createClassBrowser( this ), ciface );
 	    addTab( cb.lv, i18n( "Class Declarations" ) );
 	    setTabToolTip( cb.lv, i18n( "List of all classes and its declarations of the current source file" ) );
-	    ciface->onClick( this, TQT_SLOT( jumpTo( const TQString &, const TQString &, int ) ) );
+	    ciface->onClick( TQT_TQOBJECT(this), TQT_SLOT( jumpTo( const TQString &, const TQString &, int ) ) );
 	    classBrowsers->insert( *it, cb );
 	    setTabEnabled( cb.lv, FALSE );
 	}
@@ -1307,7 +1307,7 @@ void HierarchyView::setFormWindow( FormWindow *fw, TQObject *o )
     if ( fw == formwindow ) {
 	if ( fw ) {
 	    if ( !fake )
-		listview->setCurrent( (TQWidget*)o );
+		listview->setCurrent( TQT_TQOBJECT(o) );
 	    else
 		listview->clear();
 	    if ( MainWindow::self->qWorkspace()->activeWindow() == fw )
@@ -1330,7 +1330,7 @@ void HierarchyView::setFormWindow( FormWindow *fw, TQObject *o )
     fView->setFormWindow( fw );
     if ( !fake ) {
 	listview->setup();
-	listview->setCurrent( (TQWidget*)o );
+	listview->setCurrent( TQT_TQOBJECT(o) );
     }
     fView->setup();
 
@@ -1367,8 +1367,8 @@ void HierarchyView::showClassesTimeout()
     if ( !se->object() )
 	return;
     if ( se->formWindow() && se->formWindow()->project()->isCpp() ) {
-	setFormWindow( se->formWindow(), se->formWindow()->currentWidget() );
-	MainWindow::self->propertyeditor()->setWidget( se->formWindow()->currentWidget(),
+	setFormWindow( se->formWindow(), TQT_TQOBJECT(se->formWindow()->currentWidget()) );
+	MainWindow::self->propertyeditor()->setWidget( TQT_TQOBJECT(se->formWindow()->currentWidget()),
 						       se->formWindow() );
 	return;
     }
@@ -1445,17 +1445,17 @@ void HierarchyView::widgetsRemoved( const TQWidgetList & )
 void HierarchyView::namePropertyChanged( TQWidget *w, const TQVariant & )
 {
     TQWidget *w2 = w;
-    if ( ::qt_cast<TQMainWindow*>(w) )
+    if ( ::tqqt_cast<TQMainWindow*>(w) )
 	w2 = ( (TQMainWindow*)w )->centralWidget();
-    listview->changeNameOf( w2, w->name() );
+    listview->changeNameOf( TQT_TQOBJECT(w2), w->name() );
 }
 
 
 void HierarchyView::databasePropertyChanged( TQWidget *w, const TQStringList& info )
 {
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     TQString i = info.join( "." );
-    listview->changeDatabaseOf( w, i );
+    listview->changeDatabaseOf( TQT_TQOBJECT(w), i );
 #endif
 }
 
diff --git a/kdevdesigner/designer/hierarchyview.h b/kdevdesigner/designer/hierarchyview.h
index 7405ef3a..5145b3b5 100644
--- a/kdevdesigner/designer/hierarchyview.h
+++ b/kdevdesigner/designer/hierarchyview.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -31,7 +31,7 @@
 #include <tqlistview.h>
 #include <tqtabwidget.h>
 #include <tqguardedptr.h>
-#include <private/qcom_p.h>
+#include <private/tqcom_p.h>
 #include "../interfaces/classbrowserinterface.h"
 
 class FormWindow;
@@ -42,7 +42,7 @@ class TQMouseEvent;
 class TQWizard;
 class SourceEditor;
 
-class HierarchyItem : public QListViewItem
+class HierarchyItem : public TQListViewItem
 {
 public:
     enum Type {
@@ -68,9 +68,9 @@ public:
 	Variable
     };
 
-    HierarchyItem( Type type, TQListViewItem *parent, TQListViewItem *after,
+    HierarchyItem( Type type, TQListViewItem *tqparent, TQListViewItem *after,
 		   const TQString &txt1, const TQString &txt2, const TQString &txt3 );
-    HierarchyItem( Type type, TQListView *parent, TQListViewItem *after,
+    HierarchyItem( Type type, TQListView *tqparent, TQListViewItem *after,
 		   const TQString &txt1, const TQString &txt2, const TQString &txt3 );
 
     void paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int align );
@@ -95,12 +95,13 @@ private:
 
 };
 
-class HierarchyList : public QListView
+class HierarchyList : public TQListView
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    HierarchyList( TQWidget *parent, FormWindow *fw, bool doConnects = TRUE );
+    HierarchyList( TQWidget *tqparent, FormWindow *fw, bool doConnects = TRUE );
 
     virtual void setup();
     virtual void setCurrent( TQObject *o );
@@ -116,7 +117,7 @@ public:
 	TQListView::drawContentsOffset( p, ox, oy, cx, cy, cw, ch );
     }
 
-    void insertEntry( TQListViewItem *i, const TQPixmap &pix = TQPixmap(), const TQString &s = TQString::null );
+    void insertEntry( TQListViewItem *i, const TQPixmap &pix = TQPixmap(), const TQString &s = TQString() );
 
 protected:
     void keyPressEvent( TQKeyEvent *e );
@@ -129,7 +130,7 @@ public slots:
     void removeTabPage();
 
 private:
-    void insertObject( TQObject *o, TQListViewItem *parent );
+    void insertObject( TQObject *o, TQListViewItem *tqparent );
     TQObject *findObject( TQListViewItem *i );
     TQListViewItem *findItem( TQObject *o );
     TQObject *current() const;
@@ -155,9 +156,10 @@ protected:
 class FormDefinitionView : public HierarchyList
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    FormDefinitionView( TQWidget *parent, FormWindow *fw );
+    FormDefinitionView( TQWidget *tqparent, FormWindow *fw );
 
     void setup();
     void setupVariables();
@@ -185,12 +187,13 @@ private:
 };
 
 
-class HierarchyView : public QTabWidget
+class HierarchyView : public TQTabWidget
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    HierarchyView( TQWidget *parent );
+    HierarchyView( TQWidget *tqparent );
     ~HierarchyView();
 
     void setFormWindow( FormWindow *fw, TQObject *o );
@@ -232,9 +235,9 @@ private:
 	ClassBrowser( TQListView * = 0, ClassBrowserInterface * = 0 );
 	~ClassBrowser();
 	TQListView *lv;
-	QInterfacePtr<ClassBrowserInterface> iface;
+	TQInterfacePtr<ClassBrowserInterface> iface;
 
-	Q_DUMMY_COMPARISON_OPERATOR( ClassBrowser )
+	TQ_DUMMY_COMPARISON_OPERATOR( ClassBrowser )
     };
     FormWindow *formwindow;
     HierarchyList *listview;
diff --git a/kdevdesigner/designer/iconvieweditor.ui b/kdevdesigner/designer/iconvieweditor.ui
index e06367f1..b36341b2 100644
--- a/kdevdesigner/designer/iconvieweditor.ui
+++ b/kdevdesigner/designer/iconvieweditor.ui
@@ -25,7 +25,7 @@
 ** not clear to you.
 **
 *********************************************************************</comment>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>IconViewEditorBase</cstring>
     </property>
@@ -56,7 +56,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>Layout6</cstring>
             </property>
@@ -70,7 +70,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QIconView">
+                <widget class="TQIconView">
                     <property name="name">
                         <cstring>preview</cstring>
                     </property>
@@ -78,7 +78,7 @@
                         <string>All items in the iconview.</string>
                     </property>
                 </widget>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
                         <cstring>Layout5</cstring>
                     </property>
@@ -92,7 +92,7 @@
                         <property name="spacing">
                             <number>6</number>
                         </property>
-                        <widget class="QPushButton">
+                        <widget class="TQPushButton">
                             <property name="name">
                                 <cstring>itemNew</cstring>
                             </property>
@@ -106,7 +106,7 @@
                                 <string>Create a new item for the iconview.</string>
                             </property>
                         </widget>
-                        <widget class="QPushButton">
+                        <widget class="TQPushButton">
                             <property name="name">
                                 <cstring>itemDelete</cstring>
                             </property>
@@ -130,7 +130,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
@@ -139,7 +139,7 @@
                         </spacer>
                     </vbox>
                 </widget>
-                <widget class="QGroupBox">
+                <widget class="TQGroupBox">
                     <property name="name">
                         <cstring>GroupBox1</cstring>
                     </property>
@@ -164,7 +164,7 @@
                         <property name="spacing">
                             <number>6</number>
                         </property>
-                        <widget class="QLabel" row="0" column="0">
+                        <widget class="TQLabel" row="0" column="0">
                             <property name="name">
                                 <cstring>Label1</cstring>
                             </property>
@@ -175,11 +175,11 @@
                                 <cstring>itemText</cstring>
                             </property>
                         </widget>
-                        <widget class="QLineEdit" row="0" column="1">
+                        <widget class="TQLineEdit" row="0" column="1">
                             <property name="name">
                                 <cstring>itemText</cstring>
                             </property>
-                            <property name="minimumSize">
+                            <property name="tqminimumSize">
                                 <size>
                                     <width>0</width>
                                     <height>0</height>
@@ -192,7 +192,7 @@
                                 <string>Change the text for the selected item.</string>
                             </property>
                         </widget>
-                        <widget class="QLabel" row="1" column="0">
+                        <widget class="TQLabel" row="1" column="0">
                             <property name="name">
                                 <cstring>Label2</cstring>
                             </property>
@@ -203,7 +203,7 @@
                                 <cstring>itemChoosePixmap</cstring>
                             </property>
                         </widget>
-                        <widget class="QLayoutWidget" row="1" column="1">
+                        <widget class="TQLayoutWidget" row="1" column="1">
                             <property name="name">
                                 <cstring>Layout4</cstring>
                             </property>
@@ -217,7 +217,7 @@
                                 <property name="spacing">
                                     <number>6</number>
                                 </property>
-                                <widget class="QLabel">
+                                <widget class="TQLabel">
                                     <property name="name">
                                         <cstring>itemPixmap</cstring>
                                     </property>
@@ -225,11 +225,11 @@
                                         <string>Label4</string>
                                     </property>
                                 </widget>
-                                <widget class="QPushButton">
+                                <widget class="TQPushButton">
                                     <property name="name">
                                         <cstring>itemDeletePixmap</cstring>
                                     </property>
-                                    <property name="maximumSize">
+                                    <property name="tqmaximumSize">
                                         <size>
                                             <width>30</width>
                                             <height>22</height>
@@ -248,11 +248,11 @@
                                         <string>Delete the selected item's pixmap.</string>
                                     </property>
                                 </widget>
-                                <widget class="QPushButton">
+                                <widget class="TQPushButton">
                                     <property name="name">
                                         <cstring>itemChoosePixmap</cstring>
                                     </property>
-                                    <property name="maximumSize">
+                                    <property name="tqmaximumSize">
                                         <size>
                                             <width>30</width>
                                             <height>22</height>
@@ -274,7 +274,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>Layout1</cstring>
             </property>
@@ -288,7 +288,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonHelp</cstring>
                     </property>
@@ -309,14 +309,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonOk</cstring>
                     </property>
@@ -333,7 +333,7 @@
                         <string>Close the dialog and apply all the changes.</string>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonApply</cstring>
                     </property>
@@ -347,7 +347,7 @@
                         <string>Apply all changes.</string>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonCancel</cstring>
                     </property>
@@ -380,9 +380,9 @@
     </connection>
     <connection>
         <sender>itemText</sender>
-        <signal>textChanged( const QString &amp; )</signal>
+        <signal>textChanged( const TQString &amp; )</signal>
         <receiver>IconViewEditorBase</receiver>
-        <slot>currentTextChanged(const QString&amp;)</slot>
+        <slot>currentTextChanged(const TQString&amp;)</slot>
     </connection>
     <connection>
         <sender>buttonOk</sender>
@@ -410,15 +410,15 @@
     </connection>
     <connection>
         <sender>preview</sender>
-        <signal>selectionChanged(QIconViewItem*)</signal>
+        <signal>selectionChanged(TQIconViewItem*)</signal>
         <receiver>IconViewEditorBase</receiver>
-        <slot>currentItemChanged(QIconViewItem*)</slot>
+        <slot>currentItemChanged(TQIconViewItem*)</slot>
     </connection>
     <connection>
         <sender>preview</sender>
-        <signal>currentChanged(QIconViewItem*)</signal>
+        <signal>currentChanged(TQIconViewItem*)</signal>
         <receiver>IconViewEditorBase</receiver>
-        <slot>currentItemChanged(QIconViewItem*)</slot>
+        <slot>currentItemChanged(TQIconViewItem*)</slot>
     </connection>
     <connection>
         <sender>itemDeletePixmap</sender>
@@ -439,23 +439,23 @@
     <tabstop>buttonHelp</tabstop>
     <tabstop>buttonApply</tabstop>
 </tabstops>
-<slots>
+<Q_SLOTS>
     <slot access="protected">init()</slot>
     <slot access="protected">destroy()</slot>
     <slot access="protected">applyClicked()</slot>
     <slot access="protected">cancelClicked()</slot>
     <slot access="protected">choosePixmap()</slot>
-    <slot access="protected">currentItemChanged( QIconViewItem * )</slot>
-    <slot access="protected">currentTextChanged( const QString &amp; )</slot>
+    <slot access="protected">currentItemChanged( TQIconViewItem * )</slot>
+    <slot access="protected">currentTextChanged( const TQString &amp; )</slot>
     <slot access="protected">deleteCurrentItem()</slot>
     <slot access="protected">insertNewItem()</slot>
     <slot access="protected">deletePixmap()</slot>
     <slot access="protected">okClicked()</slot>
-</slots>
+</Q_SLOTS>
 <includes>
     <include location="local" impldecl="in implementation">myiconloader.h</include>
 </includes>
 <pixmapfunction>BarIcon2</pixmapfunction>
 
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kdevdesigner/designer/iconvieweditorimpl.cpp b/kdevdesigner/designer/iconvieweditorimpl.cpp
index a4c3064c..8f0ca643 100644
--- a/kdevdesigner/designer/iconvieweditorimpl.cpp
+++ b/kdevdesigner/designer/iconvieweditorimpl.cpp
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -37,8 +37,8 @@
 
 #include <klocale.h>
 
-IconViewEditor::IconViewEditor( TQWidget *parent, TQWidget *editWidget, FormWindow *fw )
-    : IconViewEditorBase( parent, 0, TRUE ), formwindow( fw )
+IconViewEditor::IconViewEditor( TQWidget *tqparent, TQWidget *editWidget, FormWindow *fw )
+    : IconViewEditorBase( tqparent, 0, TRUE ), formwindow( fw )
 {
     connect( buttonHelp, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) );
     iconview = (TQIconView*)editWidget;
@@ -129,7 +129,7 @@ void IconViewEditor::applyClicked()
 	items.append( item );
     }
 
-    PopulateIconViewCommand *cmd = new PopulateIconViewCommand( i18n( "Edit the Items of '%1'" ).arg( iconview->name() ),
+    PopulateIconViewCommand *cmd = new PopulateIconViewCommand( i18n( "Edit the Items of '%1'" ).tqarg( iconview->name() ),
 								formwindow, iconview, items );
     cmd->execute();
     formwindow->commandHistory()->addCommand( cmd );
diff --git a/kdevdesigner/designer/iconvieweditorimpl.h b/kdevdesigner/designer/iconvieweditorimpl.h
index a29276e8..b1823770 100644
--- a/kdevdesigner/designer/iconvieweditorimpl.h
+++ b/kdevdesigner/designer/iconvieweditorimpl.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -34,9 +34,10 @@ class FormWindow;
 class IconViewEditor : public IconViewEditorBase
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    IconViewEditor( TQWidget *parent, TQWidget *editWidget, FormWindow *fw );
+    IconViewEditor( TQWidget *tqparent, TQWidget *editWidget, FormWindow *fw );
 
 protected slots:
     void insertNewItem();
diff --git a/kdevdesigner/designer/kdevdesigner_part.cpp b/kdevdesigner/designer/kdevdesigner_part.cpp
index 135751e8..8cbf9a7c 100644
--- a/kdevdesigner/designer/kdevdesigner_part.cpp
+++ b/kdevdesigner/designer/kdevdesigner_part.cpp
@@ -40,21 +40,21 @@
 #include "designeraction.h"
 #include "formwindow.h"
 
-KDevDesignerPart::KDevDesignerPart( TQWidget *parentWidget, const char *// widgetName
+KDevDesignerPart::KDevDesignerPart( TQWidget *tqparentWidget, const char *// widgetName
                                     ,
-                                  TQObject *parent, const char *name, const TQStringList &args )
-    : KInterfaceDesigner::Designer(parent, name)
+                                  TQObject *tqparent, const char *name, const TQStringList &args )
+    : KInterfaceDesigner::Designer(tqparent, name)
 {
     setInstance( KDevDesignerPartFactory::instance() );
 
     m_widget = new MainWindow( this, true );
-    m_widget->reparent(parentWidget, TQPoint(0,0));
+    m_widget->reparent(tqparentWidget, TQPoint(0,0));
     setupDesignerWindow();
 
     setWidget(m_widget);
 
     setupActions();
-    if (args.contains("in shell"))
+    if (args.tqcontains("in shell"))
         setXMLFile("kdevdesigner_part_sh.rc");
     else
         setXMLFile("kdevdesigner_part.rc");
@@ -68,7 +68,7 @@ KDevDesignerPart::KDevDesignerPart( TQWidget *parentWidget, const char *// widge
 void KDevDesignerPart::setupDesignerWindow()
 {
     m_widget->menuBar()->hide();
-    m_widget->layoutToolBar->hide();
+    m_widget->tqlayoutToolBar->hide();
     m_widget->projectToolBar->hide();
     m_widget->toolsToolBar->hide();
     m_widget->statusBar()->hide();
@@ -144,21 +144,21 @@ void KDevDesignerPart::setupActions( )
     new KAction(i18n("Configure Toolbox..."), 0, this, TQT_SLOT(toolsConfigureToolbox()), actionCollection(), "tools_toolbox");
     new KAction(i18n("Edit &Custom Widgets..."), 0, this, TQT_SLOT(toolsEditCustomWidgets()), actionCollection(), "tools_editcustomwidgets");
 
-    action = new KAction(i18n("Adjust &Size"), createPartIconSet("designer_adjustsize.png"), CTRL + Key_J, this, TQT_SLOT(layoutAdjustSize()), actionCollection(), "layout_adjustsize");
+    action = new KAction(i18n("Adjust &Size"), createPartIconSet("designer_adjustsize.png"), CTRL + Key_J, this, TQT_SLOT(tqlayoutAdjustSize()), actionCollection(), "tqlayout_adjustsize");
     stateSync(action, m_widget->actionEditAdjustSize);
-    action = new KAction(i18n("Lay Out &Horizontally"), createPartIconSet("designer_edithlayout.png"), CTRL + Key_H, this, TQT_SLOT(layoutHLayout()), actionCollection(), "layout_h");
+    action = new KAction(i18n("Lay Out &Horizontally"), createPartIconSet("designer_edithtqlayout.png"), CTRL + Key_H, this, TQT_SLOT(tqlayoutHLayout()), actionCollection(), "tqlayout_h");
     stateSync(action, m_widget->actionEditHLayout);
-    action = new KAction(i18n("Lay Out &Vertically"), createPartIconSet("designer_editvlayout.png"), CTRL + Key_V, this, TQT_SLOT(layoutVLayout()), actionCollection(), "layout_v");
+    action = new KAction(i18n("Lay Out &Vertically"), createPartIconSet("designer_editvtqlayout.png"), CTRL + Key_V, this, TQT_SLOT(tqlayoutVLayout()), actionCollection(), "tqlayout_v");
     stateSync(action, m_widget->actionEditVLayout);
-    action = new KAction(i18n("Lay Out in &Grid"), createPartIconSet("designer_editgrid.png"), CTRL + Key_G, this, TQT_SLOT(layoutGridLayout()), actionCollection(), "layout_grid");
+    action = new KAction(i18n("Lay Out in &Grid"), createPartIconSet("designer_editgrid.png"), CTRL + Key_G, this, TQT_SLOT(tqlayoutGridLayout()), actionCollection(), "tqlayout_grid");
     stateSync(action, m_widget->actionEditGridLayout);
-    action = new KAction(i18n("Lay Out Horizontally (in S&plitter)"), createPartIconSet("designer_editvlayoutsplit.png"), 0, this, TQT_SLOT(layoutSplitHLayout()), actionCollection(), "layout_splith");
+    action = new KAction(i18n("Lay OutQt::Horizontally (in S&plitter)"), createPartIconSet("designer_editvtqlayoutsplit.png"), 0, this, TQT_SLOT(tqlayoutSplitHLayout()), actionCollection(), "tqlayout_splith");
     stateSync(action, m_widget->actionEditSplitHorizontal);
-    action = new KAction(i18n("Lay Out Vertically (in Sp&litter)"), createPartIconSet("designer_edithlayoutsplit.png"), 0, this, TQT_SLOT(layoutSplitVLayout()), actionCollection(), "layout_splitv");
+    action = new KAction(i18n("Lay OutQt::Vertically (in Sp&litter)"), createPartIconSet("designer_edithtqlayoutsplit.png"), 0, this, TQT_SLOT(tqlayoutSplitVLayout()), actionCollection(), "tqlayout_splitv");
     stateSync(action, m_widget->actionEditSplitVertical);
-    action = new KAction(i18n("&Break Layout"), createPartIconSet("designer_editbreaklayout.png"), CTRL + Key_B, this, TQT_SLOT(layoutBreak()), actionCollection(), "layout_break");
+    action = new KAction(i18n("&Break Layout"), createPartIconSet("designer_editbreaklayout.png"), CTRL + Key_B, this, TQT_SLOT(tqlayoutBreak()), actionCollection(), "tqlayout_break");
     stateSync(action, m_widget->actionEditBreakLayout);
-    toggle = new KRadioAction(i18n("Add Spacer"), createPartIconSet("designer_spacer.png"), 0, actionCollection(), "layout_spacer");
+    toggle = new KRadioAction(i18n("Add Spacer"), createPartIconSet("designer_spacer.png"), 0, actionCollection(), "tqlayout_spacer");
     setupToolsAction(toggle, m_widget->actionInsertSpacer);
 
     action = new KAction(i18n("Preview &Form"), CTRL + Key_T, this, TQT_SLOT(windowPreview()), actionCollection(), "window_preview");
@@ -256,12 +256,12 @@ KDevDesignerPartFactory::~KDevDesignerPartFactory()
     s_instance = 0L;
 }
 
-KParts::Part* KDevDesignerPartFactory::createPartObject( TQWidget *parentWidget, const char *widgetName,
-                                                        TQObject *parent, const char *name,
+KParts::Part* KDevDesignerPartFactory::createPartObject( TQWidget *tqparentWidget, const char *widgetName,
+                                                        TQObject *tqparent, const char *name,
                                                         const char *classname, const TQStringList &args )
 {
     // Create an instance of our Part
-    KDevDesignerPart* obj = new KDevDesignerPart( parentWidget, widgetName, parent, name, args );
+    KDevDesignerPart* obj = new KDevDesignerPart( tqparentWidget, widgetName, tqparent, name, args );
 
     // See if we are to be read-write or not
     if (TQCString(classname) == "KParts::ReadOnlyPart")
@@ -407,37 +407,37 @@ void KDevDesignerPart::toolsConfigureToolbox( )
     m_widget->toolsConfigure();
 }
 
-void KDevDesignerPart::layoutAdjustSize( )
+void KDevDesignerPart::tqlayoutAdjustSize( )
 {
     m_widget->actionEditAdjustSize->activate();
 }
 
-void KDevDesignerPart::layoutHLayout( )
+void KDevDesignerPart::tqlayoutHLayout( )
 {
     m_widget->actionEditHLayout->activate();
 }
 
-void KDevDesignerPart::layoutVLayout( )
+void KDevDesignerPart::tqlayoutVLayout( )
 {
     m_widget->actionEditVLayout->activate();
 }
 
-void KDevDesignerPart::layoutGridLayout( )
+void KDevDesignerPart::tqlayoutGridLayout( )
 {
     m_widget->actionEditGridLayout->activate();
 }
 
-void KDevDesignerPart::layoutSplitHLayout( )
+void KDevDesignerPart::tqlayoutSplitHLayout( )
 {
     m_widget->actionEditSplitHorizontal->activate();
 }
 
-void KDevDesignerPart::layoutSplitVLayout( )
+void KDevDesignerPart::tqlayoutSplitVLayout( )
 {
     m_widget->actionEditSplitVertical->activate();
 }
 
-void KDevDesignerPart::layoutBreak( )
+void KDevDesignerPart::tqlayoutBreak( )
 {
     m_widget->actionEditBreakLayout->activate();
 }
@@ -509,7 +509,7 @@ void KDevDesignerPart::openProject( const TQString & // projectFile
 
 KInterfaceDesigner::DesignerType KDevDesignerPart::designerType( )
 {
-    return KInterfaceDesigner::QtDesigner;
+    return KInterfaceDesigner::TQtDesigner;
 }
 
 void KDevDesignerPart::emitAddedFunction( const TQString & form, KInterfaceDesigner::Function func )
@@ -552,9 +552,9 @@ void KDevDesignerPart::emitEditSource(const TQString &formName)
     emit editSource(designerType(), formName);
 }
 
-void KDevDesignerPart::emitNewStatus(const TQString &formName, int status)
+void KDevDesignerPart::emitNewtqStatus(const TQString &formName, int status)
 {
-    emit newStatus(formName, status);
+    emit newtqStatus(formName, status);
 }
 
 void KDevDesignerPart::toolsEditCustomWidgets( )
diff --git a/kdevdesigner/designer/kdevdesigner_part.h b/kdevdesigner/designer/kdevdesigner_part.h
index f33969ef..a3a759e4 100644
--- a/kdevdesigner/designer/kdevdesigner_part.h
+++ b/kdevdesigner/designer/kdevdesigner_part.h
@@ -39,9 +39,10 @@ class KRadioAction;
 class KDevDesignerPart : public KInterfaceDesigner::Designer
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    KDevDesignerPart(TQWidget *parentWidget, const char *widgetName,
-                    TQObject *parent, const char *name, const TQStringList &args);
+    KDevDesignerPart(TQWidget *tqparentWidget, const char *widgetName,
+                    TQObject *tqparent, const char *name, const TQStringList &args);
     virtual ~KDevDesignerPart();
 
     virtual void setReadWrite(bool rw);
@@ -60,7 +61,7 @@ public:
     void emitEditFunction(const TQString &formName, const TQString &functionName);
     void emitEditSource(const TQString &formName);
     
-    void emitNewStatus(const TQString &formName, int status);
+    void emitNewtqStatus(const TQString &formName, int status);
     
 protected:
     virtual bool openFile();
@@ -103,13 +104,13 @@ protected slots:
     void toolsConfigureToolbox();
     void toolsEditCustomWidgets();
     
-    void layoutAdjustSize();
-    void layoutHLayout();
-    void layoutVLayout();
-    void layoutGridLayout();
-    void layoutSplitHLayout();
-    void layoutSplitVLayout();
-    void layoutBreak();
+    void tqlayoutAdjustSize();
+    void tqlayoutHLayout();
+    void tqlayoutVLayout();
+    void tqlayoutGridLayout();
+    void tqlayoutSplitHLayout();
+    void tqlayoutSplitVLayout();
+    void tqlayoutBreak();
     
     void windowPreview();
     void windowNext();
@@ -130,11 +131,12 @@ class KAboutData;
 class KDevDesignerPartFactory : public KParts::Factory
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
     KDevDesignerPartFactory();
     virtual ~KDevDesignerPartFactory();
-    virtual KParts::Part* createPartObject( TQWidget *parentWidget, const char *widgetName,
-                                            TQObject *parent, const char *name,
+    virtual KParts::Part* createPartObject( TQWidget *tqparentWidget, const char *widgetName,
+                                            TQObject *tqparent, const char *name,
                                             const char *classname, const TQStringList &args );
     static KInstance* instance();
  
diff --git a/kdevdesigner/designer/layout.cpp b/kdevdesigner/designer/layout.cpp
index 9757d5d9..83db3b7d 100644
--- a/kdevdesigner/designer/layout.cpp
+++ b/kdevdesigner/designer/layout.cpp
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -25,7 +25,7 @@
 **********************************************************************/
 
 #include "formwindow.h"
-#include "layout.h"
+#include "tqlayout.h"
 #include <widgetdatabase.h>
 #include "widgetfactory.h"
 
@@ -44,34 +44,34 @@ bool operator<( const TQGuardedPtr<TQWidget> &p1, const TQGuardedPtr<TQWidget> &
 }
 
 /*!
-  \class Layout layout.h
-  \brief Baseclass for layouting widgets in the Designer
+  \class Layout tqlayout.h
+  \brief Baseclass for tqlayouting widgets in the Designer
 
-  Classes derived from this abstract base class are used for layouting
+  Classes derived from this abstract base class are used for tqlayouting
   operations in the Designer.
 
 */
 
-/*!  \a p specifies the parent of the layoutBase \a lb. The parent
-  might be changed in setup(). If the layoutBase is a
-  container, the parent and the layoutBase are the same. Also they
+/*!  \a p specifies the tqparent of the tqlayoutBase \a lb. The tqparent
+  might be changed in setup(). If the tqlayoutBase is a
+  container, the tqparent and the tqlayoutBase are the same. Also they
   always have to be a widget known to the designer (e.g. in the case
-  of the tabwidget parent and layoutBase are the tabwidget and not the
+  of the tabwidget tqparent and tqlayoutBase are the tabwidget and not the
   page which actually gets laid out. For actual usage the correct
   widget is found later by Layout.)
  */
 
 Layout::Layout( const TQWidgetList &wl, TQWidget *p, FormWindow *fw, TQWidget *lb, bool doSetup, bool splitter )
-    : widgets( wl ), parent( p ), formWindow( fw ), isBreak( !doSetup ), useSplitter( splitter )
+    : widgets( wl ), tqparent( p ), formWindow( fw ), isBreak( !doSetup ), useSplitter( splitter )
 {
     widgets.setAutoDelete( FALSE );
-    layoutBase = lb;
-    if ( !doSetup && layoutBase )
-	oldGeometry = layoutBase->geometry();
+    tqlayoutBase = lb;
+    if ( !doSetup && tqlayoutBase )
+	oldGeometry = tqlayoutBase->tqgeometry();
 }
 
 /*!  The widget list we got in the constructor might contain too much
-  widgets (like widgets with different parents, already laid out
+  widgets (like widgets with different tqparents, already laid out
   widgets, etc.). Here we set up the list and so the only the "best"
   widgets get laid out.
 */
@@ -85,20 +85,20 @@ void Layout::setup()
     TQWidget *w = 0;
 
     // Go through all widgets of the list we got. As we can only
-    // layout widgets which have the same parent, we first do some
-    // sorting which means create a list for each parent containing
+    // tqlayout widgets which have the same tqparent, we first do some
+    // sorting which means create a list for each tqparent containing
     // its child here. After that we keep working on the list of
     // childs which has the most entries.
     // Widgets which are already laid out are thrown away here too
     for ( w = widgets.first(); w; w = widgets.next() ) {
-	if ( w->parentWidget() && WidgetFactory::layoutType( w->parentWidget() ) != WidgetFactory::NoLayout )
+	if ( w->tqparentWidget() && WidgetFactory::tqlayoutType( w->tqparentWidget() ) != WidgetFactory::NoLayout )
 	    continue;
-	if ( lastParent != w->parentWidget() ) {
+	if ( lastParent != w->tqparentWidget() ) {
 	    lastList = 0;
-	    lastParent = w->parentWidget();
+	    lastParent = w->tqparentWidget();
 	    TQValueList<TQWidgetList>::Iterator it = lists.begin();
 	    for ( ; it != lists.end(); ++it ) {
-		if ( ( *it ).first()->parentWidget() == w->parentWidget() )
+		if ( ( *it ).first()->tqparentWidget() == w->tqparentWidget() )
 		    lastList = &( *it );
 	    }
 	    if ( !lastList ) {
@@ -120,12 +120,12 @@ void Layout::setup()
     }
 
     // If we found no list (because no widget did fit at all) or the
-    // best list has only one entry and we do not layout a container,
+    // best list has only one entry and we do not tqlayout a container,
     // we leave here.
     if ( !lastList || ( lastList->count() < 2 &&
-			( !layoutBase ||
-			  ( !WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( layoutBase ) ) ) &&
-			    layoutBase != formWindow->mainContainer() ) )
+			( !tqlayoutBase ||
+			  ( !WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(tqlayoutBase) ) ) ) &&
+			    tqlayoutBase != formWindow->mainContainer() ) )
 			) ) {
 	widgets.clear();
 	startPoint = TQPoint( 0, 0 );
@@ -133,23 +133,23 @@ void Layout::setup()
     }
 
     // Now we have a new and clean widget list, which makes sense
-    // to layout
+    // to tqlayout
     widgets = *lastList;
-    // Also use the only correct parent later, so store it
-    parent = WidgetFactory::widgetOfContainer( widgets.first()->parentWidget() );
-    // Now calculate the position where the layout-meta-widget should
+    // Also use the only correct tqparent later, so store it
+    tqparent = WidgetFactory::widgetOfContainer( widgets.first()->tqparentWidget() );
+    // Now calculate the position where the tqlayout-meta-widget should
     // be placed and connect to widgetDestroyed() signals of the
     // widgets to get informed if one gets deleted to be able to
     // handle that and do not crash in this case
     for ( w = widgets.first(); w; w = widgets.next() ) {
 	connect( w, TQT_SIGNAL( destroyed() ),
 		 this, TQT_SLOT( widgetDestroyed() ) );
-	startPoint = TQPoint( QMIN( startPoint.x(), w->x() ),
-			     QMIN( startPoint.y(), w->y() ) );
+	startPoint = TQPoint( TQMIN( startPoint.x(), w->x() ),
+			     TQMIN( startPoint.y(), w->y() ) );
 	geometries.insert( w, TQRect( w->pos(), w->size() ) );
 	// Change the Z-order, as saving/loading uses the Z-order for
 	// writing/creating widgets and this has to be the same as in
-	// the layout. Else saving + loading will give different results
+	// the tqlayout. Else saving + loading will give different results
 	w->raise();
     }
 }
@@ -160,46 +160,46 @@ void Layout::widgetDestroyed()
 	widgets.removeRef( (TQWidget*)sender() );
 }
 
-bool Layout::prepareLayout( bool &needMove, bool &needReparent )
+bool Layout::prepareLayout( bool &needMove, bool &needRetqparent )
 {
     if ( !widgets.count() )
 	return FALSE;
     for ( TQWidget *w = widgets.first(); w; w = widgets.next() )
 	w->raise();
-    needMove = !layoutBase;
-    needReparent = needMove || ::qt_cast<QLayoutWidget*>(layoutBase) || ::qt_cast<TQSplitter*>(layoutBase);
-    if ( !layoutBase ) {
+    needMove = !tqlayoutBase;
+    needRetqparent = needMove || ::tqqt_cast<TQLayoutWidget*>(tqlayoutBase) || ::tqqt_cast<TQSplitter*>(tqlayoutBase);
+    if ( !tqlayoutBase ) {
 	if ( !useSplitter )
-	    layoutBase = WidgetFactory::create( WidgetDatabase::idFromClassName( TQLAYOUTWIDGET_OBJECT_NAME_STRING ),
-						WidgetFactory::containerOfWidget( parent ) );
+	    tqlayoutBase = WidgetFactory::create( WidgetDatabase::idFromClassName( TQLAYOUTWIDGET_OBJECT_NAME_STRING ),
+						WidgetFactory::containerOfWidget( tqparent ) );
 	else
-	    layoutBase = WidgetFactory::create( WidgetDatabase::idFromClassName( TQSPLITTER_OBJECT_NAME_STRING ),
-						WidgetFactory::containerOfWidget( parent ) );
+	    tqlayoutBase = WidgetFactory::create( WidgetDatabase::idFromClassName( TQSPLITTER_OBJECT_NAME_STRING ),
+						WidgetFactory::containerOfWidget( tqparent ) );
     } else {
-	WidgetFactory::deleteLayout( layoutBase );
+	WidgetFactory::deleteLayout( tqlayoutBase );
     }
 
     return TRUE;
 }
 
-void Layout::finishLayout( bool needMove, TQLayout *layout )
+void Layout::finishLayout( bool needMove, TQLayout *tqlayout )
 {
     if ( needMove )
-	layoutBase->move( startPoint );
-    TQRect g( TQRect( layoutBase->pos(), layoutBase->size() ) );
-    if ( WidgetFactory::layoutType( layoutBase->parentWidget() ) == WidgetFactory::NoLayout && !isBreak )
-	layoutBase->adjustSize();
+	tqlayoutBase->move( startPoint );
+    TQRect g( TQRect( tqlayoutBase->pos(), tqlayoutBase->size() ) );
+    if ( WidgetFactory::tqlayoutType( tqlayoutBase->tqparentWidget() ) == WidgetFactory::NoLayout && !isBreak )
+	tqlayoutBase->adjustSize();
     else if ( isBreak )
-	layoutBase->setGeometry( oldGeometry );
+	tqlayoutBase->setGeometry( oldGeometry );
     oldGeometry = g;
-    layoutBase->show();
-    layout->activate();
-    formWindow->insertWidget( layoutBase );
-    formWindow->selectWidget( layoutBase );
-    TQString n = layoutBase->name();
-    if ( n.find( "qt_dead_widget_" ) != -1 ) {
+    tqlayoutBase->show();
+    tqlayout->activate();
+    formWindow->insertWidget( tqlayoutBase );
+    formWindow->selectWidget( TQT_TQOBJECT(tqlayoutBase) );
+    TQString n = tqlayoutBase->name();
+    if ( n.tqfind( "qt_dead_widget_" ) != -1 ) {
 	n.remove( 0, TQString( "qt_dead_widget_" ).length() );
-	layoutBase->setName( n );
+	tqlayoutBase->setName( n );
     }
 }
 
@@ -211,23 +211,23 @@ void Layout::undoLayout()
     for ( ; it != geometries.end(); ++it ) {
 	if ( !it.key() )
 	    continue;
-	it.key()->reparent( WidgetFactory::containerOfWidget( parent ), 0, ( *it ).topLeft(), it.key()->isVisibleTo( formWindow ) );
+	it.key()->reparent( WidgetFactory::containerOfWidget( tqparent ), 0, ( *it ).topLeft(), it.key()->isVisibleTo( formWindow ) );
 	it.key()->resize( ( *it ).size() );
     }
-    formWindow->selectWidget( layoutBase, FALSE );
-    WidgetFactory::deleteLayout( layoutBase );
-    if ( parent != layoutBase && !::qt_cast<TQMainWindow*>(layoutBase) ) {
-	layoutBase->hide();
-	TQString n = layoutBase->name();
+    formWindow->selectWidget( TQT_TQOBJECT(tqlayoutBase), FALSE );
+    WidgetFactory::deleteLayout( tqlayoutBase );
+    if ( tqparent != tqlayoutBase && !::tqqt_cast<TQMainWindow*>(tqlayoutBase) ) {
+	tqlayoutBase->hide();
+	TQString n = tqlayoutBase->name();
 	n.prepend( "qt_dead_widget_" );
-	layoutBase->setName( n );
+	tqlayoutBase->setName( n );
     } else {
-	layoutBase->setGeometry( oldGeometry );
+	tqlayoutBase->setGeometry( oldGeometry );
     }
     if ( widgets.first() )
-	formWindow->selectWidget( widgets.first() );
+	formWindow->selectWidget( TQT_TQOBJECT(widgets.first()) );
     else
-	formWindow->selectWidget( formWindow );
+	formWindow->selectWidget( TQT_TQOBJECT(formWindow) );
 }
 
 void Layout::breakLayout()
@@ -236,43 +236,43 @@ void Layout::breakLayout()
     if ( !widgets.isEmpty() ) {
 	TQWidget *w;
 	for ( w = widgets.first(); w; w = widgets.next() )
-	    rects.insert( w, w->geometry() );
-    }
-    WidgetFactory::deleteLayout( layoutBase );
-    bool needReparent = qstrcmp( layoutBase->className(), TQLAYOUTWIDGET_OBJECT_NAME_STRING ) == 0 ||
-			qstrcmp( layoutBase->className(), TQSPLITTER_OBJECT_NAME_STRING ) == 0 ||
-			( !WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( layoutBase ) ) ) &&
-			  layoutBase != formWindow->mainContainer() );
-    bool needResize = qstrcmp( layoutBase->className(), TQSPLITTER_OBJECT_NAME_STRING ) == 0;
+	    rects.insert( w, w->tqgeometry() );
+    }
+    WidgetFactory::deleteLayout( tqlayoutBase );
+    bool needRetqparent = qstrcmp( tqlayoutBase->className(), TQLAYOUTWIDGET_OBJECT_NAME_STRING ) == 0 ||
+			qstrcmp( tqlayoutBase->className(), TQSPLITTER_OBJECT_NAME_STRING ) == 0 ||
+			( !WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(tqlayoutBase) ) ) ) &&
+			  tqlayoutBase != formWindow->mainContainer() );
+    bool needResize = qstrcmp( tqlayoutBase->className(), TQSPLITTER_OBJECT_NAME_STRING ) == 0;
     bool add = geometries.isEmpty();
     for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) {
-	if ( needReparent )
-	    w->reparent( layoutBase->parentWidget(), 0,
-			 layoutBase->pos() + w->pos(), TRUE );
+	if ( needRetqparent )
+	    w->reparent( tqlayoutBase->tqparentWidget(), 0,
+			 tqlayoutBase->pos() + w->pos(), TRUE );
 	if ( needResize ) {
-	    TQMap<TQWidget*, TQRect>::Iterator it = rects.find( w );
+	    TQMap<TQWidget*, TQRect>::Iterator it = rects.tqfind( w );
 	    if ( it != rects.end() )
-		w->setGeometry( TQRect( layoutBase->pos() + (*it).topLeft(), (*it).size() ) );
+		w->setGeometry( TQRect( tqlayoutBase->pos() + (*it).topLeft(), (*it).size() ) );
 	}
 	if ( add )
 	    geometries.insert( w, TQRect( w->pos(), w->size() ) );
     }
-    if ( needReparent ) {
-	layoutBase->hide();
-	parent = layoutBase->parentWidget();
-	TQString n = layoutBase->name();
+    if ( needRetqparent ) {
+	tqlayoutBase->hide();
+	tqparent = tqlayoutBase->tqparentWidget();
+	TQString n = tqlayoutBase->name();
 	n.prepend( "qt_dead_widget_" );
-	layoutBase->setName( n );
+	tqlayoutBase->setName( n );
     } else {
-	parent = layoutBase;
+	tqparent = tqlayoutBase;
     }
     if ( widgets.first() && widgets.first()->isVisibleTo( formWindow ) )
-	formWindow->selectWidget( widgets.first() );
+	formWindow->selectWidget( TQT_TQOBJECT(widgets.first()) );
     else
-	formWindow->selectWidget( formWindow );
+	formWindow->selectWidget( TQT_TQOBJECT(formWindow) );
 }
 
-class HorizontalLayoutList : public QWidgetList
+class HorizontalLayoutList : public TQWidgetList
 {
 public:
     HorizontalLayoutList( const TQWidgetList &l )
@@ -307,36 +307,36 @@ void HorizontalLayout::setup()
 
 void HorizontalLayout::doLayout()
 {
-    bool needMove, needReparent;
-    if ( !prepareLayout( needMove, needReparent ) )
+    bool needMove, needRetqparent;
+    if ( !prepareLayout( needMove, needRetqparent ) )
 	return;
 
-    TQHBoxLayout *layout = (TQHBoxLayout*)WidgetFactory::createLayout( layoutBase, 0, WidgetFactory::HBox );
+    TQHBoxLayout *tqlayout = (TQHBoxLayout*)WidgetFactory::createLayout( tqlayoutBase, 0, WidgetFactory::HBox );
 
     for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) {
-	if ( needReparent && w->parent() != layoutBase )
-	    w->reparent( layoutBase, 0, TQPoint( 0, 0 ), FALSE );
+	if ( needRetqparent && TQT_BASE_OBJECT(w->tqparent()) != TQT_BASE_OBJECT(tqlayoutBase) )
+	    w->reparent( tqlayoutBase, 0, TQPoint( 0, 0 ), FALSE );
 	if ( !useSplitter ) {
 	    if ( qstrcmp( w->className(), "Spacer" ) == 0 )
-		layout->addWidget( w, 0, ( (Spacer*)w )->alignment() );
+		tqlayout->addWidget( w, 0, ( (Spacer*)w )->tqalignment() );
 	    else
-		layout->addWidget( w );
-	    if ( ::qt_cast<QLayoutWidget*>(w) )
-		( (QLayoutWidget*)w )->updateSizePolicy();
+		tqlayout->addWidget( w );
+	    if ( ::tqqt_cast<TQLayoutWidget*>(w) )
+		( (TQLayoutWidget*)w )->updateSizePolicy();
 	}
 	w->show();
     }
 
-    if ( ::qt_cast<TQSplitter*>(layoutBase) )
-	( (TQSplitter*)layoutBase )->setOrientation( Qt::Horizontal );
+    if ( ::tqqt_cast<TQSplitter*>(tqlayoutBase) )
+	( (TQSplitter*)tqlayoutBase )->setOrientation( Qt::Horizontal );
 
-    finishLayout( needMove, layout );
+    finishLayout( needMove, tqlayout );
 }
 
 
 
 
-class VerticalLayoutList : public QWidgetList
+class VerticalLayoutList : public TQWidgetList
 {
 public:
     VerticalLayoutList( const TQWidgetList &l )
@@ -371,30 +371,30 @@ void VerticalLayout::setup()
 
 void VerticalLayout::doLayout()
 {
-    bool needMove, needReparent;
-    if ( !prepareLayout( needMove, needReparent ) )
+    bool needMove, needRetqparent;
+    if ( !prepareLayout( needMove, needRetqparent ) )
 	return;
 
-    TQVBoxLayout *layout = (TQVBoxLayout*)WidgetFactory::createLayout( layoutBase, 0, WidgetFactory::VBox );
+    TQVBoxLayout *tqlayout = (TQVBoxLayout*)WidgetFactory::createLayout( tqlayoutBase, 0, WidgetFactory::VBox );
 
     for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) {
-	if ( needReparent && w->parent() != layoutBase )
-	    w->reparent( layoutBase, 0, TQPoint( 0, 0 ), FALSE );
+	if ( needRetqparent && TQT_BASE_OBJECT(w->tqparent()) != TQT_BASE_OBJECT(tqlayoutBase) )
+	    w->reparent( tqlayoutBase, 0, TQPoint( 0, 0 ), FALSE );
 	if ( !useSplitter ) {
 	    if ( qstrcmp( w->className(), "Spacer" ) == 0 )
-		layout->addWidget( w, 0, ( (Spacer*)w )->alignment() );
+		tqlayout->addWidget( w, 0, ( (Spacer*)w )->tqalignment() );
 	    else
-		layout->addWidget( w );
-	    if ( ::qt_cast<QLayoutWidget*>(w) )
-		( (QLayoutWidget*)w )->updateSizePolicy();
+		tqlayout->addWidget( w );
+	    if ( ::tqqt_cast<TQLayoutWidget*>(w) )
+		( (TQLayoutWidget*)w )->updateSizePolicy();
 	}
 	w->show();
     }
 
-    if ( ::qt_cast<TQSplitter*>(layoutBase) )
-	( (TQSplitter*)layoutBase )->setOrientation( Qt::Vertical );
+    if ( ::tqqt_cast<TQSplitter*>(tqlayoutBase) )
+	( (TQSplitter*)tqlayoutBase )->setOrientation( Qt::Vertical );
 
-    finishLayout( needMove, layout );
+    finishLayout( needMove, tqlayout );
 }
 
 
@@ -743,11 +743,11 @@ GridLayout::~GridLayout()
 
 void GridLayout::doLayout()
 {
-    bool needMove, needReparent;
-    if ( !prepareLayout( needMove, needReparent ) )
+    bool needMove, needRetqparent;
+    if ( !prepareLayout( needMove, needRetqparent ) )
 	return;
 
-    QDesignerGridLayout *layout = (QDesignerGridLayout*)WidgetFactory::createLayout( layoutBase, 0, WidgetFactory::Grid );
+    TQDesignerGridLayout *tqlayout = (TQDesignerGridLayout*)WidgetFactory::createLayout( tqlayoutBase, 0, WidgetFactory::Grid );
 
     if ( !grid )
 	buildGrid();
@@ -756,21 +756,21 @@ void GridLayout::doLayout()
     int r, c, rs, cs;
     for ( w = widgets.first(); w; w = widgets.next() ) {
 	if ( grid->locateWidget( w, r, c, rs, cs) ) {
-	    if ( needReparent && w->parent() != layoutBase )
-		w->reparent( layoutBase, 0, TQPoint( 0, 0 ), FALSE );
+	    if ( needRetqparent && TQT_BASE_OBJECT(w->tqparent()) != TQT_BASE_OBJECT(tqlayoutBase) )
+		w->reparent( tqlayoutBase, 0, TQPoint( 0, 0 ), FALSE );
 	    if ( rs * cs == 1 ) {
-		layout->addWidget( w, r, c, ::qt_cast<Spacer*>(w) ? ( (Spacer*)w )->alignment() : 0 );
+		tqlayout->addWidget( w, r, c, ::tqqt_cast<Spacer*>(w) ? ( (Spacer*)w )->tqalignment() : 0 );
 	    } else {
-		layout->addMultiCellWidget( w, r, r+rs-1, c, c+cs-1, ::qt_cast<Spacer*>(w) ? ( (Spacer*)w )->alignment() : 0 );
+		tqlayout->addMultiCellWidget( w, r, r+rs-1, c, c+cs-1, ::tqqt_cast<Spacer*>(w) ? ( (Spacer*)w )->tqalignment() : 0 );
 	    }
-	    if ( ::qt_cast<QLayoutWidget*>(w) )
-		( (QLayoutWidget*)w )->updateSizePolicy();
+	    if ( ::tqqt_cast<TQLayoutWidget*>(w) )
+		( (TQLayoutWidget*)w )->updateSizePolicy();
 	    w->show();
 	} else {
-	    qWarning("ooops, widget '%s' does not fit in layout", w->name() );
+	    qWarning("ooops, widget '%s' does not fit in tqlayout", w->name() );
 	}
     }
-    finishLayout( needMove, layout );
+    finishLayout( needMove, tqlayout );
 }
 
 void GridLayout::setup()
@@ -787,7 +787,7 @@ void GridLayout::buildGrid()
     // Pixel to cell conversion:
     // By keeping a list of start'n'stop values (x & y) for each widget,
     // it is possible to create a very small grid of cells to represent
-    // the widget layout.
+    // the widget tqlayout.
     // -----------------------------------------------------------------
 
     // We need a list of both start and stop values for x- & y-axis
@@ -798,7 +798,7 @@ void GridLayout::buildGrid()
     int index  = 0;
     TQWidget* w = 0;
     for ( w = widgets.first(); w; w = widgets.next() ) {
-	TQRect widgetPos = w->geometry();
+	TQRect widgetPos = w->tqgeometry();
 	x[index]   = widgetPos.left();
 	x[index+1] = widgetPos.right();
 	y[index]   = widgetPos.top();
@@ -829,7 +829,7 @@ void GridLayout::buildGrid()
 		current++;
     }
 
-    // Create the smallest grid possible to represent the current layout
+    // Create the smallest grid possible to represent the current tqlayout
     // Since no widget will be placed in the last row and column, we'll
     // skip them to increase speed even further
     delete grid;
@@ -837,7 +837,7 @@ void GridLayout::buildGrid()
 
     // Mark the cells in the grid that contains a widget
     for ( w = widgets.first(); w; w = widgets.next() ) {
-	TQRect c(0,0,0,0), widgetPos = w->geometry();
+	TQRect c(0,0,0,0), widgetPos = w->tqgeometry();
 	// From left til right (not including)
 	for (uint cw=0; cw<x.size(); cw++) {
 	    if ( x[cw] == widgetPos.left() )
@@ -863,9 +863,9 @@ void GridLayout::buildGrid()
 
 
 
-Spacer::Spacer( TQWidget *parent, const char *name )
-    : TQWidget( parent, name, WMouseNoMask ),
-      orient( Vertical ), interactive(TRUE), sh( TQSize(20,20) )
+Spacer::Spacer( TQWidget *tqparent, const char *name )
+    : TQWidget( tqparent, name, WMouseNoMask ),
+      orient(Qt::Vertical ), interactive(TRUE), sh( TQSize(20,20) )
 {
     setSizeType( Expanding );
     setAutoMask( TRUE );
@@ -874,11 +874,11 @@ Spacer::Spacer( TQWidget *parent, const char *name )
 void Spacer::paintEvent( TQPaintEvent * )
 {
     TQPainter p( this );
-    p.setPen( Qt::blue );
+    p.setPen( TQt::blue );
 
-    if ( orient == Horizontal ) {
+    if ( orient ==Qt::Horizontal ) {
 	const int dist = 3;
-	const int amplitude = QMIN( 3, height() / 3 );
+	const int amplitude = TQMIN( 3, height() / 3 );
 	const int base = height() / 2;
 	int i = 0;
 	p.setPen( white );
@@ -891,7 +891,7 @@ void Spacer::paintEvent( TQPaintEvent * )
 	p.drawLine( width() - 1, 0, width() - 1, height());
     } else {
 	const int dist = 3;
-	const int amplitude = QMIN( 3, width() / 3 );
+	const int amplitude = TQMIN( 3, width() / 3 );
 	const int base = width() / 2;
 	int i = 0;
 	p.setPen( white );
@@ -908,20 +908,20 @@ void Spacer::paintEvent( TQPaintEvent * )
 void Spacer::resizeEvent( TQResizeEvent* e)
 {
     TQWidget::resizeEvent( e );
-    if ( !parentWidget() || WidgetFactory::layoutType( parentWidget() ) == WidgetFactory::NoLayout )
+    if ( !tqparentWidget() || WidgetFactory::tqlayoutType( tqparentWidget() ) == WidgetFactory::NoLayout )
 	sh = size();
 }
 
 void Spacer::updateMask()
 {
     TQRegion r( rect() );
-    if ( orient == Horizontal ) {
-	const int amplitude = QMIN( 3, height() / 3 );
+    if ( orient ==Qt::Horizontal ) {
+	const int amplitude = TQMIN( 3, height() / 3 );
 	const int base = height() / 2;
 	r = r.subtract( TQRect(1, 0, width() - 2, base - amplitude ) );
 	r = r.subtract( TQRect(1, base + amplitude, width() - 2, height() - base - amplitude ) );
     } else {
-	const int amplitude = QMIN( 3, width() / 3 );
+	const int amplitude = TQMIN( 3, width() / 3 );
 	const int base = width() / 2;
 	r = r.subtract( TQRect(0, 1, base - amplitude, height() - 2 ) );
 	r = r.subtract( TQRect( base + amplitude, 1, width() - base - amplitude, height() - 2 ) );
@@ -932,40 +932,40 @@ void Spacer::updateMask()
 void Spacer::setSizeType( SizeType t )
 {
     TQSizePolicy sizeP;
-    if ( orient == Vertical )
+    if ( orient ==Qt::Vertical )
 	sizeP = TQSizePolicy( TQSizePolicy::Minimum, (TQSizePolicy::SizeType)t );
     else
 	sizeP = TQSizePolicy( (TQSizePolicy::SizeType)t, TQSizePolicy::Minimum );
-    setSizePolicy( sizeP );
+    tqsetSizePolicy( sizeP );
 }
 
 
 Spacer::SizeType Spacer::sizeType() const
 {
-    if ( orient == Vertical )
-	return (SizeType)sizePolicy().verData();
-    return (SizeType)sizePolicy().horData();
+    if ( orient ==Qt::Vertical )
+	return (SizeType)tqsizePolicy().verData();
+    return (SizeType)tqsizePolicy().horData();
 }
 
-int Spacer::alignment() const
+int Spacer::tqalignment() const
 {
-    if ( orient == Vertical )
+    if ( orient ==Qt::Vertical )
 	return AlignHCenter;
     return AlignVCenter;
 }
 
-TQSize Spacer::minimumSize() const
+TQSize Spacer::tqminimumSize() const
 {
     TQSize s = TQSize( 20,20 );
     if ( sizeType() == Expanding )
-	if ( orient == Vertical )
+	if ( orient ==Qt::Vertical )
 	    s.rheight() = 0;
 	else
 	    s.rwidth() = 0;
     return s;
 }
 
-TQSize Spacer::sizeHint() const
+TQSize Spacer::tqsizeHint() const
 {
     return sh;
 }
@@ -974,8 +974,8 @@ TQSize Spacer::sizeHint() const
 void Spacer::setSizeHint( const TQSize &s )
 {
     sh = s;
-    if ( !parentWidget() || WidgetFactory::layoutType( parentWidget() ) == WidgetFactory::NoLayout )
-	resize( sizeHint() );
+    if ( !tqparentWidget() || WidgetFactory::tqlayoutType( tqparentWidget() ) == WidgetFactory::NoLayout )
+	resize( tqsizeHint() );
     updateGeometry();
 }
 
@@ -994,7 +994,7 @@ void Spacer::setOrientation( Qt::Orientation o )
     setSizeType( st );
     if ( interactive ) {
 	sh = TQSize( sh.height(), sh.width() );
-	if (!parentWidget() || WidgetFactory::layoutType( parentWidget() ) == WidgetFactory::NoLayout )
+	if (!tqparentWidget() || WidgetFactory::tqlayoutType( tqparentWidget() ) == WidgetFactory::NoLayout )
 	    resize( height(), width() );
     }
     updateMask();
@@ -1003,13 +1003,13 @@ void Spacer::setOrientation( Qt::Orientation o )
 }
 
 
-void QDesignerGridLayout::addWidget( TQWidget *w, int row, int col, int align_ )
+void TQDesignerGridLayout::addWidget( TQWidget *w, int row, int col, int align_ )
 {
     items.insert( w, Item(row, col, 1, 1) );
     TQGridLayout::addWidget( w, row, col, align_ );
 }
 
-void QDesignerGridLayout::addMultiCellWidget( TQWidget *w, int fromRow, int toRow,
+void TQDesignerGridLayout::addMultiCellWidget( TQWidget *w, int fromRow, int toRow,
 					      int fromCol, int toCol, int align_ )
 {
     items.insert( w, Item(fromRow, fromCol, toRow - fromRow + 1, toCol - fromCol +1) );
diff --git a/kdevdesigner/designer/layout.h b/kdevdesigner/designer/layout.h
index 23fff02b..67061595 100644
--- a/kdevdesigner/designer/layout.h
+++ b/kdevdesigner/designer/layout.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -38,9 +38,10 @@
 class FormWindow;
 class TQPaintEvent;
 
-class Layout : public QObject
+class Layout : public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     Layout( const TQWidgetList &wl, TQWidget *p, FormWindow *fw, TQWidget *lb, bool doSetup = TRUE, bool splitter = FALSE );
@@ -49,15 +50,15 @@ public:
     virtual void doLayout() = 0;
     virtual void undoLayout();
     virtual void breakLayout();
-    virtual bool prepareLayout( bool &needMove, bool &needReparent );
-    virtual void finishLayout( bool needMove, TQLayout *layout );
+    virtual bool prepareLayout( bool &needMove, bool &needRetqparent );
+    virtual void finishLayout( bool needMove, TQLayout *tqlayout );
 
 protected:
     TQWidgetList widgets;
-    TQWidget *parent;
+    TQWidget *tqparent;
     TQPoint startPoint;
     TQMap<TQGuardedPtr<TQWidget>, TQRect> geometries;
-    TQWidget *layoutBase;
+    TQWidget *tqlayoutBase;
     FormWindow *formWindow;
     TQRect oldGeometry;
     bool isBreak;
@@ -74,7 +75,7 @@ protected slots:
 class HorizontalLayout : public Layout
 {
 public:
-    HorizontalLayout( const TQWidgetList &wl, TQWidget *p, FormWindow *fw, TQWidget *lb, bool doSetup = TRUE, bool splitter = FALSE );
+   HorizontalLayout( const TQWidgetList &wl, TQWidget *p, FormWindow *fw, TQWidget *lb, bool doSetup = TRUE, bool splitter = FALSE );
 
     void doLayout();
 
@@ -86,7 +87,7 @@ protected:
 class VerticalLayout : public Layout
 {
 public:
-    VerticalLayout( const TQWidgetList &wl, TQWidget *p, FormWindow *fw, TQWidget *lb, bool doSetup = TRUE, bool splitter = FALSE );
+   VerticalLayout( const TQWidgetList &wl, TQWidget *p, FormWindow *fw, TQWidget *lb, bool doSetup = TRUE, bool splitter = FALSE );
 
     void doLayout();
 
@@ -115,16 +116,17 @@ protected:
 
 };
 
-class Spacer : public QWidget
+class Spacer : public TQWidget
 {
     Q_OBJECT
+  TQ_OBJECT
 
-    Q_OVERRIDE( TQCString name )
-    Q_PROPERTY( Orientation orientation READ orientation WRITE setOrientation )
+    TQ_OVERRIDE( TQCString name )
+    TQ_PROPERTY( Qt::Orientation orientation READ orientation WRITE setOrientation )
     Q_ENUMS( SizeType )
-    Q_PROPERTY( SizeType sizeType READ sizeType WRITE setSizeType )
-    Q_PROPERTY( TQSize sizeHint READ sizeHint WRITE setSizeHint DESIGNABLE true STORED true )
-    Q_OVERRIDE( TQRect geometry DESIGNABLE false )
+    TQ_PROPERTY( SizeType sizeType READ sizeType WRITE setSizeType )
+    TQ_PROPERTY( TQSize tqsizeHint READ tqsizeHint WRITE setSizeHint DESIGNABLE true STORED true )
+    TQ_OVERRIDE( TQRect tqgeometry DESIGNABLE false )
 
 private:
     enum { HSize = 6, HMask = 0x3f, VMask = HMask << HSize,
@@ -138,15 +140,15 @@ public:
 		    MinimumExpanding = Minimum|ExpMask,
 		    Expanding = MinimumExpanding|MayShrink };
 
-    Spacer( TQWidget *parent, const char *name );
+    Spacer( TQWidget *tqparent, const char *name );
 
-    TQSize minimumSize() const;
-    TQSize sizeHint() const;
+    TQSize tqminimumSize() const;
+    TQSize tqsizeHint() const;
     void setSizeType( SizeType t );
     SizeType sizeType() const;
-    int alignment() const;
-    Orientation orientation() const;
-    void setOrientation( Orientation o );
+    int tqalignment() const;
+    Qt::Orientation orientation() const;
+    void setOrientation( Qt::Orientation o );
     void setInteraciveMode( bool b ) { interactive = b; };
     void setSizeHint( const TQSize &s );
 
@@ -159,12 +161,13 @@ protected:
     TQSize sh;
 };
 
-class QDesignerGridLayout : public QGridLayout
+class TQDesignerGridLayout : public TQGridLayout
 {
    Q_OBJECT
+  TQ_OBJECT
 public:
-    QDesignerGridLayout( TQWidget *parent ) : TQGridLayout( parent ){};
-    QDesignerGridLayout( TQLayout *parentLayout ) : TQGridLayout( parentLayout ){};
+    TQDesignerGridLayout( TQWidget *tqparent ) : TQGridLayout( tqparent ){};
+    TQDesignerGridLayout( TQLayout *tqparentLayout ) : TQGridLayout( tqparentLayout ){};
 
     void addWidget( TQWidget *, int row, int col, int align = 0 );
     void addMultiCellWidget( TQWidget *, int fromRow, int toRow,
@@ -178,7 +181,7 @@ public:
 	int column;
 	int rowspan;
 	int colspan;
-	Q_DUMMY_COMPARISON_OPERATOR( Item )
+	TQ_DUMMY_COMPARISON_OPERATOR( Item )
     };
 
     TQMap<TQWidget*, Item> items;
diff --git a/kdevdesigner/designer/listboxdnd.cpp b/kdevdesigner/designer/listboxdnd.cpp
index 8ed979f2..9c57eb18 100644
--- a/kdevdesigner/designer/listboxdnd.cpp
+++ b/kdevdesigner/designer/listboxdnd.cpp
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -32,13 +32,13 @@
 #include <tqvaluelist.h>
 
 // The Dragobject Declaration ---------------------------------------
-class ListBoxItemDrag : public QStoredDrag
+class ListBoxItemDrag : public TQStoredDrag
 {
 public:
-    ListBoxItemDrag( ListBoxItemList & items, bool sendPtr = FALSE, TQListBox * parent = 0, const char * name = 0 );
+    ListBoxItemDrag( ListBoxItemList & items, bool sendPtr = FALSE, TQListBox * tqparent = 0, const char * name = 0 );
     ~ListBoxItemDrag() {};
     static bool canDecode( TQDragMoveEvent * event );
-    static bool decode( TQDropEvent * event, TQListBox * parent, TQListBoxItem * insertPoint );
+    static bool decode( TQDropEvent * event, TQListBox * tqparent, TQListBoxItem * insertPoint );
     enum ItemType { ListBoxText = 1, ListBoxPixmap = 2 };
 };
 // ------------------------------------------------------------------
@@ -81,7 +81,7 @@ bool ListBoxDnd::dropEvent( TQDropEvent * event )
 
 bool ListBoxDnd::mouseMoveEvent( TQMouseEvent * event )
 {
-    if ( event->state() & LeftButton ) {
+    if ( event->state() & Qt::LeftButton ) {
 	if ( ( event->pos() - mousePressPos ).manhattanLength() > 3 ) {
 
 	    ListBoxItemList list;
@@ -141,7 +141,7 @@ void ListBoxDnd::removeList( ListBoxItemList & list )
 {
     TQListBoxItem * i = list.first();
     while ( i ) {
-	((TQListBox *)src)->takeItem( i ); // remove item from QListBox
+	((TQListBox *)src)->takeItem( i ); // remove item from TQListBox
 	i = list.next();
     }
 }
@@ -152,8 +152,8 @@ void ListBoxDnd::updateLine( const TQPoint & dragPos )
     TQListBoxItem *item = itemAt( dragPos );
 
     int ypos = item ? 
-	( src->itemRect( item ).bottom() - ( line->height() / 2 ) ) : 
-	( src->itemRect( ((TQListBox *)src)->firstItem() ).top() );
+	( src->tqitemRect( item ).bottom() - ( line->height() / 2 ) ) : 
+	( src->tqitemRect( ((TQListBox *)src)->firstItem() ).top() );
 
     line->resize( src->viewport()->width(), line->height() );
     line->move( 0, ypos );
@@ -166,9 +166,9 @@ TQListBoxItem * ListBoxDnd::itemAt( TQPoint pos )
     TQListBoxItem * last = src->item( src->count() - 1 );
     int i = src->index( result );
 
-    if ( result && ( pos.y() < (src->itemRect(result).top() + src->itemHeight(i)/2) ) )
+    if ( result && ( pos.y() < (src->tqitemRect(result).top() + src->itemHeight(i)/2) ) )
 	result = result->prev();
-    else if ( !result && pos.y() > src->itemRect( last ).bottom() )
+    else if ( !result && pos.y() > src->tqitemRect( last ).bottom() )
 	result = last;
 
     return result;
@@ -184,15 +184,15 @@ bool ListBoxDnd::canDecode( TQDragEnterEvent * event )
 // The Dragobject Implementation ------------------------------------
 // ------------------------------------------------------------------
 
-ListBoxItemDrag::ListBoxItemDrag( ListBoxItemList & items, bool sendPtr, TQListBox * parent, const char * name )
-    : TQStoredDrag( "qt/listboxitem", parent, name )
+ListBoxItemDrag::ListBoxItemDrag( ListBoxItemList & items, bool sendPtr, TQListBox * tqparent, const char * name )
+    : TQStoredDrag( "qt/listboxitem", tqparent, name )
 {
     // ### FIX!
-    TQByteArray data( sizeof( Q_INT32 ) + sizeof( TQListBoxItem ) * items.count() );
+    TQByteArray data( sizeof( TQ_INT32 ) + sizeof( TQListBoxItem ) * items.count() );
     TQDataStream stream( data, IO_WriteOnly );
 
     stream << items.count();
-    stream << (Q_UINT8) sendPtr; // just transfer item pointer; omit data
+    stream << (TQ_UINT8) sendPtr; // just transfer item pointer; omit data
 
     TQListBoxItem * i = items.first();
 
@@ -200,7 +200,7 @@ ListBoxItemDrag::ListBoxItemDrag( ListBoxItemList & items, bool sendPtr, TQListB
 	
 	while ( i ) {
 	    
-	    stream << (Q_ULONG) i; //###FIX: demands sizeof(ulong) >= sizeof(void*)
+	    stream << (TQ_ULONG) i; //###FIX: demands sizeof(ulong) >= sizeof(void*)
 	    i = items.next();
 	    
 	}
@@ -209,21 +209,21 @@ ListBoxItemDrag::ListBoxItemDrag( ListBoxItemList & items, bool sendPtr, TQListB
   
 	while ( i ) {
 	
-	    Q_UINT8 b = 0;
+	    TQ_UINT8 b = 0;
 
-	    b = (Q_UINT8) ( i->text() != TQString::null ); // does item have text ?
+	    b = (TQ_UINT8) ( i->text() != TQString() ); // does item have text ?
 	    stream << b;
 	    if ( b ) {
 		stream << i->text();
 	    }
     
-	    b = (Q_UINT8) ( !!i->pixmap() ); // does item have a pixmap ?
+	    b = (TQ_UINT8) ( !!i->pixmap() ); // does item have a pixmap ?
 	    stream << b;
 	    if ( b ) {
 		stream << ( *i->pixmap() );
 	    }
 
-	    stream << (Q_UINT8) i->isSelectable();
+	    stream << (TQ_UINT8) i->isSelectable();
 	    
 	    i = items.next();
 	}
@@ -238,9 +238,9 @@ bool ListBoxItemDrag::canDecode( TQDragMoveEvent * event )
     return event->provides( "qt/listboxitem" );
 }
 
-bool ListBoxItemDrag::decode( TQDropEvent * event, TQListBox * parent, TQListBoxItem * after )
+bool ListBoxItemDrag::decode( TQDropEvent * event, TQListBox * tqparent, TQListBoxItem * after )
 {
-    TQByteArray data = event->encodedData( "qt/listboxitem" );
+    TQByteArray data = event->tqencodedData( "qt/listboxitem" );
 
     if ( data.size() ) {
 	event->accept();
@@ -249,7 +249,7 @@ bool ListBoxItemDrag::decode( TQDropEvent * event, TQListBox * parent, TQListBox
 	int count = 0;
 	stream >> count;
 
-	Q_UINT8 recievePtr = 0; // data contains just item pointers; no data
+	TQ_UINT8 recievePtr = 0; // data contains just item pointers; no data
 	stream >> recievePtr;
 
 	TQListBoxItem * item = 0;
@@ -258,11 +258,11 @@ bool ListBoxItemDrag::decode( TQDropEvent * event, TQListBox * parent, TQListBox
 	    
 	    for( int i = 0; i < count; i++ ) {
 
-		Q_ULONG p = 0; //###FIX: demands sizeof(ulong) >= sizeof(void*)
+		TQ_ULONG p = 0; //###FIX: demands sizeof(ulong) >= sizeof(void*)
 		stream >> p;
 		item = (TQListBoxItem *) p;
 		
-		parent->insertItem( item, after );
+		tqparent->insertItem( item, after );
 		
 	    }
 	    
@@ -270,27 +270,27 @@ bool ListBoxItemDrag::decode( TQDropEvent * event, TQListBox * parent, TQListBox
 
 	    for ( int i = 0; i < count; i++ ) {
 
-		Q_UINT8 hasText = 0;
+		TQ_UINT8 hasText = 0;
 		TQString text;
 		stream >> hasText;
 		if ( hasText ) {
 		    stream >> text;
 		}
 	    
-		Q_UINT8 hasPixmap = 0;
+		TQ_UINT8 hasPixmap = 0;
 		TQPixmap pixmap;
 		stream >> hasPixmap;
 		if ( hasPixmap ) {
 		    stream >> pixmap;
 		}
 	    
-		Q_UINT8 isSelectable = 0;
+		TQ_UINT8 isSelectable = 0;
 		stream >> isSelectable;
 
 		if ( hasPixmap ) {
-		    item = new TQListBoxPixmap( parent, pixmap, text, after );
+		    item = new TQListBoxPixmap( tqparent, pixmap, text, after );
 		} else {
-		    item = new TQListBoxText( parent, text, after );
+		    item = new TQListBoxText( tqparent, text, after );
 		}
 
 		item->setSelectable( isSelectable );
diff --git a/kdevdesigner/designer/listboxdnd.h b/kdevdesigner/designer/listboxdnd.h
index 3885dce2..b4da4d39 100644
--- a/kdevdesigner/designer/listboxdnd.h
+++ b/kdevdesigner/designer/listboxdnd.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -36,6 +36,7 @@ typedef TQPtrList<TQListBoxItem> ListBoxItemList;
 class ListBoxDnd : public ListDnd
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
     // dragModes are enumerated in ListDnd
     ListBoxDnd( TQListBox * eventSource, const char * name = 0 );
diff --git a/kdevdesigner/designer/listboxeditor.ui b/kdevdesigner/designer/listboxeditor.ui
index ce3d4b79..bb904236 100644
--- a/kdevdesigner/designer/listboxeditor.ui
+++ b/kdevdesigner/designer/listboxeditor.ui
@@ -25,7 +25,7 @@
 ** not clear to you.
 **
 *********************************************************************</comment>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>ListBoxEditorBase</cstring>
     </property>
@@ -56,7 +56,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QLayoutWidget" row="5" column="0" rowspan="1" colspan="3">
+        <widget class="TQLayoutWidget" row="5" column="0" rowspan="1" colspan="3">
             <property name="name">
                 <cstring>Layout1</cstring>
             </property>
@@ -70,7 +70,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>helpButton</cstring>
                     </property>
@@ -91,14 +91,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonOk</cstring>
                     </property>
@@ -115,7 +115,7 @@
                         <string>Close the dialog and apply all the changes.</string>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonApply</cstring>
                     </property>
@@ -129,7 +129,7 @@
                         <string>Apply all changes.</string>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonCancel</cstring>
                     </property>
@@ -145,7 +145,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QListBox" row="0" column="0" rowspan="5" colspan="1">
+        <widget class="TQListBox" row="0" column="0" rowspan="5" colspan="1">
             <property name="name">
                 <cstring>preview</cstring>
             </property>
@@ -156,7 +156,7 @@
                 <string>The list of items.</string>
             </property>
         </widget>
-        <widget class="QGroupBox" row="0" column="2" rowspan="5" colspan="1">
+        <widget class="TQGroupBox" row="0" column="2" rowspan="5" colspan="1">
             <property name="name">
                 <cstring>GroupBox1</cstring>
             </property>
@@ -173,7 +173,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QLabel" row="1" column="0">
+                <widget class="TQLabel" row="1" column="0">
                     <property name="name">
                         <cstring>Label2</cstring>
                     </property>
@@ -184,7 +184,7 @@
                         <cstring>itemChoosePixmap</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="1" column="1">
+                <widget class="TQLabel" row="1" column="1">
                     <property name="name">
                         <cstring>itemPixmap</cstring>
                     </property>
@@ -192,11 +192,11 @@
                         <string>Label4</string>
                     </property>
                 </widget>
-                <widget class="QPushButton" row="1" column="2">
+                <widget class="TQPushButton" row="1" column="2">
                     <property name="name">
                         <cstring>itemDeletePixmap</cstring>
                     </property>
-                    <property name="maximumSize">
+                    <property name="tqmaximumSize">
                         <size>
                             <width>30</width>
                             <height>22</height>
@@ -215,11 +215,11 @@
                         <string>Delete the selected item's pixmap.</string>
                     </property>
                 </widget>
-                <widget class="QPushButton" row="1" column="3">
+                <widget class="TQPushButton" row="1" column="3">
                     <property name="name">
                         <cstring>itemChoosePixmap</cstring>
                     </property>
-                    <property name="maximumSize">
+                    <property name="tqmaximumSize">
                         <size>
                             <width>30</width>
                             <height>22</height>
@@ -235,7 +235,7 @@
                         <string>Choose a pixmap file for the selected item.</string>
                     </property>
                 </widget>
-                <widget class="QLabel" row="0" column="0">
+                <widget class="TQLabel" row="0" column="0">
                     <property name="name">
                         <cstring>Label1</cstring>
                     </property>
@@ -250,7 +250,7 @@
                     <property name="name">
                         <cstring>itemText</cstring>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>0</width>
                             <height>0</height>
@@ -265,7 +265,7 @@
                 </widget>
             </grid>
         </widget>
-        <widget class="QPushButton" row="0" column="1">
+        <widget class="TQPushButton" row="0" column="1">
             <property name="name">
                 <cstring>itemNew</cstring>
             </property>
@@ -279,7 +279,7 @@
                 <string>&lt;b&gt;Add a new item.&lt;/b&gt;&lt;p&gt;New items are appended to the list.&lt;/p&gt;</string>
             </property>
         </widget>
-        <widget class="QPushButton" row="1" column="1">
+        <widget class="TQPushButton" row="1" column="1">
             <property name="name">
                 <cstring>itemDelete</cstring>
             </property>
@@ -303,14 +303,14 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
                 </size>
             </property>
         </spacer>
-        <widget class="QPushButton" row="3" column="1">
+        <widget class="TQPushButton" row="3" column="1">
             <property name="name">
                 <cstring>itemUp</cstring>
             </property>
@@ -327,7 +327,7 @@
                 <string>Moves the selected item up.</string>
             </property>
         </widget>
-        <widget class="QPushButton" row="4" column="1">
+        <widget class="TQPushButton" row="4" column="1">
             <property name="name">
                 <cstring>itemDown</cstring>
             </property>
@@ -361,9 +361,9 @@
     </connection>
     <connection>
         <sender>itemText</sender>
-        <signal>textChanged( const QString &amp; )</signal>
+        <signal>textChanged( const TQString &amp; )</signal>
         <receiver>ListBoxEditorBase</receiver>
-        <slot>currentTextChanged(const QString&amp;)</slot>
+        <slot>currentTextChanged(const TQString&amp;)</slot>
     </connection>
     <connection>
         <sender>buttonOk</sender>
@@ -409,15 +409,15 @@
     </connection>
     <connection>
         <sender>preview</sender>
-        <signal>selectionChanged(QListBoxItem*)</signal>
+        <signal>selectionChanged(TQListBoxItem*)</signal>
         <receiver>ListBoxEditorBase</receiver>
-        <slot>currentItemChanged(QListBoxItem*)</slot>
+        <slot>currentItemChanged(TQListBoxItem*)</slot>
     </connection>
     <connection>
         <sender>preview</sender>
-        <signal>currentChanged( QListBoxItem * )</signal>
+        <signal>currentChanged( TQListBoxItem * )</signal>
         <receiver>ListBoxEditorBase</receiver>
-        <slot>currentItemChanged(QListBoxItem*)</slot>
+        <slot>currentItemChanged(TQListBoxItem*)</slot>
     </connection>
 </connections>
 <tabstops>
@@ -434,13 +434,13 @@
     <tabstop>helpButton</tabstop>
     <tabstop>buttonApply</tabstop>
 </tabstops>
-<slots>
+<Q_SLOTS>
     <slot access="protected">init()</slot>
     <slot access="protected">destroy()</slot>
     <slot access="protected">insertNewItem()</slot>
     <slot access="protected">deleteCurrentItem()</slot>
-    <slot access="protected">currentItemChanged( QListBoxItem * )</slot>
-    <slot access="protected">currentTextChanged( const QString &amp; )</slot>
+    <slot access="protected">currentItemChanged( TQListBoxItem * )</slot>
+    <slot access="protected">currentTextChanged( const TQString &amp; )</slot>
     <slot access="protected">okClicked()</slot>
     <slot access="protected">cancelClicked()</slot>
     <slot access="protected">applyClicked()</slot>
@@ -448,10 +448,10 @@
     <slot access="protected">deletePixmap()</slot>
     <slot access="protected">moveItemUp()</slot>
     <slot access="protected">moveItemDown()</slot>
-</slots>
+</Q_SLOTS>
 <includes>
     <include location="local" impldecl="in implementation">myiconloader.h</include>
 </includes>
 <pixmapfunction>BarIcon2</pixmapfunction>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kdevdesigner/designer/listboxeditorimpl.cpp b/kdevdesigner/designer/listboxeditorimpl.cpp
index 2fade00e..073fdda6 100644
--- a/kdevdesigner/designer/listboxeditorimpl.cpp
+++ b/kdevdesigner/designer/listboxeditorimpl.cpp
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -40,8 +40,8 @@
 
 #include <klocale.h>
 
-ListBoxEditor::ListBoxEditor( TQWidget *parent, TQWidget *editWidget, FormWindow *fw )
-    : ListBoxEditorBase( parent, 0, TRUE ), formwindow( fw )
+ListBoxEditor::ListBoxEditor( TQWidget *tqparent, TQWidget *editWidget, FormWindow *fw )
+    : ListBoxEditorBase( tqparent, 0, TRUE ), formwindow( fw )
 {
     connect( helpButton, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) );
     listbox = (TQListBox*)editWidget;
@@ -70,7 +70,7 @@ ListBoxEditor::ListBoxEditor( TQWidget *parent, TQWidget *editWidget, FormWindow
 
     ListBoxRename *editorRename = new ListBoxRename( preview );
 
-    TQObjectList *l = parent->queryList( TQLINEEDIT_OBJECT_NAME_STRING, "itemText" );
+    TQObjectList *l = tqparent->queryList( TQLINEEDIT_OBJECT_NAME_STRING, "itemText" );
     TQObjectListIt it( *l );
     TQObject *obj;
     while ( (obj = it.current()) != 0 ) {
@@ -161,7 +161,7 @@ void ListBoxEditor::applyClicked()
 	items.append( item );
     }
 
-    PopulateListBoxCommand *cmd = new PopulateListBoxCommand( i18n( "Edit the Items of '%1'" ).arg( listbox->name() ),
+    PopulateListBoxCommand *cmd = new PopulateListBoxCommand( i18n( "Edit the Items of '%1'" ).tqarg( listbox->name() ),
 							      formwindow, listbox, items );
     cmd->execute();
     formwindow->commandHistory()->addCommand( cmd );
diff --git a/kdevdesigner/designer/listboxeditorimpl.h b/kdevdesigner/designer/listboxeditorimpl.h
index 960108fa..a73865f2 100644
--- a/kdevdesigner/designer/listboxeditorimpl.h
+++ b/kdevdesigner/designer/listboxeditorimpl.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -35,9 +35,10 @@ class FormWindow;
 class ListBoxEditor : public ListBoxEditorBase
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    ListBoxEditor( TQWidget *parent, TQWidget *editWidget, FormWindow *fw );
+    ListBoxEditor( TQWidget *tqparent, TQWidget *editWidget, FormWindow *fw );
 
 protected slots:
     void insertNewItem();
diff --git a/kdevdesigner/designer/listboxrename.cpp b/kdevdesigner/designer/listboxrename.cpp
index d51381dd..53f0deea 100644
--- a/kdevdesigner/designer/listboxrename.cpp
+++ b/kdevdesigner/designer/listboxrename.cpp
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -29,7 +29,7 @@
 #include <tqtimer.h>
 #include "listboxrename.h"
 
-class EditableListBoxItem : public QListBoxItem
+class EditableListBoxItem : public TQListBoxItem
 {
 public:
     void setText( const TQString & text )
@@ -84,24 +84,24 @@ bool ListBoxRename::eventFilter( TQObject *, TQEvent * event )
 	
 	switch ( ((TQKeyEvent *) event)->key() ) {
 
-	case Qt::Key_F2:
+	case TQt::Key_F2:
 	    
 	    activity = FALSE;
 	    clickedItem = src->item( src->currentItem() );
 	    showLineEdit();
 	    break;
 
-	case Qt::Key_Escape:
+	case TQt::Key_Escape:
 	    if ( !ed->isHidden() ) {
 		hideLineEdit(); // abort rename
 		return TRUE;
 	    }
 	    break;
 
-	case Qt::Key_Up:
-	case Qt::Key_Down:
-	case Qt::Key_PageUp:
-	case Qt::Key_PageDown:
+	case TQt::Key_Up:
+	case TQt::Key_Down:
+	case TQt::Key_PageUp:
+	case TQt::Key_PageDown:
 	    
 	    if ( !ed->isHidden() )
 		return TRUE; // Filter out the keystrokes
@@ -113,7 +113,7 @@ bool ListBoxRename::eventFilter( TQObject *, TQEvent * event )
     case TQEvent::Resize:
 
 	if ( clickedItem && ed && !ed->isHidden() ) {
-	    TQRect rect = src->itemRect( clickedItem );
+	    TQRect rect = src->tqitemRect( clickedItem );
 	    ed->resize( rect.right() - rect.left() - 1,
 		rect.bottom() - rect.top() - 1 );
 	}
@@ -130,7 +130,7 @@ void ListBoxRename::showLineEdit()
 {
     if ( !clickedItem || activity )
 	return;
-    TQRect rect = src->itemRect( clickedItem );
+    TQRect rect = src->tqitemRect( clickedItem );
     ed->resize( rect.right() - rect.left() - 1,
 		rect.bottom() - rect.top() - 1 );
     ed->move( rect.left() + 1, rect.top() + 1 );
diff --git a/kdevdesigner/designer/listboxrename.h b/kdevdesigner/designer/listboxrename.h
index 01f4f2e5..80b339a1 100644
--- a/kdevdesigner/designer/listboxrename.h
+++ b/kdevdesigner/designer/listboxrename.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -32,9 +32,10 @@
 
 class TQLineEdit;
 
-class ListBoxRename : public QObject
+class ListBoxRename : public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
     ListBoxRename( TQListBox * eventSource, const char * name = 0 );
     bool eventFilter( TQObject *, TQEvent * event );
diff --git a/kdevdesigner/designer/listdnd.cpp b/kdevdesigner/designer/listdnd.cpp
index 7df65cbd..8431fd18 100644
--- a/kdevdesigner/designer/listdnd.cpp
+++ b/kdevdesigner/designer/listdnd.cpp
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -37,8 +37,8 @@ ListDnd::ListDnd( TQScrollView * eventSource, const char * name )
     src->installEventFilter( this );
     src->viewport()->installEventFilter( this );
 
-    line = new TQWidget( src->viewport(), 0, Qt::WStyle_NoBorder | WStyle_StaysOnTop );
-    line->setBackgroundColor( Qt::black );
+    line = new TQWidget( src->viewport(), 0, TQt::WStyle_NoBorder | WStyle_StaysOnTop );
+    line->setBackgroundColor( TQt::black );
     line->resize( src->viewport()->width(), 2 );
     line->hide();
 }
@@ -119,7 +119,7 @@ bool ListDnd::dropEvent( TQDropEvent * )
 
 bool ListDnd::mousePressEvent( TQMouseEvent * event )
 {
-    if ( event->button() == LeftButton )
+    if ( event->button() == Qt::LeftButton )
 	mousePressPos = event->pos();
     return FALSE;
 }
diff --git a/kdevdesigner/designer/listdnd.h b/kdevdesigner/designer/listdnd.h
index 8594085b..6adf1f24 100644
--- a/kdevdesigner/designer/listdnd.h
+++ b/kdevdesigner/designer/listdnd.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -30,9 +30,10 @@
 #include <tqobject.h>
 #include <tqscrollview.h>
 
-class ListDnd : public QObject
+class ListDnd : public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
     enum DragMode { None = 0, External = 1, Internal = 2, Both = 3, Move = 4, NullDrop = 8 };
     ListDnd( TQScrollView * eventSource, const char * name = 0 );
diff --git a/kdevdesigner/designer/listeditor.ui b/kdevdesigner/designer/listeditor.ui
index 6118ba2b..02d60cb9 100644
--- a/kdevdesigner/designer/listeditor.ui
+++ b/kdevdesigner/designer/listeditor.ui
@@ -25,7 +25,7 @@
 ** not clear to you.
 **
 *********************************************************************</comment>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>ListEditor</cstring>
     </property>
@@ -50,7 +50,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QListView" row="0" column="0" rowspan="5" colspan="1">
+        <widget class="TQListView" row="0" column="0" rowspan="5" colspan="1">
             <column>
                 <property name="text">
                     <string>Column 1</string>
@@ -72,7 +72,7 @@
                 <enum>AllColumns</enum>
             </property>
         </widget>
-        <widget class="QPushButton" row="0" column="1">
+        <widget class="TQPushButton" row="0" column="1">
             <property name="name">
                 <cstring>PushButton1</cstring>
             </property>
@@ -80,7 +80,7 @@
                 <string>&amp;Add</string>
             </property>
         </widget>
-        <widget class="QPushButton" row="1" column="1">
+        <widget class="TQPushButton" row="1" column="1">
             <property name="name">
                 <cstring>PushButton2</cstring>
             </property>
@@ -88,7 +88,7 @@
                 <string>&amp;Remove</string>
             </property>
         </widget>
-        <widget class="QPushButton" row="2" column="1">
+        <widget class="TQPushButton" row="2" column="1">
             <property name="name">
                 <cstring>PushButton3</cstring>
             </property>
@@ -96,7 +96,7 @@
                 <string>Re&amp;name</string>
             </property>
         </widget>
-        <widget class="QPushButton" row="4" column="1">
+        <widget class="TQPushButton" row="4" column="1">
             <property name="name">
                 <cstring>PushButton4</cstring>
             </property>
@@ -114,7 +114,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
@@ -144,9 +144,9 @@
     </connection>
     <connection>
         <sender>listview</sender>
-        <signal>itemRenamed(QListViewItem*,int)</signal>
+        <signal>itemRenamed(TQListViewItem*,int)</signal>
         <receiver>ListEditor</receiver>
-        <slot>renamed(QListViewItem*)</slot>
+        <slot>renamed(TQListViewItem*)</slot>
     </connection>
     <connection>
         <sender>PushButton3</sender>
@@ -159,21 +159,21 @@
     <include location="local" impldecl="in implementation">listeditor.ui.h</include>
 </includes>
 <forwards>
-    <forward>class QStringList;</forward>
+    <forward>class TQStringList;</forward>
 </forwards>
-<slots>
+<Q_SLOTS>
     <slot>init()</slot>
-    <slot>setList( const QStringList &amp; l )</slot>
+    <slot>setList( const TQStringList &amp; l )</slot>
     <slot>addItem()</slot>
-    <slot>renamed( QListViewItem * i )</slot>
+    <slot>renamed( TQListViewItem * i )</slot>
     <slot>removeItems()</slot>
-    <slot returnType="QStringList">items()</slot>
+    <slot returnType="TQStringList">items()</slot>
     <slot>renameItem()</slot>
-</slots>
+</Q_SLOTS>
 <includes>
     <include location="local" impldecl="in implementation">myiconloader.h</include>
 </includes>
 <pixmapfunction>BarIcon2</pixmapfunction>
 
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kdevdesigner/designer/listeditor.ui.h b/kdevdesigner/designer/listeditor.ui.h
index cd0aa7f0..7f179cef 100644
--- a/kdevdesigner/designer/listeditor.ui.h
+++ b/kdevdesigner/designer/listeditor.ui.h
@@ -1,7 +1,7 @@
 /****************************************************************************
 ** ui.h extension file, included from the uic-generated form implementation.
 **
-** If you wish to add, delete or rename slots use Qt Designer which will
+** If you wish to add, delete or rename slots use TQt Designer which will
 ** update this file, preserving your code. Create an init() slot in place of
 ** a constructor, and a destroy() slot in place of a destructor.
 *****************************************************************************/
@@ -30,7 +30,7 @@ void ListEditor::addItem()
 {
     TQListViewItem *i = new TQListViewItem( listview, listview->lastItem() );
     i->setRenameEnabled( 0, TRUE );
-    qApp->processEvents();
+    tqApp->processEvents();
     i->startRename( 0 );
 }
 
diff --git a/kdevdesigner/designer/listviewdnd.cpp b/kdevdesigner/designer/listviewdnd.cpp
index a4abae07..b1d5323d 100644
--- a/kdevdesigner/designer/listviewdnd.cpp
+++ b/kdevdesigner/designer/listviewdnd.cpp
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -32,14 +32,14 @@
 #include <tqvaluelist.h>
 
 // The Dragobject Declaration ---------------------------------------
-class ListViewItemDrag : public QStoredDrag
+class ListViewItemDrag : public TQStoredDrag
 {
 public:
     enum DropRelation { Sibling, Child };
-    ListViewItemDrag( ListViewItemList & items, TQWidget * parent = 0, const char * name = 0 );
+    ListViewItemDrag( ListViewItemList & items, TQWidget * tqparent = 0, const char * name = 0 );
     ~ListViewItemDrag() {};
     static bool canDecode( TQDragMoveEvent * event );
-    static bool decode( TQDropEvent * event, TQListView * parent, TQListViewItem * insertPoint, DropRelation dr );
+    static bool decode( TQDropEvent * event, TQListView * tqparent, TQListViewItem * insertPoint, DropRelation dr );
 };
 // ------------------------------------------------------------------
 
@@ -74,7 +74,7 @@ bool ListViewDnd::dropEvent( TQDropEvent * event )
 	    } else if ( dpos < item->depth() ) {
 		// Parent(s) Sibling
 		while ( item && (item->depth() > dpos) )
-		    item = item->parent();
+		    item = item->tqparent();
 	    }
 	}
 
@@ -92,7 +92,7 @@ bool ListViewDnd::dropEvent( TQDropEvent * event )
 
 bool ListViewDnd::mouseMoveEvent( TQMouseEvent * event )
 {
-    if ( event->state() & LeftButton ) {
+    if ( event->state() & Qt::LeftButton ) {
 	if ( ( event->pos() - mousePressPos ).manhattanLength() > 3 ) {
 	    ListViewItemList list;
 
@@ -142,22 +142,22 @@ int ListViewDnd::buildFlatList( ListViewItemList & list )
 
 	if ( (*it)->isSelected() ) {
 	    if ( (*it)->childCount() == 0 ) {
-		// Selected, no children
+		// Selected, no tqchildren
 		list.append( *it );
 	    } else if ( !addKids ) {
 		// Children processing not set, so set it
 		// Also find the item were we shall quit
-		// processing children...if any such item
+		// processing tqchildren...if any such item
 		addKids = TRUE;
 		nextSibling = (*it)->nextSibling();
-		nextParent = (*it)->parent();
+		nextParent = (*it)->tqparent();
 		while ( nextParent && !nextSibling ) {
 		    nextSibling = nextParent->nextSibling();
-		    nextParent = nextParent->parent();
+		    nextParent = nextParent->tqparent();
 		}
 	    }
 	} else if ( ((*it)->childCount() == 0) && addKids ) {
-	    // Leaf node, and we _do_ process children
+	    // Leaf node, and we _do_ process tqchildren
 	    list.append( *it );
 	}
     }
@@ -191,8 +191,8 @@ void ListViewDnd::updateLine( const TQPoint & dragPos )
     TQListView * src = (TQListView *) this->src;
 
     int ypos = item ? 
-	( src->itemRect( item ).bottom() - ( line->height() / 2 ) ) : 
-	( src->itemRect( src->firstChild() ).top() );
+	( src->tqitemRect( item ).bottom() - ( line->height() / 2 ) ) : 
+	( src->tqitemRect( src->firstChild() ).top() );
 
     int xpos = dropDepth( item, dragPos ) * src->treeStepSize();
     line->resize( src->viewport()->width() - xpos, line->height() );
@@ -209,15 +209,15 @@ TQListViewItem * ListViewDnd::itemAt( TQPoint pos )
     if ( result && ( pos.ry() < (src->itemPos(result) + result->height()/2) ) )
 	result = result->itemAbove();
 
-    // Wind back if has parent, and we're in flat mode
-    while ( result && result->parent() && (dMode & Flat) )
-	result = result->parent();
+    // Wind back if has tqparent, and we're in flat mode
+    while ( result && result->tqparent() && (dMode & Flat) )
+	result = result->tqparent();
 
-    // Wind back if has parent, and we're in flat mode
-    while ( result && !result->isVisible() && result->parent() )
-	result = result->parent();
+    // Wind back if has tqparent, and we're in flat mode
+    while ( result && !result->isVisible() && result->tqparent() )
+	result = result->tqparent();
 
-    if ( !result && src->firstChild() && (pos.y() > src->itemRect(src->firstChild()).bottom()) ) {
+    if ( !result && src->firstChild() && (pos.y() > src->tqitemRect(src->firstChild()).bottom()) ) {
 	result = src->lastItem();
 	if ( !result->isVisible() )
 	    // Handle special case where last item is actually hidden
@@ -259,11 +259,11 @@ bool ListViewDnd::canDecode( TQDragEnterEvent * event )
 TQDataStream & operator<< ( TQDataStream & stream, const TQListViewItem & item );
 TQDataStream & operator>> ( TQDataStream & stream, TQListViewItem & item );
 
-ListViewItemDrag::ListViewItemDrag( ListViewItemList & items, TQWidget * parent, const char * name )
-    : TQStoredDrag( "qt/listviewitem", parent, name )
+ListViewItemDrag::ListViewItemDrag( ListViewItemList & items, TQWidget * tqparent, const char * name )
+    : TQStoredDrag( "qt/listviewitem", tqparent, name )
 {
     // ### FIX!
-    TQByteArray data( sizeof( Q_INT32 ) + sizeof( TQListViewItem ) * items.count() );
+    TQByteArray data( sizeof( TQ_INT32 ) + sizeof( TQListViewItem ) * items.count() );
     TQDataStream stream( data, IO_WriteOnly );
 
     stream << items.count();
@@ -282,10 +282,10 @@ bool ListViewItemDrag::canDecode( TQDragMoveEvent * event )
     return event->provides( "qt/listviewitem" );
 }
 
-bool ListViewItemDrag::decode( TQDropEvent * event, TQListView * parent, TQListViewItem * insertPoint, DropRelation dr )
+bool ListViewItemDrag::decode( TQDropEvent * event, TQListView * tqparent, TQListViewItem * insertPoint, DropRelation dr )
 {
-    TQByteArray data = event->encodedData( "qt/listviewitem" );
-    TQListViewItem* itemParent = insertPoint ? insertPoint->parent() : 0;
+    TQByteArray data = event->tqencodedData( "qt/listviewitem" );
+    TQListViewItem* itemParent = insertPoint ? insertPoint->tqparent() : 0;
 
     // Change from sibling (default) to child creation
     if ( insertPoint && dr == Child ) {
@@ -304,8 +304,8 @@ bool ListViewItemDrag::decode( TQDropEvent * event, TQListView * parent, TQListV
 	    if ( itemParent ) {
 		insertPoint = new TQListViewItem( itemParent, insertPoint );
 		itemParent->setOpen( TRUE );
-	    } else { // No parent for insertPoint, use QListView
-		insertPoint = new TQListViewItem( parent, insertPoint );
+	    } else { // No tqparent for insertPoint, use TQListView
+		insertPoint = new TQListViewItem( tqparent, insertPoint );
 	    }
 	    stream >> *insertPoint;
 	}
@@ -320,11 +320,11 @@ TQDataStream & operator<< ( TQDataStream & stream, const TQListViewItem & item )
     int columns = item.listView()->columns();
     stream << columns;
  
-    Q_UINT8 b = 0;
+    TQ_UINT8 b = 0;
 
     int i;
     for ( i = 0; i < columns; i++ ) {
-	b = (Q_UINT8) ( item.text( i ) != TQString::null ); // does column i have a string ?
+	b = (TQ_UINT8) ( item.text( i ) != TQString() ); // does column i have a string ?
 	stream << b;
 	if ( b ) {
 	    stream << item.text( i );
@@ -332,25 +332,25 @@ TQDataStream & operator<< ( TQDataStream & stream, const TQListViewItem & item )
     }
     
     for ( i = 0; i < columns; i++ ) {
-	b = (Q_UINT8) ( !!item.pixmap( i ) ); // does column i have a pixmap ?
+	b = (TQ_UINT8) ( !!item.pixmap( i ) ); // does column i have a pixmap ?
 	stream << b;
 	if ( b ) {
 	    stream << ( *item.pixmap( i ) );
 	}
     }
 
-    stream << (Q_UINT8) item.isOpen();
-    stream << (Q_UINT8) item.isSelectable();
-    stream << (Q_UINT8) item.isExpandable();
-    stream << (Q_UINT8) item.dragEnabled();
-    stream << (Q_UINT8) item.dropEnabled();
-    stream << (Q_UINT8) item.isVisible();
+    stream << (TQ_UINT8) item.isOpen();
+    stream << (TQ_UINT8) item.isSelectable();
+    stream << (TQ_UINT8) item.isExpandable();
+    stream << (TQ_UINT8) item.dragEnabled();
+    stream << (TQ_UINT8) item.dropEnabled();
+    stream << (TQ_UINT8) item.isVisible();
 
     for ( i = 0; i < columns; i++ ) {
-	stream << (Q_UINT8) item.renameEnabled( i );
+	stream << (TQ_UINT8) item.renameEnabled( i );
     }
 
-    stream << (Q_UINT8) item.multiLinesEnabled();
+    stream << (TQ_UINT8) item.multiLinesEnabled();
     stream << item.childCount();
 
     if ( item.childCount() > 0 ) {
@@ -366,10 +366,10 @@ TQDataStream & operator<< ( TQDataStream & stream, const TQListViewItem & item )
     
 TQDataStream & operator>> ( TQDataStream & stream, TQListViewItem & item )
 {
-    Q_INT32 columns;
+    TQ_INT32 columns;
     stream >> columns;
 
-    Q_UINT8 b = 0;
+    TQ_UINT8 b = 0;
 
     TQString text;
     int i;
diff --git a/kdevdesigner/designer/listviewdnd.h b/kdevdesigner/designer/listviewdnd.h
index c564326c..86c879ac 100644
--- a/kdevdesigner/designer/listviewdnd.h
+++ b/kdevdesigner/designer/listviewdnd.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -38,6 +38,7 @@ typedef TQPtrList<TQListViewItem> ListViewItemList;
 class ListViewDnd : public ListDnd
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
     enum DragMode { Flat = 16 }; // see ListDnd::DragMode
 
diff --git a/kdevdesigner/designer/listvieweditor.ui b/kdevdesigner/designer/listvieweditor.ui
index d9e87240..c3e4df1b 100644
--- a/kdevdesigner/designer/listvieweditor.ui
+++ b/kdevdesigner/designer/listvieweditor.ui
@@ -25,7 +25,7 @@
 ** not clear to you.
 **
 *********************************************************************</comment>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>ListViewEditorBase</cstring>
     </property>
@@ -56,11 +56,11 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QTabWidget">
+        <widget class="TQTabWidget">
             <property name="name">
                 <cstring>tabWidget</cstring>
             </property>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>Widget10</cstring>
                 </property>
@@ -77,7 +77,7 @@
                     <property name="spacing">
                         <number>6</number>
                     </property>
-                    <widget class="QPushButton" row="2" column="1">
+                    <widget class="TQPushButton" row="2" column="1">
                         <property name="name">
                             <cstring>itemDelete</cstring>
                         </property>
@@ -91,7 +91,7 @@
                             <string>&lt;b&gt;Deletes the selected item.&lt;/b&gt;&lt;p&gt;Any sub-items are also deleted.&lt;/p&gt;</string>
                         </property>
                     </widget>
-                    <widget class="QGroupBox" row="0" column="2" rowspan="8" colspan="1">
+                    <widget class="TQGroupBox" row="0" column="2" rowspan="8" colspan="1">
                         <property name="name">
                             <cstring>GroupBox1</cstring>
                         </property>
@@ -116,7 +116,7 @@
                             <property name="spacing">
                                 <number>6</number>
                             </property>
-                            <widget class="QLabel" row="2" column="0">
+                            <widget class="TQLabel" row="2" column="0">
                                 <property name="name">
                                     <cstring>Label2</cstring>
                                 </property>
@@ -127,7 +127,7 @@
                                     <cstring>itemChoosePixmap</cstring>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="1" column="0">
+                            <widget class="TQLabel" row="1" column="0">
                                 <property name="name">
                                     <cstring>Label1</cstring>
                                 </property>
@@ -138,11 +138,11 @@
                                     <cstring>itemText</cstring>
                                 </property>
                             </widget>
-                            <widget class="QLineEdit" row="1" column="1">
+                            <widget class="TQLineEdit" row="1" column="1">
                                 <property name="name">
                                     <cstring>itemText</cstring>
                                 </property>
-                                <property name="minimumSize">
+                                <property name="tqminimumSize">
                                     <size>
                                         <width>0</width>
                                         <height>0</height>
@@ -155,7 +155,7 @@
                                     <string>&lt;b&gt;Change the text of the item.&lt;/b&gt;&lt;p&gt;The text will be changed in the current column of the selected item.&lt;/p&gt;</string>
                                 </property>
                             </widget>
-                            <widget class="QSpinBox" row="0" column="1">
+                            <widget class="TQSpinBox" row="0" column="1">
                                 <property name="name">
                                     <cstring>itemColumn</cstring>
                                 </property>
@@ -166,7 +166,7 @@
                                     <string>&lt;b&gt;Select the current column.&lt;/b&gt;&lt;p&gt;The item's text and pixmap will be changed for the current column&lt;/p&gt;</string>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="0" column="0">
+                            <widget class="TQLabel" row="0" column="0">
                                 <property name="name">
                                     <cstring>Label4</cstring>
                                 </property>
@@ -177,7 +177,7 @@
                                     <cstring>itemColumn</cstring>
                                 </property>
                             </widget>
-                            <widget class="QLayoutWidget" row="2" column="1">
+                            <widget class="TQLayoutWidget" row="2" column="1">
                                 <property name="name">
                                     <cstring>Layout2</cstring>
                                 </property>
@@ -191,7 +191,7 @@
                                     <property name="spacing">
                                         <number>6</number>
                                     </property>
-                                    <widget class="QLabel">
+                                    <widget class="TQLabel">
                                         <property name="name">
                                             <cstring>itemPixmap</cstring>
                                         </property>
@@ -199,11 +199,11 @@
                                             <string>Label4</string>
                                         </property>
                                     </widget>
-                                    <widget class="QPushButton">
+                                    <widget class="TQPushButton">
                                         <property name="name">
                                             <cstring>itemDeletePixmap</cstring>
                                         </property>
-                                        <property name="maximumSize">
+                                        <property name="tqmaximumSize">
                                             <size>
                                                 <width>30</width>
                                                 <height>22</height>
@@ -222,11 +222,11 @@
                                             <string>&lt;b&gt;Delete the selected item's pixmap.&lt;/b&gt;&lt;p&gt;The pixmap in the current column of the selected item will be deleted.&lt;/p&gt;</string>
                                         </property>
                                     </widget>
-                                    <widget class="QPushButton">
+                                    <widget class="TQPushButton">
                                         <property name="name">
                                             <cstring>itemChoosePixmap</cstring>
                                         </property>
-                                        <property name="maximumSize">
+                                        <property name="tqmaximumSize">
                                             <size>
                                                 <width>30</width>
                                                 <height>22</height>
@@ -246,7 +246,7 @@
                             </widget>
                         </grid>
                     </widget>
-                    <widget class="QPushButton" row="0" column="1">
+                    <widget class="TQPushButton" row="0" column="1">
                         <property name="name">
                             <cstring>itemNew</cstring>
                         </property>
@@ -260,7 +260,7 @@
                             <string>&lt;b&gt;Adds a new item to the list.&lt;/b&gt;&lt;p&gt;The item will be inserted at the top of the list and can be moved using the up- and down-buttons.&lt;/p&gt;</string>
                         </property>
                     </widget>
-                    <widget class="QListView" row="0" column="0" rowspan="8" colspan="1">
+                    <widget class="TQListView" row="0" column="0" rowspan="8" colspan="1">
                         <property name="name">
                             <cstring>itemsPreview</cstring>
                         </property>
@@ -268,7 +268,7 @@
                             <string>The list of items.</string>
                         </property>
                     </widget>
-                    <widget class="QPushButton" row="1" column="1">
+                    <widget class="TQPushButton" row="1" column="1">
                         <property name="name">
                             <cstring>itemNewSub</cstring>
                         </property>
@@ -292,14 +292,14 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
                             </size>
                         </property>
                     </spacer>
-                    <widget class="QPushButton" row="4" column="1">
+                    <widget class="TQPushButton" row="4" column="1">
                         <property name="name">
                             <cstring>itemUp</cstring>
                         </property>
@@ -316,7 +316,7 @@
                             <string>&lt;b&gt;Move the selected item up.&lt;/b&gt;&lt;p&gt;The item will be moved within its level in the hierarchy.&lt;/p&gt;</string>
                         </property>
                     </widget>
-                    <widget class="QPushButton" row="5" column="1">
+                    <widget class="TQPushButton" row="5" column="1">
                         <property name="name">
                             <cstring>itemDown</cstring>
                         </property>
@@ -333,7 +333,7 @@
                             <string>&lt;b&gt;Move the selected item down.&lt;/b&gt;&lt;p&gt;The item will be moved within its level in the hierarchy.&lt;/p&gt;</string>
                         </property>
                     </widget>
-                    <widget class="QPushButton" row="6" column="1">
+                    <widget class="TQPushButton" row="6" column="1">
                         <property name="name">
                             <cstring>itemLeft</cstring>
                         </property>
@@ -350,7 +350,7 @@
                             <string>&lt;b&gt;Move the selected item one level up.&lt;/b&gt;&lt;p&gt;This will also change the level of the item's sub-items.&lt;/p&gt;</string>
                         </property>
                     </widget>
-                    <widget class="QPushButton" row="7" column="1">
+                    <widget class="TQPushButton" row="7" column="1">
                         <property name="name">
                             <cstring>itemRight</cstring>
                         </property>
@@ -369,7 +369,7 @@
                     </widget>
                 </grid>
             </widget>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>Widget11</cstring>
                 </property>
@@ -386,7 +386,7 @@
                     <property name="spacing">
                         <number>6</number>
                     </property>
-                    <widget class="QGroupBox" row="0" column="2" rowspan="5" colspan="1">
+                    <widget class="TQGroupBox" row="0" column="2" rowspan="5" colspan="1">
                         <property name="name">
                             <cstring>GroupBox1</cstring>
                         </property>
@@ -403,7 +403,7 @@
                             <property name="spacing">
                                 <number>6</number>
                             </property>
-                            <widget class="QLabel" row="1" column="0">
+                            <widget class="TQLabel" row="1" column="0">
                                 <property name="name">
                                     <cstring>Label2</cstring>
                                 </property>
@@ -414,7 +414,7 @@
                                     <cstring>colChoosePixmap</cstring>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="1" column="1">
+                            <widget class="TQLabel" row="1" column="1">
                                 <property name="name">
                                     <cstring>colPixmap</cstring>
                                 </property>
@@ -422,11 +422,11 @@
                                     <string>Label4</string>
                                 </property>
                             </widget>
-                            <widget class="QPushButton" row="1" column="2">
+                            <widget class="TQPushButton" row="1" column="2">
                                 <property name="name">
                                     <cstring>colDeletePixmap</cstring>
                                 </property>
-                                <property name="maximumSize">
+                                <property name="tqmaximumSize">
                                     <size>
                                         <width>30</width>
                                         <height>22</height>
@@ -445,11 +445,11 @@
                                     <string>Delete the pixmap of the selected column.</string>
                                 </property>
                             </widget>
-                            <widget class="QPushButton" row="1" column="3">
+                            <widget class="TQPushButton" row="1" column="3">
                                 <property name="name">
                                     <cstring>colChoosePixmap</cstring>
                                 </property>
-                                <property name="maximumSize">
+                                <property name="tqmaximumSize">
                                     <size>
                                         <width>30</width>
                                         <height>22</height>
@@ -465,7 +465,7 @@
                                     <string>&lt;b&gt;Select a pixmap file for the selected column.&lt;/b&gt;&lt;p&gt;The pixmap will be displayed in the header of the listview.&lt;/p&gt;</string>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="0" column="0">
+                            <widget class="TQLabel" row="0" column="0">
                                 <property name="name">
                                     <cstring>Label1</cstring>
                                 </property>
@@ -476,11 +476,11 @@
                                     <cstring>colText</cstring>
                                 </property>
                             </widget>
-                            <widget class="QLineEdit" row="0" column="1" rowspan="1" colspan="3">
+                            <widget class="TQLineEdit" row="0" column="1" rowspan="1" colspan="3">
                                 <property name="name">
                                     <cstring>colText</cstring>
                                 </property>
-                                <property name="minimumSize">
+                                <property name="tqminimumSize">
                                     <size>
                                         <width>0</width>
                                         <height>0</height>
@@ -493,7 +493,7 @@
                                     <string>&lt;b&gt;Enter the text for the selected column.&lt;/b&gt;&lt;p&gt;The text will be displayed in the header of the listview.&lt;/p&gt;</string>
                                 </property>
                             </widget>
-                            <widget class="QCheckBox" row="2" column="0" rowspan="1" colspan="2">
+                            <widget class="TQCheckBox" row="2" column="0" rowspan="1" colspan="2">
                                 <property name="name">
                                     <cstring>colClickable</cstring>
                                 </property>
@@ -504,7 +504,7 @@
                                     <string>If this option is checked, the selected column will react to mouse clicks on the header.</string>
                                 </property>
                             </widget>
-                            <widget class="QCheckBox" row="3" column="0" rowspan="1" colspan="2">
+                            <widget class="TQCheckBox" row="3" column="0" rowspan="1" colspan="2">
                                 <property name="name">
                                     <cstring>colResizable</cstring>
                                 </property>
@@ -517,7 +517,7 @@
                             </widget>
                         </grid>
                     </widget>
-                    <widget class="QPushButton" row="1" column="1">
+                    <widget class="TQPushButton" row="1" column="1">
                         <property name="name">
                             <cstring>colDelete</cstring>
                         </property>
@@ -531,7 +531,7 @@
                             <string>Deletes the selected Column.</string>
                         </property>
                     </widget>
-                    <widget class="QPushButton" row="4" column="1">
+                    <widget class="TQPushButton" row="4" column="1">
                         <property name="name">
                             <cstring>colDown</cstring>
                         </property>
@@ -548,7 +548,7 @@
                             <string>&lt;b&gt;Move the selected item down.&lt;/b&gt;&lt;p&gt;The top-most column will be the first column in the list.&lt;/p&gt;</string>
                         </property>
                     </widget>
-                    <widget class="QPushButton" row="0" column="1">
+                    <widget class="TQPushButton" row="0" column="1">
                         <property name="name">
                             <cstring>colNew</cstring>
                         </property>
@@ -562,7 +562,7 @@
                             <string>&lt;b&gt;Create a new column.&lt;/b&gt;&lt;p&gt;New columns are appended at the end of (right of) the list and may be moved using the up- and down-buttons.&lt;/p&gt;</string>
                         </property>
                     </widget>
-                    <widget class="QPushButton" row="3" column="1">
+                    <widget class="TQPushButton" row="3" column="1">
                         <property name="name">
                             <cstring>colUp</cstring>
                         </property>
@@ -579,7 +579,7 @@
                             <string>&lt;b&gt;Move the selected item up.&lt;/b&gt;&lt;p&gt;The top-most column will be the first column in the list.&lt;/p&gt;</string>
                         </property>
                     </widget>
-                    <widget class="QListBox" row="0" column="0" rowspan="5" colspan="1">
+                    <widget class="TQListBox" row="0" column="0" rowspan="5" colspan="1">
                         <property name="name">
                             <cstring>colPreview</cstring>
                         </property>
@@ -597,7 +597,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
@@ -607,7 +607,7 @@
                 </grid>
             </widget>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>Layout1</cstring>
             </property>
@@ -621,7 +621,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>helpButton</cstring>
                     </property>
@@ -642,14 +642,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>okButton</cstring>
                     </property>
@@ -666,7 +666,7 @@
                         <string>Close the dialog and apply all the changes.</string>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>applyButton</cstring>
                     </property>
@@ -680,7 +680,7 @@
                         <string>Apply all changes.</string>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>cancelButton</cstring>
                     </property>
@@ -737,9 +737,9 @@
     </connection>
     <connection>
         <sender>itemText</sender>
-        <signal>textChanged(const QString&amp;)</signal>
+        <signal>textChanged(const TQString&amp;)</signal>
         <receiver>ListViewEditorBase</receiver>
-        <slot>itemTextChanged(const QString&amp;)</slot>
+        <slot>itemTextChanged(const TQString&amp;)</slot>
     </connection>
     <connection>
         <sender>itemDeletePixmap</sender>
@@ -779,9 +779,9 @@
     </connection>
     <connection>
         <sender>colText</sender>
-        <signal>textChanged(const QString&amp;)</signal>
+        <signal>textChanged(const TQString&amp;)</signal>
         <receiver>ListViewEditorBase</receiver>
-        <slot>columnTextChanged(const QString&amp;)</slot>
+        <slot>columnTextChanged(const TQString&amp;)</slot>
     </connection>
     <connection>
         <sender>colDeletePixmap</sender>
@@ -809,9 +809,9 @@
     </connection>
     <connection>
         <sender>tabWidget</sender>
-        <signal>selected(const QString&amp;)</signal>
+        <signal>selected(const TQString&amp;)</signal>
         <receiver>ListViewEditorBase</receiver>
-        <slot>initTabPage(const QString&amp;)</slot>
+        <slot>initTabPage(const TQString&amp;)</slot>
     </connection>
     <connection>
         <sender>okButton</sender>
@@ -827,27 +827,27 @@
     </connection>
     <connection>
         <sender>colPreview</sender>
-        <signal>currentChanged(QListBoxItem*)</signal>
+        <signal>currentChanged(TQListBoxItem*)</signal>
         <receiver>ListViewEditorBase</receiver>
-        <slot>currentColumnChanged(QListBoxItem*)</slot>
+        <slot>currentColumnChanged(TQListBoxItem*)</slot>
     </connection>
     <connection>
         <sender>colPreview</sender>
-        <signal>selectionChanged(QListBoxItem*)</signal>
+        <signal>selectionChanged(TQListBoxItem*)</signal>
         <receiver>ListViewEditorBase</receiver>
-        <slot>currentColumnChanged(QListBoxItem*)</slot>
+        <slot>currentColumnChanged(TQListBoxItem*)</slot>
     </connection>
     <connection>
         <sender>itemsPreview</sender>
-        <signal>currentChanged(QListViewItem*)</signal>
+        <signal>currentChanged(TQListViewItem*)</signal>
         <receiver>ListViewEditorBase</receiver>
-        <slot>currentItemChanged(QListViewItem*)</slot>
+        <slot>currentItemChanged(TQListViewItem*)</slot>
     </connection>
     <connection>
         <sender>itemsPreview</sender>
-        <signal>selectionChanged(QListViewItem*)</signal>
+        <signal>selectionChanged(TQListViewItem*)</signal>
         <receiver>ListViewEditorBase</receiver>
-        <slot>currentItemChanged(QListViewItem*)</slot>
+        <slot>currentItemChanged(TQListViewItem*)</slot>
     </connection>
     <connection>
         <sender>itemNewSub</sender>
@@ -897,7 +897,7 @@
     <tabstop>colClickable</tabstop>
     <tabstop>colResizable</tabstop>
 </tabstops>
-<slots>
+<Q_SLOTS>
     <slot access="protected">init()</slot>
     <slot access="protected">destroy()</slot>
     <slot access="protected">applyClicked()</slot>
@@ -906,12 +906,12 @@
     <slot access="protected">columnPixmapChosen()</slot>
     <slot access="protected">columnPixmapDeleted()</slot>
     <slot access="protected">columnResizable(bool)</slot>
-    <slot access="protected">columnTextChanged(const QString &amp;)</slot>
+    <slot access="protected">columnTextChanged(const TQString &amp;)</slot>
     <slot access="protected">columnUpClicked()</slot>
-    <slot access="protected">currentColumnChanged(QListBoxItem*)</slot>
-    <slot access="protected">currentItemChanged(QListViewItem*)</slot>
+    <slot access="protected">currentColumnChanged(TQListBoxItem*)</slot>
+    <slot access="protected">currentItemChanged(TQListViewItem*)</slot>
     <slot access="protected">deleteColumnClicked()</slot>
-    <slot access="protected">initTabPage(const QString &amp;)</slot>
+    <slot access="protected">initTabPage(const TQString &amp;)</slot>
     <slot access="protected">itemColChanged(int)</slot>
     <slot access="protected">itemDeleteClicked()</slot>
     <slot access="protected">itemDownClicked()</slot>
@@ -920,16 +920,16 @@
     <slot access="protected">itemNewSubClicked()</slot>
     <slot access="protected">itemPixmapChoosen()</slot>
     <slot access="protected">itemPixmapDeleted()</slot>
-    <slot access="protected">itemTextChanged(const QString &amp;)</slot>
+    <slot access="protected">itemTextChanged(const TQString &amp;)</slot>
     <slot access="protected">itemUpClicked()</slot>
     <slot access="protected">newColumnClicked()</slot>
     <slot access="protected">itemRightClicked()</slot>
     <slot access="protected">okClicked()</slot>
-</slots>
+</Q_SLOTS>
 <includes>
     <include location="local" impldecl="in implementation">myiconloader.h</include>
 </includes>
 <pixmapfunction>BarIcon2</pixmapfunction>
 
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kdevdesigner/designer/listvieweditorimpl.cpp b/kdevdesigner/designer/listvieweditorimpl.cpp
index dfec1860..ce9ee737 100644
--- a/kdevdesigner/designer/listvieweditorimpl.cpp
+++ b/kdevdesigner/designer/listvieweditorimpl.cpp
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -46,8 +46,8 @@
 
 #include <klocale.h>
 
-ListViewEditor::ListViewEditor( TQWidget *parent, TQListView *lv, FormWindow *fw )
-    : ListViewEditorBase( parent, 0, TRUE ), listview( lv ), formwindow( fw )
+ListViewEditor::ListViewEditor( TQWidget *tqparent, TQListView *lv, FormWindow *fw )
+    : ListViewEditorBase( tqparent, 0, TRUE ), listview( lv ), formwindow( fw )
 {
     connect( helpButton, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) );
     itemText->setEnabled( FALSE );
@@ -68,13 +68,13 @@ ListViewEditor::ListViewEditor( TQWidget *parent, TQListView *lv, FormWindow *fw
 	itemsPreview->setSelected( itemsPreview->firstChild(), TRUE );
     }
 
-    // Clamp on drag and drop to QListView
+    // Clamp on drag and drop to TQListView
     ListViewDnd *itemsDnd = new ListViewDnd( itemsPreview );
     itemsDnd->setDragMode( ListViewDnd::Internal | ListViewDnd::Move );
     TQObject::connect( itemsDnd, TQT_SIGNAL( dropped( TQListViewItem * ) ),
 		      itemsDnd, TQT_SLOT( confirmDrop( TQListViewItem * ) ) );
 
-    // Enable rename for all QListViewItems
+    // Enable rename for all TQListViewItems
     TQListViewItemIterator it = ((TQListView *)itemsPreview)->firstChild();
     for ( ; *it; it++ )
 	(*it)->setRenameEnabled( 0, TRUE );
@@ -86,7 +86,7 @@ ListViewEditor::ListViewEditor( TQWidget *parent, TQListView *lv, FormWindow *fw
 		      TQT_SLOT( emitItemRenamed(TQListViewItem*, int, const TQString&) ) );
 
     // Connect signal-relay to TQLineEdit "itemText"
-    TQObjectList *l = parent->queryList( TQLINEEDIT_OBJECT_NAME_STRING, "itemText" );
+    TQObjectList *l = tqparent->queryList( TQLINEEDIT_OBJECT_NAME_STRING, "itemText" );
     TQObject *obj;
     TQObjectListIt itemsLineEditIt( *l );
     while ( (obj = itemsLineEditIt.current()) != 0 ) {
@@ -98,13 +98,13 @@ ListViewEditor::ListViewEditor( TQWidget *parent, TQListView *lv, FormWindow *fw
     }
     delete l;
 
-    // Clamp on drag and drop to QListBox
+    // Clamp on drag and drop to TQListBox
     ListBoxDnd *columnsDnd = new ListBoxDnd( colPreview );
     columnsDnd->setDragMode( ListBoxDnd::Internal | ListBoxDnd::Move );
     TQObject::connect( columnsDnd, TQT_SIGNAL( dropped( TQListBoxItem * ) ),
 		      columnsDnd, TQT_SLOT( confirmDrop( TQListBoxItem * ) ) );
 
-    // Clamp on rename to QListBox
+    // Clamp on rename to TQListBox
     ListBoxRename *columnsRename = new ListBoxRename( colPreview );
     TQObject::connect( columnsRename,
 		      TQT_SIGNAL( itemTextChanged( const TQString & ) ),
@@ -112,7 +112,7 @@ ListViewEditor::ListViewEditor( TQWidget *parent, TQListView *lv, FormWindow *fw
 		      TQT_SLOT( columnTextChanged( const TQString & ) ) );
 
     // Find TQLineEdit "colText" and connect
-    l = parent->queryList( TQLINEEDIT_OBJECT_NAME_STRING, "colText" );
+    l = tqparent->queryList( TQLINEEDIT_OBJECT_NAME_STRING, "colText" );
     TQObjectListIt columnsLineEditIt( *l );
     while ( (obj = columnsLineEditIt.current()) != 0 ) {
         ++columnsLineEditIt;
@@ -127,7 +127,7 @@ ListViewEditor::ListViewEditor( TQWidget *parent, TQListView *lv, FormWindow *fw
 void ListViewEditor::applyClicked()
 {
     setupItems();
-    PopulateListViewCommand *cmd = new PopulateListViewCommand( i18n( "Edit the Items and Columns of '%1'" ).arg( listview->name() ),
+    PopulateListViewCommand *cmd = new PopulateListViewCommand( i18n( "Edit the Items and Columns of '%1'" ).tqarg( listview->name() ),
 								formwindow, listview, itemsPreview );
     cmd->execute();
     formwindow->commandHistory()->addCommand( cmd );
@@ -378,10 +378,10 @@ void ListViewEditor::itemDownClicked()
 	return;
 
     TQListViewItemIterator it( i );
-    TQListViewItem *parent = i->parent();
+    TQListViewItem *tqparent = i->tqparent();
     it++;
     while ( it.current() ) {
-	if ( it.current()->parent() == parent )
+	if ( it.current()->tqparent() == tqparent )
 	    break;
 	it++;
     }
@@ -406,11 +406,11 @@ void ListViewEditor::itemNewClicked()
 
 void ListViewEditor::itemNewSubClicked()
 {
-    TQListViewItem *parent = itemsPreview->currentItem();
+    TQListViewItem *tqparent = itemsPreview->currentItem();
     TQListViewItem *item = 0;
-    if ( parent ) {
-	item = new TQListViewItem( parent );
-	parent->setOpen( TRUE );
+    if ( tqparent ) {
+	item = new TQListViewItem( tqparent );
+	tqparent->setOpen( TRUE );
     } else {
 	item = new TQListViewItem( itemsPreview );
     }
@@ -466,10 +466,10 @@ void ListViewEditor::itemUpClicked()
 	return;
 
     TQListViewItemIterator it( i );
-    TQListViewItem *parent = i->parent();
+    TQListViewItem *tqparent = i->tqparent();
     --it;
     while ( it.current() ) {
-	if ( it.current()->parent() == parent )
+	if ( it.current()->tqparent() == tqparent )
 	    break;
 	--it;
     }
@@ -488,13 +488,13 @@ void ListViewEditor::itemRightClicked()
 	return;
 
     TQListViewItemIterator it( i );
-    TQListViewItem *parent = i->parent();
-    parent = parent ? parent->firstChild() : itemsPreview->firstChild();
-    if ( !parent )
+    TQListViewItem *tqparent = i->tqparent();
+    tqparent = tqparent ? tqparent->firstChild() : itemsPreview->firstChild();
+    if ( !tqparent )
 	return;
     it++;
     while ( it.current() ) {
-	if ( it.current()->parent() == parent )
+	if ( it.current()->tqparent() == tqparent )
 	    break;
 	it++;
     }
@@ -528,13 +528,13 @@ void ListViewEditor::itemLeftClicked()
 	return;
 
     TQListViewItemIterator it( i );
-    TQListViewItem *parent = i->parent();
-    if ( !parent )
+    TQListViewItem *tqparent = i->tqparent();
+    if ( !tqparent )
 	return;
-    parent = parent->parent();
+    tqparent = tqparent->tqparent();
     --it;
     while ( it.current() ) {
-	if ( it.current()->parent() == parent )
+	if ( it.current()->tqparent() == tqparent )
 	    break;
 	--it;
     }
@@ -592,7 +592,7 @@ void ListViewEditor::setupColumns()
 void ListViewEditor::setupItems()
 {
     itemColumn->setMinValue( 0 );
-    itemColumn->setMaxValue( QMAX( numColumns - 1, 0 ) );
+    itemColumn->setMaxValue( TQMAX( numColumns - 1, 0 ) );
     int i = 0;
     TQHeader *header = itemsPreview->header();
     for ( TQListBoxItem *item = colPreview->firstItem(); item; item = item->next() ) {
@@ -609,7 +609,7 @@ void ListViewEditor::setupItems()
     while ( itemsPreview->columns() > i )
 	itemsPreview->removeColumn( i );
 
-    itemColumn->setValue( QMIN( numColumns - 1, itemColumn->value() ) );
+    itemColumn->setValue( TQMIN( numColumns - 1, itemColumn->value() ) );
 }
 
 ListViewEditor::Column *ListViewEditor::findColumn( TQListBoxItem *i )
diff --git a/kdevdesigner/designer/listvieweditorimpl.h b/kdevdesigner/designer/listvieweditorimpl.h
index cdeeabe6..1555823e 100644
--- a/kdevdesigner/designer/listvieweditorimpl.h
+++ b/kdevdesigner/designer/listvieweditorimpl.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -38,9 +38,10 @@ class FormWindow;
 class ListViewEditor : public ListViewEditorBase
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    ListViewEditor( TQWidget *parent, TQListView *lv, FormWindow *fw );
+    ListViewEditor( TQWidget *tqparent, TQListView *lv, FormWindow *fw );
 
 signals:
     void itemRenamed(const TQString &);
@@ -80,7 +81,7 @@ private:
 	TQString text;
 	TQPixmap pixmap;
 	bool clickable, resizable;
-	Q_DUMMY_COMPARISON_OPERATOR( Column )
+	TQ_DUMMY_COMPARISON_OPERATOR( Column )
     };
 
 private:
diff --git a/kdevdesigner/designer/mainwindow.cpp b/kdevdesigner/designer/mainwindow.cpp
index 8ea48706..b4b5c1ac 100644
--- a/kdevdesigner/designer/mainwindow.cpp
+++ b/kdevdesigner/designer/mainwindow.cpp
@@ -1,15 +1,15 @@
  /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -65,7 +65,7 @@
 #include "formsettings.h"
 #include "preferences.h"
 #include "pixmapcollectioneditor.h"
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 #include "dbconnectionimpl.h"
 #endif
 //#include "connectioneditor.h"
@@ -114,7 +114,7 @@
 #include <tqtooltip.h>
 #include <tqsizegrip.h>
 #include <tqtextview.h>
-#include <qassistantclient.h>
+#include <tqassistantclient.h>
 #include <stdlib.h>
 
 #include "kdevdesigner_part.h"
@@ -142,7 +142,7 @@ static TQString textNoAccel( const TQString& text)
 {
     TQString t = text;
     int i;
-    while ( (i = t.find('&') )>= 0 ) {
+    while ( (i = t.tqfind('&') )>= 0 ) {
 	t.remove(i,1);
     }
     return t;
@@ -152,7 +152,7 @@ static TQString textNoAccel( const TQString& text)
 MainWindow::MainWindow( KDevDesignerPart *part, bool asClient, bool single, const TQString &plgDir )
     : TQMainWindow( 0, "designer_mainwindow"/*, WType_TopLevel | (single ? 0 : WDestructiveClose) | WGroupLeader*/ ),
       grd( 10, 10 ), sGrid( TRUE ), snGrid( TRUE ), restoreConfig( TRUE ), splashScreen( TRUE ),
-      fileFilter( i18n( "Qt User-Interface Files (*.ui)" ) ), client( asClient ),
+      fileFilter( i18n( "TQt User-Interface Files (*.ui)" ) ), client( asClient ),
       previewing( FALSE ), databaseAutoEdit( FALSE ), autoSaveEnabled( FALSE ), autoSaveInterval( 1800 ), m_part(part)
 {
 //    extern void qInitImages_designercore();
@@ -184,9 +184,9 @@ MainWindow::MainWindow( KDevDesignerPart *part, bool asClient, bool single, cons
     setupPluginManagers();
 
 /*    if ( !single )
-	qApp->setMainWidget( this );*/
+	tqApp->setMainWidget( this );*/
     TQWidgetFactory::addWidgetFactory( new CustomWidgetFactory );
-#ifndef Q_WS_MACX
+#ifndef TQ_WS_MACX
     setIcon( BarIcon( "designer_appicon.png", KDevDesignerPartFactory::instance() ) );
 #endif
 
@@ -201,8 +201,8 @@ MainWindow::MainWindow( KDevDesignerPart *part, bool asClient, bool single, cons
     singleProject = single;
 
     statusBar()->clear();
-#if defined(QT_NON_COMMERCIAL)
-    statusBar()->addWidget( new TQLabel(i18n("Ready - This is the non-commercial version of Qt - "
+#if defined(TQT_NON_COMMERCIAL)
+    statusBar()->addWidget( new TQLabel(i18n("Ready - This is the non-commercial version of TQt - "
 	"For commercial evaluations, use the help menu to register with Trolltech."), statusBar()), 1 );
 #else
     statusBar()->addWidget( new TQLabel("Ready", statusBar()), 1 );
@@ -219,9 +219,9 @@ MainWindow::MainWindow( KDevDesignerPart *part, bool asClient, bool single, cons
     setupEditActions();
     setupProjectActions();
     setupSearchActions();
-    layoutToolBar = new TQToolBar( this, "Layout" );
-    layoutToolBar->setCloseMode( TQDockWindow::Undocked );
-    addToolBar( layoutToolBar, i18n( "Layout" ) );
+    tqlayoutToolBar = new TQToolBar( this, "Layout" );
+    tqlayoutToolBar->setCloseMode( TQDockWindow::Undocked );
+    addToolBar( tqlayoutToolBar, i18n( "Layout" ) );
     interpreterPluginManager = 0;
     setupToolActions();
     setupLayoutActions();
@@ -246,17 +246,17 @@ MainWindow::MainWindow( KDevDesignerPart *part, bool asClient, bool single, cons
     emit hasActiveWindow( FALSE );
 
     lastPressWidget = 0;
-    qApp->installEventFilter( this );
+    tqApp->installEventFilter( this );
 
-    TQSize as( qApp->desktop()->size() );
+    TQSize as( tqApp->desktop()->size() );
     as -= TQSize( 30, 30 );
     resize( TQSize( 1200, 1000 ).boundedTo( as ) );
 
-    connect( qApp->clipboard(), TQT_SIGNAL( dataChanged() ),
+    connect( tqApp->clipboard(), TQT_SIGNAL( dataChanged() ),
 	     this, TQT_SLOT( clipboardChanged() ) );
     clipboardChanged();
-    layoutChilds = FALSE;
-    layoutSelected = FALSE;
+    tqlayoutChilds = FALSE;
+    tqlayoutSelected = FALSE;
     breakLayout = FALSE;
     backPix = TRUE;
 
@@ -273,10 +273,10 @@ MainWindow::MainWindow( KDevDesignerPart *part, bool asClient, bool single, cons
     delete w;
     w = WidgetFactory::create( WidgetDatabase::idFromClassName( TQFRAME_OBJECT_NAME_STRING ), this, 0, FALSE );
     delete w;
-    setAppropriate( (TQDockWindow*)actionEditor->parentWidget(), FALSE );
-    actionEditor->parentWidget()->hide();
+    setAppropriate( (TQDockWindow*)actionEditor->tqparentWidget(), FALSE );
+    actionEditor->tqparentWidget()->hide();
 
-    assistant = new QAssistantClient( assistantPath(), this );
+    assistant = new TQAssistantClient( assistantPath(), TQT_TQOBJECT(this) );
 
     statusBar()->setSizeGripEnabled( TRUE );
     set_splash_status( "Initialization Done." );
@@ -286,7 +286,7 @@ MainWindow::MainWindow( KDevDesignerPart *part, bool asClient, bool single, cons
     if ( autoSaveEnabled )
 	autoSaveTimer->start( autoSaveInterval * 1000 );
 
-    setFocusPolicy( StrongFocus );
+    setFocusPolicy( TQ_StrongFocus );
 }
 
 MainWindow::~MainWindow()
@@ -355,7 +355,7 @@ void MainWindow::setupPropertyEditor()
     dw->setResizeEnabled( TRUE );
     dw->setCloseMode( TQDockWindow::Always );
     propertyEditor = new PropertyEditor( dw );
-    addToolBar( dw, Qt::DockRight );
+    addToolBar( dw, TQt::DockRight );
     dw->setWidget( propertyEditor );
     dw->setFixedExtentWidth( 250 );
     dw->setCaption( i18n( "Property Editor/Signal Handlers" ) );
@@ -383,7 +383,7 @@ void MainWindow::setupOutputWindow()
     TQDockWindow *dw = new TQDockWindow( TQDockWindow::InDock, this );
     dw->setResizeEnabled( TRUE );
     dw->setCloseMode( TQDockWindow::Always );
-    addToolBar( dw, Qt::DockBottom );
+    addToolBar( dw, TQt::DockBottom );
     oWindow = new OutputWindow( dw );
     dw->setWidget( oWindow );
     dw->setFixedExtentHeight( 150 );
@@ -398,7 +398,7 @@ void MainWindow::setupHierarchyView()
     dw->setResizeEnabled( TRUE );
     dw->setCloseMode( TQDockWindow::Always );
     hierarchyView = new HierarchyView( dw );
-    addToolBar( dw, Qt::DockRight );
+    addToolBar( dw, TQt::DockRight );
     dw->setWidget( hierarchyView );
 
     dw->setCaption( i18n( "Object Explorer" ) );
@@ -408,7 +408,7 @@ void MainWindow::setupHierarchyView()
 			"<p>The Object Explorer provides an overview of the relationships "
 			"between the widgets in a form. You can use the clipboard functions using "
 			"a context menu for each item in the view. It is also useful for selecting widgets "
-			"in forms that have complex layouts.</p>"
+			"in forms that have complex tqlayouts.</p>"
 			"<p>The columns can be resized by dragging the separator in the list's header.</p>"
 			"<p>The second tab shows all the form's slots, class variables, includes, etc.</p>") );
     dw->show();
@@ -420,14 +420,14 @@ void MainWindow::setupWorkspace()
     dw->setResizeEnabled( TRUE );
     dw->setCloseMode( TQDockWindow::Always );
     TQVBox *vbox = new TQVBox( dw );
-    QCompletionEdit *edit = new QCompletionEdit( vbox );
+    TQCompletionEdit *edit = new TQCompletionEdit( vbox );
     TQToolTip::add( edit, i18n( "Start typing the buffer you want to switch to here (ALT+B)" ) );
     TQAccel *a = new TQAccel( this );
     a->connectItem( a->insertItem( ALT + Key_B ), edit, TQT_SLOT( setFocus() ) );
     wspace = new Workspace( vbox, this );
     wspace->setBufferEdit( edit );
     wspace->setCurrentProject( currentProject );
-    addToolBar( dw, Qt::DockRight );
+    addToolBar( dw, TQt::DockRight );
     dw->setWidget( vbox );
 
     dw->setCaption( i18n( "Project Overview" ) );
@@ -442,7 +442,7 @@ void MainWindow::setupWorkspace()
 void MainWindow::setupActionEditor()
 {
     TQDockWindow *dw = new TQDockWindow( TQDockWindow::OutsideDock, this, 0 );
-    addDockWindow( dw, Qt::DockTornOff );
+    addDockWindow( dw, TQt::DockTornOff );
     dw->setResizeEnabled( TRUE );
     dw->setCloseMode( TQDockWindow::Always );
     actionEditor = new ActionEditor( dw );
@@ -465,14 +465,14 @@ void MainWindow::setupToolbox()
     TQDockWindow *dw = new TQDockWindow( TQDockWindow::InDock, this );
     dw->setResizeEnabled( TRUE );
     dw->setCloseMode( TQDockWindow::Always );
-    addToolBar( dw, Qt::DockLeft );
+    addToolBar( dw, TQt::DockLeft );
     toolBox = new TQToolBox( dw );
     dw->setWidget( toolBox );
     dw->setFixedExtentWidth( 160 );
     dw->setCaption( i18n( "Toolbox" ) );
     dw->show();
-    setDockEnabled( dw, Qt::DockTop, FALSE );
-    setDockEnabled( dw, Qt::DockBottom, FALSE );
+    setDockEnabled( dw, TQt::DockTop, FALSE );
+    setDockEnabled( dw, TQt::DockBottom, FALSE );
     commonWidgetsToolBar = new TQToolBar( "Common Widgets", 0, toolBox, FALSE, "Common Widgets" );
     commonWidgetsToolBar->setFrameStyle( TQFrame::NoFrame );
     commonWidgetsToolBar->setOrientation( Qt::Vertical );
@@ -537,7 +537,7 @@ int MainWindow::currentTool() const
 {
     if ( !actionCurrentTool )
 	return POINTER_TOOL;
-    return TQString::fromLatin1(actionCurrentTool->name()).toInt();
+    return TQString::tqfromLatin1(actionCurrentTool->name()).toInt();
 }
 
 void MainWindow::runProjectPrecondition()
@@ -582,7 +582,7 @@ TQWidget* MainWindow::previewFormInternal( TQStyle* style, TQPalette* palet )
     TQStringList databases;
     TQPtrDictIterator<TQWidget> wit( *fw->widgets() );
     while ( wit.current() ) {
-	TQStringList lst = MetaDataBase::fakeProperty( wit.current(), "database" ).toStringList();
+	TQStringList lst = MetaDataBase::fakeProperty( TQT_TQOBJECT(wit.current()), "database" ).toStringList();
 	if ( !lst.isEmpty() )
 	    databases << lst [ 0 ];
 	++wit;
@@ -601,12 +601,12 @@ TQWidget* MainWindow::previewFormInternal( TQStyle* style, TQPalette* palet )
     Resource resource( this );
     resource.setWidget( fw );
     TQValueList<Resource::Image> images;
-    resource.save( &buffer );
+    resource.save( TQT_TQIODEVICE(&buffer) );
 
     buffer.close();
     buffer.open( IO_ReadOnly );
 
-    TQWidget *w = TQWidgetFactory::create( &buffer );
+    TQWidget *w = TQWidgetFactory::create( TQT_TQIODEVICE(&buffer) );
     if ( w ) {
 	previewedForm = w;
 	if ( palet ) {
@@ -662,21 +662,21 @@ void MainWindow::previewForm( const TQString & style )
 	p.setColor( TQPalette::Active, TQColorGroup::Base, TQColor( 55, 77, 78 ) );
 	p.setColor( TQPalette::Inactive, TQColorGroup::Base, TQColor( 55, 77, 78 ) );
 	p.setColor( TQPalette::Disabled, TQColorGroup::Base, TQColor( 55, 77, 78 ) );
-	p.setColor( TQPalette::Active, TQColorGroup::Highlight, Qt::white );
+	p.setColor( TQPalette::Active, TQColorGroup::Highlight, TQt::white );
 	p.setColor( TQPalette::Active, TQColorGroup::HighlightedText, TQColor( 55, 77, 78 ) );
-	p.setColor( TQPalette::Inactive, TQColorGroup::Highlight, Qt::white );
+	p.setColor( TQPalette::Inactive, TQColorGroup::Highlight, TQt::white );
 	p.setColor( TQPalette::Inactive, TQColorGroup::HighlightedText, TQColor( 55, 77, 78 ) );
-	p.setColor( TQPalette::Disabled, TQColorGroup::Highlight, Qt::white );
+	p.setColor( TQPalette::Disabled, TQColorGroup::Highlight, TQt::white );
 	p.setColor( TQPalette::Disabled, TQColorGroup::HighlightedText, TQColor( 55, 77, 78 ) );
-	p.setColor( TQPalette::Active, TQColorGroup::Foreground, Qt::white );
-	p.setColor( TQPalette::Active, TQColorGroup::Text, Qt::white );
-	p.setColor( TQPalette::Active, TQColorGroup::ButtonText, Qt::white );
-	p.setColor( TQPalette::Inactive, TQColorGroup::Foreground, Qt::white );
-	p.setColor( TQPalette::Inactive, TQColorGroup::Text, Qt::white );
-	p.setColor( TQPalette::Inactive, TQColorGroup::ButtonText, Qt::white );
-	p.setColor( TQPalette::Disabled, TQColorGroup::Foreground, Qt::lightGray );
-	p.setColor( TQPalette::Disabled, TQColorGroup::Text, Qt::lightGray );
-	p.setColor( TQPalette::Disabled, TQColorGroup::ButtonText, Qt::lightGray );
+	p.setColor( TQPalette::Active, TQColorGroup::Foreground, TQt::white );
+	p.setColor( TQPalette::Active, TQColorGroup::Text, TQt::white );
+	p.setColor( TQPalette::Active, TQColorGroup::ButtonText, TQt::white );
+	p.setColor( TQPalette::Inactive, TQColorGroup::Foreground, TQt::white );
+	p.setColor( TQPalette::Inactive, TQColorGroup::Text, TQt::white );
+	p.setColor( TQPalette::Inactive, TQColorGroup::ButtonText, TQt::white );
+	p.setColor( TQPalette::Disabled, TQColorGroup::Foreground, TQt::lightGray );
+	p.setColor( TQPalette::Disabled, TQColorGroup::Text, TQt::lightGray );
+	p.setColor( TQPalette::Disabled, TQColorGroup::ButtonText, TQt::lightGray );
 
 	w = previewFormInternal( st, &p );
     } else if ( style == "SGI" ) {
@@ -729,20 +729,20 @@ void MainWindow::previewForm( const TQString & style )
 
     if ( !w )
 	return;
-    w->insertChild( st );
+    w->insertChild( TQT_TQOBJECT(st) );
     w->show();
 }
 
 void MainWindow::helpContents()
 {
-    TQWidget *focusWidget = qApp->focusWidget();
+    TQWidget *tqfocusWidget = tqApp->tqfocusWidget();
     bool showClassDocu = TRUE;
-    while ( focusWidget ) {
-	if ( focusWidget->isA( "PropertyList" ) ) {
+    while ( tqfocusWidget ) {
+	if ( tqfocusWidget->isA( "PropertyList" ) ) {
 	    showClassDocu = FALSE;
 	    break;
 	}
-	focusWidget = focusWidget->parentWidget();
+	tqfocusWidget = tqfocusWidget->tqparentWidget();
     }
 
     TQString source = "designer-manual.html";
@@ -753,10 +753,10 @@ void MainWindow::helpContents()
 	    TQTextStream ts( &f );
 	    while ( !ts.eof() ) {
 		TQString s = ts.readLine();
-		int from = s.find( "\"" );
+		int from = s.tqfind( "\"" );
 		if ( from == -1 )
 		    continue;
-		int to = s.findRev( "\"" );
+		int to = s.tqfindRev( "\"" );
 		if ( to == -1 )
 		    continue;
 		propertyDocumentation[ s.mid( from + 1, to - from - 1 ) ] = s.mid( to + 2 ) + "-prop";
@@ -767,23 +767,23 @@ void MainWindow::helpContents()
 
     if ( propertyEditor->widget() && !showClassDocu ) {
 	if ( !propertyEditor->currentProperty().isEmpty() ) {
-	    TQMetaObject* mo = propertyEditor->metaObjectOfCurrentProperty();
+	    TQMetaObject* mo = propertyEditor->tqmetaObjectOfCurrentProperty();
 	    TQString s;
 	    TQString cp = propertyEditor->currentProperty();
-	    if ( cp == "layoutMargin" ) {
-		source = propertyDocumentation[ "QLayout/margin" ];
-	    } else if ( cp == "layoutSpacing" ) {
-		source = propertyDocumentation[ "QLayout/spacing" ];
+	    if ( cp == "tqlayoutMargin" ) {
+		source = propertyDocumentation[ "TQLayout/margin" ];
+	    } else if ( cp == "tqlayoutSpacing" ) {
+		source = propertyDocumentation[ "TQLayout/spacing" ];
 	    } else if ( cp == "toolTip" ) {
 		source = "tqtooltip.html#details";
 	    } else if ( mo && qstrcmp( mo->className(), "Spacer" ) == 0 ) {
 		if ( cp != "name" )
 		    source = "tqsizepolicy.html#SizeType";
 		else
-		    source = propertyDocumentation[ "QObject/name" ];
+		    source = propertyDocumentation[ "TQObject/name" ];
 	    } else {
-		while ( mo && !propertyDocumentation.contains( ( s = TQString( mo->className() ) + "/" + cp ) ) )
-		    mo = mo->superClass();
+		while ( mo && !propertyDocumentation.tqcontains( ( s = TQString( mo->className() ) + "/" + cp ) ) )
+		    mo = mo->tqsuperClass();
 		if ( mo )
 		    source = "p:" + propertyDocumentation[s];
 	    }
@@ -793,8 +793,8 @@ void MainWindow::helpContents()
 	if ( source.isEmpty() || source == "designer-manual.html" ) {
 	    if ( classname.lower() == "spacer" )
 		source = "qspaceritem.html#details";
-	    else if ( classname == "QLayoutWidget" )
-		source = "layout.html";
+	    else if ( classname == TQLAYOUTWIDGET_OBJECT_NAME_STRING )
+		source = "tqlayout.html";
 	    else
 		source = TQString( WidgetFactory::classNameOf( propertyEditor->widget() ) ).lower() + ".html#details";
 	}
@@ -821,18 +821,18 @@ void MainWindow::helpAbout()
 	LanguageInterface *iface = MetaDataBase::languageInterface( eProject->language() );
 	dlg.aboutLicense->setText( iface->aboutText() );
     }
-    dlg.aboutVersion->setText(TQString("Version ") + TQString(QT_VERSION_STR));
-    dlg.resize( dlg.width(), dlg.layout()->heightForWidth(dlg.width()) );
+    dlg.aboutVersion->setText(TQString("Version ") + TQString(TQT_VERSION_STR));
+    dlg.resize( dlg.width(), dlg.tqlayout()->heightForWidth(dlg.width()) );
     dlg.exec();
 }
 
-void MainWindow::helpAboutQt()
+void MainWindow::helpAboutTQt()
 {
-    TQMessageBox::aboutQt( this, "Qt Designer" );
+    TQMessageBox::aboutTQt( this, "TQt Designer" );
 }
 
 #if defined(_WS_WIN_)
-#include <qt_windows.h>
+#include <tqt_windows.h>
 #include <tqprocess.h>
 #endif
 
@@ -847,16 +847,16 @@ void MainWindow::helpRegister()
     TQString command;
     TQString sub( "htmlfile\\shell" );
 #if defined(UNICODE)
-    if ( TQApplication::winVersion() & Qt::WV_NT_based ) {
+    if ( TQApplication::winVersion() & TQt::WV_NT_based ) {
 	unsigned char data[256];
 	res = RegOpenKeyExW( HKEY_CLASSES_ROOT, NULL, 0, KEY_READ, &key );
 	res = RegOpenKeyExW( key, (TCHAR*)sub.ucs2(), 0, KEY_READ, &subkey );
 	res = RegQueryValueExW( subkey, NULL, NULL, &type, data, &size );
-	command = qt_winQString( data ) + "\\command";
+	command = qt_winTQString( data ) + "\\command";
 	size = 255;
 	res = RegOpenKeyExW( subkey, (TCHAR*)command.ucs2(), 0, KEY_READ, &subkey );
 	res = RegQueryValueExW( subkey, NULL, NULL, &type, data, &size );
-	command = qt_winQString( data );
+	command = qt_winTQString( data );
     } else
 #endif
     {
@@ -876,8 +876,8 @@ void MainWindow::helpRegister()
 
     TQProcess process( command + " www.trolltech.com/products/download/eval/evaluation.html" );
     if ( !process.start() )
-	TQMessageBox::information( this, "Register Qt", "Launching your web browser failed.\n"
-	"To register Qt, point your browser to www.trolltech.com/products/download/eval/evaluation.html" );
+	TQMessageBox::information( this, "Register TQt", "Launching your web browser failed.\n"
+	"To register TQt, point your browser to www.trolltech.com/products/download/eval/evaluation.html" );
 #endif
 }
 
@@ -886,14 +886,14 @@ void MainWindow::showProperties( TQObject *o )
     if ( !o->isWidgetType() ) {
 	propertyEditor->setWidget( o, lastActiveFormWindow );
 	if ( lastActiveFormWindow )
-	    hierarchyView->setFormWindow( lastActiveFormWindow, lastActiveFormWindow->mainContainer() );
+	    hierarchyView->setFormWindow( lastActiveFormWindow, TQT_TQOBJECT(lastActiveFormWindow->mainContainer()) );
 	else
 	    hierarchyView->setFormWindow( 0, 0 );
 	return;
     }
     TQWidget *w = (TQWidget*)o;
     setupHierarchyView();
-    FormWindow *fw = (FormWindow*)isAFormWindowChild( w );
+    FormWindow *fw = (FormWindow*)isAFormWindowChild( TQT_TQOBJECT(w) );
     if ( fw ) {
 	if ( fw->numSelectedWidgets() > 1 ) {
 	    TQWidgetList wl = fw->selectedWidgets();
@@ -903,16 +903,16 @@ void MainWindow::showProperties( TQObject *o )
 	    }
 	    propertyEditor->setWidget( new PropertyObject( wl ), fw );
 	} else {
-	    propertyEditor->setWidget( w, fw );
+	    propertyEditor->setWidget( TQT_TQOBJECT(w), fw );
 	}
-	hierarchyView->setFormWindow( fw, w );
+	hierarchyView->setFormWindow( fw, TQT_TQOBJECT(w) );
     } else {
 	propertyEditor->setWidget( 0, 0 );
 	hierarchyView->setFormWindow( 0, 0 );
     }
 
     if ( currentTool() == POINTER_TOOL && fw &&
-	 ( !qworkspace->activeWindow() || !::qt_cast<SourceEditor*>(qworkspace->activeWindow()) ) )
+	 ( !qworkspace->activeWindow() || !::tqqt_cast<SourceEditor*>(qworkspace->activeWindow()) ) )
 	fw->setFocus();
 }
 
@@ -929,23 +929,23 @@ void MainWindow::updateProperties( TQObject * )
 
 bool MainWindow::eventFilter( TQObject *o, TQEvent *e )
 {
-    if ( ::qt_cast<MenuBarEditor*>(o) || ::qt_cast<PopupMenuEditor*>(o) ||
+    if ( ::tqqt_cast<MenuBarEditor*>(o) || ::tqqt_cast<PopupMenuEditor*>(o) ||
 	 ( o &&
-	   ( ::qt_cast<MenuBarEditor*>(o->parent()) ||
-	     ::qt_cast<PopupMenuEditor*>(o->parent()) ) ) ) {
+	   ( ::tqqt_cast<MenuBarEditor*>(o->tqparent()) ||
+	     ::tqqt_cast<PopupMenuEditor*>(o->tqparent()) ) ) ) {
 
-	if ( e->type() == TQEvent::Accel && ::qt_cast<PopupMenuEditor*>(o) ) {
+	if ( e->type() == TQEvent::Accel && ::tqqt_cast<PopupMenuEditor*>(o) ) {
 	    return TRUE; // consume accel events
- 	} else if ( e->type() == TQEvent::MouseButtonPress && ::qt_cast<MenuBarEditor*>(o) ) {
+ 	} else if ( e->type() == TQEvent::MouseButtonPress && ::tqqt_cast<MenuBarEditor*>(o) ) {
 	    TQPoint pos = ((TQMouseEvent*)e)->pos();
-	    MenuBarEditor *m = ::qt_cast<MenuBarEditor*>(o);
+	    MenuBarEditor *m = ::tqqt_cast<MenuBarEditor*>(o);
 	    showProperties( o );
 	    if ( m->findItem( pos ) >= m->count() )
 		m->setFocus();
-	} else if ( e->type() == TQEvent::MouseButtonPress && ::qt_cast<PopupMenuEditor*>(o) ) {
-	    PopupMenuEditor *m = ::qt_cast<PopupMenuEditor*>(o);
+	} else if ( e->type() == TQEvent::MouseButtonPress && ::tqqt_cast<PopupMenuEditor*>(o) ) {
+	    PopupMenuEditor *m = ::tqqt_cast<PopupMenuEditor*>(o);
 	    PopupMenuEditorItem *i = m->at( ((TQMouseEvent*)e)->pos() );
-	    if ( m->find( i->action() ) != -1 && !i->isSeparator() )
+	    if ( m->tqfind( i->action() ) != -1 && !i->isSeparator() )
 		showProperties( i->action() );
 	}
 	return TQMainWindow::eventFilter( o, e );
@@ -962,9 +962,9 @@ bool MainWindow::eventFilter( TQObject *o, TQEvent *e )
 	     ( ( (TQKeyEvent*)e )->state() & ShiftButton ) != ShiftButton ) {
 	    w = (TQWidget*)o;
 	    while ( w ) {
-		if ( ::qt_cast<PropertyList*>(w) )
+		if ( ::tqqt_cast<PropertyList*>(w) )
 		    break;
-		w = w->parentWidget( TRUE );
+		w = w->tqparentWidget( TRUE );
 	    }
 	    if ( w ) {
 		propertyEditor->propertyList()->showCurrentWhatsThis();
@@ -978,7 +978,7 @@ bool MainWindow::eventFilter( TQObject *o, TQEvent *e )
 	       ( (TQKeyEvent*)e )->key() == Key_E ) &&
 	     ( (TQKeyEvent*)e )->state() & ControlButton ) {
 	    if ( qWorkspace()->activeWindow() &&
-		 ::qt_cast<SourceEditor*>(qWorkspace()->activeWindow()) ) {
+		 ::tqqt_cast<SourceEditor*>(qWorkspace()->activeWindow()) ) {
 		( (TQKeyEvent*)e )->ignore();
 		return TRUE;
 	    }
@@ -987,44 +987,44 @@ bool MainWindow::eventFilter( TQObject *o, TQEvent *e )
     case TQEvent::ContextMenu:
     case TQEvent::MouseButtonPress:
 	if ( o && currentTool() == POINTER_TOOL &&
-	     ( ::qt_cast<MenuBarEditor*>(o) ||
-	       ::qt_cast<PopupMenuEditor*>(o) ||
-	       ::qt_cast<QDesignerToolBar*>(o) ||
-	       ( ::qt_cast<TQComboBox*>(o) ||
-		 ::qt_cast<TQToolButton*>(o) ||
-		 ::qt_cast<QDesignerToolBarSeparator*>(o) ) &&
-	       o->parent()
-	       && ( ::qt_cast<QDesignerToolBar*>(o->parent())
-		   || ::qt_cast<QDesignerWidgetStack*>(o->parent())) ) ) {
+	     ( ::tqqt_cast<MenuBarEditor*>(o) ||
+	       ::tqqt_cast<PopupMenuEditor*>(o) ||
+	       ::tqqt_cast<TQDesignerToolBar*>(o) ||
+	       ( ::tqqt_cast<TQComboBox*>(o) ||
+		 ::tqqt_cast<TQToolButton*>(o) ||
+		 ::tqqt_cast<TQDesignerToolBarSeparator*>(o) ) &&
+	       o->tqparent()
+	       && ( ::tqqt_cast<TQDesignerToolBar*>(o->tqparent())
+		   || ::tqqt_cast<TQDesignerWidgetStack*>(o->tqparent())) ) ) {
 	    TQWidget *w = (TQWidget*)o;
-	    if ( ::qt_cast<TQToolButton*>(w) ||
-		 ::qt_cast<TQComboBox*>(w) ||
-		 ::qt_cast<PopupMenuEditor*>(w) ||
-		 ::qt_cast<QDesignerToolBarSeparator*>(w) )
-		w = w->parentWidget();
-	    TQWidget *pw = w->parentWidget();
+	    if ( ::tqqt_cast<TQToolButton*>(w) ||
+		 ::tqqt_cast<TQComboBox*>(w) ||
+		 ::tqqt_cast<PopupMenuEditor*>(w) ||
+		 ::tqqt_cast<TQDesignerToolBarSeparator*>(w) )
+		w = w->tqparentWidget();
+	    TQWidget *pw = w->tqparentWidget();
 	    while ( pw ) {
-		if ( ::qt_cast<FormWindow*>(pw) ) {
-		    ( (FormWindow*)pw )->emitShowProperties( w );
-		    if ( !::qt_cast<QDesignerToolBar*>(o) )
-			return ( !::qt_cast<TQToolButton*>(o) &&
-				 !::qt_cast<MenuBarEditor*>(o) &&
-				 !::qt_cast<TQComboBox*>(o) &&
-				 !::qt_cast<QDesignerToolBarSeparator*>(o) );
+		if ( ::tqqt_cast<FormWindow*>(pw) ) {
+		    ( (FormWindow*)pw )->emitShowProperties( TQT_TQOBJECT(w) );
+		    if ( !::tqqt_cast<TQDesignerToolBar*>(o) )
+			return ( !::tqqt_cast<TQToolButton*>(o) &&
+				 !::tqqt_cast<MenuBarEditor*>(o) &&
+				 !::tqqt_cast<TQComboBox*>(o) &&
+				 !::tqqt_cast<TQDesignerToolBarSeparator*>(o) );
 		}
-		pw = pw->parentWidget();
+		pw = pw->tqparentWidget();
 	    }
 	}
-	if ( o && ( ::qt_cast<QDesignerToolBar*>(o) || o->inherits("QDockWindowHandle") )
+	if ( o && ( ::tqqt_cast<TQDesignerToolBar*>(o) || o->inherits(TQDOCKWINDOWHANDLE_OBJECT_NAME_STRING) )
 	     && e->type() == TQEvent::ContextMenu )
 	    break;
 	if ( isAToolBarChild( o ) && currentTool() != CONNECT_TOOL && currentTool() != BUDDY_TOOL )
 	    break;
-	if ( ::qt_cast<TQSizeGrip*>(o) )
+	if ( ::tqqt_cast<TQSizeGrip*>(o) )
 	    break;
 	if ( !( w = isAFormWindowChild( o ) ) ||
-	     ::qt_cast<SizeHandle*>(o) ||
-	     ::qt_cast<OrderIndicator*>(o) )
+	     ::tqqt_cast<SizeHandle*>(o) ||
+	     ::tqqt_cast<OrderIndicator*>(o) )
 	    break;
 	if ( !w->hasFocus() )
 	    w->setFocus();
@@ -1049,11 +1049,11 @@ bool MainWindow::eventFilter( TQObject *o, TQEvent *e )
 	lastPressWidget = 0;
 	if ( isAToolBarChild( o )  && currentTool() != CONNECT_TOOL && currentTool() != BUDDY_TOOL )
 	    break;
-	if ( ::qt_cast<TQSizeGrip*>(o) )
+	if ( ::tqqt_cast<TQSizeGrip*>(o) )
 	    break;
 	if ( !( w = isAFormWindowChild( o ) ) ||
-	     ::qt_cast<SizeHandle*>(o) ||
-	     ::qt_cast<OrderIndicator*>(o) )
+	     ::tqqt_cast<SizeHandle*>(o) ||
+	     ::tqqt_cast<OrderIndicator*>(o) )
 	    break;
 	passiveInteractor = WidgetFactory::isPassiveInteractor( o );
 	if ( !passiveInteractor )
@@ -1069,15 +1069,15 @@ bool MainWindow::eventFilter( TQObject *o, TQEvent *e )
 	    break;
 	w = isAFormWindowChild( o );
 	if ( lastPressWidget != (TQWidget*)o && w &&
-	     !::qt_cast<SizeHandle*>(o) && !::qt_cast<OrderIndicator*>(o) &&
-	     !::qt_cast<PopupMenuEditor*>(o) && !::qt_cast<TQMenuBar*>(o) &&
-	     !::qt_cast<TQSizeGrip*>(o) )
+	     !::tqqt_cast<SizeHandle*>(o) && !::tqqt_cast<OrderIndicator*>(o) &&
+	     !::tqqt_cast<PopupMenuEditor*>(o) && !::tqqt_cast<TQMenuBar*>(o) &&
+	     !::tqqt_cast<TQSizeGrip*>(o) )
 	    return TRUE;
-	if ( o && ::qt_cast<TQSizeGrip*>(o) )
+	if ( o && ::tqqt_cast<TQSizeGrip*>(o) )
 	    break;
 	if ( lastPressWidget != (TQWidget*)o ||
-	     ( !w || ::qt_cast<SizeHandle*>(o) ) ||
-	       ::qt_cast<OrderIndicator*>(o) )
+	     ( !w || ::tqqt_cast<SizeHandle*>(o) ) ||
+	       ::tqqt_cast<OrderIndicator*>(o) )
 	    break;
 	passiveInteractor = WidgetFactory::isPassiveInteractor( o );
 	if ( !passiveInteractor )
@@ -1090,14 +1090,14 @@ bool MainWindow::eventFilter( TQObject *o, TQEvent *e )
 	    return FALSE;
 	}
 	if ( ( (TQKeyEvent*)e )->key() == Key_Escape && incrementalSearch->hasFocus() ) {
-	    if ( ::qt_cast<SourceEditor*>(qWorkspace()->activeWindow()) ) {
+	    if ( ::tqqt_cast<SourceEditor*>(qWorkspace()->activeWindow()) ) {
 		qWorkspace()->activeWindow()->setFocus();
 		return TRUE;
 	    }
 	}
 	if ( !( w = isAFormWindowChild( o ) ) ||
-	     ::qt_cast<SizeHandle*>(o) ||
-	     ::qt_cast<OrderIndicator*>(o) )
+	     ::tqqt_cast<SizeHandle*>(o) ||
+	     ::tqqt_cast<OrderIndicator*>(o) )
 	    break;
 	( (FormWindow*)w )->handleKeyPress( (TQKeyEvent*)e, ( (FormWindow*)w )->designerWidget( o ) );
 	if ( ((TQKeyEvent*)e)->isAccepted() )
@@ -1105,10 +1105,10 @@ bool MainWindow::eventFilter( TQObject *o, TQEvent *e )
 	break;
     case TQEvent::MouseButtonDblClick:
 	if ( !( w = isAFormWindowChild( o ) ) ||
-	     ::qt_cast<SizeHandle*>(o) ||
-	     ::qt_cast<OrderIndicator*>(o) ) {
-	    if ( ::qt_cast<TQToolButton*>(o) && ((TQToolButton*)o)->isOn() &&
-		 o->parent() && ::qt_cast<TQToolBar*>(o->parent()) && formWindow() )
+	     ::tqqt_cast<SizeHandle*>(o) ||
+	     ::tqqt_cast<OrderIndicator*>(o) ) {
+	    if ( ::tqqt_cast<TQToolButton*>(o) && ((TQToolButton*)o)->isOn() &&
+		 o->tqparent() && ::tqqt_cast<TQToolBar*>(o->tqparent()) && formWindow() )
 		formWindow()->setToolFixed();
 	    break;
 	}
@@ -1122,8 +1122,8 @@ bool MainWindow::eventFilter( TQObject *o, TQEvent *e )
 	return TRUE;
     case TQEvent::KeyRelease:
 	if ( !( w = isAFormWindowChild( o ) ) ||
-	     ::qt_cast<SizeHandle*>(o) ||
-	     ::qt_cast<OrderIndicator*>(o) )
+	     ::tqqt_cast<SizeHandle*>(o) ||
+	     ::tqqt_cast<OrderIndicator*>(o) )
 	    break;
 	( (FormWindow*)w )->handleKeyRelease( (TQKeyEvent*)e, ( (FormWindow*)w )->designerWidget( o ) );
 	if ( ((TQKeyEvent*)e)->isAccepted() )
@@ -1131,27 +1131,27 @@ bool MainWindow::eventFilter( TQObject *o, TQEvent *e )
 	break;
     case TQEvent::Hide:
 	if ( !( w = isAFormWindowChild( o ) ) ||
-	     ::qt_cast<SizeHandle*>(o) ||
-	     ::qt_cast<OrderIndicator*>(o) )
+	     ::tqqt_cast<SizeHandle*>(o) ||
+	     ::tqqt_cast<OrderIndicator*>(o) )
 	    break;
-	if ( ( (FormWindow*)w )->isWidgetSelected( (TQWidget*)o ) )
-	    ( (FormWindow*)w )->selectWidget( (TQWidget*)o, FALSE );
+	if ( ( (FormWindow*)w )->isWidgetSelected( TQT_TQOBJECT(o) ) )
+	    ( (FormWindow*)w )->selectWidget( TQT_TQOBJECT(o), FALSE );
 	break;
     case TQEvent::Enter:
     case TQEvent::Leave:
 	if ( !( w = isAFormWindowChild( o ) ) ||
-	     ::qt_cast<SizeHandle*>(o) ||
-	     ::qt_cast<OrderIndicator*>(o) ||
-	     ::qt_cast<MenuBarEditor*>(o) )
+	     ::tqqt_cast<SizeHandle*>(o) ||
+	     ::tqqt_cast<OrderIndicator*>(o) ||
+	     ::tqqt_cast<MenuBarEditor*>(o) )
 	    break;
 	return TRUE;
     case TQEvent::Resize:
     case TQEvent::Move:
 	if ( !( w = isAFormWindowChild( o ) ) ||
-	     ::qt_cast<SizeHandle*>(o) ||
-	     ::qt_cast<OrderIndicator*>(o) )
+	     ::tqqt_cast<SizeHandle*>(o) ||
+	     ::tqqt_cast<OrderIndicator*>(o) )
 	    break;
-	if ( WidgetFactory::layoutType( (TQWidget*)o->parent() ) != WidgetFactory::NoLayout ) {
+	if ( WidgetFactory::tqlayoutType( (TQWidget*)o->tqparent() ) != WidgetFactory::NoLayout ) {
 	    ( (FormWindow*)w )->updateSelection( (TQWidget*)o );
 	    if ( e->type() != TQEvent::Resize )
 		( (FormWindow*)w )->updateChildSelections( (TQWidget*)o );
@@ -1161,31 +1161,31 @@ bool MainWindow::eventFilter( TQObject *o, TQEvent *e )
 	if ( o->isWidgetType() && (TQWidget*)o == (TQWidget*)previewedForm ) {
 	    if ( lastActiveFormWindow && lastActiveFormWindow->project() ) {
 		TQStringList lst =
-		    MetaDataBase::fakeProperty( lastActiveFormWindow, "database" ).toStringList();
+		    MetaDataBase::fakeProperty( TQT_TQOBJECT(lastActiveFormWindow), "database" ).toStringList();
 		lastActiveFormWindow->project()->closeDatabase( lst[ 0 ] );
 	    }
 	}
 	break;
     case TQEvent::DragEnter:
-	if ( o == qWorkspace() || o == workspace() || o == workspace()->viewport() ) {
+	if ( TQT_BASE_OBJECT(o) == qWorkspace() || TQT_BASE_OBJECT(o) == workspace() || TQT_BASE_OBJECT(o) == workspace()->viewport() ) {
 	    workspace()->contentsDragEnterEvent( (TQDragEnterEvent*)e );
 	    return TRUE;
 	}
 	break;
     case TQEvent::DragMove:
-	if ( o == qWorkspace() || o == workspace() || o == workspace()->viewport() ) {
+	if ( TQT_BASE_OBJECT(o) == qWorkspace() || TQT_BASE_OBJECT(o) == workspace() || TQT_BASE_OBJECT(o) == workspace()->viewport() ) {
 	    workspace()->contentsDragMoveEvent( (TQDragMoveEvent*)e );
 	    return TRUE;
 	}
 	break;
     case TQEvent::Drop:
-	if ( o == qWorkspace() || o == workspace() || o == workspace()->viewport() ) {
+	if ( TQT_BASE_OBJECT(o) == qWorkspace() || TQT_BASE_OBJECT(o) == workspace() || TQT_BASE_OBJECT(o) == workspace()->viewport() ) {
 	    workspace()->contentsDropEvent( (TQDropEvent*)e );
 	    return TRUE;
 	}
 	break;
     case TQEvent::Show:
-	if ( o != this )
+	if ( TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(this) )
 	    break;
 	if ( ((TQShowEvent*)e)->spontaneous() )
 	    break;
@@ -1195,33 +1195,33 @@ bool MainWindow::eventFilter( TQObject *o, TQEvent *e )
 	return TRUE;
     case TQEvent::Wheel:
 	if ( !( w = isAFormWindowChild( o ) ) ||
-	     ::qt_cast<SizeHandle*>(o) ||
-	     ::qt_cast<OrderIndicator*>(o) )
+	     ::tqqt_cast<SizeHandle*>(o) ||
+	     ::tqqt_cast<OrderIndicator*>(o) )
 	    break;
 	return TRUE;
     case TQEvent::FocusIn:
-	if ( !::qt_cast<FormWindow*>(o) && isAFormWindowChild( o ) )
+	if ( !::tqqt_cast<FormWindow*>(o) && isAFormWindowChild( o ) )
 	    return TRUE; //FIXME
 	if ( hierarchyView->formDefinitionView()->isRenaming()
-	     && ( o->inherits( "Editor" ) || ::qt_cast<FormWindow*>(o) ) )
+	     && ( o->inherits( "Editor" ) || ::tqqt_cast<FormWindow*>(o) ) )
 		TQApplication::sendPostedEvents();
 	if ( o->inherits( "Editor" ) ) {
 	    TQWidget *w = (TQWidget*)o;
 	    while ( w ) {
-		if ( ::qt_cast<SourceEditor*>(w) )
+		if ( ::tqqt_cast<SourceEditor*>(w) )
 		    break;
-		w = w->parentWidget( TRUE );
+		w = w->tqparentWidget( TRUE );
 	    }
-	    if ( ::qt_cast<SourceEditor*>(w) )
+	    if ( ::tqqt_cast<SourceEditor*>(w) )
 		( (SourceEditor*)w )->checkTimeStamp();
-	} else if ( ::qt_cast<FormWindow*>(o) ) {
+	} else if ( ::tqqt_cast<FormWindow*>(o) ) {
 	    FormWindow *fw = (FormWindow*)o;
 	    if ( fw->formFile() && fw->formFile()->editor() )
 		fw->formFile()->editor()->checkTimeStamp();
 	}
 	break;
     case TQEvent::FocusOut:
-	if ( !::qt_cast<FormWindow*>(o) && isAFormWindowChild( o ) )
+	if ( !::tqqt_cast<FormWindow*>(o) && isAFormWindowChild( o ) )
 	    return TRUE;
 	break;
     default:
@@ -1233,12 +1233,12 @@ bool MainWindow::eventFilter( TQObject *o, TQEvent *e )
 
 TQWidget *MainWindow::isAFormWindowChild( TQObject *o ) const
 {
-    if ( ::qt_cast<TQWizard*>(o->parent()) && !::qt_cast<TQPushButton*>(o) )
+    if ( ::tqqt_cast<TQWizard*>(o->tqparent()) && !::tqqt_cast<TQPushButton*>(o) )
 	return 0;
     while ( o ) {
-	if ( ::qt_cast<FormWindow*>(o) )
+	if ( ::tqqt_cast<FormWindow*>(o) )
 	    return (TQWidget*)o;
-	o = o->parent();
+	o = o->tqparent();
     }
     return 0;
 }
@@ -1246,11 +1246,11 @@ TQWidget *MainWindow::isAFormWindowChild( TQObject *o ) const
 TQWidget *MainWindow::isAToolBarChild( TQObject *o ) const
 {
     while ( o ) {
-	if ( ::qt_cast<QDesignerToolBar*>(o) )
+	if ( ::tqqt_cast<TQDesignerToolBar*>(o) )
 	    return (TQWidget*)o;
-	if ( ::qt_cast<FormWindow*>(o) )
+	if ( ::tqqt_cast<FormWindow*>(o) )
 	    return 0;
-	o = o->parent();
+	o = o->tqparent();
     }
     return 0;
 }
@@ -1259,10 +1259,10 @@ FormWindow *MainWindow::formWindow()
 {
     if ( qworkspace->activeWindow() ) {
 	FormWindow *fw = 0;
-	if ( ::qt_cast<FormWindow*>(qworkspace->activeWindow()) )
+	if ( ::tqqt_cast<FormWindow*>(qworkspace->activeWindow()) )
 	    fw = (FormWindow*)qworkspace->activeWindow();
 	else if ( lastActiveFormWindow &&
-		    qworkspace->windowList().find( lastActiveFormWindow ) != -1)
+		    qworkspace->windowList().tqfind( lastActiveFormWindow ) != -1)
 	    fw = lastActiveFormWindow;
 	return fw;
     }
@@ -1279,7 +1279,7 @@ void MainWindow::insertFormWindow( FormWindow *fw )
 {
     if ( fw )
 	TQWhatsThis::add( fw, i18n( "<b>The Form Window</b>"
-			       "<p>Use the various tools to add widgets or to change the layout "
+			       "<p>Use the various tools to add widgets or to change the tqlayout "
 			       "and behavior of the components in the form. Select one or multiple "
 			       "widgets to move them or lay them out. If a single widget is chosen it can "
 			       "be resized using the resize handles.</p>"
@@ -1307,12 +1307,12 @@ void MainWindow::insertFormWindow( FormWindow *fw )
     }
     fw->show();
     fw->currentToolChanged();
-    if ( fw->caption().isEmpty() && qstrlen( fw->name() )  )
+    if ( fw->caption().isEmpty() && tqstrlen( fw->name() )  )
 	fw->setCaption( fw->name() );
     fw->mainContainer()->setCaption( fw->caption() );
-    WidgetFactory::saveDefaultProperties( fw->mainContainer(),
+    WidgetFactory::saveDefaultProperties( TQT_TQOBJECT(fw->mainContainer()),
 					  WidgetDatabase::
-					  idFromClassName( WidgetFactory::classNameOf( fw->mainContainer() ) ) );
+					  idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(fw->mainContainer()) ) ) );
     activeWindowChanged( fw );
     emit formWindowsChanged();
     for ( SourceEditor *e = sourceEditors.first(); e; e = sourceEditors.next() ) {
@@ -1356,13 +1356,13 @@ bool MainWindow::unregisterClient( FormWindow *w )
     TQPtrList<SourceEditor> waitingForDelete;
     waitingForDelete.setAutoDelete( TRUE );
     for ( SourceEditor *e = sourceEditors.first(); e; e = sourceEditors.next() ) {
-	if ( e->object() == w )
+	if ( TQT_BASE_OBJECT(e->object()) == TQT_BASE_OBJECT(w) )
 	    waitingForDelete.append( e );
     }
 
     if ( actionEditor->form() == w ) {
 	actionEditor->setFormWindow( 0 );
-	actionEditor->parentWidget()->hide();
+	actionEditor->tqparentWidget()->hide();
     }
 
     return TRUE;
@@ -1371,7 +1371,7 @@ bool MainWindow::unregisterClient( FormWindow *w )
 void MainWindow::activeWindowChanged( TQWidget *w )
 {
     TQWidget *old = formWindow();
-    if ( ::qt_cast<FormWindow*>(w) ) {
+    if ( ::tqqt_cast<FormWindow*>(w) ) {
 	FormWindow *fw = (FormWindow*)w;
 	FormWindow *ofw = lastActiveFormWindow;
 	lastActiveFormWindow = fw;
@@ -1384,16 +1384,16 @@ void MainWindow::activeWindowChanged( TQWidget *w )
 		formWindow()->clearSelection();
 	}
 	workspace()->activeFormChanged( fw );
-	setAppropriate( (TQDockWindow*)actionEditor->parentWidget(),
-			::qt_cast<TQMainWindow*>(lastActiveFormWindow->mainContainer()) );
-	if ( appropriate( (TQDockWindow*)actionEditor->parentWidget() ) ) {
+	setAppropriate( (TQDockWindow*)actionEditor->tqparentWidget(),
+			::tqqt_cast<TQMainWindow*>(lastActiveFormWindow->mainContainer()) );
+	if ( appropriate( (TQDockWindow*)actionEditor->tqparentWidget() ) ) {
 	    if ( actionEditor->wantToBeShown() )
-		actionEditor->parentWidget()->show();
+		actionEditor->tqparentWidget()->show();
 	} else {
 	    TQWidget *mc = 0;
-	    if ( ofw && (mc = ofw->mainContainer()) && ::qt_cast<TQMainWindow*>(mc) )
-		actionEditor->setWantToBeShown( !actionEditor->parentWidget()->isHidden() );
-	    actionEditor->parentWidget()->hide();
+	    if ( ofw && (mc = ofw->mainContainer()) && ::tqqt_cast<TQMainWindow*>(mc) )
+		actionEditor->setWantToBeShown( !actionEditor->tqparentWidget()->isHidden() );
+	    actionEditor->tqparentWidget()->hide();
 	}
 
 	actionEditor->setFormWindow( lastActiveFormWindow );
@@ -1421,12 +1421,12 @@ void MainWindow::activeWindowChanged( TQWidget *w )
 	emit hasActiveForm( FALSE );
 	propertyEditor->clear();
 	hierarchyView->clear();
-	updateUndoRedo( FALSE, FALSE, TQString::null, TQString::null );
+	updateUndoRedo( FALSE, FALSE, TQString(), TQString() );
     }
 
     selectionChanged();
 
-    if ( ::qt_cast<SourceEditor*>(w) ) {
+    if ( ::tqqt_cast<SourceEditor*>(w) ) {
 	SourceEditor *se = (SourceEditor*)w;
 	TQGuardedPtr<FormWindow> fw = se->formWindow();
 	if ( se->formWindow() &&
@@ -1479,16 +1479,16 @@ void MainWindow::updateUndoRedo( bool undoAvailable, bool redoAvailable,
 				 const TQString &undoCmd, const TQString &redoCmd )
 {
     if ( qWorkspace()->activeWindow() &&
-	 ::qt_cast<SourceEditor*>(qWorkspace()->activeWindow()) )
+	 ::tqqt_cast<SourceEditor*>(qWorkspace()->activeWindow()) )
 	 return; // do not set a formWindow related command
     actionEditUndo->setEnabled( undoAvailable );
     actionEditRedo->setEnabled( redoAvailable );
     if ( !undoCmd.isEmpty() )
-	actionEditUndo->setMenuText( i18n( "&Undo: %1" ).arg( undoCmd ) );
+	actionEditUndo->setMenuText( i18n( "&Undo: %1" ).tqarg( undoCmd ) );
     else
 	actionEditUndo->setMenuText( i18n( "&Undo: Not Available" ) );
     if ( !redoCmd.isEmpty() )
-	actionEditRedo->setMenuText( i18n( "&Redo: %1" ).arg( redoCmd ) );
+	actionEditRedo->setMenuText( i18n( "&Redo: %1" ).tqarg( redoCmd ) );
     else
 	actionEditRedo->setMenuText( i18n( "&Redo: Not Available" ) );
 
@@ -1504,7 +1504,7 @@ void MainWindow::updateUndoRedo( bool undoAvailable, bool redoAvailable,
 void MainWindow::updateEditorUndoRedo()
 {
     if ( !qWorkspace()->activeWindow() ||
-	 !::qt_cast<SourceEditor*>(qWorkspace()->activeWindow()) )
+	 !::tqqt_cast<SourceEditor*>(qWorkspace()->activeWindow()) )
 	return;
     SourceEditor *editor = (SourceEditor*)qWorkspace()->activeWindow();
     actionEditUndo->setEnabled( editor->editIsUndoAvailable() );
@@ -1524,7 +1524,7 @@ void MainWindow::popupFormWindowMenu( const TQPoint & gp, FormWindow *fw )
     setupRMBSpecialCommands( ids, commands, fw );
     setupRMBProperties( ids, commands, fw );
 
-    qApp->processEvents();
+    tqApp->processEvents();
     int r = rmbFormWindow->exec( gp );
 
     handleRMBProperties( r, commands, fw );
@@ -1542,7 +1542,7 @@ void MainWindow::popupWidgetMenu( const TQPoint &gp, FormWindow * /*fw*/, TQWidg
     setupRMBSpecialCommands( ids, commands, w );
     setupRMBProperties( ids, commands, w );
 
-    qApp->processEvents();
+    tqApp->processEvents();
     int r = rmbWidgets->exec( gp );
 
     handleRMBProperties( r, commands, w );
@@ -1554,18 +1554,18 @@ void MainWindow::popupWidgetMenu( const TQPoint &gp, FormWindow * /*fw*/, TQWidg
 
 void MainWindow::setupRMBProperties( TQValueList<uint> &ids, TQMap<TQString, int> &props, TQWidget *w )
 {
-    const TQMetaProperty* text = w->metaObject()->property( w->metaObject()->findProperty( "text", TRUE ), TRUE );
+    const TQMetaProperty* text = w->tqmetaObject()->property( w->tqmetaObject()->tqfindProperty( "text", TRUE ), TRUE );
     if ( text && qstrcmp( text->type(), TQSTRING_OBJECT_NAME_STRING) != 0 )
 	text = 0;
-    const TQMetaProperty* title = w->metaObject()->property( w->metaObject()->findProperty( "title", TRUE ), TRUE );
+    const TQMetaProperty* title = w->tqmetaObject()->property( w->tqmetaObject()->tqfindProperty( "title", TRUE ), TRUE );
     if ( title && qstrcmp( title->type(), TQSTRING_OBJECT_NAME_STRING) != 0 )
 	title = 0;
     const TQMetaProperty* pagetitle =
-	w->metaObject()->property( w->metaObject()->findProperty( "pageTitle", TRUE ), TRUE );
+	w->tqmetaObject()->property( w->tqmetaObject()->tqfindProperty( "pageTitle", TRUE ), TRUE );
     if ( pagetitle && qstrcmp( pagetitle->type(), TQSTRING_OBJECT_NAME_STRING) != 0 )
 	pagetitle = 0;
     const TQMetaProperty* pixmap =
-	w->metaObject()->property( w->metaObject()->findProperty( "pixmap", TRUE ), TRUE );
+	w->tqmetaObject()->property( w->tqmetaObject()->tqfindProperty( "pixmap", TRUE ), TRUE );
     if ( pixmap && qstrcmp( pixmap->type(), TQPIXMAP_OBJECT_NAME_STRING) != 0 )
 	pixmap = 0;
 
@@ -1580,7 +1580,7 @@ void MainWindow::setupRMBProperties( TQValueList<uint> &ids, TQMap<TQString, int
 	    ids << ( id = rmbWidgets->insertItem( i18n("Choose Pixmap..."), -1, 0) );
 	    props.insert( "pixmap", id );
 	}
-	if ( text && text->designable(w) && !::qt_cast<TQTextEdit*>(w) ) {
+	if ( text && text->designable(w) && !::tqqt_cast<TQTextEdit*>(w) ) {
 	    ids << ( id = rmbWidgets->insertItem( i18n("Edit Text..."), -1, 0) );
 	    props.insert( "text", id );
 	}
@@ -1595,15 +1595,15 @@ void MainWindow::setupRMBProperties( TQValueList<uint> &ids, TQMap<TQString, int
     }
 }
 
-#ifdef QT_CONTAINER_CUSTOM_WIDGETS
-static QWidgetContainerInterfacePrivate *containerWidgetInterface( TQWidget *w )
+#ifdef TQT_CONTAINER_CUSTOM_WIDGETS
+static TQWidgetContainerInterfacePrivate *containerWidgetInterface( TQWidget *w )
 {
     WidgetInterface *iface = 0;
-    widgetManager()->queryInterface( WidgetFactory::classNameOf( w ), &iface );
+    widgetManager()->queryInterface( WidgetFactory::classNameOf( TQT_TQOBJECT(w) ), &iface );
     if ( !iface )
 	return 0;
-    QWidgetContainerInterfacePrivate *iface2 = 0;
-    iface->queryInterface( IID_QWidgetContainer, (QUnknownInterface**)&iface2 );
+    TQWidgetContainerInterfacePrivate *iface2 = 0;
+    iface->queryInterface( IID_TQWidgetContainer, (TQUnknownInterface**)&iface2 );
     if ( !iface2 )
 	return 0;
     iface->release();
@@ -1616,19 +1616,19 @@ void MainWindow::setupRMBSpecialCommands( TQValueList<uint> &ids,
 {
     int id;
 
-    if ( ::qt_cast<TQTabWidget*>(w) ) {
+    if ( ::tqqt_cast<TQTabWidget*>(w) ) {
 	if ( ids.isEmpty() )
 	    ids << rmbWidgets->insertSeparator( 0 );
-	if ( ( (QDesignerTabWidget*)w )->count() > 1) {
+	if ( ( (TQDesignerTabWidget*)w )->count() > 1) {
 	    ids << ( id = rmbWidgets->insertItem( i18n("Delete Page"), -1, 0 ) );
 	    commands.insert( "remove", id );
 	}
 	ids << ( id = rmbWidgets->insertItem( i18n("Add Page"), -1, 0 ) );
 	commands.insert( "add", id );
-    } else if ( ::qt_cast<QDesignerWidgetStack*>(w) ) {
+    } else if ( ::tqqt_cast<TQDesignerWidgetStack*>(w) ) {
 	if ( ids.isEmpty() )
 	    ids << rmbWidgets->insertSeparator( 0 );
-	if ( ( (QDesignerWidgetStack*)w )->count() > 1) {
+	if ( ( (TQDesignerWidgetStack*)w )->count() > 1) {
 	    ids << ( id = rmbWidgets->insertItem( i18n("Previous Page"), -1, 0 ) );
 	    commands.insert( "prevpage", id );
 	    ids << ( id = rmbWidgets->insertItem( i18n("Next Page"), -1, 0 ) );
@@ -1639,7 +1639,7 @@ void MainWindow::setupRMBSpecialCommands( TQValueList<uint> &ids,
 	}
 	ids << ( id = rmbWidgets->insertItem( i18n("Add Page"), -1, 0 ) );
 	commands.insert( "add", id );
-    } else if ( ::qt_cast<TQToolBox*>(w) ) {
+    } else if ( ::tqqt_cast<TQToolBox*>(w) ) {
 	if ( ids.isEmpty() )
 	    ids << rmbWidgets->insertSeparator( 0 );
 	if ( ( (TQToolBox*)w )->count() > 1 ) {
@@ -1648,33 +1648,33 @@ void MainWindow::setupRMBSpecialCommands( TQValueList<uint> &ids,
 	}
 	ids << ( id = rmbWidgets->insertItem( i18n("Add Page"), -1, 0 ) );
 	commands.insert( "add", id );
-#ifdef QT_CONTAINER_CUSTOM_WIDGETS
+#ifdef TQT_CONTAINER_CUSTOM_WIDGETS
     } else if ( WidgetDatabase::
 		isCustomPluginWidget( WidgetDatabase::
-				      idFromClassName( WidgetFactory::classNameOf( w ) ) ) ) {
-	QWidgetContainerInterfacePrivate *iface = containerWidgetInterface( w );
-	if ( iface && iface->supportsPages( WidgetFactory::classNameOf( w ) ) ) {
+				      idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(w) ) ) ) ) {
+	TQWidgetContainerInterfacePrivate *iface = containerWidgetInterface( w );
+	if ( iface && iface->supportsPages( WidgetFactory::classNameOf( TQT_TQOBJECT(w) ) ) ) {
 	    if ( ids.isEmpty() )
 		ids << rmbWidgets->insertSeparator( 0 );
 
-	    if ( iface->count( WidgetFactory::classNameOf( w ), w ) > 1 ) {
+	    if ( iface->count( WidgetFactory::classNameOf( TQT_TQOBJECT(w) ), w ) > 1 ) {
 		ids << ( id = rmbWidgets->insertItem( i18n( "Delete Page" ), -1, 0 ) );
 		commands.insert( "remove", id );
 	    }
 	    ids << ( id = rmbWidgets->insertItem( i18n("Add Page"), -1, 0 ) );
 	    commands.insert( "add", id );
-	    if ( iface->currentIndex( WidgetFactory::classNameOf( w ), w ) != -1 ) {
+	    if ( iface->currentIndex( WidgetFactory::classNameOf( TQT_TQOBJECT(w) ), w ) != -1 ) {
 		ids << ( id = rmbWidgets->insertItem( i18n("Rename Current Page..."), -1, 0 ) );
 		commands.insert( "rename", id );
 	    }
 	}
 	if ( iface )
 	    iface->release();
-#endif // QT_CONTAINER_CUSTOM_WIDGETS
+#endif // TQT_CONTAINER_CUSTOM_WIDGETS
     }
 
     if ( WidgetFactory::hasSpecialEditor( WidgetDatabase::
-			  idFromClassName( WidgetFactory::classNameOf( w ) ), w ) ) {
+			  idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(w) ) ), TQT_TQOBJECT(w) ) ) {
 	if ( ids.isEmpty() )
 	    ids << rmbWidgets->insertSeparator( 0 );
 	ids << ( id = rmbWidgets->insertItem( i18n("Edit..."), -1, 0 ) );
@@ -1687,7 +1687,7 @@ void MainWindow::setupRMBSpecialCommands( TQValueList<uint> &ids,
 {
     int id;
 
-    if ( ::qt_cast<TQWizard*>(fw->mainContainer()) ) {
+    if ( ::tqqt_cast<TQWizard*>(fw->mainContainer()) ) {
 	if ( ids.isEmpty() )
 	    ids << rmbFormWindow->insertSeparator( 0 );
 
@@ -1705,7 +1705,7 @@ void MainWindow::setupRMBSpecialCommands( TQValueList<uint> &ids,
 	ids << ( id = rmbFormWindow->insertItem( i18n("Edit Pages..."), -1, 0 ) );
 	commands.insert( "edit", id );
 
-    } else if ( ::qt_cast<TQMainWindow*>(fw->mainContainer()) ) {
+    } else if ( ::tqqt_cast<TQMainWindow*>(fw->mainContainer()) ) {
 	if ( ids.isEmpty() )
 	    ids << rmbFormWindow->insertSeparator( 0 );
 	ids << ( id = rmbFormWindow->insertItem( i18n( "Add Menu Item" ), -1, 0 ) );
@@ -1720,108 +1720,108 @@ void MainWindow::handleRMBProperties( int id, TQMap<TQString, int> &props, TQWid
     if ( id == props[ "text" ] ) {
 	bool ok = FALSE;
 	bool oldDoWrap = FALSE;
-	if ( ::qt_cast<TQLabel*>(w) ) {
-	    int align = w->property( "alignment" ).toInt();
+	if ( ::tqqt_cast<TQLabel*>(w) ) {
+	    int align = w->property( "tqalignment" ).toInt();
 	    if ( align & WordBreak )
 		oldDoWrap = TRUE;
 	}
 	bool doWrap = oldDoWrap;
 
 	TQString text;
-	if ( ::qt_cast<TQTextView*>(w) || ::qt_cast<TQLabel*>(w) || ::qt_cast<TQButton*>(w) ) {
-	    text = MultiLineEditor::getText( this, w->property( "text" ).toString(), !::qt_cast<TQButton*>(w), &doWrap );
+	if ( ::tqqt_cast<TQTextView*>(w) || ::tqqt_cast<TQLabel*>(w) || ::tqqt_cast<TQButton*>(w) ) {
+	    text = MultiLineEditor::getText( this, w->property( "text" ).toString(), !::tqqt_cast<TQButton*>(w), &doWrap );
 	    ok = !text.isNull();
 	} else {
-	    text = QInputDialog::getText( i18n("Text"), i18n( "New text" ),
+	    text = TQInputDialog::getText( i18n("Text"), i18n( "New text" ),
 				  TQLineEdit::Normal, w->property("text").toString(), &ok, this );
 	}
 	if ( ok ) {
 	    if ( oldDoWrap != doWrap ) {
-		TQString pn( i18n( "Set 'wordwrap' of '%1'" ).arg( w->name() ) );
-		SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), w, propertyEditor,
+		TQString pn( i18n( "Set 'wordwrap' of '%1'" ).tqarg( w->name() ) );
+		SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), TQT_TQOBJECT(w), propertyEditor,
 								  "wordwrap", TQVariant( oldDoWrap, 0 ),
-								  TQVariant( doWrap, 0 ), TQString::null, TQString::null );
+								  TQVariant( doWrap, 0 ), TQString(), TQString() );
 		cmd->execute();
 		formWindow()->commandHistory()->addCommand( cmd );
-		MetaDataBase::setPropertyChanged( w, "wordwrap", TRUE );
+		MetaDataBase::setPropertyChanged( TQT_TQOBJECT(w), "wordwrap", TRUE );
 	    }
 
-	    TQString pn( i18n( "Set the 'text' of '%1'" ).arg( w->name() ) );
-	    SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), w, propertyEditor,
+	    TQString pn( i18n( "Set the 'text' of '%1'" ).tqarg( w->name() ) );
+	    SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), TQT_TQOBJECT(w), propertyEditor,
 							      "text", w->property( "text" ),
-							      text, TQString::null, TQString::null );
+							      text, TQString(), TQString() );
 	    cmd->execute();
 	    formWindow()->commandHistory()->addCommand( cmd );
-	    MetaDataBase::setPropertyChanged( w, "text", TRUE );
+	    MetaDataBase::setPropertyChanged( TQT_TQOBJECT(w), "text", TRUE );
 	}
     } else if ( id == props[ "title" ] ) {
 	bool ok = FALSE;
-	TQString title = QInputDialog::getText( i18n("Title"), i18n( "New title" ),
+	TQString title = TQInputDialog::getText( i18n("Title"), i18n( "New title" ),
 			       TQLineEdit::Normal, w->property("title").toString(), &ok, this );
 	if ( ok ) {
-	    TQString pn( i18n( "Set the 'title' of '%2'" ).arg( w->name() ) );
-	    SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), w, propertyEditor,
+	    TQString pn( i18n( "Set the 'title' of '%2'" ).tqarg( w->name() ) );
+	    SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), TQT_TQOBJECT(w), propertyEditor,
 							      "title", w->property( "title" ),
-							      title, TQString::null, TQString::null );
+							      title, TQString(), TQString() );
 	    cmd->execute();
 	    formWindow()->commandHistory()->addCommand( cmd );
-	    MetaDataBase::setPropertyChanged( w, "title", TRUE );
+	    MetaDataBase::setPropertyChanged( TQT_TQOBJECT(w), "title", TRUE );
 	}
     } else if ( id == props[ "pagetitle" ] ) {
 	bool ok = FALSE;
-	TQString text = QInputDialog::getText( i18n("Page Title"), i18n( "New page title" ),
+	TQString text = TQInputDialog::getText( i18n("Page Title"), i18n( "New page title" ),
 			      TQLineEdit::Normal, w->property("pageTitle").toString(), &ok, this );
 	if ( ok ) {
-	    TQString pn( i18n( "Set the 'pageTitle' of '%2'" ).arg( w->name() ) );
-	    SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), w, propertyEditor,
+	    TQString pn( i18n( "Set the 'pageTitle' of '%2'" ).tqarg( w->name() ) );
+	    SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), TQT_TQOBJECT(w), propertyEditor,
 							      "pageTitle",
 							      w->property( "pageTitle" ),
-							      text, TQString::null, TQString::null );
+							      text, TQString(), TQString() );
 	    cmd->execute();
 	    formWindow()->commandHistory()->addCommand( cmd );
-	    MetaDataBase::setPropertyChanged( w, "pageTitle", TRUE );
+	    MetaDataBase::setPropertyChanged( TQT_TQOBJECT(w), "pageTitle", TRUE );
 	}
     } else if ( id == props[ "pixmap" ] ) {
-	TQPixmap oldPix = w->property( "pixmap" ).toPixmap();
+	TQPixmap oldPix = TQVariant(w->property( "pixmap" )).toPixmap();
 	TQPixmap pix = qChoosePixmap( this, formWindow(), oldPix );
 	if ( !pix.isNull() ) {
-	    TQString pn( i18n( "Set the 'pixmap' of '%2'" ).arg( w->name() ) );
-	    SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), w, propertyEditor,
+	    TQString pn( i18n( "Set the 'pixmap' of '%2'" ).tqarg( w->name() ) );
+	    SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), TQT_TQOBJECT(w), propertyEditor,
 							      "pixmap", w->property( "pixmap" ),
-							      pix, TQString::null, TQString::null );
+							      pix, TQString(), TQString() );
 	    cmd->execute();
 	    formWindow()->commandHistory()->addCommand( cmd );
-	    MetaDataBase::setPropertyChanged( w, "pixmap", TRUE );
+	    MetaDataBase::setPropertyChanged( TQT_TQOBJECT(w), "pixmap", TRUE );
 	}
     }
 }
 
 void MainWindow::handleRMBSpecialCommands( int id, TQMap<TQString, int> &commands, TQWidget *w )
 {
-    if ( ::qt_cast<TQTabWidget*>(w) ) {
+    if ( ::tqqt_cast<TQTabWidget*>(w) ) {
 	TQTabWidget *tw = (TQTabWidget*)w;
 	if ( id == commands[ "add" ] ) {
 	    AddTabPageCommand *cmd =
-		new AddTabPageCommand( i18n( "Add Page to %1" ).arg( tw->name() ), formWindow(),
+		new AddTabPageCommand( i18n( "Add Page to %1" ).tqarg( tw->name() ), formWindow(),
 				       tw, "Tab" );
 	    formWindow()->commandHistory()->addCommand( cmd );
 	    cmd->execute();
 	} else if ( id == commands[ "remove" ] ) {
 	    if ( tw->currentPage() ) {
-		QDesignerTabWidget *dtw = (QDesignerTabWidget*)tw;
+		TQDesignerTabWidget *dtw = (TQDesignerTabWidget*)tw;
 		DeleteTabPageCommand *cmd =
 		    new DeleteTabPageCommand( i18n( "Delete Page %1 of %2" ).
-					      arg( dtw->pageTitle() ).arg( tw->name() ),
+					      tqarg( dtw->pageTitle() ).tqarg( tw->name() ),
 					      formWindow(), tw, tw->currentPage() );
 		formWindow()->commandHistory()->addCommand( cmd );
 		cmd->execute();
 	    }
 	}
-    } else if ( ::qt_cast<TQToolBox*>(w) ) {
+    } else if ( ::tqqt_cast<TQToolBox*>(w) ) {
 	TQToolBox *tb = (TQToolBox*)w;
 	if ( id == commands[ "add" ] ) {
 	    AddToolBoxPageCommand *cmd =
-		new AddToolBoxPageCommand( i18n( "Add Page to %1" ).arg( tb->name() ),
+		new AddToolBoxPageCommand( i18n( "Add Page to %1" ).tqarg( tb->name() ),
 					   formWindow(),
 					   tb, "Page" );
 	    formWindow()->commandHistory()->addCommand( cmd );
@@ -1837,11 +1837,11 @@ void MainWindow::handleRMBSpecialCommands( int id, TQMap<TQString, int> &command
 		cmd->execute();
 	    }
 	}
-    } else if ( ::qt_cast<TQWidgetStack*>(w) ) {
-	QDesignerWidgetStack *ws = (QDesignerWidgetStack*)w;
+    } else if ( ::tqqt_cast<TQWidgetStack*>(w) ) {
+	TQDesignerWidgetStack *ws = (TQDesignerWidgetStack*)w;
 	if ( id == commands[ "add" ] ) {
 	    AddWidgetStackPageCommand *cmd =
-		new AddWidgetStackPageCommand( i18n( "Add Page to %1" ).arg( ws->name() ),
+		new AddWidgetStackPageCommand( i18n( "Add Page to %1" ).tqarg( ws->name() ),
 					       formWindow(), ws );
 	    formWindow()->commandHistory()->addCommand( cmd );
 	    cmd->execute();
@@ -1849,50 +1849,50 @@ void MainWindow::handleRMBSpecialCommands( int id, TQMap<TQString, int> &command
 	    if ( ws->visibleWidget() ) {
 		DeleteWidgetStackPageCommand *cmd =
 		    new DeleteWidgetStackPageCommand( i18n( "Delete Page %1 of %2" ).
-						      arg( ws->currentPage() ).arg( ws->name() ),
+						      tqarg( ws->currentPage() ).tqarg( ws->name() ),
 						      formWindow(), ws, ws->visibleWidget() );
 		formWindow()->commandHistory()->addCommand( cmd );
 		cmd->execute();
 	    }
 	} else if ( id == commands[ "nextpage" ] ) {
 	    int currentPage = w->property( "currentPage" ).toInt();
-	    TQString pn( i18n( "Raise next page of '%2'" ).arg( w->name() ) );
+	    TQString pn( i18n( "Raise next page of '%2'" ).tqarg( w->name() ) );
 	    SetPropertyCommand *cmd =
-		new SetPropertyCommand( pn, formWindow(), w, propertyEditor,
+		new SetPropertyCommand( pn, formWindow(), TQT_TQOBJECT(w), propertyEditor,
 					"currentPage", currentPage,
-					currentPage + 1, TQString::null, TQString::null );
+					currentPage + 1, TQString(), TQString() );
 	    cmd->execute();
 	    formWindow()->commandHistory()->addCommand( cmd );
-	    MetaDataBase::setPropertyChanged( w, "currentPage", TRUE );
+	    MetaDataBase::setPropertyChanged( TQT_TQOBJECT(w), "currentPage", TRUE );
 	} else if ( id == commands[ "prevpage" ] ) {
 	    int currentPage = w->property( "currentPage" ).toInt();
-	    TQString pn( i18n( "Raise previous page of '%2'" ).arg( w->name() ) );
+	    TQString pn( i18n( "Raise previous page of '%2'" ).tqarg( w->name() ) );
 	    SetPropertyCommand *cmd =
-		new SetPropertyCommand( pn, formWindow(), w, propertyEditor,
+		new SetPropertyCommand( pn, formWindow(), TQT_TQOBJECT(w), propertyEditor,
 					"currentPage", currentPage,
-					currentPage -1, TQString::null, TQString::null );
+					currentPage -1, TQString(), TQString() );
 	    cmd->execute();
 	    formWindow()->commandHistory()->addCommand( cmd );
-	    MetaDataBase::setPropertyChanged( w, "currentPage", TRUE );
+	    MetaDataBase::setPropertyChanged( TQT_TQOBJECT(w), "currentPage", TRUE );
 	}
-#ifdef QT_CONTAINER_CUSTOM_WIDGETS
+#ifdef TQT_CONTAINER_CUSTOM_WIDGETS
     } else if ( WidgetDatabase::
 		isCustomPluginWidget( WidgetDatabase::
-				      idFromClassName( WidgetFactory::classNameOf( w ) ) ) ) {
+				      idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(w) ) ) ) ) {
 	if ( id == commands[ "add" ] ) {
 	    AddContainerPageCommand *cmd =
-		new AddContainerPageCommand( i18n( "Add Page to %1" ).arg( w->name() ),
+		new AddContainerPageCommand( i18n( "Add Page to %1" ).tqarg( w->name() ),
 					     formWindow(), w, "Page" );
 	    formWindow()->commandHistory()->addCommand( cmd );
 	    cmd->execute();
 	} else if ( id == commands[ "remove" ] ) {
-	    QWidgetContainerInterfacePrivate *iface = containerWidgetInterface( w );
+	    TQWidgetContainerInterfacePrivate *iface = containerWidgetInterface( w );
 	    if ( iface ) {
-		TQString wClassName = WidgetFactory::classNameOf( w );
+		TQString wClassName = WidgetFactory::classNameOf( TQT_TQOBJECT(w) );
 		int index = iface->currentIndex( wClassName, w );
 		DeleteContainerPageCommand *cmd =
 		    new DeleteContainerPageCommand( i18n( "Delete Page %1 of %2" ).
-						    arg( iface->pageLabel( wClassName,
+						    tqarg( iface->pageLabel( wClassName,
 									   w, index ) ).
 						    arg( w->name() ),
 						    formWindow(), w, index );
@@ -1901,12 +1901,12 @@ void MainWindow::handleRMBSpecialCommands( int id, TQMap<TQString, int> &command
 		iface->release();
 	    }
 	} else if ( id == commands[ "rename" ] ) {
-	    QWidgetContainerInterfacePrivate *iface = containerWidgetInterface( w );
+	    TQWidgetContainerInterfacePrivate *iface = containerWidgetInterface( w );
 	    if ( iface ) {
 		bool ok = FALSE;
-		TQString wClassName = WidgetFactory::classNameOf( w );
+		TQString wClassName = WidgetFactory::classNameOf( TQT_TQOBJECT(w) );
 		int index = iface->currentIndex( wClassName, w );
-		TQString text = QInputDialog::getText( i18n("Page Title"), i18n( "New page title" ),
+		TQString text = TQInputDialog::getText( i18n("Page Title"), i18n( "New page title" ),
 						      TQLineEdit::Normal,
 						      iface->pageLabel( wClassName, w,
 								       index ),
@@ -1925,33 +1925,33 @@ void MainWindow::handleRMBSpecialCommands( int id, TQMap<TQString, int> &command
 		iface->release();
 	    }
 	}
-#endif // QT_CONTAINER_CUSTOM_WIDGETS
+#endif // TQT_CONTAINER_CUSTOM_WIDGETS
     }
 
     if ( WidgetFactory::hasSpecialEditor( WidgetDatabase::
-				  idFromClassName( WidgetFactory::classNameOf( w ) ), w ) ) {
+				  idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(w) ) ), TQT_TQOBJECT(w) ) ) {
 	if ( id == commands[ "edit" ] )
 	    WidgetFactory::editWidget( WidgetDatabase::
-		       idFromClassName( WidgetFactory::classNameOf( w ) ), this, w, formWindow() );
+		       idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(w) ) ), this, w, formWindow() );
     }
 }
 
 void MainWindow::handleRMBSpecialCommands( int id, TQMap<TQString, int> &commands, FormWindow *fw )
 {
-    if ( ::qt_cast<TQWizard*>(fw->mainContainer()) ) {
+    if ( ::tqqt_cast<TQWizard*>(fw->mainContainer()) ) {
 	TQWizard *wiz = (TQWizard*)fw->mainContainer();
 	if ( id == commands[ "add" ] ) {
 	    AddWizardPageCommand *cmd =
-		new AddWizardPageCommand( i18n( "Add Page to %1" ).arg( wiz->name() ),
+		new AddWizardPageCommand( i18n( "Add Page to %1" ).tqarg( wiz->name() ),
 					  formWindow(), wiz, "WizardPage" );
 	    formWindow()->commandHistory()->addCommand( cmd );
 	    cmd->execute();
 	} else if ( id == commands[ "remove" ] ) {
 	    if ( wiz->currentPage() ) {
-		QDesignerWizard *dw = (QDesignerWizard*)wiz;
+		TQDesignerWizard *dw = (TQDesignerWizard*)wiz;
 		DeleteWizardPageCommand *cmd =
 		    new DeleteWizardPageCommand( i18n( "Delete Page %1 of %2" ).
-						 arg( dw->pageTitle() ).arg( wiz->name() ),
+						 tqarg( dw->pageTitle() ).tqarg( wiz->name() ),
 						 formWindow(), wiz,
 						 wiz->indexOf( wiz->currentPage() ) );
 		formWindow()->commandHistory()->addCommand( cmd );
@@ -1964,11 +1964,11 @@ void MainWindow::handleRMBSpecialCommands( int id, TQMap<TQString, int> &command
 	} else if ( id == commands[ "rename" ] ) {
 
 	    bool ok = FALSE;
-	    QDesignerWizard *dw = (QDesignerWizard*)wiz;
-	    TQString text = QInputDialog::getText( i18n("Page Title"), i18n( "New page title" ),
+	    TQDesignerWizard *dw = (TQDesignerWizard*)wiz;
+	    TQString text = TQInputDialog::getText( i18n("Page Title"), i18n( "New page title" ),
 					  TQLineEdit::Normal, dw->pageTitle(), &ok, this );
 	    if ( ok ) {
-		TQString pn( i18n( "Rename page %1 of %2" ).arg( dw->pageTitle() ).arg( wiz->name() ) );
+		TQString pn( i18n( "Rename page %1 of %2" ).tqarg( dw->pageTitle() ).tqarg( wiz->name() ) );
 		RenameWizardPageCommand *cmd =
 		    new RenameWizardPageCommand( pn, formWindow()
 						 , wiz, wiz->indexOf( wiz->currentPage() ), text );
@@ -1976,17 +1976,17 @@ void MainWindow::handleRMBSpecialCommands( int id, TQMap<TQString, int> &command
 		cmd->execute();
 	    }
 	}
-    } else if ( ::qt_cast<TQMainWindow*>(fw->mainContainer()) ) {
+    } else if ( ::tqqt_cast<TQMainWindow*>(fw->mainContainer()) ) {
 	TQMainWindow *mw = (TQMainWindow*)fw->mainContainer();
 	if ( id == commands[ "add_toolbar" ] ) {
 	    AddToolBarCommand *cmd =
-		new AddToolBarCommand( i18n( "Add Toolbar to '%1'" ).arg( formWindow()->name() ),
+		new AddToolBarCommand( i18n( "Add Toolbar to '%1'" ).tqarg( formWindow()->name() ),
 				       formWindow(), mw );
 	    formWindow()->commandHistory()->addCommand( cmd );
 	    cmd->execute();
 	} else if ( id == commands[ "add_menu_item" ] ) {
 	    AddMenuCommand *cmd =
-		new AddMenuCommand( i18n( "Add Menu to '%1'" ).arg( formWindow()->name() ),
+		new AddMenuCommand( i18n( "Add Menu to '%1'" ).tqarg( formWindow()->name() ),
 				    formWindow(), mw );
 	    formWindow()->commandHistory()->addCommand( cmd );
 	    cmd->execute();
@@ -1996,15 +1996,15 @@ void MainWindow::handleRMBSpecialCommands( int id, TQMap<TQString, int> &command
 
 void MainWindow::clipboardChanged()
 {
-    TQString text( qApp->clipboard()->text() );
+    TQString text( tqApp->clipboard()->text() );
     TQString start( "<!DOCTYPE UI-SELECTION>" );
     actionEditPaste->setEnabled( text.left( start.length() ) == start );
 }
 
 void MainWindow::selectionChanged()
 {
-    layoutChilds = FALSE;
-    layoutSelected = FALSE;
+    tqlayoutChilds = FALSE;
+    tqlayoutSelected = FALSE;
     breakLayout = FALSE;
     if ( !formWindow() ) {
 	actionEditCut->setEnabled( FALSE );
@@ -2041,7 +2041,7 @@ void MainWindow::selectionChanged()
 	int unlaidout = 0;
 	int laidout = 0;
 	for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) {
-	    if ( !w->parentWidget() || WidgetFactory::layoutType( w->parentWidget() ) == WidgetFactory::NoLayout )
+	    if ( !w->tqparentWidget() || WidgetFactory::tqlayoutType( w->tqparentWidget() ) == WidgetFactory::NoLayout )
 		unlaidout++;
 	    else
 		laidout++;
@@ -2053,27 +2053,27 @@ void MainWindow::selectionChanged()
 	actionEditGridLayout->setEnabled( unlaidout > 1 );
 	actionEditBreakLayout->setEnabled( laidout > 0 );
 	actionEditAdjustSize->setEnabled( laidout > 0 );
-	layoutSelected = unlaidout > 1;
+	tqlayoutSelected = unlaidout > 1;
 	breakLayout = laidout > 0;
     } else if ( selectedWidgets == 1 ) {
 	TQWidget *w = widgets.first();
-	bool isContainer = WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( w ) ) ) ||
+	bool isContainer = WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(w) ) ) ) ||
 			   w == formWindow()->mainContainer();
-	actionEditAdjustSize->setEnabled( !w->parentWidget() ||
-					  WidgetFactory::layoutType( w->parentWidget() ) == WidgetFactory::NoLayout );
+	actionEditAdjustSize->setEnabled( !w->tqparentWidget() ||
+					  WidgetFactory::tqlayoutType( w->tqparentWidget() ) == WidgetFactory::NoLayout );
 
 	if ( !isContainer ) {
 	    actionEditHLayout->setEnabled( FALSE );
 	    actionEditVLayout->setEnabled( FALSE );
 	    actionEditGridLayout->setEnabled( FALSE );
-	    if ( w->parentWidget() && WidgetFactory::layoutType( w->parentWidget() ) != WidgetFactory::NoLayout ) {
-		actionEditBreakLayout->setEnabled( !isAToolBarChild( w ) );
+	    if ( w->tqparentWidget() && WidgetFactory::tqlayoutType( w->tqparentWidget() ) != WidgetFactory::NoLayout ) {
+		actionEditBreakLayout->setEnabled( !isAToolBarChild( TQT_TQOBJECT(w) ) );
 		breakLayout = TRUE;
 	    } else {
 		actionEditBreakLayout->setEnabled( FALSE );
 	    }
 	} else {
-	    if ( WidgetFactory::layoutType( w ) == WidgetFactory::NoLayout ) {
+	    if ( WidgetFactory::tqlayoutType( w ) == WidgetFactory::NoLayout ) {
 		if ( !formWindow()->hasInsertedChildren( w ) ) {
 		    actionEditHLayout->setEnabled( FALSE );
 		    actionEditVLayout->setEnabled( FALSE );
@@ -2084,24 +2084,24 @@ void MainWindow::selectionChanged()
 		    actionEditVLayout->setEnabled( TRUE );
 		    actionEditGridLayout->setEnabled( TRUE );
 		    actionEditBreakLayout->setEnabled( FALSE );
-		    layoutChilds = TRUE;
+		    tqlayoutChilds = TRUE;
 		}
-		if ( w->parentWidget() && WidgetFactory::layoutType( w->parentWidget() ) != WidgetFactory::NoLayout ) {
-		    actionEditBreakLayout->setEnabled( !isAToolBarChild( w ) );
+		if ( w->tqparentWidget() && WidgetFactory::tqlayoutType( w->tqparentWidget() ) != WidgetFactory::NoLayout ) {
+		    actionEditBreakLayout->setEnabled( !isAToolBarChild( TQT_TQOBJECT(w) ) );
 		    breakLayout = TRUE;
 		}
 	    } else {
 		actionEditHLayout->setEnabled( FALSE );
 		actionEditVLayout->setEnabled( FALSE );
 		actionEditGridLayout->setEnabled( FALSE );
-		actionEditBreakLayout->setEnabled( !isAToolBarChild( w ) );
+		actionEditBreakLayout->setEnabled( !isAToolBarChild( TQT_TQOBJECT(w) ) );
 		breakLayout = TRUE;
 	    }
 	}
     } else if ( selectedWidgets == 0 ) {
 	actionEditAdjustSize->setEnabled( TRUE );
 	TQWidget *w = formWindow()->mainContainer();
-	if ( WidgetFactory::layoutType( w ) == WidgetFactory::NoLayout ) {
+	if ( WidgetFactory::tqlayoutType( w ) == WidgetFactory::NoLayout ) {
 	    if ( !formWindow()->hasInsertedChildren( w ) ) {
 		actionEditHLayout->setEnabled( FALSE );
 		actionEditVLayout->setEnabled( FALSE );
@@ -2112,7 +2112,7 @@ void MainWindow::selectionChanged()
 		actionEditVLayout->setEnabled( TRUE );
 		actionEditGridLayout->setEnabled( TRUE );
 		actionEditBreakLayout->setEnabled( FALSE );
-		layoutChilds = TRUE;
+		tqlayoutChilds = TRUE;
 	    }
 	} else {
 	    actionEditHLayout->setEnabled( FALSE );
@@ -2132,7 +2132,7 @@ void MainWindow::selectionChanged()
 static TQString fixArgs( const TQString &s2 )
 {
     TQString s = s2;
-    return s.replace( ',', ';' );
+    return s.tqreplace( ',', ';' );
 }
 
 void MainWindow::writeConfig()
@@ -2177,18 +2177,18 @@ void MainWindow::writeConfig()
     config.writeEntry( keybase + "Geometries/MainwindowWidth", width() );
     config.writeEntry( keybase + "Geometries/MainwindowHeight", height() );
     config.writeEntry( keybase + "Geometries/MainwindowMaximized", isMaximized() );
-    config.writeEntry( keybase + "Geometries/PropertyEditorX", propertyEditor->parentWidget()->x() );
-    config.writeEntry( keybase + "Geometries/PropertyEditorY", propertyEditor->parentWidget()->y() );
-    config.writeEntry( keybase + "Geometries/PropertyEditorWidth", propertyEditor->parentWidget()->width() );
-    config.writeEntry( keybase + "Geometries/PropertyEditorHeight", propertyEditor->parentWidget()->height() );
-    config.writeEntry( keybase + "Geometries/HierarchyViewX", hierarchyView->parentWidget()->x() );
-    config.writeEntry( keybase + "Geometries/HierarchyViewY", hierarchyView->parentWidget()->y() );
-    config.writeEntry( keybase + "Geometries/HierarchyViewWidth", hierarchyView->parentWidget()->width() );
-    config.writeEntry( keybase + "Geometries/HierarchyViewHeight", hierarchyView->parentWidget()->height() );
-    config.writeEntry( keybase + "Geometries/WorkspaceX", wspace->parentWidget()->x() );
-    config.writeEntry( keybase + "Geometries/WorkspaceY", wspace->parentWidget()->y() );
-    config.writeEntry( keybase + "Geometries/WorkspaceWidth", wspace->parentWidget()->width() );
-    config.writeEntry( keybase + "Geometries/WorkspaceHeight", wspace->parentWidget()->height() );
+    config.writeEntry( keybase + "Geometries/PropertyEditorX", propertyEditor->tqparentWidget()->x() );
+    config.writeEntry( keybase + "Geometries/PropertyEditorY", propertyEditor->tqparentWidget()->y() );
+    config.writeEntry( keybase + "Geometries/PropertyEditorWidth", propertyEditor->tqparentWidget()->width() );
+    config.writeEntry( keybase + "Geometries/PropertyEditorHeight", propertyEditor->tqparentWidget()->height() );
+    config.writeEntry( keybase + "Geometries/HierarchyViewX", hierarchyView->tqparentWidget()->x() );
+    config.writeEntry( keybase + "Geometries/HierarchyViewY", hierarchyView->tqparentWidget()->y() );
+    config.writeEntry( keybase + "Geometries/HierarchyViewWidth", hierarchyView->tqparentWidget()->width() );
+    config.writeEntry( keybase + "Geometries/HierarchyViewHeight", hierarchyView->tqparentWidget()->height() );
+    config.writeEntry( keybase + "Geometries/WorkspaceX", wspace->tqparentWidget()->x() );
+    config.writeEntry( keybase + "Geometries/WorkspaceY", wspace->tqparentWidget()->y() );
+    config.writeEntry( keybase + "Geometries/WorkspaceWidth", wspace->tqparentWidget()->width() );
+    config.writeEntry( keybase + "Geometries/WorkspaceHeight", wspace->tqparentWidget()->height() );
 
     config.writeEntry( keybase + "View/TextLabels", usesTextLabel() );
     config.writeEntry( keybase + "View/BigIcons", usesBigPixmaps() );
@@ -2211,8 +2211,8 @@ void MainWindow::writeConfig()
 	l << w->className;
 	l << w->includeFile;
 	l << TQString::number( (int)w->includePolicy );
-	l << TQString::number( w->sizeHint.width() );
-	l << TQString::number( w->sizeHint.height() );
+	l << TQString::number( w->tqsizeHint.width() );
+	l << TQString::number( w->tqsizeHint.height() );
 	l << TQString::number( w->lstSignals.count() );
 	for ( TQValueList<TQCString>::ConstIterator it = w->lstSignals.begin(); it != w->lstSignals.end(); ++it )
 	    l << TQString( fixArgs( *it ) );
@@ -2242,7 +2242,7 @@ void MainWindow::writeConfig()
 static TQString fixArgs2( const TQString &s2 )
 {
     TQString s = s2;
-    return s.replace( ';', ',' );
+    return s.tqreplace( ';', ',' );
 }
 
 void MainWindow::readConfig()
@@ -2261,7 +2261,7 @@ void MainWindow::readConfig()
 	if ( !ok ) {
 	    if ( oWindow ) {
 		oWindow->shuttingDown();
-		( (TQDockWindow*)oWindow->parent() )->hide();
+		( (TQDockWindow*)oWindow->tqparent() )->hide();
 	    }
 	    TQPixmap pix;
 	    pix.load( backPixName );
@@ -2273,7 +2273,7 @@ void MainWindow::readConfig()
     }
     if ( !readPreviousConfig ) {
 	fileFilter = config.readEntry( keybase + "FileFilter", fileFilter );
-	templPath = config.readEntry( keybase + "TemplatePath", TQString::null );
+	templPath = config.readEntry( keybase + "TemplatePath", TQString() );
 	databaseAutoEdit = config.readBoolEntry( keybase + "DatabaseAutoEdit", databaseAutoEdit );
 	shStartDialog = config.readBoolEntry( keybase + "ShowStartDialog", shStartDialog );
 	autoSaveEnabled = config.readBoolEntry( keybase + "AutoSave/Enabled", autoSaveEnabled );
@@ -2290,14 +2290,14 @@ void MainWindow::readConfig()
 	}
 	// We know that the oldSettingsKey() will return 3.1
 	if ( keybase == DesignerApplication::oldSettingsKey() ) {
-	    if (keybase.contains("3.1"))
+	    if (keybase.tqcontains("3.1"))
 		recentlyFiles = config.readListEntry( keybase + "RecentlyOpenedFiles", ',' );
 	    else
 		recentlyFiles = config.readListEntry(keybase + "RecentlyOpenedFiles");
 
 	    if ( recentlyFiles.count() == 1 && recentlyFiles[0].isNull() )
 		recentlyFiles.clear();
-	    if (keybase.contains("3.1"))
+	    if (keybase.tqcontains("3.1"))
 		recentlyProjects = config.readListEntry( keybase + "RecentlyOpenedProjects", ',' );
 	    else
 		recentlyProjects = config.readListEntry( keybase + "RecentlyOpenedProjects");
@@ -2315,7 +2315,7 @@ void MainWindow::readConfig()
 	    if ( !pix.isNull() )
 		qworkspace->setBackgroundPixmap( pix );
 	} else {
-	    qworkspace->setBackgroundColor( TQColor( (QRgb)config.readNumEntry( keybase + "Background/Color" ) ) );
+	    qworkspace->setBackgroundColor( TQColor( (TQRgb)config.readNumEntry( keybase + "Background/Color" ) ) );
 	}
 
 	if ( !readPreviousConfig ) {
@@ -2333,7 +2333,7 @@ void MainWindow::readConfig()
 		r.setWidth( config.readNumEntry( keybase + "Geometries/MainwindowWidth", r.width() ) );
 		r.setHeight( config.readNumEntry( keybase + "Geometries/MainwindowHeight", r.height() ) );
 
-		TQRect desk = TQApplication::desktop()->geometry();
+		TQRect desk = TQApplication::desktop()->tqgeometry();
 		TQRect inter = desk.intersect( r );
 		resize( r.size() );
 		if ( inter.width() * inter.height() > ( r.width() * r.height() / 20 ) ) {
@@ -2351,8 +2351,8 @@ void MainWindow::readConfig()
 	w->className = l[ 0 ];
 	w->includeFile = l[ 1 ];
 	w->includePolicy = (MetaDataBase::CustomWidget::IncludePolicy)l[ 2 ].toInt();
-	w->sizeHint.setWidth( l[ 3 ].toInt() );
-	w->sizeHint.setHeight( l[ 4 ].toInt() );
+	w->tqsizeHint.setWidth( l[ 3 ].toInt() );
+	w->tqsizeHint.setHeight( l[ 4 ].toInt() );
 	uint c = 5;
 	if ( l.count() > c ) {
 	    int numSignals = l[ c ].toInt();
@@ -2401,7 +2401,7 @@ void MainWindow::readConfig()
     if ( !restoreConfig )
 	return;
 
-#ifndef Q_WS_MAC
+#ifndef TQ_WS_MAC
     /* I'm sorry to make this not happen on the Mac, but it seems to hang somewhere deep
        in TQLayout, it gets into a very large loop - and seems it has to do with clever
        things the designer does ###Sam */
@@ -2418,7 +2418,7 @@ void MainWindow::readConfig()
     }
     if ( readPreviousConfig && oWindow ) {
 	oWindow->shuttingDown();
-	( (TQDockWindow*)oWindow->parent() )->hide();
+	( (TQDockWindow*)oWindow->tqparent() )->hide();
     }
 
     rebuildCustomWidgetGUI();
@@ -2449,9 +2449,9 @@ HierarchyView *MainWindow::objectHierarchy() const
     return hierarchyView;
 }
 
-TQPopupMenu *MainWindow::setupNormalHierarchyMenu( TQWidget *parent )
+TQPopupMenu *MainWindow::setupNormalHierarchyMenu( TQWidget *tqparent )
 {
-    TQPopupMenu *menu = new TQPopupMenu( parent );
+    TQPopupMenu *menu = new TQPopupMenu( tqparent );
 
     actionEditCut->addTo( menu );
     actionEditCopy->addTo( menu );
@@ -2461,12 +2461,12 @@ TQPopupMenu *MainWindow::setupNormalHierarchyMenu( TQWidget *parent )
     return menu;
 }
 
-TQPopupMenu *MainWindow::setupTabWidgetHierarchyMenu( TQWidget *parent, const char *addSlot, const char *removeSlot )
+TQPopupMenu *MainWindow::setupTabWidgetHierarchyMenu( TQWidget *tqparent, const char *addSlot, const char *removeSlot )
 {
-    TQPopupMenu *menu = new TQPopupMenu( parent );
+    TQPopupMenu *menu = new TQPopupMenu( tqparent );
 
-    menu->insertItem( i18n( "Add Page" ), parent, addSlot );
-    menu->insertItem( i18n( "Delete Page" ), parent, removeSlot );
+    menu->insertItem( i18n( "Add Page" ), tqparent, addSlot );
+    menu->insertItem( i18n( "Delete Page" ), tqparent, removeSlot );
     menu->insertSeparator();
     actionEditCut->addTo( menu );
     actionEditCopy->addTo( menu );
@@ -2489,7 +2489,7 @@ void MainWindow::closeEvent( TQCloseEvent *e )
     while ( wit.current() ) {
 	TQWidget *w = wit.current();
 	++wit;
-	if ( ::qt_cast<FormWindow*>(w) ) {
+	if ( ::tqqt_cast<FormWindow*>(w) ) {
 	    if ( ( (FormWindow*)w )->formFile()->editor() )
 		windows.removeRef( ( (FormWindow*)w )->formFile()->editor() );
 	    if ( ( (FormWindow*)w )->formFile()->formWindow() )
@@ -2498,7 +2498,7 @@ void MainWindow::closeEvent( TQCloseEvent *e )
 		e->ignore();
 		return;
 	    }
-	} else if ( ::qt_cast<SourceEditor*>(w) ) {
+	} else if ( ::tqqt_cast<SourceEditor*>(w) ) {
 	    if ( !( (SourceEditor*)w )->close() ) {
 		e->ignore();
 		return;
@@ -2513,7 +2513,7 @@ void MainWindow::closeEvent( TQCloseEvent *e )
 	++it;
 	if ( pro->isModified() ) {
 	    switch ( TQMessageBox::warning( this, i18n( "Save Project Settings" ),
-					   i18n( "Save changes to '%1'?" ).arg( pro->fileName() ),
+					   i18n( "Save changes to '%1'?" ).tqarg( pro->fileName() ),
 					   i18n( "&Yes" ), i18n( "&No" ), i18n( "&Cancel" ), 0, 2 ) ) {
 	    case 0: // save
 		pro->save();
@@ -2562,19 +2562,19 @@ ActionEditor *MainWindow::actioneditor() const
 
 bool MainWindow::openEditor( TQWidget *w, FormWindow *f )
 {
-    if ( f && !f->project()->isCpp() && !WidgetFactory::isPassiveInteractor( w ) ) {
-	TQString defSignal = WidgetFactory::defaultSignal( w );
+    if ( f && !f->project()->isCpp() && !WidgetFactory::isPassiveInteractor( TQT_TQOBJECT(w) ) ) {
+	TQString defSignal = WidgetFactory::defaultSignal( TQT_TQOBJECT(w) );
 	if ( defSignal.isEmpty() ) {
 	    editSource();
 	} else {
 	    TQString s = TQString( w->name() ) + "_" + defSignal;
 	    LanguageInterface *iface = MetaDataBase::languageInterface( f->project()->language() );
 	    if ( iface ) {
-		TQStrList sigs = iface->signalNames( w );
+		TQStrList sigs = iface->signalNames( TQT_TQOBJECT(w) );
 		TQString fullSignal;
 		for ( int i = 0; i < (int)sigs.count(); ++i ) {
 		    TQString sig = sigs.at( i );
-		    if ( sig.left( sig.find( '(' ) ) == defSignal ) {
+		    if ( sig.left( sig.tqfind( '(' ) ) == defSignal ) {
 			fullSignal = sig;
 			break;
 		    }
@@ -2582,18 +2582,18 @@ bool MainWindow::openEditor( TQWidget *w, FormWindow *f )
 
 		if ( !fullSignal.isEmpty() ) {
 		    TQString signl = fullSignal;
-		    fullSignal = fullSignal.mid( fullSignal.find( '(' ) + 1 );
+		    fullSignal = fullSignal.mid( fullSignal.tqfind( '(' ) + 1 );
 		    fullSignal.remove( (int)fullSignal.length() - 1, 1 );
 		    fullSignal = iface->createArguments( fullSignal.simplifyWhiteSpace() );
 		    s += "(" + fullSignal + ")";
-		    if ( !MetaDataBase::hasFunction( f, s.latin1() ) )
-			MetaDataBase::addFunction( f, s.latin1(), "", "public", "slot",
+		    if ( !MetaDataBase::hasFunction( TQT_TQOBJECT(f), s.latin1() ) )
+			MetaDataBase::addFunction( TQT_TQOBJECT(f), s.latin1(), "", "public", "slot",
 						   f->project()->language(), "void" );
-		    s = s.left( s.find( '(' ) ).latin1();
-		    if ( !MetaDataBase::hasConnection( f, w, defSignal.latin1(), f->mainContainer(), s.latin1() ) ) {
+		    s = s.left( s.tqfind( '(' ) ).latin1();
+		    if ( !MetaDataBase::hasConnection( TQT_TQOBJECT(f), TQT_TQOBJECT(w), defSignal.latin1(), TQT_TQOBJECT(f->mainContainer()), s.latin1() ) ) {
 			MetaDataBase::Connection conn;
-			conn.sender = w;
-			conn.receiver = f->mainContainer();
+			conn.sender = TQT_TQOBJECT(w);
+			conn.receiver = TQT_TQOBJECT(f->mainContainer());
 			conn.signal = signl;
 			conn.slot = s;
 			AddConnectionCommand *cmd =
@@ -2609,73 +2609,73 @@ bool MainWindow::openEditor( TQWidget *w, FormWindow *f )
 	return TRUE;
     }
     if ( WidgetFactory::hasSpecialEditor( WidgetDatabase::
-					  idFromClassName( WidgetFactory::classNameOf( w ) ), w ) ) {
-	statusMessage( i18n( "Edit %1..." ).arg( w->className() ) );
-	WidgetFactory::editWidget( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( w ) ),
+					  idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(w) ) ), TQT_TQOBJECT(w) ) ) {
+	statusMessage( i18n( "Edit %1..." ).tqarg( w->className() ) );
+	WidgetFactory::editWidget( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(w) ) ),
 				   this, w, formWindow() );
 	statusBar()->clear();
 	return TRUE;
     }
 
-    const TQMetaProperty* text = w->metaObject()->property( w->metaObject()->findProperty( "text", TRUE ), TRUE );
-    const TQMetaProperty* title = w->metaObject()->property( w->metaObject()->findProperty( "title", TRUE ), TRUE );
+    const TQMetaProperty* text = w->tqmetaObject()->property( w->tqmetaObject()->tqfindProperty( "text", TRUE ), TRUE );
+    const TQMetaProperty* title = w->tqmetaObject()->property( w->tqmetaObject()->tqfindProperty( "title", TRUE ), TRUE );
     if ( text && text->designable(w) ) {
 	bool ok = FALSE;
 	bool oldDoWrap = FALSE;
-	if ( ::qt_cast<TQLabel*>(w) ) {
-	    int align = w->property( "alignment" ).toInt();
+	if ( ::tqqt_cast<TQLabel*>(w) ) {
+	    int align = w->property( "tqalignment" ).toInt();
 	    if ( align & WordBreak )
 		oldDoWrap = TRUE;
 	}
 	bool doWrap = oldDoWrap;
 
 	TQString text;
-	if ( ::qt_cast<TQTextEdit*>(w) || ::qt_cast<TQLabel*>(w) || ::qt_cast<TQButton*>(w) ) {
+	if ( ::tqqt_cast<TQTextEdit*>(w) || ::tqqt_cast<TQLabel*>(w) || ::tqqt_cast<TQButton*>(w) ) {
 	    text = MultiLineEditor::getText( this, w->property( "text" ).toString(),
-					     !::qt_cast<TQButton*>(w), &doWrap );
+					     !::tqqt_cast<TQButton*>(w), &doWrap );
 	    ok = !text.isNull();
 	} else {
-	    text = QInputDialog::getText( i18n("Text"), i18n( "New text" ),
+	    text = TQInputDialog::getText( i18n("Text"), i18n( "New text" ),
 				  TQLineEdit::Normal, w->property("text").toString(), &ok, this );
 	}
 	if ( ok ) {
 	    if ( oldDoWrap != doWrap ) {
-		TQString pn( i18n( "Set 'wordwrap' of '%1'" ).arg( w->name() ) );
-		SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), w, propertyEditor,
+		TQString pn( i18n( "Set 'wordwrap' of '%1'" ).tqarg( w->name() ) );
+		SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), TQT_TQOBJECT(w), propertyEditor,
 								  "wordwrap", TQVariant( oldDoWrap, 0 ),
-								  TQVariant( doWrap, 0 ), TQString::null, TQString::null );
+								  TQVariant( doWrap, 0 ), TQString(), TQString() );
 		cmd->execute();
 		formWindow()->commandHistory()->addCommand( cmd );
-		MetaDataBase::setPropertyChanged( w, "wordwrap", TRUE );
+		MetaDataBase::setPropertyChanged( TQT_TQOBJECT(w), "wordwrap", TRUE );
 	    }
 
-	    TQString pn( i18n( "Set the 'text' of '%1'" ).arg( w->name() ) );
-	    SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), w, propertyEditor,
+	    TQString pn( i18n( "Set the 'text' of '%1'" ).tqarg( w->name() ) );
+	    SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), TQT_TQOBJECT(w), propertyEditor,
 							      "text", w->property( "text" ),
-							      text, TQString::null, TQString::null );
+							      text, TQString(), TQString() );
 	    cmd->execute();
 	    formWindow()->commandHistory()->addCommand( cmd );
-	    MetaDataBase::setPropertyChanged( w, "text", TRUE );
+	    MetaDataBase::setPropertyChanged( TQT_TQOBJECT(w), "text", TRUE );
 	}
 	return TRUE;
     }
     if ( title && title->designable(w) ) {
 	bool ok = FALSE;
 	TQString text;
-	text = QInputDialog::getText( i18n("Title"), i18n( "New title" ), TQLineEdit::Normal, w->property("title").toString(), &ok, this );
+	text = TQInputDialog::getText( i18n("Title"), i18n( "New title" ), TQLineEdit::Normal, w->property("title").toString(), &ok, this );
 	if ( ok ) {
-	    TQString pn( i18n( "Set the 'title' of '%2'" ).arg( w->name() ) );
-	    SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), w, propertyEditor,
+	    TQString pn( i18n( "Set the 'title' of '%2'" ).tqarg( w->name() ) );
+	    SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), TQT_TQOBJECT(w), propertyEditor,
 							      "title", w->property( "title" ),
-							      text, TQString::null, TQString::null );
+							      text, TQString(), TQString() );
 	    cmd->execute();
 	    formWindow()->commandHistory()->addCommand( cmd );
-	    MetaDataBase::setPropertyChanged( w, "title", TRUE );
+	    MetaDataBase::setPropertyChanged( TQT_TQOBJECT(w), "title", TRUE );
 	}
 	return TRUE;
     }
 
-    if ( !WidgetFactory::isPassiveInteractor( w ) )
+    if ( !WidgetFactory::isPassiveInteractor( TQT_TQOBJECT(w) ) )
 	editSource();
 
     return TRUE;
@@ -2706,12 +2706,12 @@ void MainWindow::rebuildCustomWidgetGUI()
 	a->setToggleAction( TRUE );
 	a->setText( w->className );
 	a->setIconSet( *w->pixmap );
-	a->setStatusTip( i18n( "Insert a %1 (custom widget)" ).arg( w->className ) );
+	a->setStatusTip( i18n( "Insert a %1 (custom widget)" ).tqarg( w->className ) );
 	a->setWhatsThis( i18n("<b>%1 (custom widget)</b>"
 			    "<p>Click <b>Edit Custom Widgets...</b> in the <b>Tools|Custom</b> menu to "
 			    "add and change custom widgets. You can add properties as well as "
-			    "signals and slots to integrate them into Qt Designer, "
-			    "and provide a pixmap which will be used to represent the widget on the form.</p>").arg( w->className ) );
+			    "signals and slots to integrate them into TQt Designer, "
+			    "and provide a pixmap which will be used to represent the widget on the form.</p>").tqarg( w->className ) );
 
 	a->addTo( customWidgetToolBar );
 	a->addTo( customWidgetToolBar2 );
@@ -2746,7 +2746,7 @@ bool MainWindow::isCustomWidgetUsed( MetaDataBase::CustomWidget *wid )
 {
     TQWidgetList windows = qWorkspace()->windowList();
     for ( TQWidget *w = windows.first(); w; w = windows.next() ) {
-	if ( ::qt_cast<FormWindow*>(w) ) {
+	if ( ::tqqt_cast<FormWindow*>(w) ) {
 	    if ( ( (FormWindow*)w )->isCustomWidgetUsed( wid ) )
 		return TRUE;
 	}
@@ -2761,7 +2761,7 @@ void MainWindow::setGrid( const TQPoint &p )
     grd = p;
     TQWidgetList windows = qWorkspace()->windowList();
     for ( TQWidget *w = windows.first(); w; w = windows.next() ) {
-	if ( !::qt_cast<FormWindow*>(w) )
+	if ( !::tqqt_cast<FormWindow*>(w) )
 	    continue;
 	( (FormWindow*)w )->mainContainer()->update();
     }
@@ -2774,7 +2774,7 @@ void MainWindow::setShowGrid( bool b )
     sGrid = b;
     TQWidgetList windows = qWorkspace()->windowList();
     for ( TQWidget *w = windows.first(); w; w = windows.next() ) {
-	if ( !::qt_cast<FormWindow*>(w) )
+	if ( !::tqqt_cast<FormWindow*>(w) )
 	    continue;
 	( (FormWindow*)w )->mainContainer()->update();
     }
@@ -2804,7 +2804,7 @@ void MainWindow::projectSelected( TQAction *a )
     a->setOn( TRUE );
     if ( currentProject )
 	currentProject->setActive( FALSE );
-    Project *p = *projects.find( a );
+    Project *p = *projects.tqfind( a );
     p->setActive( TRUE );
     if ( currentProject == p )
 	return;
@@ -2842,8 +2842,8 @@ void MainWindow::checkTempFiles()
     TQStringList lst = d.entryList();
     TQApplication::restoreOverrideCursor();
     bool load = TQMessageBox::information( this, i18n( "Restoring Last Session" ),
-					  i18n( "Qt Designer found some temporary saved files, which were\n"
-					      "written when Qt Designer crashed last time. Do you want to\n"
+					  i18n( "TQt Designer found some temporary saved files, which were\n"
+					      "written when TQt Designer crashed last time. Do you want to\n"
 					      "load these files?" ), i18n( "&Yes" ), i18n( "&No" ) ) == 0;
     TQApplication::setOverrideCursor( waitCursor );
     for ( TQStringList::ConstIterator it = lst.begin(); it != lst.end(); ++it ) {
@@ -2856,52 +2856,52 @@ void MainWindow::checkTempFiles()
 void MainWindow::showDialogHelp()
 {
     TQWidget *w = (TQWidget*)sender();
-    w = w->topLevelWidget();
+    w = w->tqtopLevelWidget();
 
     TQString link = documentationPath() + "/designer-manual-13.html#";
 
-    if ( ::qt_cast<NewFormBase*>(w) || ::qt_cast<StartDialogBase*>(w) ) // own doc for startdialog?
+    if ( ::tqqt_cast<NewFormBase*>(w) || ::tqqt_cast<StartDialogBase*>(w) ) // own doc for startdialog?
 	link += "dialog-file-new";
-    else if ( ::qt_cast<CreateTemplate*>(w) )
+    else if ( ::tqqt_cast<CreateTemplate*>(w) )
 	link += "dialog-file-create-template";
-    else if ( ::qt_cast<EditFunctionsBase*>(w) )
+    else if ( ::tqqt_cast<EditFunctionsBase*>(w) )
 	link += "dialog-edit-functions";
-//     else if ( ::qt_cast<ConnectionViewerBase*>(w) )
+//     else if ( ::tqqt_cast<ConnectionViewerBase*>(w) )
     else if ( w->inherits("ConnectionViewerBase") )
  	link += "dialog-view-connections";
-    else if ( ::qt_cast<FormSettingsBase*>(w) )
+    else if ( ::tqqt_cast<FormSettingsBase*>(w) )
 	link += "dialog-edit-form-settings";
-    else if ( ::qt_cast<Preferences*>(w) )
+    else if ( ::tqqt_cast<Preferences*>(w) )
 	link += "dialog-edit-preferences";
-    else if ( ::qt_cast<PixmapCollectionEditor*>(w) )
+    else if ( ::tqqt_cast<PixmapCollectionEditor*>(w) )
 	link += "dialog-image-collection";
-//    else if ( ::qt_cast<DatabaseConnectionBase*>(w) )
+//    else if ( ::tqqt_cast<DatabaseConnectionBase*>(w) )
     else if ( w->inherits( "DatabaseConnectionBase" ) )
 	link += "dialog-edit-database-connections";
-    else if ( ::qt_cast<ProjectSettingsBase*>(w) )
+    else if ( ::tqqt_cast<ProjectSettingsBase*>(w) )
 	link += "dialog-project-settings";
-    else if ( ::qt_cast<FindDialog*>(w) )
-	link += "dialog-find-text";
-    else if ( ::qt_cast<ReplaceDialog*>(w) )
-	link += "dialog-replace-text";
-    else if ( ::qt_cast<GotoLineDialog*>(w) )
+    else if ( ::tqqt_cast<FindDialog*>(w) )
+	link += "dialog-tqfind-text";
+    else if ( ::tqqt_cast<ReplaceDialog*>(w) )
+	link += "dialog-tqreplace-text";
+    else if ( ::tqqt_cast<GotoLineDialog*>(w) )
 	link += "dialog-go-to-line";
-//    else if ( ::qt_cast<ConnectionEditorBase*>(w) )
+//    else if ( ::tqqt_cast<ConnectionEditorBase*>(w) )
     else if ( w->inherits("ConnectionEditorBase") )
 	link += "dialog-edit-connections";
-    else if ( ::qt_cast<CustomWidgetEditorBase*>(w) )
+    else if ( ::tqqt_cast<CustomWidgetEditorBase*>(w) )
 	link += "dialog-edit-custom-widgets";
-    else if ( ::qt_cast<PaletteEditorBase*>(w) )
+    else if ( ::tqqt_cast<PaletteEditorBase*>(w) )
 	link += "dialog-edit-palette";
-    else if ( ::qt_cast<ListBoxEditorBase*>(w) )
+    else if ( ::tqqt_cast<ListBoxEditorBase*>(w) )
 	link += "dialog-edit-listbox";
-    else if ( ::qt_cast<ListViewEditorBase*>(w) )
+    else if ( ::tqqt_cast<ListViewEditorBase*>(w) )
 	link += "dialog-edit-listview";
-    else if ( ::qt_cast<IconViewEditorBase*>(w) )
+    else if ( ::tqqt_cast<IconViewEditorBase*>(w) )
 	link += "dialog-edit-iconview";
-    else if ( ::qt_cast<TableEditorBase*>(w) )
+    else if ( ::tqqt_cast<TableEditorBase*>(w) )
 	link += "dialog-edit-table";
-    else if ( ::qt_cast<MultiLineEditor*>(w) )
+    else if ( ::tqqt_cast<MultiLineEditor*>(w) )
 	link += "dialog-text";
 
     else {
@@ -2915,7 +2915,7 @@ void MainWindow::showDialogHelp()
 
 void MainWindow::setupActionManager()
 {
-    actionPluginManager = new QPluginManager<ActionInterface>( IID_Action, TQApplication::libraryPaths(), pluginDirectory() );
+    actionPluginManager = new TQPluginManager<ActionInterface>( IID_Action, TQApplication::libraryPaths(), pluginDirectory() );
 
     TQStringList lst = actionPluginManager->featureList();
     for ( TQStringList::ConstIterator ait = lst.begin(); ait != lst.end(); ++ait ) {
@@ -2925,7 +2925,7 @@ void MainWindow::setupActionManager()
 	    continue;
 
 	iface->connectTo( desInterface );
-	TQAction *a = iface->create( *ait, this );
+	TQAction *a = iface->create( *ait, TQT_TQOBJECT(this) );
 	if ( !a )
 	    continue;
 
@@ -2967,7 +2967,7 @@ void MainWindow::editFunction( const TQString &func, bool rereadSource )
     if ( !MetaDataBase::hasEditor( lang ) ) {
 	TQMessageBox::information( this, i18n( "Edit Source" ),
 				  i18n( "There is no plugin for editing %1 code installed.\n"
-				      "Note: Plugins are not available in static Qt configurations." ).arg( lang ) );
+				      "Note: Plugins are not available in static TQt configurations." ).tqarg( lang ) );
 	return;
     }
 
@@ -2979,7 +2979,7 @@ void MainWindow::editFunction( const TQString &func, bool rereadSource )
 	}
     }
 
-    createSourceEditor( formWindow(), formWindow()->project(), lang, func, rereadSource );
+    createSourceEditor( TQT_TQOBJECT(formWindow()), formWindow()->project(), lang, func, rereadSource );
 }
 
 void MainWindow::setupRecentlyFilesMenu()
@@ -3099,7 +3099,7 @@ void MainWindow::addRecentlyOpened( const TQString &fn, TQStringList &lst )
     TQFileInfo fi( fn );
     fi.convertToAbs();
     TQString f = fi.filePath();
-    if ( lst.find( f ) != lst.end() )
+    if ( lst.tqfind( f ) != lst.end() )
 	lst.remove( f );
     if ( lst.count() >= 10 )
 	lst.pop_back();
@@ -3115,19 +3115,19 @@ TemplateWizardInterface * MainWindow::templateWizardInterface( const TQString& c
 
 void MainWindow::setupPluginManagers()
 {
-    editorPluginManager = new QPluginManager<EditorInterface>( IID_Editor, TQApplication::libraryPaths(), "/kdevdesigner" );
+    editorPluginManager = new TQPluginManager<EditorInterface>( IID_Editor, TQApplication::libraryPaths(), "/kdevdesigner" );
     MetaDataBase::setEditor( editorPluginManager->featureList() );
 
     templateWizardPluginManager =
-	new QPluginManager<TemplateWizardInterface>( IID_TemplateWizard, TQApplication::libraryPaths(), pluginDirectory() );
+	new TQPluginManager<TemplateWizardInterface>( IID_TemplateWizard, TQApplication::libraryPaths(), pluginDirectory() );
 
     MetaDataBase::setupInterfaceManagers( "/designer" );
     preferencePluginManager =
-	new QPluginManager<PreferenceInterface>( IID_Preference, TQApplication::libraryPaths(), pluginDirectory() );
+	new TQPluginManager<PreferenceInterface>( IID_Preference, TQApplication::libraryPaths(), pluginDirectory() );
     projectSettingsPluginManager =
-	new QPluginManager<ProjectSettingsInterface>( IID_ProjectSettings, TQApplication::libraryPaths(), pluginDirectory() );
+	new TQPluginManager<ProjectSettingsInterface>( IID_ProjectSettings, TQApplication::libraryPaths(), pluginDirectory() );
     sourceTemplatePluginManager =
-	new QPluginManager<SourceTemplateInterface>( IID_SourceTemplate, TQApplication::libraryPaths(), pluginDirectory() );
+	new TQPluginManager<SourceTemplateInterface>( IID_SourceTemplate, TQApplication::libraryPaths(), pluginDirectory() );
 
     if ( preferencePluginManager ) {
 	TQStringList lst = preferencePluginManager->featureList();
@@ -3189,10 +3189,10 @@ void MainWindow::setModified( bool b, TQWidget *window )
 {
     TQWidget *w = window;
     while ( w ) {
-	if ( ::qt_cast<FormWindow*>(w) ) {
+	if ( ::tqqt_cast<FormWindow*>(w) ) {
 	    ( (FormWindow*)w )->modificationChanged( b );
 	    return;
-	} else if ( ::qt_cast<SourceEditor*>(w) ) {
+	} else if ( ::tqqt_cast<SourceEditor*>(w) ) {
 	    FormWindow *fw = ( (SourceEditor*)w )->formWindow();
 	    if ( fw && !fw->isFake() ) {
 		//fw->commandHistory()->setModified( b );
@@ -3204,13 +3204,13 @@ void MainWindow::setModified( bool b, TQWidget *window )
 	    }
 	    return;
 	}
-	w = w->parentWidget( TRUE );
+	w = w->tqparentWidget( TRUE );
     }
 }
 
 void MainWindow::editorClosed( SourceEditor *e )
 {
-    sourceEditors.take( sourceEditors.findRef( e ) );
+    sourceEditors.take( sourceEditors.tqfindRef( e ) );
 }
 
 void MainWindow::functionsChanged()
@@ -3227,7 +3227,7 @@ void MainWindow::doFunctionsChanged()
 
 void MainWindow::updateFunctionList()
 {
-    if ( !qWorkspace()->activeWindow() || !::qt_cast<SourceEditor*>(qWorkspace()->activeWindow()) )
+    if ( !qWorkspace()->activeWindow() || !::tqqt_cast<SourceEditor*>(qWorkspace()->activeWindow()) )
 	return;
     SourceEditor *se = (SourceEditor*)qWorkspace()->activeWindow();
     se->save();
@@ -3238,7 +3238,7 @@ void MainWindow::updateFunctionList()
 	    return;
 	TQValueList<LanguageInterface::Connection> conns;
 	iface->connections( se->text(), &conns );
-	MetaDataBase::setupConnections( se->formWindow(), conns );
+	MetaDataBase::setupConnections( TQT_TQOBJECT(se->formWindow()), conns );
 	propertyEditor->eventList()->setup();
     }
 }
@@ -3300,9 +3300,9 @@ void MainWindow::enableAll( bool enable )
     menuBar()->setEnabled( enable );
     TQObjectList *l = queryList( TQDOCKWINDOW_OBJECT_NAME_STRING );
     for ( TQObject *o = l->first(); o; o = l->next() ) {
-	if ( o == wspace->parentWidget() ||
-	     o == oWindow->parentWidget() ||
-	     o == hierarchyView->parentWidget() )
+	if ( TQT_BASE_OBJECT(o) == wspace->tqparentWidget() ||
+	     TQT_BASE_OBJECT(o) == oWindow->tqparentWidget() ||
+	     TQT_BASE_OBJECT(o) == hierarchyView->tqparentWidget() )
 	    continue;
 	( (TQWidget*)o )->setEnabled( enable );
     }
@@ -3316,9 +3316,9 @@ void MainWindow::showSourceLine( TQObject *o, int line, LineMode lm )
 	FormWindow *fw = 0;
 	SourceEditor *se = 0;
 	SourceFile *sf = 0;
-	if ( ::qt_cast<FormWindow*>(w) ) {
+	if ( ::tqqt_cast<FormWindow*>(w) ) {
 	    fw = (FormWindow*)w;
-	} else if ( ::qt_cast<SourceEditor*>(w) ) {
+	} else if ( ::tqqt_cast<SourceEditor*>(w) ) {
 	    se = (SourceEditor*)w;
 	    if ( !se->object() )
 		continue;
@@ -3350,7 +3350,7 @@ void MainWindow::showSourceLine( TQObject *o, int line, LineMode lm )
 		    fw->showNormal();
 		    fw->setFocus();
 		    lastActiveFormWindow = fw;
-		    qApp->processEvents();
+		    tqApp->processEvents();
 		    se = editSource();
 		    if ( se ) {
 			switch ( lm ) {
@@ -3386,7 +3386,7 @@ void MainWindow::showSourceLine( TQObject *o, int line, LineMode lm )
 	}
     }
 
-    if ( ::qt_cast<SourceFile*>(o) ) {
+    if ( ::tqqt_cast<SourceFile*>(o) ) {
 	for ( TQPtrListIterator<SourceFile> sources = currentProject->sourceFiles();
 	      sources.current(); ++sources ) {
 	    SourceFile* f = sources.current();
@@ -3422,10 +3422,10 @@ void MainWindow::showSourceLine( TQObject *o, int line, LineMode lm )
 
     mblockNewForms = TRUE;
     if ( !fw )
-	openFormWindow( currentProject->makeAbsolute( *qwf_forms->find( (TQWidget*)o ) ) );
+	openFormWindow( currentProject->makeAbsolute( *qwf_forms->tqfind( (TQWidget*)o ) ) );
     else
 	fw->formFile()->showEditor( FALSE );
-    qApp->processEvents(); // give all views the chance to get the formwindow
+    tqApp->processEvents(); // give all views the chance to get the formwindow
     SourceEditor *se = editSource();
     if ( se ) {
 	switch ( lm ) {
@@ -3448,12 +3448,12 @@ TQObject *MainWindow::findRealObject( TQObject *o )
 {
     TQWidgetList windows = qWorkspace()->windowList();
     for ( TQWidget *w = windows.first(); w; w = windows.next() ) {
-	if ( ::qt_cast<FormWindow*>(w) && TQString( w->name() ) == TQString( o->name() ) )
-	    return w;
-	else if ( ::qt_cast<SourceEditor*>(w) && ( (SourceEditor*)w )->formWindow() &&
+	if ( ::tqqt_cast<FormWindow*>(w) && TQString( w->name() ) == TQString( o->name() ) )
+	    return TQT_TQOBJECT(w);
+	else if ( ::tqqt_cast<SourceEditor*>(w) && ( (SourceEditor*)w )->formWindow() &&
 		  TQString( ( (SourceEditor*)w )->formWindow()->name() ) == TQString( o->name() ) )
-	    return w;
-	else if ( ::qt_cast<SourceFile*>(w) && ( (SourceEditor*)w )->sourceFile() &&
+	    return TQT_TQOBJECT(w);
+	else if ( ::tqqt_cast<SourceFile*>(w) && ( (SourceEditor*)w )->sourceFile() &&
 		  ( (SourceEditor*)w )->sourceFile() == o )
 	    return o;
     }
@@ -3463,7 +3463,7 @@ TQObject *MainWindow::findRealObject( TQObject *o )
 void MainWindow::formNameChanged( FormWindow *fw )
 {
     for ( SourceEditor *e = sourceEditors.first(); e; e = sourceEditors.next() ) {
-	if ( e->object() == fw )
+	if ( TQT_BASE_OBJECT(e->object()) == TQT_BASE_OBJECT(fw) )
 	    e->refresh( TRUE );
 	if ( e->project() == fw->project() )
 	    e->resetContext();
@@ -3474,7 +3474,7 @@ void MainWindow::breakPointsChanged()
 {
     if ( !inDebugMode )
 	return;
-    if ( !qWorkspace()->activeWindow() || !::qt_cast<SourceEditor*>(qWorkspace()->activeWindow()) )
+    if ( !qWorkspace()->activeWindow() || !::tqqt_cast<SourceEditor*>(qWorkspace()->activeWindow()) )
 	return;
     SourceEditor *e = (SourceEditor*)qWorkspace()->activeWindow();
     if ( !e->object() || !e->project() )
@@ -3484,7 +3484,7 @@ void MainWindow::breakPointsChanged()
 
     if ( !interpreterPluginManager ) {
 	interpreterPluginManager =
-	    new QPluginManager<InterpreterInterface>( IID_Interpreter,
+	    new TQPluginManager<InterpreterInterface>( IID_Interpreter,
 						      TQApplication::libraryPaths(),
 						      "/qsa" );
     }
@@ -3520,14 +3520,14 @@ void MainWindow::breakPointsChanged()
 int MainWindow::currentLayoutDefaultSpacing() const
 {
     if ( ( (MainWindow*)this )->formWindow() )
-	return ( (MainWindow*)this )->formWindow()->layoutDefaultSpacing();
+	return ( (MainWindow*)this )->formWindow()->tqlayoutDefaultSpacing();
     return BOXLAYOUT_DEFAULT_SPACING;
 }
 
 int MainWindow::currentLayoutDefaultMargin() const
 {
     if ( ( (MainWindow*)this )->formWindow() )
-	return ( (MainWindow*)this )->formWindow()->layoutDefaultMargin();
+	return ( (MainWindow*)this )->formWindow()->tqlayoutDefaultMargin();
     return BOXLAYOUT_DEFAULT_MARGIN;
 }
 
@@ -3568,10 +3568,10 @@ bool MainWindow::openProjectSettings( Project *pro )
 	dia.tabWidget->addTab( t.w, t.title );
 	if ( t.receiver ) {
 	    connect( dia.buttonOk, TQT_SIGNAL( clicked() ), senderObject, TQT_SLOT( emitAcceptSignal() ) );
-	    connect( senderObject, TQT_SIGNAL( acceptSignal( QUnknownInterface * ) ), t.receiver, t.accept_slot );
-	    connect( senderObject, TQT_SIGNAL( initSignal( QUnknownInterface * ) ), t.receiver, t.init_slot );
+	    connect( senderObject, TQT_SIGNAL( acceptSignal( TQUnknownInterface * ) ), t.receiver, t.accept_slot );
+	    connect( senderObject, TQT_SIGNAL( initSignal( TQUnknownInterface * ) ), t.receiver, t.init_slot );
 	    senderObject->emitInitSignal();
-	    disconnect( senderObject, TQT_SIGNAL( initSignal( QUnknownInterface * ) ), t.receiver, t.init_slot );
+	    disconnect( senderObject, TQT_SIGNAL( initSignal( TQUnknownInterface * ) ), t.receiver, t.init_slot );
 	}
     }
 
@@ -3620,13 +3620,13 @@ TQString MainWindow::whatsThisFrom( const TQString &key )
 	}
     }
 
-    int i = menuHelpFile.find( key );
+    int i = menuHelpFile.tqfind( key );
     if ( i == -1 )
-	return TQString::null;
+	return TQString();
     int start = i;
     int end = i;
-    start = menuHelpFile.findRev( "<li>", i ) + 4;
-    end = menuHelpFile.find( '\n', i ) - 1;
+    start = menuHelpFile.tqfindRev( "<li>", i ) + 4;
+    end = menuHelpFile.tqfind( '\n', i ) - 1;
     return menuHelpFile.mid( start, end - start + 1 );
 }
 
@@ -3641,13 +3641,13 @@ void MainWindow::setSingleProject( Project *pro )
 	while ( wit.current() ) {
 	    TQWidget *w = wit.current();
 	    ++wit;
-	    if ( ::qt_cast<FormWindow*>(w) ) {
+	    if ( ::tqqt_cast<FormWindow*>(w) ) {
 		if ( ( (FormWindow*)w )->project() == pro ) {
 		    if ( ( (FormWindow*)w )->formFile()->editor() )
 			windows.removeRef( ( (FormWindow*)w )->formFile()->editor() );
 		    ( (FormWindow*)w )->formFile()->close();
 		}
-	    } else if ( ::qt_cast<SourceEditor*>(w) ) {
+	    } else if ( ::tqqt_cast<SourceEditor*>(w) ) {
 		( (SourceEditor*)w )->close();
 	    }
 	}
@@ -3655,7 +3655,7 @@ void MainWindow::setSingleProject( Project *pro )
 	windows = qWorkspace()->windowList();
 	qWorkspace()->blockSignals( FALSE );
 	currentProject = 0;
-	updateUndoRedo( FALSE, FALSE, TQString::null, TQString::null );
+	updateUndoRedo( FALSE, FALSE, TQString(), TQString() );
     }
 
     singleProject = TRUE;
@@ -3682,15 +3682,15 @@ void MainWindow::showGUIStuff( bool b )
 	return;
     guiStuffVisible = b;
     if ( !b ) {
-	setAppropriate( (TQDockWindow*)toolBox->parentWidget(), FALSE );
-	toolBox->parentWidget()->hide();
+	setAppropriate( (TQDockWindow*)toolBox->tqparentWidget(), FALSE );
+	toolBox->tqparentWidget()->hide();
 	for ( TQToolBar *tb = widgetToolBars.first(); tb; tb = widgetToolBars.next() ) {
 	    tb->hide();
 	    setAppropriate( tb, FALSE );
 	}
 	propertyEditor->setPropertyEditorEnabled( FALSE );
-	setAppropriate( layoutToolBar, FALSE );
-	layoutToolBar->hide();
+	setAppropriate( tqlayoutToolBar, FALSE );
+	tqlayoutToolBar->hide();
 	setAppropriate( toolsToolBar, FALSE );
 	toolsToolBar->hide();
 	menubar->removeItem( toolsMenuId );
@@ -3706,7 +3706,7 @@ void MainWindow::showGUIStuff( bool b )
 	actionEditConnections->setEnabled( FALSE );
 	actionEditFunctions->setEnabled( FALSE );
 	actionEditAccels->setEnabled( FALSE );
-	( (TQDockWindow*)propertyEditor->parentWidget() )->
+	( (TQDockWindow*)propertyEditor->tqparentWidget() )->
 	    setCaption( i18n( "Signal Handlers" ) );
 	actionGroupNew->removeFrom( fileMenu );
 	actionGroupNew->removeFrom( projectToolBar );
@@ -3719,19 +3719,19 @@ void MainWindow::showGUIStuff( bool b )
 	actionFileSave->addTo( projectToolBar );
 	actionFileExit->addTo( fileMenu );
     } else {
-	setAppropriate( (TQDockWindow*)toolBox->parentWidget(), TRUE );
-	toolBox->parentWidget()->show();
+	setAppropriate( (TQDockWindow*)toolBox->tqparentWidget(), TRUE );
+	toolBox->tqparentWidget()->show();
 	for ( TQToolBar *tb = widgetToolBars.first(); tb; tb = widgetToolBars.next() ) {
 	    setAppropriate( tb, TRUE );
 	    tb->hide();
 	}
 	propertyEditor->setPropertyEditorEnabled( TRUE );
-	setAppropriate( layoutToolBar, TRUE );
-	layoutToolBar->show();
+	setAppropriate( tqlayoutToolBar, TRUE );
+	tqlayoutToolBar->show();
 	setAppropriate( toolsToolBar, TRUE );
 	toolsToolBar->show();
 	menubar->insertItem( i18n( "&Tools" ), toolsMenu, toolsMenuId, toolsMenuIndex );
-	menubar->insertItem( i18n( "&Layout" ), layoutMenu, toolsMenuId + 1, toolsMenuIndex + 1 );
+	menubar->insertItem( i18n( "&Layout" ), tqlayoutMenu, toolsMenuId + 1, toolsMenuIndex + 1 );
 	menubar->insertItem( i18n( "&Preview" ), previewMenu, toolsMenuId + 2, toolsMenuIndex + 2 );
 	connect( this, TQT_SIGNAL( hasActiveForm(bool) ), actionEditAccels, TQT_SLOT( setEnabled(bool) ) );
 	connect( this, TQT_SIGNAL( hasActiveForm(bool) ), actionEditFunctions, TQT_SLOT( setEnabled(bool) ) );
@@ -3743,7 +3743,7 @@ void MainWindow::showGUIStuff( bool b )
 	actionEditConnections->setEnabled( TRUE );
 	actionEditFunctions->setEnabled( TRUE );
 	actionEditAccels->setEnabled( TRUE );
-	( (TQDockWindow*)propertyEditor->parentWidget() )->
+	( (TQDockWindow*)propertyEditor->tqparentWidget() )->
 	    setCaption( i18n( "Property Editor/Signal Handlers" ) );
 	actionFileSave->removeFrom( fileMenu );
 	actionFileSave->removeFrom( projectToolBar );
diff --git a/kdevdesigner/designer/mainwindow.h b/kdevdesigner/designer/mainwindow.h
index a5db52df..a33c5e25 100644
--- a/kdevdesigner/designer/mainwindow.h
+++ b/kdevdesigner/designer/mainwindow.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -43,7 +43,7 @@
 #include <tqmainwindow.h>
 #include <tqmap.h>
 #include <tqguardedptr.h>
-#include <private/qpluginmanager_p.h>
+#include <private/tqpluginmanager_p.h>
 #include <tqobjectlist.h>
 
 class TQToolBox;
@@ -65,10 +65,10 @@ class ReplaceDialog;
 class GotoLineDialog;
 class SourceFile;
 class FormFile;
-class QAssistantClient;
+class TQAssistantClient;
 class DesignerAction;
 
-#if defined(Q_FULL_TEMPLATE_INSTANTIATION)
+#if defined(TQ_FULL_TEMPLATE_INSTANTIATION)
 #include <tqtoolbar.h>
 #else
 class TQToolBar;
@@ -77,9 +77,10 @@ class Preferences;
 
 class KDevDesignerPart;
 
-class MainWindow : public QMainWindow
+class MainWindow : public TQMainWindow
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     enum LineMode { Error, Step, StackFrame };
@@ -108,8 +109,8 @@ public:
     void popupFormWindowMenu( const TQPoint &gp, FormWindow *fw );
     void popupWidgetMenu( const TQPoint &gp, FormWindow *fw, TQWidget *w );
 
-    TQPopupMenu *setupNormalHierarchyMenu( TQWidget *parent );
-    TQPopupMenu *setupTabWidgetHierarchyMenu( TQWidget *parent, const char *addSlot, const char *removeSlot );
+    TQPopupMenu *setupNormalHierarchyMenu( TQWidget *tqparent );
+    TQPopupMenu *setupTabWidgetHierarchyMenu( TQWidget *tqparent, const char *addSlot, const char *removeSlot );
 
     FormWindow *openFormWindow( const TQString &fn, bool validFileName = TRUE, FormFile *ff = 0 );
     bool isCustomWidgetUsed( MetaDataBase::CustomWidget *w );
@@ -138,7 +139,7 @@ public:
     TemplateWizardInterface* templateWizardInterface( const TQString& className );
     TQStringList sourceTemplates() const;
     SourceTemplateInterface* sourceTemplateInterface( const TQString& templ );
-    QUnknownInterface* designerInterface() const { return desInterface; }
+    TQUnknownInterface* designerInterface() const { return desInterface; }
     TQPtrList<DesignerProject> projectList() const;
     TQStringList projectNames() const;
     TQStringList projectFileNames() const;
@@ -186,7 +187,7 @@ public:
     void setPluginDirectory( const TQString &pd );
     TQString pluginDirectory() const { return pluginDir; }
 
-    QAssistantClient* assistantClient() const { return assistant; }
+    TQAssistantClient* assistantClient() const { return assistant; }
 
     void addRecentlyOpenedFile( const TQString &fn ) { addRecentlyOpened( fn, recentlyFiles ); }
 
@@ -264,8 +265,8 @@ public slots:
     SourceEditor *editSource( SourceFile *f );
     SourceEditor *openSourceEditor();
     SourceEditor *createSourceEditor( TQObject *object, Project *project,
-				      const TQString &lang = TQString::null,
-				      const TQString &func = TQString::null,
+				      const TQString &lang = TQString(),
+				      const TQString &func = TQString(),
 				      bool rereadSource = FALSE );
     void editFormSettings();
     void editProjectSettings();
@@ -291,7 +292,7 @@ public slots:
     void helpContents();
     void helpManual();
     void helpAbout();
-    void helpAboutQt();
+    void helpAboutTQt();
     void helpRegister();
 
 private slots:
@@ -374,7 +375,7 @@ private:
 	TQString title;
 	TQObject *receiver;
 	const char *init_slot, *accept_slot;
-	Q_DUMMY_COMPARISON_OPERATOR( Tab )
+	TQ_DUMMY_COMPARISON_OPERATOR( Tab )
     };
 
 private:
@@ -385,7 +386,7 @@ private:
     TQWorkspace *qworkspace;
     TQMenuBar *menubar;
     TQGuardedPtr<FormWindow> lastActiveFormWindow;
-    bool breakLayout, layoutChilds, layoutSelected;
+    bool breakLayout, tqlayoutChilds, tqlayoutSelected;
     TQPoint grd;
     bool sGrid, snGrid;
     bool restoreConfig;
@@ -405,9 +406,9 @@ private:
     TQActionGroup *actionGroupTools, *actionGroupProjects;
     TQAction* actionPointerTool, *actionConnectTool, *actionOrderTool, *actionBuddyTool;
     TQAction* actionCurrentTool;
-    DesignerAction *actionHelpContents, *actionHelpAbout, *actionHelpAboutQt, *actionHelpWhatsThis;
+    DesignerAction *actionHelpContents, *actionHelpAbout, *actionHelpAboutTQt, *actionHelpWhatsThis;
     DesignerAction *actionHelpManual;
-#if defined(QT_NON_COMMERCIAL)
+#if defined(TQT_NON_COMMERCIAL)
     DesignerAction *actionHelpRegister;
 #endif
     DesignerAction *actionToolsCustomWidget, *actionEditPreferences;
@@ -424,8 +425,8 @@ private:
     TQPopupMenu *rmbWidgets;
     TQPopupMenu *rmbFormWindow;
     TQPopupMenu *customWidgetMenu, *windowMenu, *fileMenu, *recentlyFilesMenu, *recentlyProjectsMenu;
-    TQPopupMenu *toolsMenu, *layoutMenu, *previewMenu;
-    TQToolBar *customWidgetToolBar, *layoutToolBar, *projectToolBar, *customWidgetToolBar2, *toolsToolBar;
+    TQPopupMenu *toolsMenu, *tqlayoutMenu, *previewMenu;
+    TQToolBar *customWidgetToolBar, *tqlayoutToolBar, *projectToolBar, *customWidgetToolBar2, *toolsToolBar;
     TQToolBar *commonWidgetsToolBar;
     TQPtrList<TQToolBar> widgetToolBars;
 
@@ -435,16 +436,16 @@ private:
     TQString templPath;
     ActionEditor *actionEditor;
     Project *currentProject;
-    QPluginManager<ActionInterface> *actionPluginManager;
-    QPluginManager<EditorInterface> *editorPluginManager;
-    QPluginManager<TemplateWizardInterface> *templateWizardPluginManager;
-    QPluginManager<InterpreterInterface> *interpreterPluginManager;
-    QPluginManager<PreferenceInterface> *preferencePluginManager;
-    QPluginManager<ProjectSettingsInterface> *projectSettingsPluginManager;
-    QPluginManager<SourceTemplateInterface> *sourceTemplatePluginManager;
+    TQPluginManager<ActionInterface> *actionPluginManager;
+    TQPluginManager<EditorInterface> *editorPluginManager;
+    TQPluginManager<TemplateWizardInterface> *templateWizardPluginManager;
+    TQPluginManager<InterpreterInterface> *interpreterPluginManager;
+    TQPluginManager<PreferenceInterface> *preferencePluginManager;
+    TQPluginManager<ProjectSettingsInterface> *projectSettingsPluginManager;
+    TQPluginManager<SourceTemplateInterface> *sourceTemplatePluginManager;
     TQPtrList<SourceEditor> sourceEditors;
     bool previewing;
-    QUnknownInterface *desInterface;
+    TQUnknownInterface *desInterface;
     TQStringList recentlyFiles;
     TQStringList recentlyProjects;
     OutputWindow *oWindow;
@@ -472,7 +473,7 @@ private:
     uint guiStuffVisible : 1;
     uint editorsReadOnly : 1;
     uint savePluginPaths : 1;
-    QAssistantClient *assistant;
+    TQAssistantClient *assistant;
     bool shStartDialog;
     TQString pluginDir;
     bool sSignalHandlers;
@@ -487,12 +488,13 @@ public:
 friend class KDevDesignerPart;
 };
 
-class SenderObject : public QObject
+class SenderObject : public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    SenderObject( QUnknownInterface *i ) : iface( i ) { iface->addRef(); }
+    SenderObject( TQUnknownInterface *i ) : iface( i ) { iface->addRef(); }
     ~SenderObject() { iface->release(); }
 
 public slots:
@@ -500,11 +502,11 @@ public slots:
     void emitAcceptSignal() { emit acceptSignal( iface ); }
 
 signals:
-    void initSignal( QUnknownInterface * );
-    void acceptSignal( QUnknownInterface * );
+    void initSignal( TQUnknownInterface * );
+    void acceptSignal( TQUnknownInterface * );
 
 private:
-    QUnknownInterface *iface;
+    TQUnknownInterface *iface;
 
 };
 
diff --git a/kdevdesigner/designer/mainwindowactions.cpp b/kdevdesigner/designer/mainwindowactions.cpp
index ebbccdad..ed4ed2bf 100644
--- a/kdevdesigner/designer/mainwindowactions.cpp
+++ b/kdevdesigner/designer/mainwindowactions.cpp
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000-2001 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -71,7 +71,7 @@
 #include "pixmapcollectioneditor.h"
 #include "styledbutton.h"
 #include "customwidgeteditorimpl.h"
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 #include "dbconnectionsimpl.h"
 #include "dbconnectionimpl.h"
 #endif
@@ -124,108 +124,108 @@ static TQIconSet createIconSet( const TQString &name )
 
 void MainWindow::setupEditActions()
 {
-    actionEditUndo = new DesignerAction( i18n("Undo"), createIconSet( "designer_undo.png" ),i18n("&Undo: Not Available"), CTRL + Key_Z, this, 0 );
+    actionEditUndo = new DesignerAction( i18n("Undo"), createIconSet( "designer_undo.png" ),i18n("&Undo: Not Available"), CTRL + Key_Z, TQT_TQOBJECT(this), 0 );
     actionEditUndo->setStatusTip( i18n( "Undoes the last action" ) );
     actionEditUndo->setWhatsThis( whatsThisFrom( "Edit|Undo" ) );
-    connect( actionEditUndo, TQT_SIGNAL( activated() ), this, TQT_SLOT( editUndo() ) );
+    connect( actionEditUndo, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editUndo() ) );
     actionEditUndo->setEnabled( FALSE );
 
-    actionEditRedo = new DesignerAction( i18n( "Redo" ), createIconSet("designer_redo.png"), i18n( "&Redo: Not Available" ), CTRL + Key_Y, this, 0 );
+    actionEditRedo = new DesignerAction( i18n( "Redo" ), createIconSet("designer_redo.png"), i18n( "&Redo: Not Available" ), CTRL + Key_Y, TQT_TQOBJECT(this), 0 );
     actionEditRedo->setStatusTip( i18n( "Redoes the last undone operation") );
     actionEditRedo->setWhatsThis( whatsThisFrom( "Edit|Redo" ) );
-    connect( actionEditRedo, TQT_SIGNAL( activated() ), this, TQT_SLOT( editRedo() ) );
+    connect( actionEditRedo, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editRedo() ) );
     actionEditRedo->setEnabled( FALSE );
 
-    actionEditCut = new DesignerAction( i18n( "Cut" ), createIconSet("designer_editcut.png"), i18n( "Cu&t" ), CTRL + Key_X, this, 0 );
+    actionEditCut = new DesignerAction( i18n( "Cut" ), createIconSet("designer_editcut.png"), i18n( "Cu&t" ), CTRL + Key_X, TQT_TQOBJECT(this), 0 );
     actionEditCut->setStatusTip( i18n( "Cuts the selected widgets and puts them on the clipboard" ) );
     actionEditCut->setWhatsThis(  whatsThisFrom( "Edit|Cut" ) );
-    connect( actionEditCut, TQT_SIGNAL( activated() ), this, TQT_SLOT( editCut() ) );
+    connect( actionEditCut, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editCut() ) );
     actionEditCut->setEnabled( FALSE );
 
-    actionEditCopy = new DesignerAction( i18n( "Copy" ), createIconSet("designer_editcopy.png"), i18n( "&Copy" ), CTRL + Key_C, this, 0 );
+    actionEditCopy = new DesignerAction( i18n( "Copy" ), createIconSet("designer_editcopy.png"), i18n( "&Copy" ), CTRL + Key_C, TQT_TQOBJECT(this), 0 );
     actionEditCopy->setStatusTip( i18n( "Copies the selected widgets to the clipboard" ) );
     actionEditCopy->setWhatsThis(  whatsThisFrom( "Edit|Copy" ) );
-    connect( actionEditCopy, TQT_SIGNAL( activated() ), this, TQT_SLOT( editCopy() ) );
+    connect( actionEditCopy, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editCopy() ) );
     actionEditCopy->setEnabled( FALSE );
 
-    actionEditPaste = new DesignerAction( i18n( "Paste" ), createIconSet("designer_editpaste.png"), i18n( "&Paste" ), CTRL + Key_V, this, 0 );
+    actionEditPaste = new DesignerAction( i18n( "Paste" ), createIconSet("designer_editpaste.png"), i18n( "&Paste" ), CTRL + Key_V, TQT_TQOBJECT(this), 0 );
     actionEditPaste->setStatusTip( i18n( "Pastes the clipboard's contents" ) );
     actionEditPaste->setWhatsThis( whatsThisFrom( "Edit|Paste" ) );
-    connect( actionEditPaste, TQT_SIGNAL( activated() ), this, TQT_SLOT( editPaste() ) );
+    connect( actionEditPaste, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editPaste() ) );
     actionEditPaste->setEnabled( FALSE );
 
-    actionEditDelete = new DesignerAction( i18n( "Delete" ), TQPixmap(), i18n( "&Delete" ), Key_Delete, this, 0 );
+    actionEditDelete = new DesignerAction( i18n( "Delete" ), TQPixmap(), i18n( "&Delete" ), Key_Delete, TQT_TQOBJECT(this), 0 );
     actionEditDelete->setStatusTip( i18n( "Deletes the selected widgets" ) );
     actionEditDelete->setWhatsThis( whatsThisFrom( "Edit|Delete" ) );
-    connect( actionEditDelete, TQT_SIGNAL( activated() ), this, TQT_SLOT( editDelete() ) );
+    connect( actionEditDelete, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editDelete() ) );
     actionEditDelete->setEnabled( FALSE );
-#ifdef Q_WS_MAC
-    TQAction *macDelete = new DesignerAction( i18n( "Delete" ), TQPixmap(), i18n( "&Delete" ), Key_Backspace, this, 0 );
-    connect( macDelete, TQT_SIGNAL( activated() ), this, TQT_SLOT( editDelete() ) );
+#ifdef TQ_WS_MAC
+    TQAction *macDelete = new DesignerAction( i18n( "Delete" ), TQPixmap(), i18n( "&Delete" ), Key_Backspace, TQT_TQOBJECT(this), 0 );
+    connect( macDelete, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editDelete() ) );
 #endif
 
-    actionEditSelectAll = new DesignerAction( i18n( "Select All" ), TQPixmap(), i18n( "Select &All" ), CTRL + Key_A, this, 0 );
+    actionEditSelectAll = new DesignerAction( i18n( "Select All" ), TQPixmap(), i18n( "Select &All" ), CTRL + Key_A, TQT_TQOBJECT(this), 0 );
     actionEditSelectAll->setStatusTip( i18n( "Selects all widgets" ) );
     actionEditSelectAll->setWhatsThis( whatsThisFrom( "Edit|Select All" ) );
-    connect( actionEditSelectAll, TQT_SIGNAL( activated() ), this, TQT_SLOT( editSelectAll() ) );
+    connect( actionEditSelectAll, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editSelectAll() ) );
     actionEditSelectAll->setEnabled( TRUE );
 
-    actionEditRaise = new DesignerAction( i18n( "Bring to Front" ), createIconSet("designer_editraise.png"), i18n( "Bring to &Front" ), 0, this, 0 );
+    actionEditRaise = new DesignerAction( i18n( "Bring to Front" ), createIconSet("designer_editraise.png"), i18n( "Bring to &Front" ), 0, TQT_TQOBJECT(this), 0 );
     actionEditRaise->setStatusTip( i18n( "Raises the selected widgets" ) );
     actionEditRaise->setWhatsThis( i18n( "Raises the selected widgets" ) );
-    connect( actionEditRaise, TQT_SIGNAL( activated() ), this, TQT_SLOT( editRaise() ) );
+    connect( actionEditRaise, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editRaise() ) );
     actionEditRaise->setEnabled( FALSE );
 
-    actionEditLower = new DesignerAction( i18n( "Send to Back" ), createIconSet("designer_editlower.png"), i18n( "Send to &Back" ), 0, this, 0 );
+    actionEditLower = new DesignerAction( i18n( "Send to Back" ), createIconSet("designer_editlower.png"), i18n( "Send to &Back" ), 0, TQT_TQOBJECT(this), 0 );
     actionEditLower->setStatusTip( i18n( "Lowers the selected widgets" ) );
     actionEditLower->setWhatsThis( i18n( "Lowers the selected widgets" ) );
-    connect( actionEditLower, TQT_SIGNAL( activated() ), this, TQT_SLOT( editLower() ) );
+    connect( actionEditLower, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editLower() ) );
     actionEditLower->setEnabled( FALSE );
 
     actionEditAccels = new DesignerAction( i18n( "Check Accelerators" ), TQPixmap(),
-				    i18n( "Chec&k Accelerators" ), ALT + Key_R, this, 0 );
+				    i18n( "Chec&k Accelerators" ), ALT + Key_R, TQT_TQOBJECT(this), 0 );
     actionEditAccels->setStatusTip( i18n("Checks if the accelerators used in the form are unique") );
     actionEditAccels->setWhatsThis( whatsThisFrom( "Edit|Check Accelerator" ) );
-    connect( actionEditAccels, TQT_SIGNAL( activated() ), this, TQT_SLOT( editAccels() ) );
+    connect( actionEditAccels, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editAccels() ) );
     connect( this, TQT_SIGNAL( hasActiveForm(bool) ), actionEditAccels, TQT_SLOT( setEnabled(bool) ) );
 
     actionEditFunctions = new DesignerAction( i18n( "Slots" ), createIconSet("designer_editslots.png"),
-				   i18n( "S&lots..." ), 0, this, 0 );
+				   i18n( "S&lots..." ), 0, TQT_TQOBJECT(this), 0 );
     actionEditFunctions->setStatusTip( i18n("Opens a dialog for editing slots") );
     actionEditFunctions->setWhatsThis( whatsThisFrom( "Edit|Slots" ) );
-    connect( actionEditFunctions, TQT_SIGNAL( activated() ), this, TQT_SLOT( editFunctions() ) );
+    connect( actionEditFunctions, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editFunctions() ) );
     connect( this, TQT_SIGNAL( hasActiveForm(bool) ), actionEditFunctions, TQT_SLOT( setEnabled(bool) ) );
 
     actionEditConnections = new DesignerAction( i18n( "Connections" ), createIconSet("designer_connecttool.png"),
-					 i18n( "Co&nnections..." ), 0, this, 0 );
+					 i18n( "Co&nnections..." ), 0, TQT_TQOBJECT(this), 0 );
     actionEditConnections->setStatusTip( i18n("Opens a dialog for editing connections") );
     actionEditConnections->setWhatsThis( whatsThisFrom( "Edit|Connections" ) );
-    connect( actionEditConnections, TQT_SIGNAL( activated() ), this, TQT_SLOT( editConnections() ) );
+    connect( actionEditConnections, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editConnections() ) );
     connect( this, TQT_SIGNAL( hasActiveForm(bool) ), actionEditConnections, TQT_SLOT( setEnabled(bool) ) );
 
     actionEditSource = new DesignerAction( i18n( "Source" ), TQIconSet(),
-					 i18n( "&Source..." ), CTRL + Key_E, this, 0 );
+					 i18n( "&Source..." ), CTRL + Key_E, TQT_TQOBJECT(this), 0 );
     actionEditSource->setStatusTip( i18n("Opens an editor to edit the form's source code") );
     actionEditSource->setWhatsThis( whatsThisFrom( "Edit|Source" ) );
-    connect( actionEditSource, TQT_SIGNAL( activated() ), this, TQT_SLOT( editSource() ) );
+    connect( actionEditSource, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editSource() ) );
     connect( this, TQT_SIGNAL( hasActiveForm(bool) ), actionEditSource, TQT_SLOT( setEnabled(bool) ) );
 
     actionEditFormSettings = new DesignerAction( i18n( "Form Settings" ), TQPixmap(),
-					  i18n( "&Form Settings..." ), 0, this, 0 );
+					  i18n( "&Form Settings..." ), 0, TQT_TQOBJECT(this), 0 );
     actionEditFormSettings->setStatusTip( i18n("Opens a dialog to change the form's settings") );
     actionEditFormSettings->setWhatsThis( whatsThisFrom( "Edit|Form Settings" ) );
-    connect( actionEditFormSettings, TQT_SIGNAL( activated() ), this, TQT_SLOT( editFormSettings() ) );
+    connect( actionEditFormSettings, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editFormSettings() ) );
     connect( this, TQT_SIGNAL( hasActiveForm(bool) ), actionEditFormSettings, TQT_SLOT( setEnabled(bool) ) );
 
     actionEditPreferences = new DesignerAction( i18n( "Preferences" ), TQPixmap(),
-					 i18n( "Preferences..." ), 0, this, 0 );
+					 i18n( "Preferences..." ), 0, TQT_TQOBJECT(this), 0 );
     actionEditPreferences->setStatusTip( i18n("Opens a dialog to change preferences") );
     actionEditPreferences->setWhatsThis( whatsThisFrom( "Edit|Preferences" ) );
-    connect( actionEditPreferences, TQT_SIGNAL( activated() ), this, TQT_SLOT( editPreferences() ) );
+    connect( actionEditPreferences, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editPreferences() ) );
 
 /*    TQToolBar *tb = new TQToolBar( this, "Edit" );
     tb->setCloseMode( TQDockWindow::Undocked );
-    TQWhatsThis::add( tb, i18n( "<b>The Edit toolbar</b>%1").arg(i18n(toolbarHelp).arg("")) );
+    TQWhatsThis::add( tb, i18n( "<b>The Edit toolbar</b>%1").tqarg(i18n(toolbarHelp).tqarg("")) );
     addToolBar( tb, i18n( "Edit" ) );
     actionEditUndo->addTo( tb );
     actionEditRedo->addTo( tb );
@@ -240,7 +240,7 @@ void MainWindow::setupEditActions()
 #endif
 
     TQPopupMenu *menu = new TQPopupMenu( this, "Edit" );
-    connect( menu, TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT( updateEditorUndoRedo() ) );
+    connect( menu, TQT_SIGNAL( aboutToShow() ), TQT_TQOBJECT(this), TQT_SLOT( updateEditorUndoRedo() ) );
     menubar->insertItem( i18n( "&Edit" ), menu );
     actionEditUndo->addTo( menu );
     actionEditRedo->addTo( menu );
@@ -269,26 +269,26 @@ void MainWindow::setupEditActions()
 void MainWindow::setupSearchActions()
 {
     actionSearchFind = new DesignerAction( i18n( "Find" ), createIconSet( "designer_searchfind.png" ),
-				    i18n( "&Find..." ), CTRL + Key_F, this, 0 );
-    connect( actionSearchFind, TQT_SIGNAL( activated() ), this, TQT_SLOT( searchFind() ) );
+				    i18n( "&Find..." ), CTRL + Key_F, TQT_TQOBJECT(this), 0 );
+    connect( actionSearchFind, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( searchFind() ) );
     actionSearchFind->setEnabled( FALSE );
     actionSearchFind->setWhatsThis( whatsThisFrom( "Search|Find" ) );
 
     actionSearchIncremetal = new DesignerAction( i18n( "Find Incremental" ), TQIconSet(),
-					  i18n( "Find &Incremental" ), ALT + Key_I, this, 0 );
-    connect( actionSearchIncremetal, TQT_SIGNAL( activated() ), this, TQT_SLOT( searchIncremetalFindMenu() ) );
+					  i18n( "Find &Incremental" ), ALT + Key_I, TQT_TQOBJECT(this), 0 );
+    connect( actionSearchIncremetal, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( searchIncremetalFindMenu() ) );
     actionSearchIncremetal->setEnabled( FALSE );
     actionSearchIncremetal->setWhatsThis( whatsThisFrom( "Search|Find Incremental" ) );
 
     actionSearchReplace = new DesignerAction( i18n( "Replace" ), TQIconSet(),
-				    i18n( "&Replace..." ), CTRL + Key_R, this, 0 );
-    connect( actionSearchReplace, TQT_SIGNAL( activated() ), this, TQT_SLOT( searchReplace() ) );
+				    i18n( "&Replace..." ), CTRL + Key_R, TQT_TQOBJECT(this), 0 );
+    connect( actionSearchReplace, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( searchReplace() ) );
     actionSearchReplace->setEnabled( FALSE );
     actionSearchReplace->setWhatsThis( whatsThisFrom( "Search|Replace" ) );
 
     actionSearchGotoLine = new DesignerAction( i18n( "Goto Line" ), TQIconSet(),
-				    i18n( "&Goto Line..." ), ALT + Key_G, this, 0 );
-    connect( actionSearchGotoLine, TQT_SIGNAL( activated() ), this, TQT_SLOT( searchGotoLine() ) );
+				    i18n( "&Goto Line..." ), ALT + Key_G, TQT_TQOBJECT(this), 0 );
+    connect( actionSearchGotoLine, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( searchGotoLine() ) );
     actionSearchGotoLine->setEnabled( FALSE );
     actionSearchGotoLine->setWhatsThis( whatsThisFrom( "Search|Goto line" ) );
 
@@ -320,92 +320,92 @@ void MainWindow::setupLayoutActions()
     if ( !actionGroupTools ) {
 	actionGroupTools = new TQActionGroup( this );
 	actionGroupTools->setExclusive( TRUE );
-	connect( actionGroupTools, TQT_SIGNAL( selected(TQAction*) ), this, TQT_SLOT( toolSelected(TQAction*) ) );
+	connect( actionGroupTools, TQT_SIGNAL( selected(TQAction*) ), TQT_TQOBJECT(this), TQT_SLOT( toolSelected(TQAction*) ) );
     }
 
     actionEditAdjustSize = new DesignerAction( i18n( "Adjust Size" ), createIconSet("designer_adjustsize.png"),
-					i18n( "Adjust &Size" ), CTRL + Key_J, this, 0 );
+					i18n( "Adjust &Size" ), CTRL + Key_J, TQT_TQOBJECT(this), 0 );
     actionEditAdjustSize->setStatusTip(i18n("Adjusts the size of the selected widget") );
     actionEditAdjustSize->setWhatsThis( whatsThisFrom( "Layout|Adjust Size" ) );
-    connect( actionEditAdjustSize, TQT_SIGNAL( activated() ), this, TQT_SLOT( editAdjustSize() ) );
+    connect( actionEditAdjustSize, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editAdjustSize() ) );
     actionEditAdjustSize->setEnabled( FALSE );
 
-    actionEditHLayout = new DesignerAction( i18n( "Lay Out Horizontally" ), createIconSet("designer_edithlayout.png"),
-				     i18n( "Lay Out &Horizontally" ), CTRL + Key_H, this, 0 );
+    actionEditHLayout = new DesignerAction( i18n( "Lay OutQt::Horizontally" ), createIconSet("designer_edithtqlayout.png"),
+				     i18n( "Lay Out &Horizontally" ), CTRL + Key_H, TQT_TQOBJECT(this), 0 );
     actionEditHLayout->setStatusTip(i18n("Lays out the selected widgets horizontally") );
-    actionEditHLayout->setWhatsThis( whatsThisFrom( "Layout|Lay Out Horizontally" ) );
-    connect( actionEditHLayout, TQT_SIGNAL( activated() ), this, TQT_SLOT( editLayoutHorizontal() ) );
+    actionEditHLayout->setWhatsThis( whatsThisFrom( "Layout|Lay OutQt::Horizontally" ) );
+    connect( actionEditHLayout, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editLayoutHorizontal() ) );
     actionEditHLayout->setEnabled( FALSE );
 
-    actionEditVLayout = new DesignerAction( i18n( "Lay Out Vertically" ), createIconSet("designer_editvlayout.png"),
-				     i18n( "Lay Out &Vertically" ), CTRL + Key_L, this, 0 );
+    actionEditVLayout = new DesignerAction( i18n( "Lay OutQt::Vertically" ), createIconSet("designer_editvtqlayout.png"),
+				     i18n( "Lay Out &Vertically" ), CTRL + Key_L, TQT_TQOBJECT(this), 0 );
     actionEditVLayout->setStatusTip(i18n("Lays out the selected widgets vertically") );
-    actionEditVLayout->setWhatsThis(  whatsThisFrom( "Layout|Lay Out Vertically" ) );
-    connect( actionEditVLayout, TQT_SIGNAL( activated() ), this, TQT_SLOT( editLayoutVertical() ) );
+    actionEditVLayout->setWhatsThis(  whatsThisFrom( "Layout|Lay OutQt::Vertically" ) );
+    connect( actionEditVLayout, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editLayoutVertical() ) );
     actionEditVLayout->setEnabled( FALSE );
 
     actionEditGridLayout = new DesignerAction( i18n( "Lay Out in a Grid" ), createIconSet("designer_editgrid.png"),
-					i18n( "Lay Out in a &Grid" ), CTRL + Key_G, this, 0 );
+					i18n( "Lay Out in a &Grid" ), CTRL + Key_G, TQT_TQOBJECT(this), 0 );
     actionEditGridLayout->setStatusTip(i18n("Lays out the selected widgets in a grid") );
     actionEditGridLayout->setWhatsThis( whatsThisFrom( "Layout|Lay Out in a Grid" ) );
-    connect( actionEditGridLayout, TQT_SIGNAL( activated() ), this, TQT_SLOT( editLayoutGrid() ) );
+    connect( actionEditGridLayout, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editLayoutGrid() ) );
     actionEditGridLayout->setEnabled( FALSE );
 
-    actionEditSplitHorizontal = new DesignerAction( i18n( "Lay Out Horizontally (in Splitter)" ), createIconSet("designer_editvlayoutsplit.png"),
-					     i18n( "Lay Out Horizontally (in S&plitter)" ), 0, this, 0 );
+    actionEditSplitHorizontal = new DesignerAction( i18n( "Lay OutQt::Horizontally (in Splitter)" ), createIconSet("designer_editvtqlayoutsplit.png"),
+					     i18n( "Lay OutQt::Horizontally (in S&plitter)" ), 0, TQT_TQOBJECT(this), 0 );
     actionEditSplitHorizontal->setStatusTip(i18n("Lays out the selected widgets horizontally in a splitter") );
-    actionEditSplitHorizontal->setWhatsThis( whatsThisFrom( "Layout|Lay Out Horizontally (in Splitter)" ) );
-    connect( actionEditSplitHorizontal, TQT_SIGNAL( activated() ), this, TQT_SLOT( editLayoutHorizontalSplit() ) );
+    actionEditSplitHorizontal->setWhatsThis( whatsThisFrom( "Layout|Lay OutQt::Horizontally (in Splitter)" ) );
+    connect( actionEditSplitHorizontal, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editLayoutHorizontalSplit() ) );
     actionEditSplitHorizontal->setEnabled( FALSE );
 
-    actionEditSplitVertical = new DesignerAction( i18n( "Lay Out Vertically (in Splitter)" ), createIconSet("designer_edithlayoutsplit.png"),
-					     i18n( "Lay Out Vertically (in Sp&litter)" ), 0, this, 0 );
+    actionEditSplitVertical = new DesignerAction( i18n( "Lay OutQt::Vertically (in Splitter)" ), createIconSet("designer_edithtqlayoutsplit.png"),
+					     i18n( "Lay OutQt::Vertically (in Sp&litter)" ), 0, TQT_TQOBJECT(this), 0 );
     actionEditSplitVertical->setStatusTip(i18n("Lays out the selected widgets vertically in a splitter") );
-    actionEditSplitVertical->setWhatsThis( whatsThisFrom( "Layout|Lay Out Vertically (in Splitter)" ) );
-    connect( actionEditSplitVertical, TQT_SIGNAL( activated() ), this, TQT_SLOT( editLayoutVerticalSplit() ) );
+    actionEditSplitVertical->setWhatsThis( whatsThisFrom( "Layout|Lay OutQt::Vertically (in Splitter)" ) );
+    connect( actionEditSplitVertical, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editLayoutVerticalSplit() ) );
     actionEditSplitVertical->setEnabled( FALSE );
 
     actionEditBreakLayout = new DesignerAction( i18n( "Break Layout" ), createIconSet("designer_editbreaklayout.png"),
-					 i18n( "&Break Layout" ), CTRL + Key_B, this, 0 );
-    actionEditBreakLayout->setStatusTip(i18n("Breaks the selected layout") );
+					 i18n( "&Break Layout" ), CTRL + Key_B, TQT_TQOBJECT(this), 0 );
+    actionEditBreakLayout->setStatusTip(i18n("Breaks the selected tqlayout") );
     actionEditBreakLayout->setWhatsThis( whatsThisFrom( "Layout|Break Layout" ) );
-    connect( actionEditBreakLayout, TQT_SIGNAL( activated() ), this, TQT_SLOT( editBreakLayout() ) );
+    connect( actionEditBreakLayout, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editBreakLayout() ) );
     actionEditBreakLayout->setEnabled( FALSE );
 
     int id = WidgetDatabase::idFromClassName( "Spacer" );
     actionInsertSpacer = new WidgetAction( i18n( "Layout" ), actionGroupTools, TQString::number( id ).latin1() );
     actionInsertSpacer->setToggleAction( TRUE );
     actionInsertSpacer->setText( WidgetDatabase::className( id ) );
-    actionInsertSpacer->setMenuText( i18n( "Add %1").arg( WidgetDatabase::className( id ) ) );
+    actionInsertSpacer->setMenuText( i18n( "Add %1").tqarg( WidgetDatabase::className( id ) ) );
     actionInsertSpacer->setIconSet( WidgetDatabase::iconSet( id ) );
     actionInsertSpacer->setToolTip( WidgetDatabase::toolTip( id ) );
-    actionInsertSpacer->setStatusTip( i18n( "Insert a %1").arg(WidgetDatabase::toolTip( id )) );
+    actionInsertSpacer->setStatusTip( i18n( "Insert a %1").tqarg(WidgetDatabase::toolTip( id )) );
     actionInsertSpacer->setWhatsThis( i18n("<b>A %1</b><p>%2</p>"
 			     "<p>Click to insert a single %3,"
 			     "or double click to keep the tool selected.")
-	.arg(WidgetDatabase::toolTip( id ))
-	.arg(WidgetDatabase::whatsThis( id ))
-	.arg(WidgetDatabase::toolTip( id ) ));
+	.tqarg(WidgetDatabase::toolTip( id ))
+	.tqarg(WidgetDatabase::whatsThis( id ))
+	.tqarg(WidgetDatabase::toolTip( id ) ));
 
     actionInsertSpacer->addTo( commonWidgetsToolBar );
     commonWidgetsPage.append( actionInsertSpacer );
     TQWidget *w;
     commonWidgetsToolBar->setStretchableWidget( ( w = new TQWidget( commonWidgetsToolBar ) ) );
     w->setBackgroundMode( commonWidgetsToolBar->backgroundMode() );
-    TQWhatsThis::add( layoutToolBar, i18n( "<b>The Layout toolbar</b>%1" ).arg(i18n(toolbarHelp).arg("")) );
-    actionEditAdjustSize->addTo( layoutToolBar );
-    layoutToolBar->addSeparator();
-    actionEditHLayout->addTo( layoutToolBar );
-    actionEditVLayout->addTo( layoutToolBar );
-    actionEditGridLayout->addTo( layoutToolBar );
-    actionEditSplitHorizontal->addTo( layoutToolBar );
-    actionEditSplitVertical->addTo( layoutToolBar );
-    actionEditBreakLayout->addTo( layoutToolBar );
-    layoutToolBar->addSeparator();
-    actionInsertSpacer->addTo( layoutToolBar );
+    TQWhatsThis::add( tqlayoutToolBar, i18n( "<b>The Layout toolbar</b>%1" ).tqarg(i18n(toolbarHelp).tqarg("")) );
+    actionEditAdjustSize->addTo( tqlayoutToolBar );
+    tqlayoutToolBar->addSeparator();
+    actionEditHLayout->addTo( tqlayoutToolBar );
+    actionEditVLayout->addTo( tqlayoutToolBar );
+    actionEditGridLayout->addTo( tqlayoutToolBar );
+    actionEditSplitHorizontal->addTo( tqlayoutToolBar );
+    actionEditSplitVertical->addTo( tqlayoutToolBar );
+    actionEditBreakLayout->addTo( tqlayoutToolBar );
+    tqlayoutToolBar->addSeparator();
+    actionInsertSpacer->addTo( tqlayoutToolBar );
 
     TQPopupMenu *menu = new TQPopupMenu( this, "Layout" );
-    layoutMenu = menu;
+    tqlayoutMenu = menu;
     menubar->insertItem( i18n( "&Layout" ), menu, toolsMenuId + 1 );
     actionEditAdjustSize->addTo( menu );
     menu->insertSeparator();
@@ -461,7 +461,7 @@ void MainWindow::setupToolActions()
     TQToolBar *tb = new TQToolBar( this, "Tools" );
     tb->setCloseMode( TQDockWindow::Undocked );
     toolsToolBar = tb;
-    TQWhatsThis::add( tb, i18n( "<b>The Tools toolbar</b>%1" ).arg(i18n(toolbarHelp).arg("")) );
+    TQWhatsThis::add( tb, i18n( "<b>The Tools toolbar</b>%1" ).tqarg(i18n(toolbarHelp).tqarg("")) );
 
     addToolBar( tb, i18n( "Tools" ), TQMainWindow::DockTop, FALSE );
     actionPointerTool->addTo( tb );
@@ -487,7 +487,7 @@ void MainWindow::setupToolActions()
 
     actionToolsCustomWidget = new DesignerAction( i18n("Custom Widgets"),
 					   createIconSet( "designer_customwidget.png" ),
-					   i18n("Edit &Custom Widgets..."), 0, this, 0 );
+					   i18n("Edit &Custom Widgets..."), 0, TQT_TQOBJECT(this), 0 );
     actionToolsCustomWidget->setStatusTip( i18n("Opens a dialog to add and change "
 					      "custom widgets") );
     actionToolsCustomWidget->setWhatsThis( whatsThisFrom( "Tools|Custom|Edit Custom"
@@ -505,13 +505,13 @@ void MainWindow::setupToolActions()
 	widgetToolBars.append( tb );
 	bool plural = grp[(int)grp.length()-1] == 's';
 	if ( plural ) {
-	    TQWhatsThis::add( tb, i18n( "<b>The %1</b>%2" ).arg(grp).arg(i18n(toolbarHelp).
-				arg( i18n(" Click on a button to insert a single widget, "
-				"or double click to insert multiple %1.") ).arg(grp)) );
+	    TQWhatsThis::add( tb, i18n( "<b>The %1</b>%2" ).tqarg(grp).tqarg(i18n(toolbarHelp).
+				tqarg( i18n(" Click on a button to insert a single widget, "
+				"or double click to insert multiple %1.") ).tqarg(grp)) );
 	} else {
-	    TQWhatsThis::add( tb, i18n( "<b>The %1 Widgets</b>%2" ).arg(grp).arg(i18n(toolbarHelp).
-				arg( i18n(" Click on a button to insert a single %1 widget, "
-				"or double click to insert multiple widgets.") ).arg(grp)) );
+	    TQWhatsThis::add( tb, i18n( "<b>The %1 Widgets</b>%2" ).tqarg(grp).tqarg(i18n(toolbarHelp).
+				tqarg( i18n(" Click on a button to insert a single %1 widget, "
+				"or double click to insert multiple widgets.") ).tqarg(grp)) );
 	}
 	addToolBar( tb, grp );
 	tb->hide();
@@ -552,11 +552,11 @@ void MainWindow::setupToolActions()
 	    a->setToolTip( ttip );
 	    if ( !WidgetDatabase::isWhatsThisLoaded() )
 		WidgetDatabase::loadWhatsThis( documentationPath() );
-	    a->setStatusTip( i18n( "Insert a %1").arg(WidgetDatabase::className( i )) );
+	    a->setStatusTip( i18n( "Insert a %1").tqarg(WidgetDatabase::className( i )) );
 
-	    TQString whats = i18n("<b>A %1</b>").arg( WidgetDatabase::className( i ) );
+	    TQString whats = i18n("<b>A %1</b>").tqarg( WidgetDatabase::className( i ) );
 	    if ( !WidgetDatabase::whatsThis( i ).isEmpty() )
-	    whats += TQString("<p>%1</p>").arg(WidgetDatabase::whatsThis( i ));
+	    whats += TQString("<p>%1</p>").tqarg(WidgetDatabase::whatsThis( i ));
 	    a->setWhatsThis( whats+ i18n("<p>Double click on this tool to keep it selected.</p>") );
 
 	    if ( grp != "KDE" )
@@ -602,10 +602,10 @@ void MainWindow::setupToolActions()
 	customWidgetToolBar2 = tb2;
     }
 
-    TQAction *a = new DesignerAction( i18n( "Configure Toolbox" ), i18n( "Configure Toolbox..." ), 0, this );
+    TQAction *a = new DesignerAction( i18n( "Configure Toolbox" ), i18n( "Configure Toolbox..." ), 0, TQT_TQOBJECT(this) );
     a->setStatusTip( i18n( "Opens a dialog to configure the common "
 					       "widgets page of the toolbox") );
-    connect( a, TQT_SIGNAL( activated() ), this, TQT_SLOT( toolsConfigure() ) );
+    connect( a, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( toolsConfigure() ) );
     mmenu->insertSeparator();
     a->addTo( mmenu );
     resetTool();
@@ -617,7 +617,7 @@ void MainWindow::setupFileActions()
     tb->setCloseMode( TQDockWindow::Undocked );
     projectToolBar = tb;
 
-    TQWhatsThis::add( tb, i18n( "<b>The File toolbar</b>%1" ).arg(i18n(toolbarHelp).arg("")) );
+    TQWhatsThis::add( tb, i18n( "<b>The File toolbar</b>%1" ).tqarg(i18n(toolbarHelp).tqarg("")) );
     addToolBar( tb, i18n( "File" ) );
     fileMenu = new TQPopupMenu( this, "File" );
     menubar->insertItem( i18n( "&File" ), fileMenu );
@@ -625,7 +625,7 @@ void MainWindow::setupFileActions()
     DesignerAction *a = 0;
 
     if ( !singleProject ) {
-	DesignerAction *a = new DesignerAction( this, 0 );
+	DesignerAction *a = new DesignerAction( TQT_TQOBJECT(this), 0 );
 	a->setText( i18n( "New" ) );
 	a->setToolTip( i18n( "New dialog or file" ) );
 	a->setMenuText( i18n( "&New..." ) );
@@ -633,7 +633,7 @@ void MainWindow::setupFileActions()
 	a->setAccel( CTRL + Key_N );
 	a->setStatusTip( i18n( "Creates a new project, form or source file." ) );
 	a->setWhatsThis( whatsThisFrom( "File|New" ) );
-	connect( a, TQT_SIGNAL( activated() ), this, TQT_SLOT( fileNew() ) );
+	connect( a, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( fileNew() ) );
 	a->addTo( tb );
 	a->addTo( fileMenu );
 	actionNewFile = a;
@@ -653,15 +653,15 @@ void MainWindow::setupFileActions()
 	newForm->setIconSet( createIconSet("designer_form.png") );
 	newForm->setAccel( CTRL + Key_N );
 	newForm->setStatusTip( i18n( "Creates a new dialog." ) );
-	connect( newForm, TQT_SIGNAL( activated() ), this, TQT_SLOT( fileNewDialog() ) );
+	connect( newForm, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( fileNewDialog() ) );
 
-	DesignerAction *newFile = new DesignerAction( a, 0 );
+	DesignerAction *newFile = new DesignerAction( TQT_TQOBJECT(a), 0 );
 	newFile->setText( i18n( "New File" ) );
 	newFile->setMenuText( i18n( "&File..." ) );
 	newFile->setIconSet( createIconSet("designer_filenew.png") );
 	newFile->setAccel( ALT + Key_N );
 	newFile->setStatusTip( i18n( "Creates a new file." ) );
-	connect( newFile, TQT_SIGNAL( activated() ), this, TQT_SLOT( fileNewFile() ) );
+	connect( newFile, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( fileNewFile() ) );
 	actionNewFile = newFile;
 
 	a->addTo( tb );
@@ -670,14 +670,14 @@ void MainWindow::setupFileActions()
 	fileMenu->insertSeparator();
     }
 
-    a = new DesignerAction( this, 0 );
+    a = new DesignerAction( TQT_TQOBJECT(this), 0 );
     a->setText( i18n( "Open" ) );
     a->setMenuText( i18n( "&Open..." ) );
     a->setIconSet( createIconSet("designer_fileopen.png") );
     a->setAccel( CTRL + Key_O );
     a->setStatusTip( i18n( "Opens an existing project, form or source file ") );
     a->setWhatsThis( whatsThisFrom( "File|Open" ) );
-    connect( a, TQT_SIGNAL( activated() ), this, TQT_SLOT( fileOpen() ) );
+    connect( a, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( fileOpen() ) );
     if ( !singleProject ) {
 	a->addTo( tb );
 	a->addTo( fileMenu );
@@ -685,20 +685,20 @@ void MainWindow::setupFileActions()
     }
 
 
-    a = new DesignerAction( this, 0 );
+    a = new DesignerAction( TQT_TQOBJECT(this), 0 );
     actionFileClose = a;
     a->setText( i18n( "Close" ) );
     a->setMenuText( i18n( "&Close" ) );
     a->setStatusTip( i18n( "Closes the current project or document" ) );
     a->setWhatsThis(whatsThisFrom( "File|Close" ) );
-    connect( a, TQT_SIGNAL( activated() ), this, TQT_SLOT( fileClose() ) );
+    connect( a, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( fileClose() ) );
     connect( this, TQT_SIGNAL( hasActiveWindowOrProject(bool) ), a, TQT_SLOT( setEnabled(bool) ) );
     if ( !singleProject ) {
 	a->addTo( fileMenu );
 	fileMenu->insertSeparator();
     }
 
-    a = new DesignerAction( this, 0 );
+    a = new DesignerAction( TQT_TQOBJECT(this), 0 );
     actionFileSave = a;
     a->setText( i18n( "Save" ) );
     a->setMenuText( i18n( "&Save" ) );
@@ -706,41 +706,41 @@ void MainWindow::setupFileActions()
     a->setAccel( CTRL + Key_S );
     a->setStatusTip( i18n( "Saves the current project or document" ) );
     a->setWhatsThis(whatsThisFrom( "File|Save" ) );
-    connect( a, TQT_SIGNAL( activated() ), this, TQT_SLOT( fileSave() ) );
+    connect( a, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( fileSave() ) );
     connect( this, TQT_SIGNAL( hasActiveWindowOrProject(bool) ), a, TQT_SLOT( setEnabled(bool) ) );
     a->addTo( tb );
     a->addTo( fileMenu );
 
-    a = new DesignerAction( this, 0 );
+    a = new DesignerAction( TQT_TQOBJECT(this), 0 );
     actionFileSaveAs = a;
     a->setText( i18n( "Save As" ) );
     a->setMenuText( i18n( "Save &As..." ) );
     a->setStatusTip( i18n( "Saves the current form with a new filename" ) );
     a->setWhatsThis( whatsThisFrom( "File|Save As" ) );
-    connect( a, TQT_SIGNAL( activated() ), this, TQT_SLOT( fileSaveAs() ) );
+    connect( a, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( fileSaveAs() ) );
     connect( this, TQT_SIGNAL( hasActiveWindow(bool) ), a, TQT_SLOT( setEnabled(bool) ) );
     if ( !singleProject )
 	a->addTo( fileMenu );
 
-    a = new DesignerAction( this, 0 );
+    a = new DesignerAction( TQT_TQOBJECT(this), 0 );
     actionFileSaveAll = a;
     a->setText( i18n( "Save All" ) );
     a->setMenuText( i18n( "Sa&ve All" ) );
     a->setStatusTip( i18n( "Saves all open documents" ) );
     a->setWhatsThis( whatsThisFrom( "File|Save All" ) );
-    connect( a, TQT_SIGNAL( activated() ), this, TQT_SLOT( fileSaveAll() ) );
+    connect( a, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( fileSaveAll() ) );
     connect( this, TQT_SIGNAL( hasActiveWindowOrProject(bool) ), a, TQT_SLOT( setEnabled(bool) ) );
     if ( !singleProject ) {
 	a->addTo( fileMenu );
 	fileMenu->insertSeparator();
     }
 
-    a = new DesignerAction( this, 0 );
+    a = new DesignerAction( TQT_TQOBJECT(this), 0 );
     a->setText( i18n( "Create Template" ) );
     a->setMenuText( i18n( "Create &Template..." ) );
     a->setStatusTip( i18n( "Creates a new template" ) );
     a->setWhatsThis( whatsThisFrom( "File|Create Template" ) );
-    connect( a, TQT_SIGNAL( activated() ), this, TQT_SLOT( fileCreateTemplate() ) );
+    connect( a, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( fileCreateTemplate() ) );
     if ( !singleProject )
 	a->addTo( fileMenu );
 
@@ -767,7 +767,7 @@ void MainWindow::setupFileActions()
     if ( !singleProject )
 	fileMenu->insertSeparator();
 
-    a = new DesignerAction( this, 0 );
+    a = new DesignerAction( TQT_TQOBJECT(this), 0 );
     actionFileExit = a;
     if  ( !singleProjectMode() ) {
 	a->setText( i18n( "Exit" ) );
@@ -778,7 +778,7 @@ void MainWindow::setupFileActions()
 	a->setText( i18n( "Close" ) );
 	a->setMenuText( i18n( "&Close" ) );
     }
-    connect( a, TQT_SIGNAL( activated() ), this, TQT_SLOT( fileQuit() ) );
+    connect( a, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( fileQuit() ) );
     a->addTo( fileMenu );
 }
 
@@ -792,8 +792,8 @@ void MainWindow::setupProjectActions()
     ag->setMenuText( i18n( "Active Project" ) );
     ag->setExclusive( TRUE );
     ag->setUsesDropDown( TRUE );
-    connect( ag, TQT_SIGNAL( selected( TQAction * ) ), this, TQT_SLOT( projectSelected( TQAction * ) ) );
-    connect( ag, TQT_SIGNAL( selected( TQAction * ) ), this, TQT_SIGNAL( projectChanged() ) );
+    connect( ag, TQT_SIGNAL( selected( TQAction * ) ), TQT_TQOBJECT(this), TQT_SLOT( projectSelected( TQAction * ) ) );
+    connect( ag, TQT_SIGNAL( selected( TQAction * ) ), TQT_TQOBJECT(this), TQT_SIGNAL( projectChanged() ) );
     DesignerAction *a = new DesignerAction( i18n( "<No Project>" ), i18n( "<No Project>" ), 0, ag, 0, TRUE );
     eProject = new Project( "", i18n( "<No Project>" ), projectSettingsPluginManager, TRUE );
     projects.insert( a, eProject );
@@ -805,31 +805,31 @@ void MainWindow::setupProjectActions()
     if ( !singleProject )
 	projectMenu->insertSeparator();
 
-    a = new DesignerAction( i18n( "Add File" ), TQPixmap(), i18n( "&Add File..." ), 0, this, 0 );
+    a = new DesignerAction( i18n( "Add File" ), TQPixmap(), i18n( "&Add File..." ), 0, TQT_TQOBJECT(this), 0 );
     actionProjectAddFile = a;
     a->setStatusTip( i18n("Adds a file to the current project") );
     a->setWhatsThis( whatsThisFrom( "Project|Add File" ) );
-    connect( a, TQT_SIGNAL( activated() ), this, TQT_SLOT( projectInsertFile() ) );
+    connect( a, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( projectInsertFile() ) );
     a->setEnabled( FALSE );
     connect( this, TQT_SIGNAL( hasNonDummyProject(bool) ), a, TQT_SLOT( setEnabled(bool) ) );
     if ( !singleProject )
 	a->addTo( projectMenu );
 
     actionEditPixmapCollection = new DesignerAction( i18n( "Image Collection..." ), TQPixmap(),
-					  i18n( "&Image Collection..." ), 0, this, 0 );
+					  i18n( "&Image Collection..." ), 0, TQT_TQOBJECT(this), 0 );
     actionEditPixmapCollection->setStatusTip( i18n("Opens a dialog for editing the current project's image collection") );
     actionEditPixmapCollection->setWhatsThis( whatsThisFrom( "Project|Image Collection" ) );
-    connect( actionEditPixmapCollection, TQT_SIGNAL( activated() ), this, TQT_SLOT( editPixmapCollection() ) );
+    connect( actionEditPixmapCollection, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editPixmapCollection() ) );
     actionEditPixmapCollection->setEnabled( FALSE );
     connect( this, TQT_SIGNAL( hasNonDummyProject(bool) ), actionEditPixmapCollection, TQT_SLOT( setEnabled(bool) ) );
     actionEditPixmapCollection->addTo( projectMenu );
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     actionEditDatabaseConnections = new DesignerAction( i18n( "Database Connections..." ), TQPixmap(),
-						 i18n( "&Database Connections..." ), 0, this, 0 );
+						 i18n( "&Database Connections..." ), 0, TQT_TQOBJECT(this), 0 );
     actionEditDatabaseConnections->setStatusTip( i18n("Opens a dialog for editing the current project's database connections") );
     actionEditDatabaseConnections->setWhatsThis( whatsThisFrom( "Project|Database Connections" ) );
-    connect( actionEditDatabaseConnections, TQT_SIGNAL( activated() ), this, TQT_SLOT( editDatabaseConnections() ) );
+    connect( actionEditDatabaseConnections, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editDatabaseConnections() ) );
     //actionEditDatabaseConnections->setEnabled( FALSE );
     //connect( this, TQT_SIGNAL( hasNonDummyProject(bool) ), actionEditDatabaseConnections, TQT_SLOT( setEnabled(bool) ) );
     if ( !singleProject )
@@ -837,10 +837,10 @@ void MainWindow::setupProjectActions()
 #endif
 
     actionEditProjectSettings = new DesignerAction( i18n( "Project Settings..." ), TQPixmap(),
-					  i18n( "&Project Settings..." ), 0, this, 0 );
+					  i18n( "&Project Settings..." ), 0, TQT_TQOBJECT(this), 0 );
     actionEditProjectSettings->setStatusTip( i18n("Opens a dialog to change the project's settings") );
     actionEditProjectSettings->setWhatsThis( whatsThisFrom( "Project|Project Settings" ) );
-    connect( actionEditProjectSettings, TQT_SIGNAL( activated() ), this, TQT_SLOT( editProjectSettings() ) );
+    connect( actionEditProjectSettings, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editProjectSettings() ) );
     actionEditProjectSettings->setEnabled( FALSE );
     connect( this, TQT_SIGNAL( hasNonDummyProject(bool) ), actionEditProjectSettings, TQT_SLOT( setEnabled(bool) ) );
     actionEditProjectSettings->addTo( projectMenu );
@@ -851,22 +851,22 @@ void MainWindow::setupPreviewActions()
 {
     DesignerAction* a = 0;
     TQPopupMenu *menu = new TQPopupMenu( this, "Preview" );
-    layoutMenu = menu;
+    tqlayoutMenu = menu;
     menubar->insertItem( i18n( "&Preview" ), menu, toolsMenuId + 2 );
 
-    a = new DesignerAction( i18n( "Preview Form" ), TQPixmap(), i18n( "Preview &Form" ), 0, this, 0 );
+    a = new DesignerAction( i18n( "Preview Form" ), TQPixmap(), i18n( "Preview &Form" ), 0, TQT_TQOBJECT(this), 0 );
     actionPreview = a;
     a->setAccel( CTRL + Key_T );
     a->setStatusTip( i18n("Opens a preview") );
     a->setWhatsThis( whatsThisFrom( "Preview|Preview Form" ) );
-    connect( a, TQT_SIGNAL( activated() ), this, TQT_SLOT( previewForm() ) );
+    connect( a, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( previewForm() ) );
     connect( this, TQT_SIGNAL( hasActiveForm(bool) ), a, TQT_SLOT( setEnabled(bool) ) );
     a->addTo( menu );
 
     menu->insertSeparator();
 
-    TQSignalMapper *mapper = new TQSignalMapper( this );
-    connect( mapper, TQT_SIGNAL(mapped(const TQString&)), this, TQT_SLOT(previewForm(const TQString&)) );
+    TQSignalMapper *mapper = new TQSignalMapper( TQT_TQOBJECT(this) );
+    connect( mapper, TQT_SIGNAL(mapped(const TQString&)), TQT_TQOBJECT(this), TQT_SLOT(previewForm(const TQString&)) );
     TQStringList styles = TQStyleFactory::keys();
     for ( TQStringList::Iterator it = styles.begin(); it != styles.end(); ++it ) {
 	TQString info;
@@ -883,12 +883,12 @@ void MainWindow::setupPreviewActions()
 	else if ( *it == "MotifPlus" )
 	    info = i18n( "The preview will use the advanced Motif look and feel used by the GIMP toolkit (GTK) on Linux." );
 
-	a = new DesignerAction( i18n( "Preview Form in %1 Style" ).arg( *it ), TQPixmap(),
-					 i18n( "... in %1 Style" ).arg( *it ), 0, this, 0 );
-	a->setStatusTip( i18n("Opens a preview in %1 style").arg( *it ) );
+	a = new DesignerAction( i18n( "Preview Form in %1 Style" ).tqarg( *it ), TQPixmap(),
+					 i18n( "... in %1 Style" ).tqarg( *it ), 0, TQT_TQOBJECT(this), 0 );
+	a->setStatusTip( i18n("Opens a preview in %1 style").tqarg( *it ) );
 	a->setWhatsThis( i18n("<b>Open a preview in %1 style.</b>"
 			"<p>Use the preview to test the design and "
-			"signal-slot connections of the current form. %2</p>").arg( *it ).arg( info ) );
+			"signal-slot connections of the current form. %2</p>").tqarg( *it ).tqarg( info ) );
 	mapper->setMapping( a, *it );
 	connect( a, TQT_SIGNAL(activated()), mapper, TQT_SLOT(map()) );
 	connect( this, TQT_SIGNAL( hasActiveForm(bool) ), a, TQT_SLOT( setEnabled(bool) ) );
@@ -902,31 +902,31 @@ void MainWindow::setupWindowActions()
     if ( !windowActionsSetup ) {
 	windowActionsSetup = TRUE;
 */
-	actionWindowTile = new DesignerAction( i18n( "Tile" ), i18n( "&Tile" ), 0, this );
+	actionWindowTile = new DesignerAction( i18n( "Tile" ), i18n( "&Tile" ), 0, TQT_TQOBJECT(this) );
 	actionWindowTile->setStatusTip( i18n("Tiles the windows so that they are all visible") );
 	actionWindowTile->setWhatsThis( whatsThisFrom( "Window|Tile" ) );
 	connect( actionWindowTile, TQT_SIGNAL( activated() ), qworkspace, TQT_SLOT( tile() ) );
-	actionWindowCascade = new DesignerAction( i18n( "Cascade" ), i18n( "&Cascade" ), 0, this );
+	actionWindowCascade = new DesignerAction( i18n( "Cascade" ), i18n( "&Cascade" ), 0, TQT_TQOBJECT(this) );
 	actionWindowCascade->setStatusTip( i18n("Cascades the windows so that all their title bars are visible") );
 	actionWindowCascade->setWhatsThis( whatsThisFrom( "Window|Cascade" ) );
 	connect( actionWindowCascade, TQT_SIGNAL( activated() ), qworkspace, TQT_SLOT( cascade() ) );
 
-	actionWindowClose = new DesignerAction( i18n( "Close" ), i18n( "Cl&ose" ), CTRL + Key_F4, this );
+	actionWindowClose = new DesignerAction( i18n( "Close" ), i18n( "Cl&ose" ), CTRL + Key_F4, TQT_TQOBJECT(this) );
 	actionWindowClose->setStatusTip( i18n( "Closes the active window") );
 	actionWindowClose->setWhatsThis( whatsThisFrom( "Window|Close" ) );
 	connect( actionWindowClose, TQT_SIGNAL( activated() ), qworkspace, TQT_SLOT( closeActiveWindow() ) );
 
-	actionWindowCloseAll = new DesignerAction( i18n( "Close All" ), i18n( "Close Al&l" ), 0, this );
+	actionWindowCloseAll = new DesignerAction( i18n( "Close All" ), i18n( "Close Al&l" ), 0, TQT_TQOBJECT(this) );
 	actionWindowCloseAll->setStatusTip( i18n( "Closes all form windows") );
 	actionWindowCloseAll->setWhatsThis( whatsThisFrom( "Window|Close All" ) );
 	connect( actionWindowCloseAll, TQT_SIGNAL( activated() ), qworkspace, TQT_SLOT( closeAllWindows() ) );
 
-	actionWindowNext = new DesignerAction( i18n( "Next" ), i18n( "Ne&xt" ), CTRL + Key_F6, this );
+	actionWindowNext = new DesignerAction( i18n( "Next" ), i18n( "Ne&xt" ), CTRL + Key_F6, TQT_TQOBJECT(this) );
 	actionWindowNext->setStatusTip( i18n( "Activates the next window" ) );
 	actionWindowNext->setWhatsThis( whatsThisFrom( "Window|Next" ) );
 	connect( actionWindowNext, TQT_SIGNAL( activated() ), qworkspace, TQT_SLOT( activateNextWindow() ) );
 
-	actionWindowPrevious = new DesignerAction( i18n( "Previous" ), i18n( "Pre&vious" ), CTRL + SHIFT + Key_F6, this );
+	actionWindowPrevious = new DesignerAction( i18n( "Previous" ), i18n( "Pre&vious" ), CTRL + SHIFT + Key_F6, TQT_TQOBJECT(this) );
 	actionWindowPrevious->setStatusTip( i18n( "Activates the previous window" ) );
 	actionWindowPrevious->setWhatsThis( whatsThisFrom( "Window|Previous" ) );
 	connect( actionWindowPrevious, TQT_SIGNAL( activated() ), qworkspace, TQT_SLOT( activatePreviousWindow() ) );
@@ -958,20 +958,20 @@ void MainWindow::setupWindowActions()
     int j = 0;
     for ( int i = 0; i < int( windows.count() ); ++i ) {
 	TQWidget *w = windows.at( i );
-	if ( !::qt_cast<FormWindow*>(w) && !::qt_cast<SourceEditor*>(w) )
+	if ( !::tqqt_cast<FormWindow*>(w) && !::tqqt_cast<SourceEditor*>(w) )
 	    continue;
-	if ( ::qt_cast<FormWindow*>(w) && ( ( (FormWindow*)w )->isFake() ) )
+	if ( ::tqqt_cast<FormWindow*>(w) && ( ( (FormWindow*)w )->isFake() ) )
 	    continue;
 	j++;
 	TQString itemText;
 	if ( j < 10 )
-	    itemText = TQString("&%1 ").arg( j );
-	if ( ::qt_cast<FormWindow*>(w) )
+	    itemText = TQString("&%1 ").tqarg( j );
+	if ( ::tqqt_cast<FormWindow*>(w) )
 	    itemText += w->name();
 	else
 	    itemText += w->caption();
 
-	int id = windowMenu->insertItem( itemText, this, TQT_SLOT( windowsMenuActivated( int ) ) );
+	int id = windowMenu->insertItem( itemText, TQT_TQOBJECT(this), TQT_SLOT( windowsMenuActivated( int ) ) );
 	windowMenu->setItemParameter( id, i );
 	windowMenu->setItemChecked( id, qworkspace->activeWindow() == windows.at( i ) );
     }
@@ -979,43 +979,43 @@ void MainWindow::setupWindowActions()
 
 void MainWindow::setupHelpActions()
 {
-    actionHelpContents = new DesignerAction( i18n( "Contents" ), i18n( "&Contents" ), Key_F1, this, 0 );
+    actionHelpContents = new DesignerAction( i18n( "Contents" ), i18n( "&Contents" ), Key_F1, TQT_TQOBJECT(this), 0 );
     actionHelpContents->setStatusTip( i18n("Opens the online help") );
     actionHelpContents->setWhatsThis( whatsThisFrom( "Help|Contents" ) );
-    connect( actionHelpContents, TQT_SIGNAL( activated() ), this, TQT_SLOT( helpContents() ) );
+    connect( actionHelpContents, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( helpContents() ) );
 
-    actionHelpManual = new DesignerAction( i18n( "Manual" ), i18n( "&Manual" ), CTRL + Key_M, this, 0 );
-    actionHelpManual->setStatusTip( i18n("Opens the Qt Designer manual") );
+    actionHelpManual = new DesignerAction( i18n( "Manual" ), i18n( "&Manual" ), CTRL + Key_M, TQT_TQOBJECT(this), 0 );
+    actionHelpManual->setStatusTip( i18n("Opens the TQt Designer manual") );
     actionHelpManual->setWhatsThis( whatsThisFrom( "Help|Manual" ) );
-    connect( actionHelpManual, TQT_SIGNAL( activated() ), this, TQT_SLOT( helpManual() ) );
+    connect( actionHelpManual, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( helpManual() ) );
 
-    actionHelpAbout = new DesignerAction( i18n("About"), TQPixmap(), i18n("&About"), 0, this, 0 );
-    actionHelpAbout->setStatusTip( i18n("Displays information about Qt Designer") );
+    actionHelpAbout = new DesignerAction( i18n("About"), TQPixmap(), i18n("&About"), 0, TQT_TQOBJECT(this), 0 );
+    actionHelpAbout->setStatusTip( i18n("Displays information about TQt Designer") );
     actionHelpAbout->setWhatsThis( whatsThisFrom( "Help|About" ) );
-    connect( actionHelpAbout, TQT_SIGNAL( activated() ), this, TQT_SLOT( helpAbout() ) );
+    connect( actionHelpAbout, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( helpAbout() ) );
 
-    actionHelpAboutQt = new DesignerAction( i18n("About Qt"), TQPixmap(), i18n("About &Qt"), 0, this, 0 );
-    actionHelpAboutQt->setStatusTip( i18n("Displays information about the Qt Toolkit") );
-    actionHelpAboutQt->setWhatsThis( whatsThisFrom( "Help|About Qt" ) );
-    connect( actionHelpAboutQt, TQT_SIGNAL( activated() ), this, TQT_SLOT( helpAboutQt() ) );
+    actionHelpAboutTQt = new DesignerAction( i18n("About TQt"), TQPixmap(), i18n("About &TQt"), 0, TQT_TQOBJECT(this), 0 );
+    actionHelpAboutTQt->setStatusTip( i18n("Displays information about the TQt Toolkit") );
+    actionHelpAboutTQt->setWhatsThis( whatsThisFrom( "Help|About TQt" ) );
+    connect( actionHelpAboutTQt, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( helpAboutTQt() ) );
 
-#if 0 //defined(QT_NON_COMMERCIAL)
+#if 0 //defined(TQT_NON_COMMERCIAL)
     // ### not used anymore -- should be deleted?
-    actionHelpRegister = new DesignerAction( i18n("Register Qt"), TQPixmap(), i18n("&Register Qt..."), 0, this, 0 );
+    actionHelpRegister = new DesignerAction( i18n("Register TQt"), TQPixmap(), i18n("&Register TQt..."), 0, TQT_TQOBJECT(this), 0 );
     actionHelpRegister->setStatusTip( i18n("Opens a web browser at the evaluation form on www.trolltech.com") );
     actionHelpRegister->setWhatsThis( i18n("Register with Trolltech") );
-    connect( actionHelpRegister, TQT_SIGNAL( activated() ), this, TQT_SLOT( helpRegister() ) );
+    connect( actionHelpRegister, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( helpRegister() ) );
 #endif
 
     actionHelpWhatsThis = new DesignerAction( i18n("What's This?"), TQIconSet( whatsthis_image, whatsthis_image ),
-				       i18n("What's This?"), SHIFT + Key_F1, this, 0 );
+				       i18n("What's This?"), SHIFT + Key_F1, TQT_TQOBJECT(this), 0 );
     actionHelpWhatsThis->setStatusTip( i18n("\"What's This?\" context sensitive help") );
     actionHelpWhatsThis->setWhatsThis( whatsThisFrom( "Help|What's This?" ) );
-    connect( actionHelpWhatsThis, TQT_SIGNAL( activated() ), this, TQT_SLOT( whatsThis() ) );
+    connect( actionHelpWhatsThis, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( whatsThis() ) );
 
 /*    TQToolBar *tb = new TQToolBar( this, "Help" );
     tb->setCloseMode( TQDockWindow::Undocked );
-    TQWhatsThis::add( tb, i18n( "<b>The Help toolbar</b>%1" ).arg(i18n(toolbarHelp).arg("") ));
+    TQWhatsThis::add( tb, i18n( "<b>The Help toolbar</b>%1" ).tqarg(i18n(toolbarHelp).tqarg("") ));
     addToolBar( tb, i18n( "Help" ) );
     actionHelpWhatsThis->addTo( tb );*/
 
@@ -1026,8 +1026,8 @@ void MainWindow::setupHelpActions()
     actionHelpManual->addTo( menu );
     menu->insertSeparator();
     actionHelpAbout->addTo( menu );
-    actionHelpAboutQt->addTo( menu );
-#if 0 //defined(QT_NON_COMMERCIAL)
+    actionHelpAboutTQt->addTo( menu );
+#if 0 //defined(TQT_NON_COMMERCIAL)
     // ### not used anymore -- should be deleted?
     actionHelpRegister->addTo( menu );
 #endif
@@ -1057,13 +1057,13 @@ void MainWindow::fileNewDialog()
     currentProject->setModified( TRUE );
     workspace()->update();
     fw->setProject( currentProject );
-    MetaDataBase::addEntry( fw );
-    TQWidget *w = WidgetFactory::create( WidgetDatabase::idFromClassName( "TQDialog" ), fw, n.latin1() );
+    MetaDataBase::addEntry( TQT_TQOBJECT(fw) );
+    TQWidget *w = WidgetFactory::create( WidgetDatabase::idFromClassName( TQDIALOG_OBJECT_NAME_STRING ), fw, n.latin1() );
     fw->setMainContainer( w );
     fw->setCaption( n );
     fw->resize( 600, 480 );
     insertFormWindow( fw );
-    fw->killAccels( fw );
+    fw->killAccels( TQT_TQOBJECT(fw) );
     fw->project()->setModified( TRUE );
     fw->setFocus();
     fw->setSavePixmapInProject( TRUE );
@@ -1072,7 +1072,7 @@ void MainWindow::fileNewDialog()
 
 void MainWindow::fileNewFile()
 {
-    TQString name = QInputDialog::getText( i18n( "Name of File" ), i18n( "Enter the name of the new source file:" ) );
+    TQString name = TQInputDialog::getText( i18n( "Name of File" ), i18n( "Enter the name of the new source file:" ) );
     if ( name.isEmpty() )
 	return;
     if ( name.right( 3 ) != ".qs" )
@@ -1088,7 +1088,7 @@ void MainWindow::fileQuit()
 {
     close();
     if ( !singleProjectMode() )
-	qApp->closeAllWindows();
+	tqApp->closeAllWindows();
 }
 
 void MainWindow::fileClose()
@@ -1098,9 +1098,9 @@ void MainWindow::fileClose()
     } else {
 	TQWidget *w = qworkspace->activeWindow();
 	if ( w ) {
-	    if ( ::qt_cast<FormWindow*>(w) )
+	    if ( ::tqqt_cast<FormWindow*>(w) )
 		( (FormWindow*)w )->formFile()->close();
-	    else if ( ::qt_cast<SourceEditor*>(w) )
+	    else if ( ::tqqt_cast<SourceEditor*>(w) )
 		( (SourceEditor*)w )->close();
 	}
     }
@@ -1125,7 +1125,7 @@ void MainWindow::fileCloseProject()
     if ( a ) {
 	if ( pro->isModified() ) {
 	    switch ( TQMessageBox::warning( this, i18n( "Save Project Settings" ),
-					   i18n( "Save changes to '%1'?" ).arg( pro->fileName() ),
+					   i18n( "Save changes to '%1'?" ).tqarg( pro->fileName() ),
 					   i18n( "&Yes" ), i18n( "&No" ), i18n( "&Cancel" ), 0, 2 ) ) {
 	    case 0: // save
 		pro->save();
@@ -1145,14 +1145,14 @@ void MainWindow::fileCloseProject()
 	while ( wit.current() ) {
 	    TQWidget *w = wit.current();
 	    ++wit;
-	    if ( ::qt_cast<FormWindow*>(w) ) {
+	    if ( ::tqqt_cast<FormWindow*>(w) ) {
 		if ( ( (FormWindow*)w )->project() == pro ) {
 		    if ( ( (FormWindow*)w )->formFile()->editor() )
 			windows.removeRef( ( (FormWindow*)w )->formFile()->editor() );
 		    if ( !( (FormWindow*)w )->formFile()->close() )
 			return;
 		}
-	    } else if ( ::qt_cast<SourceEditor*>(w) ) {
+	    } else if ( ::tqqt_cast<SourceEditor*>(w) ) {
 		if ( !( (SourceEditor*)w )->close() )
 		    return;
 	    }
@@ -1166,11 +1166,11 @@ void MainWindow::fileCloseProject()
 	currentProject = 0;
 	if ( lastValid ) {
 	    projectSelected( lastValid );
-	    statusMessage( i18n( "Selected project '%1'" ).arg( currentProject->projectName() ) );
+	    statusMessage( i18n( "Selected project '%1'" ).tqarg( currentProject->projectName() ) );
 	}
 	if ( !windows.isEmpty() ) {
 	    for ( TQWidget *w = windows.first(); w; w = windows.next() ) {
-		if ( !::qt_cast<FormWindow*>(w) )
+		if ( !::tqqt_cast<FormWindow*>(w) )
 		    continue;
 		w->setFocus();
 		activeWindowChanged( w );
@@ -1179,7 +1179,7 @@ void MainWindow::fileCloseProject()
 	} else {
 	    emit hasActiveWindow( FALSE );
 	    emit hasActiveForm( FALSE );
-	    updateUndoRedo( FALSE, FALSE, TQString::null, TQString::null );
+	    updateUndoRedo( FALSE, FALSE, TQString(), TQString() );
 	}
     }
 }
@@ -1198,7 +1198,7 @@ void MainWindow::fileOpen( const TQString &filter, const TQString &extension, co
 {
     statusMessage( i18n( "Open a file...") );
 
-    QPluginManager<ImportFilterInterface> manager( IID_ImportFilter, TQApplication::libraryPaths(), pluginDirectory() );
+    TQPluginManager<ImportFilterInterface> manager( IID_ImportFilter, TQApplication::libraryPaths(), pluginDirectory() );
 
     Project* project = inProject ? currentProject : eProject;
 
@@ -1209,9 +1209,9 @@ void MainWindow::fileOpen( const TQString &filter, const TQString &extension, co
 	if ( filter.isEmpty() ) {
 	    if ( !inProject )
 		filterlist << i18n( "*.ui *.pro|Designer Files" );
-	    filterlist << i18n( "*.ui|Qt User-Interface Files" );
+	    filterlist << i18n( "*.ui|TQt User-Interface Files" );
 	    if ( !inProject )
-		filterlist << i18n( "*.pro|QMAKE Project Files" );
+		filterlist << i18n( "*.pro|TQMAKE Project Files" );
 	    TQStringList list = manager.featureList();
 	    for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it )
 		filterlist << *it;
@@ -1230,11 +1230,11 @@ void MainWindow::fileOpen( const TQString &filter, const TQString &extension, co
 	TQStringList filenames;
 	if ( fn.isEmpty() ) {
 	    if ( !inProject ) {
-		TQString f = KFileDialog::getOpenFileName( TQString::null, filters, this, /*0,*/
+		TQString f = KFileDialog::getOpenFileName( TQString(), filters, this, /*0,*/
 							  i18n("Open" )/*, &lastOpenFilter */);
 		filenames << f;
 	    } else {
-		filenames = KFileDialog::getOpenFileNames( TQString::null, filters, this, /*0,*/
+		filenames = KFileDialog::getOpenFileNames( TQString(), filters, this, /*0,*/
 							   i18n("Add")/*, &lastOpenFilter */);
 	    }
 	} else {
@@ -1246,16 +1246,16 @@ void MainWindow::fileOpen( const TQString &filter, const TQString &extension, co
 	    if ( !filename.isEmpty() ) {
 		TQFileInfo fi( filename );
 
-		if ( fi.extension( FALSE ) == "pro" && ( extension.isEmpty() || extension.find( ";pro" ) != -1 ) ) {
+		if ( fi.extension( FALSE ) == "pro" && ( extension.isEmpty() || extension.tqfind( ";pro" ) != -1 ) ) {
 		    addRecentlyOpened( filename, recentlyProjects );
 		    openProject( filename );
-		} else if ( fi.extension( FALSE ) == "ui" && ( extension.isEmpty() || extension.find( ";ui" ) != -1 ) ) {
+		} else if ( fi.extension( FALSE ) == "ui" && ( extension.isEmpty() || extension.tqfind( ";ui" ) != -1 ) ) {
 		    if ( !inProject )
 			setCurrentProject( eProject );
 		    openFormWindow( filename );
 		    addRecentlyOpened( filename, recentlyFiles );
-		} else if ( !extension.isEmpty() && extension.find( ";" + fi.extension( FALSE ) ) != -1 ||
-			    additionalSources.find( fi.extension( FALSE ) ) != additionalSources.end() ) {
+		} else if ( !extension.isEmpty() && extension.tqfind( ";" + fi.extension( FALSE ) ) != -1 ||
+			    additionalSources.tqfind( fi.extension( FALSE ) ) != additionalSources.end() ) {
 		    SourceFile *sf = project->findSourceFile( project->makeRelative( filename ) );
 		    if ( !sf )
 			sf = new SourceFile( project->makeRelative( filename ), FALSE, project );
@@ -1263,7 +1263,7 @@ void MainWindow::fileOpen( const TQString &filter, const TQString &extension, co
 		} else if ( extension.isEmpty() ) {
 		    TQString filter;
 		    for ( TQStringList::Iterator it2 = filterlist.begin(); it2 != filterlist.end(); ++it2 ) {
-			if ( (*it2).contains( "." + fi.extension( FALSE ), FALSE ) ) {
+			if ( (*it2).tqcontains( "." + fi.extension( FALSE ), FALSE ) ) {
 			    filter = *it2;
 			    break;
 			}
@@ -1276,11 +1276,11 @@ void MainWindow::fileOpen( const TQString &filter, const TQString &extension, co
 					      arg( filename )/*, 3000*/ );
 			return;
 		    }
-		    statusMessage( i18n( "Importing '%1' using import filter ...").arg( filename ) );
+		    statusMessage( i18n( "Importing '%1' using import filter ...").tqarg( filename ) );
 		    TQStringList list = iface->import( filter, filename );
 		    iface->release();
 		    if ( list.isEmpty() ) {
-			statusMessage( i18n( "Nothing to load in '%1'").arg( filename )/*, 3000*/ );
+			statusMessage( i18n( "Nothing to load in '%1'").tqarg( filename )/*, 3000*/ );
 			return;
 		    }
 		    if ( !inProject )
@@ -1319,7 +1319,7 @@ FormWindow *MainWindow::openFormWindow( const TQString &filename, bool validFile
 	return formWindow();
     }
 
-    statusMessage( i18n( "Reading file '%1'...").arg( filename ) );
+    statusMessage( i18n( "Reading file '%1'...").tqarg( filename ) );
     FormFile *ff2 = currentProject->findFormFile( currentProject->makeRelative(filename) );
     if ( ff2 && ff2->formWindow() ) {
 	ff2->formWindow()->setFocus();
@@ -1334,14 +1334,14 @@ FormWindow *MainWindow::openFormWindow( const TQString &filename, bool validFile
 	ff = new FormFile( currentProject->makeRelative( filename ), FALSE, currentProject );
     bool b = resource.load( ff ) && (FormWindow*)resource.widget();
     if ( !validFileName && resource.widget() )
-	( (FormWindow*)resource.widget() )->setFileName( TQString::null );
+	( (FormWindow*)resource.widget() )->setFileName( TQString() );
     TQApplication::restoreOverrideCursor();
     if ( b ) {
 	rebuildCustomWidgetGUI();
-	statusMessage( i18n( "Loaded file '%1'").arg( filename )/*, 3000 */);
+	statusMessage( i18n( "Loaded file '%1'").tqarg( filename )/*, 3000 */);
     } else {
-	statusMessage( i18n( "Failed to load file '%1'").arg( filename )/*, 5000 */);
-	TQMessageBox::information( this, i18n("Load File"), i18n("Could not load file '%1'.").arg( filename ) );
+	statusMessage( i18n( "Failed to load file '%1'").tqarg( filename )/*, 5000 */);
+	TQMessageBox::information( this, i18n("Load File"), i18n("Could not load file '%1'.").tqarg( filename ) );
 	delete ff;
     }
     return (FormWindow*)resource.widget();
@@ -1358,7 +1358,7 @@ bool MainWindow::fileSave()
 bool MainWindow::fileSaveForm()
 {
     for ( SourceEditor *e = sourceEditors.first(); e; e = sourceEditors.next() ) {
-	if ( e->object() == formWindow() || e == qWorkspace()->activeWindow() ) {
+	if ( TQT_BASE_OBJECT(e->object()) == formWindow() || e == qWorkspace()->activeWindow() ) {
 	    e->save();
 	}
     }
@@ -1367,7 +1367,7 @@ bool MainWindow::fileSaveForm()
 
     TQWidget *w = qWorkspace()->activeWindow();
     if ( w ) {
-	if ( ::qt_cast<SourceEditor*>(w) ) {
+	if ( ::tqqt_cast<SourceEditor*>(w) ) {
 	    SourceEditor *se = (SourceEditor*)w;
 	    if ( se->formWindow() )
 		fw = se->formWindow();
@@ -1389,7 +1389,7 @@ bool MainWindow::fileSaveForm()
 bool MainWindow::fileSaveProject()
 {
     currentProject->save();
-    statusMessage( i18n( "Project '%1' saved.").arg( currentProject->projectName() )/*, 3000 */);
+    statusMessage( i18n( "Project '%1' saved.").tqarg( currentProject->projectName() )/*, 3000 */);
     return TRUE;
 }
 
@@ -1400,9 +1400,9 @@ bool MainWindow::fileSaveAs()
     TQWidget *w = qworkspace->activeWindow();
     if ( !w )
 	return TRUE;
-    if ( ::qt_cast<FormWindow*>(w) )
+    if ( ::tqqt_cast<FormWindow*>(w) )
 	return ( (FormWindow*)w )->formFile()->saveAs();
-    else if ( ::qt_cast<SourceEditor*>(w) )
+    else if ( ::tqqt_cast<SourceEditor*>(w) )
 	return ( (SourceEditor*)w )->saveAs();
     return FALSE;
 }
@@ -1425,7 +1425,7 @@ void MainWindow::fileCreateTemplate()
     }
     for ( i = 0; i < WidgetDatabase::count(); ++i ) {
 	if ( WidgetDatabase::isContainer( i ) && !WidgetDatabase::isForm(i) &&
-	     WidgetDatabase::className( i ) != "TQTabWidget" && WidgetDatabase::group( i ) != "Temp" ) {
+	     WidgetDatabase::className( i ) != TQTABWIDGET_OBJECT_NAME_STRING && WidgetDatabase::group( i ) != "Temp" ) {
 	    dia.listClass->insertItem( WidgetDatabase::className( i ) );
 	}
     }
@@ -1444,7 +1444,7 @@ void MainWindow::fileCreateTemplate()
 
 void MainWindow::createNewTemplate()
 {
-    CreateTemplate *dia = (CreateTemplate*)sender()->parent();
+    CreateTemplate *dia = (CreateTemplate*)TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->tqparent();
     TQString fn = dia->editName->text();
     TQString cn = dia->listClass->currentText();
     if ( fn.isEmpty() || cn.isEmpty() ) {
@@ -1453,7 +1453,7 @@ void MainWindow::createNewTemplate()
     }
 
     TQStringList templRoots;
-    const char *qtdir = getenv( "QTDIR" );
+    const char *qtdir = getenv( "TQTDIR" );
     if(qtdir)
 	templRoots << qtdir;
     templRoots << qInstallPathData();
@@ -1482,7 +1482,7 @@ void MainWindow::createNewTemplate()
     ts << "    <cstring>" << cn << "Form</cstring>" << endl;
     ts << "</property>" << endl;
     ts << "<property stdset=\"1\">" << endl;
-    ts << "    <name>geometry</name>" << endl;
+    ts << "    <name>tqgeometry</name>" << endl;
     ts << "    <rect>" << endl;
     ts << "        <width>300</width>" << endl;
     ts << "        <height>400</height>" << endl;
@@ -1499,7 +1499,7 @@ void MainWindow::createNewTemplate()
 void MainWindow::editUndo()
 {
     if ( qWorkspace()->activeWindow() &&
-	 ::qt_cast<SourceEditor*>(qWorkspace()->activeWindow()) ) {
+	 ::tqqt_cast<SourceEditor*>(qWorkspace()->activeWindow()) ) {
 	( (SourceEditor*)qWorkspace()->activeWindow() )->editUndo();
 	return;
     }
@@ -1510,7 +1510,7 @@ void MainWindow::editUndo()
 void MainWindow::editRedo()
 {
     if ( qWorkspace()->activeWindow() &&
-	 ::qt_cast<SourceEditor*>(qWorkspace()->activeWindow()) ) {
+	 ::tqqt_cast<SourceEditor*>(qWorkspace()->activeWindow()) ) {
 	( (SourceEditor*)qWorkspace()->activeWindow() )->editRedo();
 	return;
     }
@@ -1521,7 +1521,7 @@ void MainWindow::editRedo()
 void MainWindow::editCut()
 {
     if ( qWorkspace()->activeWindow() &&
-	 ::qt_cast<SourceEditor*>(qWorkspace()->activeWindow()) ) {
+	 ::tqqt_cast<SourceEditor*>(qWorkspace()->activeWindow()) ) {
 	( (SourceEditor*)qWorkspace()->activeWindow() )->editCut();
 	return;
     }
@@ -1532,18 +1532,18 @@ void MainWindow::editCut()
 void MainWindow::editCopy()
 {
     if ( qWorkspace()->activeWindow() &&
-	 ::qt_cast<SourceEditor*>(qWorkspace()->activeWindow()) ) {
+	 ::tqqt_cast<SourceEditor*>(qWorkspace()->activeWindow()) ) {
 	( (SourceEditor*)qWorkspace()->activeWindow() )->editCopy();
 	return;
     }
     if ( formWindow() )
-	qApp->clipboard()->setText( formWindow()->copy() );
+	tqApp->clipboard()->setText( formWindow()->copy() );
 }
 
 void MainWindow::editPaste()
 {
     if ( qWorkspace()->activeWindow() &&
-	 ::qt_cast<SourceEditor*>(qWorkspace()->activeWindow()) ) {
+	 ::tqqt_cast<SourceEditor*>(qWorkspace()->activeWindow()) ) {
 	( (SourceEditor*)qWorkspace()->activeWindow() )->editPaste();
 	return;
     }
@@ -1554,20 +1554,20 @@ void MainWindow::editPaste()
     TQWidgetList l( formWindow()->selectedWidgets() );
     if ( l.count() == 1 ) {
 	w = l.first();
-	if ( WidgetFactory::layoutType( w ) != WidgetFactory::NoLayout ||
-	     ( !WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( w ) ) ) &&
+	if ( WidgetFactory::tqlayoutType( w ) != WidgetFactory::NoLayout ||
+	     ( !WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(w) ) ) ) &&
 	       w != formWindow()->mainContainer() ) )
 	    w = formWindow()->mainContainer();
     }
 
-    if ( w && WidgetFactory::layoutType( w ) == WidgetFactory::NoLayout ) {
-	formWindow()->paste( qApp->clipboard()->text(), WidgetFactory::containerOfWidget( w ) );
+    if ( w && WidgetFactory::tqlayoutType( w ) == WidgetFactory::NoLayout ) {
+	formWindow()->paste( tqApp->clipboard()->text(), WidgetFactory::containerOfWidget( w ) );
 	hierarchyView->widgetInserted( 0 );
 	formWindow()->commandHistory()->setModified( TRUE );
     } else {
 	TQMessageBox::information( this, i18n( "Paste Error" ),
 				  i18n( "Cannot paste widgets. Designer could not find a container\n"
-				      "to paste into which does not contain a layout. Break the layout\n"
+				      "to paste into which does not contain a tqlayout. Break the tqlayout\n"
 				      "of the container you want to paste into and select this container\n"
 				      "and then paste again." ) );
     }
@@ -1582,7 +1582,7 @@ void MainWindow::editDelete()
 void MainWindow::editSelectAll()
 {
     if ( qWorkspace()->activeWindow() &&
-	 ::qt_cast<SourceEditor*>(qWorkspace()->activeWindow()) ) {
+	 ::tqqt_cast<SourceEditor*>(qWorkspace()->activeWindow()) ) {
 	( (SourceEditor*)qWorkspace()->activeWindow() )->editSelectAll();
 	return;
     }
@@ -1611,42 +1611,42 @@ void MainWindow::editAdjustSize()
 
 void MainWindow::editLayoutHorizontal()
 {
-    if ( layoutChilds )
+    if ( tqlayoutChilds )
 	editLayoutContainerHorizontal();
-    else if ( layoutSelected && formWindow() )
-	formWindow()->layoutHorizontal();
+    else if ( tqlayoutSelected && formWindow() )
+	formWindow()->tqlayoutHorizontal();
 }
 
 void MainWindow::editLayoutVertical()
 {
-    if ( layoutChilds )
+    if ( tqlayoutChilds )
 	editLayoutContainerVertical();
-    else if ( layoutSelected && formWindow() )
-	formWindow()->layoutVertical();
+    else if ( tqlayoutSelected && formWindow() )
+	formWindow()->tqlayoutVertical();
 }
 
 void MainWindow::editLayoutHorizontalSplit()
 {
-    if ( layoutChilds )
+    if ( tqlayoutChilds )
 	; // no way to do that
-    else if ( layoutSelected && formWindow() )
-	formWindow()->layoutHorizontalSplit();
+    else if ( tqlayoutSelected && formWindow() )
+	formWindow()->tqlayoutHorizontalSplit();
 }
 
 void MainWindow::editLayoutVerticalSplit()
 {
-    if ( layoutChilds )
+    if ( tqlayoutChilds )
 	; // no way to do that
-    else if ( layoutSelected && formWindow() )
-	formWindow()->layoutVerticalSplit();
+    else if ( tqlayoutSelected && formWindow() )
+	formWindow()->tqlayoutVerticalSplit();
 }
 
 void MainWindow::editLayoutGrid()
 {
-    if ( layoutChilds )
+    if ( tqlayoutChilds )
 	editLayoutContainerGrid();
-    else if ( layoutSelected && formWindow() )
-	formWindow()->layoutGrid();
+    else if ( tqlayoutSelected && formWindow() )
+	formWindow()->tqlayoutGrid();
 }
 
 void MainWindow::editLayoutContainerVertical()
@@ -1658,7 +1658,7 @@ void MainWindow::editLayoutContainerVertical()
     if ( l.count() == 1 )
 	w = l.first();
     if ( w )
-	formWindow()->layoutVerticalContainer( w  );
+	formWindow()->tqlayoutVerticalContainer( w  );
 }
 
 void MainWindow::editLayoutContainerHorizontal()
@@ -1670,7 +1670,7 @@ void MainWindow::editLayoutContainerHorizontal()
     if ( l.count() == 1 )
 	w = l.first();
     if ( w )
-	formWindow()->layoutHorizontalContainer( w );
+	formWindow()->tqlayoutHorizontalContainer( w );
 }
 
 void MainWindow::editLayoutContainerGrid()
@@ -1682,7 +1682,7 @@ void MainWindow::editLayoutContainerGrid()
     if ( l.count() == 1 )
 	w = l.first();
     if ( w )
-	formWindow()->layoutGridContainer( w  );
+	formWindow()->tqlayoutGridContainer( w  );
 }
 
 void MainWindow::editBreakLayout()
@@ -1692,15 +1692,15 @@ void MainWindow::editBreakLayout()
     TQWidget *w = formWindow()->mainContainer();
     if ( formWindow()->currentWidget() )
 	w = formWindow()->currentWidget();
-    if ( WidgetFactory::layoutType( w ) != WidgetFactory::NoLayout ||
-	 w->parentWidget() && WidgetFactory::layoutType( w->parentWidget() ) != WidgetFactory::NoLayout ) {
+    if ( WidgetFactory::tqlayoutType( w ) != WidgetFactory::NoLayout ||
+	 w->tqparentWidget() && WidgetFactory::tqlayoutType( w->tqparentWidget() ) != WidgetFactory::NoLayout ) {
 	formWindow()->breakLayout( w );
 	return;
     } else {
 	TQWidgetList widgets = formWindow()->selectedWidgets();
 	for ( w = widgets.first(); w; w = widgets.next() ) {
-	    if ( WidgetFactory::layoutType( w ) != WidgetFactory::NoLayout ||
-		 w->parentWidget() && WidgetFactory::layoutType( w->parentWidget() ) != WidgetFactory::NoLayout )
+	    if ( WidgetFactory::tqlayoutType( w ) != WidgetFactory::NoLayout ||
+		 w->tqparentWidget() && WidgetFactory::tqlayoutType( w->tqparentWidget() ) != WidgetFactory::NoLayout )
 		break;
 	}
 	if ( w ) {
@@ -1710,8 +1710,8 @@ void MainWindow::editBreakLayout()
     }
 
     w = formWindow()->mainContainer();
-    if ( WidgetFactory::layoutType( w ) != WidgetFactory::NoLayout ||
-	 w->parentWidget() && WidgetFactory::layoutType( w->parentWidget() ) != WidgetFactory::NoLayout )
+    if ( WidgetFactory::tqlayoutType( w ) != WidgetFactory::NoLayout ||
+	 w->tqparentWidget() && WidgetFactory::tqlayoutType( w->tqparentWidget() ) != WidgetFactory::NoLayout )
 	formWindow()->breakLayout( w );
 }
 
@@ -1761,7 +1761,7 @@ SourceEditor *MainWindow::openSourceEditor()
     if ( !MetaDataBase::hasEditor( lang ) ) {
 	TQMessageBox::information( this, i18n( "Edit Source" ),
 				  i18n( "There is no plugin for editing %1 code installed.\n"
-				      "Note: Plugins are not available in static Qt configurations." ).arg( lang ) );
+				      "Note: Plugins are not available in static TQt configurations." ).tqarg( lang ) );
 	return 0;
     }
 
@@ -1774,7 +1774,7 @@ SourceEditor *MainWindow::openSourceEditor()
     }
 
     if ( !editor )
-	editor = createSourceEditor( formWindow(), formWindow()->project(), lang );
+editor = createSourceEditor( TQT_TQOBJECT(formWindow()), formWindow()->project(), lang );
     return editor;
 }
 
@@ -1784,7 +1784,7 @@ SourceEditor *MainWindow::editSource( SourceFile *f )
     if ( !MetaDataBase::hasEditor( lang ) ) {
 	TQMessageBox::information( this, i18n( "Edit Source" ),
 				  i18n( "There is no plugin for editing %1 code installed.\n"
-				      "Note: Plugins are not available in static Qt configurations." ).arg( lang ) );
+				      "Note: Plugins are not available in static TQt configurations." ).tqarg( lang ) );
 	return 0;
     }
 
@@ -1859,7 +1859,7 @@ void MainWindow::editPixmapCollection()
 
 void MainWindow::editDatabaseConnections()
 {
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     DatabaseConnectionsEditor dia( currentProject, this, 0, TRUE );
     dia.exec();
 #endif
@@ -1905,10 +1905,10 @@ void MainWindow::editPreferences()
 	dia->tabWidget->addTab( t.w, t.title );
 	if ( t.receiver ) {
 	    connect( dia->buttonOk, TQT_SIGNAL( clicked() ), senderObject, TQT_SLOT( emitAcceptSignal() ) );
-	    connect( senderObject, TQT_SIGNAL( acceptSignal( QUnknownInterface * ) ), t.receiver, t.accept_slot );
-	    connect( senderObject, TQT_SIGNAL( initSignal( QUnknownInterface * ) ), t.receiver, t.init_slot );
+	    connect( senderObject, TQT_SIGNAL( acceptSignal( TQUnknownInterface * ) ), t.receiver, t.accept_slot );
+	    connect( senderObject, TQT_SIGNAL( initSignal( TQUnknownInterface * ) ), t.receiver, t.init_slot );
 	    senderObject->emitInitSignal();
-	    disconnect( senderObject, TQT_SIGNAL( initSignal( QUnknownInterface * ) ), t.receiver, t.init_slot );
+	    disconnect( senderObject, TQT_SIGNAL( initSignal( TQUnknownInterface * ) ), t.receiver, t.init_slot );
 	}
     }
 
@@ -1921,7 +1921,7 @@ void MainWindow::editPreferences()
 	setUsesTextLabel( dia->checkBoxTextLabels->isChecked() );
 	if (dia->textEditPluginPaths->isModified()) {
 	    pluginPaths = dia->textEditPluginPaths->text();
-	    TQApplication::setLibraryPaths(TQStringList::split("\n", pluginPaths));
+	    TQApplication::tqsetLibraryPaths(TQStringList::split("\n", pluginPaths));
 	    savePluginPaths = TRUE;
 	}
 
@@ -1961,7 +1961,7 @@ void MainWindow::editPreferences()
 void MainWindow::searchFind()
 {
     if ( !qWorkspace()->activeWindow() ||
-	 !::qt_cast<SourceEditor*>(qWorkspace()->activeWindow()) )
+	 !::tqqt_cast<SourceEditor*>(qWorkspace()->activeWindow()) )
 	 return;
 
     if ( !findDialog )
@@ -1983,27 +1983,27 @@ void MainWindow::searchIncremetalFindMenu()
 void MainWindow::searchIncremetalFind()
 {
     if ( !qWorkspace()->activeWindow() ||
-	 !::qt_cast<SourceEditor*>(qWorkspace()->activeWindow()) )
+	 !::tqqt_cast<SourceEditor*>(qWorkspace()->activeWindow()) )
 	 return;
 
-    ( (SourceEditor*)qWorkspace()->activeWindow() )->editorInterface()->find( incrementalSearch->text(),
+    ( (SourceEditor*)qWorkspace()->activeWindow() )->editorInterface()->tqfind( incrementalSearch->text(),
 									     FALSE, FALSE, TRUE, FALSE );
 }
 
 void MainWindow::searchIncremetalFindNext()
 {
     if ( !qWorkspace()->activeWindow() ||
-	 !::qt_cast<SourceEditor*>(qWorkspace()->activeWindow()) )
+	 !::tqqt_cast<SourceEditor*>(qWorkspace()->activeWindow()) )
 	 return;
 
-    ( (SourceEditor*)qWorkspace()->activeWindow() )->editorInterface()->find( incrementalSearch->text(),
+    ( (SourceEditor*)qWorkspace()->activeWindow() )->editorInterface()->tqfind( incrementalSearch->text(),
 									     FALSE, FALSE, TRUE, TRUE );
 }
 
 void MainWindow::searchReplace()
 {
     if ( !qWorkspace()->activeWindow() ||
-	 !::qt_cast<SourceEditor*>(qWorkspace()->activeWindow()) )
+	 !::tqqt_cast<SourceEditor*>(qWorkspace()->activeWindow()) )
 	 return;
 
     if ( !replaceDialog )
@@ -2019,7 +2019,7 @@ void MainWindow::searchReplace()
 void MainWindow::searchGotoLine()
 {
     if ( !qWorkspace()->activeWindow() ||
-	 !::qt_cast<SourceEditor*>(qWorkspace()->activeWindow()) )
+	 !::tqqt_cast<SourceEditor*>(qWorkspace()->activeWindow()) )
 	 return;
 
     if ( !gotoLineDialog )
@@ -2054,8 +2054,8 @@ void MainWindow::showStartDialog()
 {
     if ( singleProjectMode() )
 	return;
-    for ( int i = 1; i < qApp->argc(); ++i ) {
-	TQString arg = qApp->argv()[i];
+    for ( int i = 1; i < tqApp->argc(); ++i ) {
+	TQString arg = tqApp->argv()[i];
 	if ( arg[0] != '-' )
 	    return;
     }
diff --git a/kdevdesigner/designer/menubareditor.cpp b/kdevdesigner/designer/menubareditor.cpp
index 0c123886..c6fa7fb4 100644
--- a/kdevdesigner/designer/menubareditor.cpp
+++ b/kdevdesigner/designer/menubareditor.cpp
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2003 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -43,11 +43,11 @@ extern void find_accel( const TQString &txt, TQMap<TQChar, TQWidgetList > &accel
 
 // Drag Object Declaration -------------------------------------------
 
-class MenuBarEditorItemPtrDrag : public QStoredDrag
+class MenuBarEditorItemPtrDrag : public TQStoredDrag
 {
 public:
     MenuBarEditorItemPtrDrag( MenuBarEditorItem * item,
-			      TQWidget * parent = 0,
+			      TQWidget * tqparent = 0,
 			      const char * name = 0 );
     ~MenuBarEditorItemPtrDrag() {};
     static bool canDecode( TQDragMoveEvent * e );
@@ -57,13 +57,13 @@ public:
 // Drag Object Implementation ---------------------------------------
 
 MenuBarEditorItemPtrDrag::MenuBarEditorItemPtrDrag( MenuBarEditorItem * item,
-						    TQWidget * parent,
+						    TQWidget * tqparent,
 						    const char * name )
-    : TQStoredDrag( "qt/menubareditoritemptr", parent, name )
+    : TQStoredDrag( "qt/menubareditoritemptr", tqparent, name )
 {
-    TQByteArray data( sizeof( Q_LONG ) );
+    TQByteArray data( sizeof( TQ_LONG ) );
     TQDataStream stream( data, IO_WriteOnly );
-    stream << ( Q_LONG ) item;
+    stream << ( TQ_LONG ) item;
     setEncodedData( data );
 }
 
@@ -74,13 +74,13 @@ bool MenuBarEditorItemPtrDrag::canDecode( TQDragMoveEvent * e )
 
 bool MenuBarEditorItemPtrDrag::decode( TQDropEvent * e, MenuBarEditorItem ** i )
 {
-    TQByteArray data = e->encodedData( "qt/menubareditoritemptr" );
+    TQByteArray data = e->tqencodedData( "qt/menubareditoritemptr" );
     TQDataStream stream( data, IO_ReadOnly );
 
     if ( !data.size() )
 	return FALSE;
 
-    Q_LONG p = 0;
+    TQ_LONG p = 0;
     stream >> p;
     *i = ( MenuBarEditorItem *) p;
 
@@ -89,8 +89,8 @@ bool MenuBarEditorItemPtrDrag::decode( TQDropEvent * e, MenuBarEditorItem ** i )
 
 // MenuBarEditorItem ---------------------------------------------------
 
-MenuBarEditorItem::MenuBarEditorItem( MenuBarEditor * bar, TQObject * parent, const char * name )
-    : TQObject( parent, name ),
+MenuBarEditorItem::MenuBarEditorItem( MenuBarEditor * bar, TQObject * tqparent, const char * name )
+    : TQObject( tqparent, name ),
       menuBar( bar ),
       popupMenu( 0 ),
       visible( TRUE ),
@@ -99,8 +99,8 @@ MenuBarEditorItem::MenuBarEditorItem( MenuBarEditor * bar, TQObject * parent, co
 { }
 
 MenuBarEditorItem::MenuBarEditorItem( PopupMenuEditor * menu, MenuBarEditor * bar,
-				      TQObject * parent, const char * name )
-    : TQObject( parent, name ),
+				      TQObject * tqparent, const char * name )
+    : TQObject( tqparent, name ),
       menuBar( bar ),
       popupMenu( menu ),
       visible( TRUE ),
@@ -111,8 +111,8 @@ MenuBarEditorItem::MenuBarEditorItem( PopupMenuEditor * menu, MenuBarEditor * ba
 }
 
 MenuBarEditorItem::MenuBarEditorItem( TQActionGroup * actionGroup, MenuBarEditor * bar,
-				      TQObject * parent, const char * name )
-    : TQObject( parent, name ),
+				      TQObject * tqparent, const char * name )
+    : TQObject( tqparent, name ),
       menuBar( bar ),
       popupMenu( 0 ),
       visible( TRUE ),
@@ -124,8 +124,8 @@ MenuBarEditorItem::MenuBarEditorItem( TQActionGroup * actionGroup, MenuBarEditor
     popupMenu->insert( actionGroup );
 }
 
-MenuBarEditorItem::MenuBarEditorItem( MenuBarEditorItem * item, TQObject * parent, const char * name )
-    : TQObject( parent, name ),
+MenuBarEditorItem::MenuBarEditorItem( MenuBarEditorItem * item, TQObject * tqparent, const char * name )
+    : TQObject( tqparent, name ),
       menuBar( item->menuBar ),
       popupMenu( 0 ),
       text( item->text ),
@@ -141,8 +141,8 @@ MenuBarEditorItem::MenuBarEditorItem( MenuBarEditorItem * item, TQObject * paren
 int MenuBarEditor::clipboardOperation = 0;
 MenuBarEditorItem * MenuBarEditor::clipboardItem = 0;
 
-MenuBarEditor::MenuBarEditor( FormWindow * fw, TQWidget * parent, const char * name )
-    : TQMenuBar( parent, name ),
+MenuBarEditor::MenuBarEditor( FormWindow * fw, TQWidget * tqparent, const char * name )
+    : TQMenuBar( tqparent, name ),
       formWnd( fw ),
       draggedItem( 0 ),
       currentIndex( 0 ),
@@ -152,7 +152,7 @@ MenuBarEditor::MenuBarEditor( FormWindow * fw, TQWidget * parent, const char * n
       hasSeparator( FALSE )
 {
     setAcceptDrops( TRUE );
-    setFocusPolicy( StrongFocus );
+    setFocusPolicy( TQ_StrongFocus );
 
     addItem.setMenuText( i18n("new menu") );
     addSeparator.setMenuText( i18n("new separator") );
@@ -165,8 +165,8 @@ MenuBarEditor::MenuBarEditor( FormWindow * fw, TQWidget * parent, const char * n
     lineEdit->setBackgroundOrigin(ParentOrigin);
     lineEdit->installEventFilter( this );
 
-    dropLine = new TQWidget( this, "menubar dropline", Qt::WStyle_NoBorder | WStyle_StaysOnTop );
-    dropLine->setBackgroundColor( Qt::red );
+    dropLine = new TQWidget( this, "menubar dropline", TQt::WStyle_NoBorder | WStyle_StaysOnTop );
+    dropLine->setBackgroundColor( TQt::red );
     dropLine->hide();
 
     setMinimumHeight( fontMetrics().height() + 2 * borderSize() );
@@ -185,7 +185,7 @@ FormWindow * MenuBarEditor::formWindow()
 MenuBarEditorItem * MenuBarEditor::createItem( int index, bool addToCmdStack )
 {
     MenuBarEditorItem * i =
-	new MenuBarEditorItem( new PopupMenuEditor( formWnd, ( TQWidget * ) parent() ), this );
+	new MenuBarEditorItem( new PopupMenuEditor( formWnd, ( TQWidget * ) tqparent() ), this );
     if ( addToCmdStack ) {
 	AddMenuCommand * cmd = new AddMenuCommand( i18n( "Add Menu" ), formWnd, this, i, index );
 	formWnd->commandHistory()->addCommand( cmd );
@@ -199,7 +199,7 @@ MenuBarEditorItem * MenuBarEditor::createItem( int index, bool addToCmdStack )
 
 void MenuBarEditor::insertItem( MenuBarEditorItem * item, int index )
 {
-    item->menu()->parentMenu = this;
+    item->menu()->tqparentMenu = this;
 
     if ( index != -1 )
 	itemList.insert( index, item );
@@ -273,7 +273,7 @@ void MenuBarEditor::removeItem( MenuBarEditorItem * item )
 
 int MenuBarEditor::findItem( MenuBarEditorItem * item )
 {
-    return itemList.findRef( item );
+    return itemList.tqfindRef( item );
 }
 
 int MenuBarEditor::findItem( PopupMenuEditor * menu )
@@ -314,7 +314,7 @@ int MenuBarEditor::findItem( TQPoint & pos )
 
 	    r = TQRect( x, y, s.width(), s.height() );
 
-	    if ( r.contains( pos ) )
+	    if ( r.tqcontains( pos ) )
 		return itemList.at();
 
 	    addItemSizeToCoords( i, x, y, w );
@@ -334,7 +334,7 @@ int MenuBarEditor::findItem( TQPoint & pos )
 
     r = TQRect( x, y, s.width(), s.height() );
 
-    if ( r.contains( pos ) )
+    if ( r.tqcontains( pos ) )
 	return itemList.count();
 
     return itemList.count() + 1;
@@ -415,8 +415,8 @@ void MenuBarEditor::exchange( int a, int b )
 	 ia == &addItem || ia == &addSeparator ||
 	 ib == &addItem || ib == &addSeparator )
 	return; // do nothing
-    itemList.replace( b, ia );
-    itemList.replace( a, ib );
+    itemList.tqreplace( b, ia );
+    itemList.tqreplace( a, ib );
 }
 
 void MenuBarEditor::showLineEdit( int index )
@@ -502,9 +502,9 @@ void MenuBarEditor::deleteItem( int index )
     }
 }
 
-TQSize MenuBarEditor::sizeHint() const
+TQSize MenuBarEditor::tqsizeHint() const
 {
-    return TQSize( parentWidget()->width(), heightForWidth( parentWidget()->width() ) );
+    return TQSize( tqparentWidget()->width(), heightForWidth( tqparentWidget()->width() ) );
 }
 
 int MenuBarEditor::heightForWidth( int max_width ) const
@@ -534,8 +534,8 @@ void MenuBarEditor::show()
     TQWidget::show();
     resizeInternals();
 
-    TQResizeEvent e( parentWidget()->size(), parentWidget()->size() );
-    TQApplication::sendEvent( parentWidget(), &e );
+    TQResizeEvent e( tqparentWidget()->size(), tqparentWidget()->size() );
+    TQApplication::sendEvent( tqparentWidget(), &e );
 }
 
 void MenuBarEditor::checkAccels( TQMap<TQChar, TQWidgetList > &accels )
@@ -571,12 +571,12 @@ void MenuBarEditor::paste()
 
 bool MenuBarEditor::eventFilter( TQObject * o, TQEvent * e )
 {
-    if ( o == lineEdit && e->type() == TQEvent::FocusOut ) {
+    if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(lineEdit) && e->type() == TQEvent::FocusOut ) {
 	leaveEditMode();
 	lineEdit->hide();
 	update();
     } else if ( e->type() == TQEvent::LayoutHint ) {
-	resize( sizeHint() );
+	resize( tqsizeHint() );
      }
     return TQMenuBar::eventFilter( o, e );
 }
@@ -585,8 +585,8 @@ void MenuBarEditor::paintEvent( TQPaintEvent * )
 {
     TQPainter p( this );
     TQRect r = rect();
-    style().drawPrimitive( TQStyle::PE_PanelMenuBar, &p,
-			   r, colorGroup() );
+    tqstyle().tqdrawPrimitive( TQStyle::PE_PanelMenuBar, &p,
+			   r, tqcolorGroup() );
     drawItems( p );
 }
 
@@ -646,7 +646,7 @@ void MenuBarEditor::mouseMoveEvent( TQMouseEvent * e )
 	    // If the item is dropped in the same list,
 	    //  we will have two instances of the same pointer
 	    // in the list.
-	    itemList.find( draggedItem );
+	    itemList.tqfind( draggedItem );
 	    TQLNode * node = itemList.currentNode();
 	    dropConfirmed = FALSE;
 	    d->dragCopy(); // dragevents and stuff happens
@@ -719,67 +719,67 @@ void MenuBarEditor::keyPressEvent( TQKeyEvent * e )
     if ( lineEdit->isHidden() ) { // In navigation mode
 	switch ( e->key() ) {
 
-	case Qt::Key_Delete:
+	case TQt::Key_Delete:
 	    hideItem();
 	    deleteItem();
 	    showItem();
 	    break;
 
-	case Qt::Key_Left:
+	case TQt::Key_Left:
 	    e->accept();
-	    navigateLeft( e->state() & Qt::ControlButton );
+	    navigateLeft( e->state() & TQt::ControlButton );
 	    return;
 
-	case Qt::Key_Right:
+	case TQt::Key_Right:
 	    e->accept();
-	    navigateRight( e->state() & Qt::ControlButton );
+	    navigateRight( e->state() & TQt::ControlButton );
 	    return; // no update
 
-	case Qt::Key_Down:
+	case TQt::Key_Down:
 	    e->accept();
 	    focusItem();
 	    return; // no update
 
-	case Qt::Key_PageUp:
+	case TQt::Key_PageUp:
 	    currentIndex = 0;
 	    break;
 
-	case Qt::Key_PageDown:
+	case TQt::Key_PageDown:
 	    currentIndex = itemList.count();
 	    break;
 
-	case Qt::Key_Enter:
-	case Qt::Key_Return:
-	case Qt::Key_F2:
+	case TQt::Key_Enter:
+	case TQt::Key_Return:
+	case TQt::Key_F2:
 	    e->accept();
 	    enterEditMode();
 	    return; // no update
 
-	case Qt::Key_Up:
-	case Qt::Key_Alt:
-	case Qt::Key_Shift:
-	case Qt::Key_Control:
-	case Qt::Key_Escape:
+	case TQt::Key_Up:
+	case TQt::Key_Alt:
+	case TQt::Key_Shift:
+	case TQt::Key_Control:
+	case TQt::Key_Escape:
 	    e->ignore();
 	    setFocus(); // FIXME: this is because some other widget get the focus when CTRL is pressed
 	    return; // no update
 
-	case Qt::Key_C:
-	    if ( e->state() & Qt::ControlButton && currentIndex < (int)itemList.count() ) {
+	case TQt::Key_C:
+	    if ( e->state() & TQt::ControlButton && currentIndex < (int)itemList.count() ) {
 		copy( currentIndex );
 		break;
 	    }
 
-	case Qt::Key_X:
-	    if ( e->state() & Qt::ControlButton && currentIndex < (int)itemList.count() ) {
+	case TQt::Key_X:
+	    if ( e->state() & TQt::ControlButton && currentIndex < (int)itemList.count() ) {
 		hideItem();
 		cut( currentIndex );
 		showItem();
 		break;
 	    }
 
-	case Qt::Key_V:
-	    if ( e->state() & Qt::ControlButton ) {
+	case TQt::Key_V:
+	    if ( e->state() & TQt::ControlButton ) {
 		hideItem();
 		paste( currentIndex < (int)itemList.count() ? currentIndex + 1: itemList.count() );
 		showItem();
@@ -799,13 +799,13 @@ void MenuBarEditor::keyPressEvent( TQKeyEvent * e )
     } else { // In edit mode
 
 	switch ( e->key() ) {
-	case Qt::Key_Control:
+	case TQt::Key_Control:
 	    e->ignore();
 	    return;
-	case Qt::Key_Enter:
-	case Qt::Key_Return:
+	case TQt::Key_Enter:
+	case TQt::Key_Return:
 	    leaveEditMode();
-	case Qt::Key_Escape:
+	case TQt::Key_Escape:
 	    lineEdit->hide();
 	    setFocus();
 	    break;
@@ -817,8 +817,8 @@ void MenuBarEditor::keyPressEvent( TQKeyEvent * e )
 
 void MenuBarEditor::focusOutEvent( TQFocusEvent * e )
 {
-    TQWidget * fw = qApp->focusWidget();
-    if ( e->lostFocus() && !::qt_cast<PopupMenuEditor*>(fw) )
+    TQWidget * fw = tqApp->tqfocusWidget();
+    if ( e->lostFocus() && !::tqqt_cast<PopupMenuEditor*>(fw) )
 	hideItem();
     update();
 }
@@ -834,7 +834,7 @@ void MenuBarEditor::drawItems( TQPainter & p )
     TQPoint pos( borderSize(), 0 );
     uint c = 0;
 
-    p.setPen( colorGroup().buttonText() );
+    p.setPen( tqcolorGroup().buttonText() );
 
     MenuBarEditorItem * i = itemList.first();
     while ( i ) {
@@ -866,7 +866,7 @@ void MenuBarEditor::drawItem( TQPainter & p,
 	drawSeparator( p, pos );
     } else {
 	int flags = TQPainter::AlignLeft | TQPainter::AlignVCenter |
-	    Qt::ShowPrefix | Qt::SingleLine;
+	    TQt::ShowPrefix | TQt::SingleLine;
 	p.drawText( pos.x() + borderSize(), pos.y(), w - borderSize(), itemHeight,
 		    flags, i->menuText() );
     }
@@ -892,7 +892,7 @@ void MenuBarEditor::drawSeparator( TQPainter & p, TQPoint & pos )
 
     p.fillRect( left, pos.y() + borderSize() * 2,
 		separatorWidth - 1, itemHeight - borderSize() * 4,
-		TQBrush( darkBlue, Qt::Dense5Pattern ) );
+		TQBrush( darkBlue, TQt::Dense5Pattern ) );
 
     p.restore();
 }
@@ -1004,7 +1004,7 @@ void MenuBarEditor::dropInPlace( MenuBarEditorItem * i, const TQPoint & pos )
 
     hideItem();
     Command * cmd = 0;
-    int iidx = itemList.findRef( i );
+    int iidx = itemList.tqfindRef( i );
     if ( iidx != -1 ) { // internal dnd
 	cmd = new MoveMenuCommand( i18n( "Item Dragged" ), formWnd, this, iidx, idx );
 	item( iidx )->setVisible( TRUE );
diff --git a/kdevdesigner/designer/menubareditor.h b/kdevdesigner/designer/menubareditor.h
index 6dbf86f2..6932fe44 100644
--- a/kdevdesigner/designer/menubareditor.h
+++ b/kdevdesigner/designer/menubareditor.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2003 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -34,21 +34,22 @@ class PopupMenuEditor;
 class MenuBarEditor;
 class TQActionGroup;
 
-class MenuBarEditorItem : public QObject
+class MenuBarEditorItem : public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
 
     friend class MenuBarEditor;
 
-    MenuBarEditorItem( MenuBarEditor * bar = 0, TQObject * parent = 0, const char * name = 0 );
+    MenuBarEditorItem( MenuBarEditor * bar = 0, TQObject * tqparent = 0, const char * name = 0 );
     
 public:
     MenuBarEditorItem( PopupMenuEditor * menu, MenuBarEditor * bar,
-		       TQObject * parent = 0, const char * name = 0);
+		       TQObject * tqparent = 0, const char * name = 0);
     MenuBarEditorItem( TQActionGroup * actionGroup, MenuBarEditor * bar,
-		       TQObject * parent = 0, const char * name = 0);
+		       TQObject * tqparent = 0, const char * name = 0);
     MenuBarEditorItem( MenuBarEditorItem * item,
-		       TQObject * parent = 0, const char * name = 0);
+		       TQObject * tqparent = 0, const char * name = 0);
     ~MenuBarEditorItem() { };
 
     PopupMenuEditor * menu() { return popupMenu; }
@@ -78,12 +79,13 @@ private:
 class TQLineEdit;
 class FormWindow;
 
-class MenuBarEditor : public QMenuBar
+class MenuBarEditor : public TQMenuBar
 {
     Q_OBJECT
+  TQ_OBJECT
     
 public:
-    MenuBarEditor( FormWindow * fw, TQWidget * parent = 0, const char * name = 0 );
+    MenuBarEditor( FormWindow * fw, TQWidget * tqparent = 0, const char * name = 0 );
     ~MenuBarEditor();
 
     FormWindow * formWindow();
@@ -118,9 +120,9 @@ public:
     void focusItem( int index = -1 );
     void deleteItem( int index = -1 );
 
-    TQSize sizeHint() const;
-    TQSize minimumSize() const { return sizeHint(); }
-    TQSize minimumSizeHint() const { return sizeHint(); }
+    TQSize tqsizeHint() const;
+    TQSize tqminimumSize() const { return tqsizeHint(); }
+    TQSize tqminimumSizeHint() const { return tqsizeHint(); }
     int heightForWidth( int max_width ) const;
 
     void show();
diff --git a/kdevdesigner/designer/metadatabase.cpp b/kdevdesigner/designer/metadatabase.cpp
index 5fc1960f..1a609f8f 100644
--- a/kdevdesigner/designer/metadatabase.cpp
+++ b/kdevdesigner/designer/metadatabase.cpp
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -50,7 +50,7 @@
 #include <tqwidgetlist.h>
 #include <tqmainwindow.h>
 #include <tqregexp.h>
-#include <private/qpluginmanager_p.h>
+#include <private/tqpluginmanager_p.h>
 #include <tqdatetime.h>
 #include <tqfile.h>
 #include <tqfileinfo.h>
@@ -88,7 +88,7 @@ static TQPtrList<MetaDataBase::CustomWidget> *cWidgets = 0;
 static bool doUpdate = TRUE;
 static TQStringList langList;
 static TQStringList editorLangList;
-static QPluginManager<LanguageInterface> *languageInterfaceManager = 0;
+static TQPluginManager<LanguageInterface> *languageInterfaceManager = 0;
 
 /*!
   \class MetaDataBase metadatabase.h
@@ -126,7 +126,7 @@ void MetaDataBase::addEntry( TQObject *o )
     if ( !o )
 	return;
     setupDataBase();
-    if ( db->find( o ) )
+    if ( db->tqfind( o ) )
 	return;
     MetaDataBaseRecord *r = new MetaDataBaseRecord;
     r->object = o;
@@ -149,7 +149,7 @@ void MetaDataBase::setPropertyChanged( TQObject *o, const TQString &property, bo
 	( (PropertyObject*)o )->mdPropertyChanged( property, changed );
 	return;
     }
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
@@ -157,24 +157,24 @@ void MetaDataBase::setPropertyChanged( TQObject *o, const TQString &property, bo
     }
 
     if ( changed ) {
-	if ( r->changedProperties.findIndex( property ) == -1 )
+	if ( r->changedProperties.tqfindIndex( property ) == -1 )
 	    r->changedProperties.append( property );
     } else {
-	if ( r->changedProperties.findIndex( property ) != -1 )
+	if ( r->changedProperties.tqfindIndex( property ) != -1 )
 	    r->changedProperties.remove( property );
     }
 
     if ( doUpdate &&
 	 ( property == "hAlign" || property == "vAlign" || property == "wordwrap" ) ) {
 	doUpdate = FALSE;
-	setPropertyChanged( o, "alignment", changed ||
+	setPropertyChanged( o, "tqalignment", changed ||
 			    isPropertyChanged( o, "hAlign" ) ||
 			    isPropertyChanged( o, "vAlign" ) ||
 			    isPropertyChanged( o, "wordwrap" ) );
 	doUpdate = TRUE;
     }
 
-    if ( doUpdate && property == "alignment" ) {
+    if ( doUpdate && property == "tqalignment" ) {
 	doUpdate = FALSE;
 	setPropertyChanged( o, "hAlign", changed );
 	setPropertyChanged( o, "vAlign", changed );
@@ -188,20 +188,20 @@ bool MetaDataBase::isPropertyChanged( TQObject *o, const TQString &property )
     setupDataBase();
     if ( o->isA( "PropertyObject" ) )
 	return ( (PropertyObject*)o )->mdIsPropertyChanged( property );
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
 	return FALSE;
     }
 
-    return r->changedProperties.findIndex( property ) != -1;
+    return r->changedProperties.tqfindIndex( property ) != -1;
 }
 
 TQStringList MetaDataBase::changedProperties( TQObject *o )
 {
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
@@ -219,7 +219,7 @@ void MetaDataBase::setPropertyComment( TQObject *o, const TQString &property, co
 	( (PropertyObject*)o )->mdSetPropertyComment( property, comment );
 	return;
     }
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
@@ -234,14 +234,14 @@ TQString MetaDataBase::propertyComment( TQObject *o, const TQString &property )
     setupDataBase();
     if ( o->isA( "PropertyObject" ) )
 	return ( (PropertyObject*)o )->mdPropertyComment( property );
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
-	return TQString::null;
+	return TQString();
     }
 
-    return *r->propertyComments.find( property );
+    return *r->propertyComments.tqfind( property );
 }
 
 void MetaDataBase::setFakeProperty( TQObject *o, const TQString &property, const TQVariant& value )
@@ -251,7 +251,7 @@ void MetaDataBase::setFakeProperty( TQObject *o, const TQString &property, const
 	( (PropertyObject*)o )->mdSetFakeProperty( property, value );
 	return;
     }
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
@@ -265,13 +265,13 @@ TQVariant MetaDataBase::fakeProperty( TQObject * o, const TQString &property)
     setupDataBase();
     if ( o->isA( "PropertyObject" ) )
 	return ( (PropertyObject*)o )->mdFakeProperty( property );
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
 	return TQVariant();
     }
-    TQMap<TQString, TQVariant>::Iterator it = r->fakeProperties.find( property );
+    TQMap<TQString, TQVariant>::Iterator it = r->fakeProperties.tqfind( property );
     if ( it != r->fakeProperties.end() )
 	return r->fakeProperties[property];
     return WidgetFactory::defaultValue( o, property );
@@ -281,7 +281,7 @@ TQVariant MetaDataBase::fakeProperty( TQObject * o, const TQString &property)
 TQMap<TQString,TQVariant>* MetaDataBase::fakeProperties( TQObject* o )
 {
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
@@ -295,7 +295,7 @@ void MetaDataBase::setSpacing( TQObject *o, int spacing )
     if ( !o )
 	return;
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r || !o->isWidgetType() ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
@@ -303,16 +303,16 @@ void MetaDataBase::setSpacing( TQObject *o, int spacing )
     }
 
     r->spacing = spacing;
-    TQLayout * layout = 0;
-    WidgetFactory::layoutType( (TQWidget*)o, layout );
-    if ( layout ) {
+    TQLayout * tqlayout = 0;
+    WidgetFactory::tqlayoutType( (TQWidget*)o, tqlayout );
+    if ( tqlayout ) {
 	int spadef = 6;
 	if ( MainWindow::self->formWindow() )
-	    spadef = MainWindow::self->formWindow()->layoutDefaultSpacing();
+	    spadef = MainWindow::self->formWindow()->tqlayoutDefaultSpacing();
 	if ( spacing == -1 )
-	    layout->setSpacing( spadef );
+	    tqlayout->setSpacing( spadef );
 	else
-	    layout->setSpacing( spacing );
+	    tqlayout->setSpacing( spacing );
     }
 }
 
@@ -321,9 +321,9 @@ int MetaDataBase::spacing( TQObject *o )
     if ( !o )
 	return -1;
     setupDataBase();
-    if ( ::qt_cast<TQMainWindow*>(o) )
-	o = ( (TQMainWindow*)o )->centralWidget();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    if ( ::tqqt_cast<TQMainWindow*>(o) )
+	o = TQT_TQOBJECT(( (TQMainWindow*)o )->centralWidget());
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r || !o->isWidgetType() ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
@@ -338,7 +338,7 @@ void MetaDataBase::setMargin( TQObject *o, int margin )
     if ( !o )
 	return;
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r || !o->isWidgetType() ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
@@ -346,30 +346,30 @@ void MetaDataBase::setMargin( TQObject *o, int margin )
     }
 
     r->margin = margin;
-    TQLayout * layout = 0;
-    WidgetFactory::layoutType( (TQWidget*)o, layout );
+    TQLayout * tqlayout = 0;
+    WidgetFactory::tqlayoutType( (TQWidget*)o, tqlayout );
 
     bool isInnerLayout = TRUE;
 
     TQWidget *widget = (TQWidget*)o;
-    if ( widget && !::qt_cast<QLayoutWidget*>(widget) &&
-	( WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( widget ) ) ) ||
-	widget && widget->parentWidget() && ::qt_cast<FormWindow*>(widget->parentWidget()) ) )
+    if ( widget && !::tqqt_cast<TQLayoutWidget*>(widget) &&
+	( WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(widget) ) ) ) ||
+	widget && widget->tqparentWidget() && ::tqqt_cast<FormWindow*>(widget->tqparentWidget()) ) )
 	isInnerLayout = FALSE;
 
 
-    if ( layout ) {
+    if ( tqlayout ) {
 	int mardef = 11;
 	if ( MainWindow::self->formWindow() )
-	    mardef = MainWindow::self->formWindow()->layoutDefaultMargin();
+	    mardef = MainWindow::self->formWindow()->tqlayoutDefaultMargin();
 	if ( margin == -1 ) {
 	    if ( isInnerLayout )
-		layout->setMargin( 1 );
+		tqlayout->setMargin( 1 );
 	    else
-		layout->setMargin( QMAX( 1, mardef ) );
+		tqlayout->setMargin( TQMAX( 1, mardef ) );
 	}
 	else
-	    layout->setMargin( QMAX( 1, margin ) );
+	    tqlayout->setMargin( TQMAX( 1, margin ) );
     }
 }
 
@@ -378,9 +378,9 @@ int MetaDataBase::margin( TQObject *o )
     if ( !o )
 	return -1;
     setupDataBase();
-    if ( ::qt_cast<TQMainWindow*>(o) )
-	o = ( (TQMainWindow*)o )->centralWidget();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    if ( ::tqqt_cast<TQMainWindow*>(o) )
+	o = TQT_TQOBJECT(( (TQMainWindow*)o )->centralWidget());
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r || !o->isWidgetType() ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
@@ -394,7 +394,7 @@ void MetaDataBase::setResizeMode( TQObject *o, const TQString &mode )
     if ( !o )
 	return;
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r || !o->isWidgetType() ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
@@ -407,15 +407,15 @@ void MetaDataBase::setResizeMode( TQObject *o, const TQString &mode )
 TQString MetaDataBase::resizeMode( TQObject *o )
 {
     if ( !o )
-	return TQString::null;
+	return TQString();
     setupDataBase();
-    if ( ::qt_cast<TQMainWindow*>(o) )
-	o = ( (TQMainWindow*)o )->centralWidget();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    if ( ::tqqt_cast<TQMainWindow*>(o) )
+	o = TQT_TQOBJECT(( (TQMainWindow*)o )->centralWidget());
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r || !o->isWidgetType() ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
-	return TQString::null;
+	return TQString();
     }
     return r->resizeMode;
 }
@@ -424,7 +424,7 @@ void MetaDataBase::addConnection( TQObject *o, TQObject *sender, const TQCString
 				  TQObject *receiver, const TQCString &slot, bool addCode )
 {
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
@@ -440,15 +440,15 @@ void MetaDataBase::addConnection( TQObject *o, TQObject *sender, const TQCString
     r->connections.append( conn );
     if ( addCode ) {
 	TQString rec = receiver->name();
-	if ( ::qt_cast<FormWindow*>(o) && receiver == ( (FormWindow*)o )->mainContainer() )
+	if ( ::tqqt_cast<FormWindow*>(o) && TQT_BASE_OBJECT(receiver) ==( (FormWindow*)o )->mainContainer() )
 	    rec = "this";
 	TQString sen = sender->name();
-	if ( ::qt_cast<FormWindow*>(o) && sender == ( (FormWindow*)o )->mainContainer() )
+	if ( ::tqqt_cast<FormWindow*>(o) && TQT_BASE_OBJECT(sender) ==( (FormWindow*)o )->mainContainer() )
 	    sen = "this";
 	FormFile *ff = 0;
-	if ( ::qt_cast<FormFile*>(o) )
+	if ( ::tqqt_cast<FormFile*>(o) )
 	    ff = (FormFile*)o;
-	else if ( ::qt_cast<FormWindow*>(o) )
+	else if ( ::tqqt_cast<FormWindow*>(o) )
 	    ff = ( (FormWindow*)o )->formFile();
 	ff->addConnection( sen, signal, rec, slot );
     }
@@ -458,7 +458,7 @@ void MetaDataBase::removeConnection( TQObject *o, TQObject *sender, const TQCStr
 				     TQObject *receiver, const TQCString &slot )
 {
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
@@ -468,17 +468,17 @@ void MetaDataBase::removeConnection( TQObject *o, TQObject *sender, const TQCStr
 	return;
     for ( TQValueList<Connection>::Iterator it = r->connections.begin(); it != r->connections.end(); ++it ) {
 	Connection conn = *it;
-	if ( conn.sender == sender &&
+	if ( TQT_BASE_OBJECT(conn.sender) ==sender &&
 	     conn.signal == signal &&
-	     conn.receiver == receiver &&
+	     TQT_BASE_OBJECT(conn.receiver) ==receiver &&
 	     conn.slot == slot ) {
 	    r->connections.remove( it );
 	    break;
 	}
     }
-    if ( ::qt_cast<FormWindow*>(o) ) {
+    if ( ::tqqt_cast<FormWindow*>(o) ) {
 	TQString rec = receiver->name();
-	if ( receiver == ( (FormWindow*)o )->mainContainer() )
+	if ( TQT_BASE_OBJECT(receiver) ==( (FormWindow*)o )->mainContainer() )
 	    rec = "this";
 	( (FormWindow*)o )->formFile()->removeConnection( sender->name(), signal, rec, slot );
     }
@@ -487,14 +487,14 @@ void MetaDataBase::removeConnection( TQObject *o, TQObject *sender, const TQCStr
 void MetaDataBase::setupConnections( TQObject *o, const TQValueList<LanguageInterface::Connection> &conns )
 {
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
 	return;
     }
 
-    if ( !::qt_cast<FormFile*>(o) )
+    if ( !::tqqt_cast<FormFile*>(o) )
 	return;
 
     FormFile *formfile = (FormFile*)o;
@@ -505,8 +505,8 @@ void MetaDataBase::setupConnections( TQObject *o, const TQValueList<LanguageInte
 	  cit != conns.end(); ++cit ) {
 	// #### get the correct sender object out of Bla.Blub.sender
 	TQString senderName = (*cit).sender;
-	if ( senderName.find( '.' ) != -1 )
-	    senderName = senderName.mid( senderName.findRev( '.' ) + 1 );
+	if ( senderName.tqfind( '.' ) != -1 )
+	    senderName = senderName.mid( senderName.tqfindRev( '.' ) + 1 );
 	TQObject *sender = 0;
 	if ( formfile->formWindow() )
 	    sender = formfile->formWindow()->child( senderName );
@@ -514,8 +514,8 @@ void MetaDataBase::setupConnections( TQObject *o, const TQValueList<LanguageInte
 	    sender = formfile->project()->objectForFakeFormFile( formfile );
 	if ( !sender && senderName == "this" )
 	    sender = formfile->formWindow() ?
-		     formfile->formWindow()->mainContainer() :
-		     formfile->project()->objectForFakeFormFile( formfile );
+		     TQT_TQOBJECT(formfile->formWindow()->mainContainer()) :
+		     TQT_TQOBJECT(formfile->project()->objectForFakeFormFile( formfile ));
 	if ( !sender )
 	    continue;
 	MetaDataBase::addConnection( formfile->formWindow() ?
@@ -524,8 +524,8 @@ void MetaDataBase::setupConnections( TQObject *o, const TQValueList<LanguageInte
 				     sender,
 				     (*cit).signal.latin1(),
 				     formfile->formWindow() ?
-				     formfile->formWindow()->mainContainer() :
-				     formfile->project()->objectForFakeFormFile( formfile ),
+				     TQT_TQOBJECT(formfile->formWindow()->mainContainer()) :
+				     TQT_TQOBJECT(formfile->project()->objectForFakeFormFile( formfile )),
 				     (*cit).slot.latin1(),
 				     FALSE );
     }
@@ -535,7 +535,7 @@ bool MetaDataBase::hasConnection( TQObject *o, TQObject *sender, const TQCString
 				  TQObject *receiver, const TQCString &slot )
 {
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
@@ -544,9 +544,9 @@ bool MetaDataBase::hasConnection( TQObject *o, TQObject *sender, const TQCString
 
     for ( TQValueList<Connection>::Iterator it = r->connections.begin(); it != r->connections.end(); ++it ) {
 	Connection conn = *it;
-	if ( conn.sender == sender &&
+	if ( TQT_BASE_OBJECT(conn.sender) ==sender &&
 	     conn.signal == signal &&
-	     conn.receiver == receiver &&
+	     TQT_BASE_OBJECT(conn.receiver) ==receiver &&
 	     conn.slot == slot )
 	    return TRUE;
     }
@@ -557,7 +557,7 @@ bool MetaDataBase::hasConnection( TQObject *o, TQObject *sender, const TQCString
 TQValueList<MetaDataBase::Connection> MetaDataBase::connections( TQObject *o )
 {
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
@@ -570,7 +570,7 @@ TQValueList<MetaDataBase::Connection> MetaDataBase::connections( TQObject *o, TQ
 								TQObject *receiver )
 {
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
@@ -581,8 +581,8 @@ TQValueList<MetaDataBase::Connection> MetaDataBase::connections( TQObject *o, TQ
     TQValueList<Connection>::Iterator conn;
     while ( ( conn = it ) != r->connections.end() ) {
 	++it;
-	if ( (*conn).sender == sender &&
-	     (*conn).receiver == receiver )
+	if ( TQT_BASE_OBJECT((*conn).sender) ==sender &&
+	     TQT_BASE_OBJECT((*conn).receiver) ==receiver )
 	    ret << *conn;
     }
 
@@ -592,7 +592,7 @@ TQValueList<MetaDataBase::Connection> MetaDataBase::connections( TQObject *o, TQ
 TQValueList<MetaDataBase::Connection> MetaDataBase::connections( TQObject *o, TQObject *object )
 {
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
@@ -603,8 +603,8 @@ TQValueList<MetaDataBase::Connection> MetaDataBase::connections( TQObject *o, TQ
     TQValueList<Connection>::Iterator conn;
     while ( ( conn = it ) != r->connections.end() ) {
 	++it;
-	if ( (*conn).sender == object ||
-	     (*conn).receiver == object )
+	if ( TQT_BASE_OBJECT((*conn).sender) ==object ||
+	     TQT_BASE_OBJECT((*conn).receiver) ==object )
 	    ret << *conn;
     }
     return ret;
@@ -613,7 +613,7 @@ TQValueList<MetaDataBase::Connection> MetaDataBase::connections( TQObject *o, TQ
 void MetaDataBase::doConnections( TQObject *o )
 {
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
@@ -648,16 +648,16 @@ void MetaDataBase::doConnections( TQObject *o )
 	    delete l;
 	}
 	TQString s = "2""%1";
-	s = s.arg( conn.signal );
+	s = s.tqarg( conn.signal.data() );
 	TQString s2 = "1""%1";
-	s2 = s2.arg( conn.slot );
+	s2 = s2.tqarg( conn.slot.data() );
 
-	TQStrList signalList = sender->metaObject()->signalNames( TRUE );
-	TQStrList slotList = receiver->metaObject()->slotNames( TRUE );
+	TQStrList signalList = sender->tqmetaObject()->signalNames( TRUE );
+	TQStrList slotList = receiver->tqmetaObject()->slotNames( TRUE );
 
 	// avoid warnings
-	if ( signalList.find( conn.signal ) == -1 ||
-	     slotList.find( conn.slot ) == -1 )
+	if ( signalList.tqfind( conn.signal ) == -1 ||
+	     slotList.tqfind( conn.slot ) == -1 )
 	    continue;
 
 	TQObject::connect( sender, s, receiver, s2 );
@@ -667,7 +667,7 @@ void MetaDataBase::doConnections( TQObject *o )
 bool MetaDataBase::hasSlot( TQObject *o, const TQCString &slot, bool onlyCustom )
 {
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
@@ -675,18 +675,18 @@ bool MetaDataBase::hasSlot( TQObject *o, const TQCString &slot, bool onlyCustom
     }
 
     if ( !onlyCustom ) {
-	TQStrList slotList = o->metaObject()->slotNames( TRUE );
-	if ( slotList.find( slot ) != -1 )
+	TQStrList slotList = o->tqmetaObject()->slotNames( TRUE );
+	if ( slotList.tqfind( slot ) != -1 )
 	    return TRUE;
 
-	if ( ::qt_cast<FormWindow*>(o) ) {
-	    o = ( (FormWindow*)o )->mainContainer();
-	    slotList = o->metaObject()->slotNames( TRUE );
-	    if ( slotList.find( slot ) != -1 )
+	if ( ::tqqt_cast<FormWindow*>(o) ) {
+	    o = TQT_TQOBJECT(( (FormWindow*)o )->mainContainer());
+	    slotList = o->tqmetaObject()->slotNames( TRUE );
+	    if ( slotList.tqfind( slot ) != -1 )
 		return TRUE;
 	}
 
-	//if ( ::qt_cast<CustomWidget*>(o) ) {
+	//if ( ::tqqt_cast<CustomWidget*>(o) ) {
 	if ( o->inherits( "CustomWidget" ) ) {
 	    MetaDataBase::CustomWidget *w = ( (::CustomWidget*)o )->customWidget();
 	    for ( TQValueList<Function>::Iterator it = w->lstSlots.begin(); it != w->lstSlots.end(); ++it ) {
@@ -711,7 +711,7 @@ bool MetaDataBase::hasSlot( TQObject *o, const TQCString &slot, bool onlyCustom
 bool MetaDataBase::isSlotUsed( TQObject *o, const TQCString &slot )
 {
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 	          o, o->name(), o->className() );
@@ -732,7 +732,7 @@ void MetaDataBase::addFunction( TQObject *o, const TQCString &function, const TQ
 				const TQString &returnType )
 {
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
@@ -746,7 +746,7 @@ void MetaDataBase::addFunction( TQObject *o, const TQCString &function, const TQ
     f.type = type;
     f.language = language;
     f.returnType = returnType;
-    TQValueList<MetaDataBase::Function>::Iterator it = r->functionList.find( f );
+    TQValueList<MetaDataBase::Function>::Iterator it = r->functionList.tqfind( f );
     if ( it != r->functionList.end() )
 	r->functionList.remove( it );
     r->functionList.append( f );
@@ -756,7 +756,7 @@ void MetaDataBase::addFunction( TQObject *o, const TQCString &function, const TQ
 void MetaDataBase::setFunctionList( TQObject *o, const TQValueList<Function> &functionList )
 {
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
@@ -770,7 +770,7 @@ void MetaDataBase::removeFunction( TQObject *o, const TQCString &function, const
 				   const TQString &returnType )
 {
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
@@ -794,7 +794,7 @@ void MetaDataBase::removeFunction( TQObject *o, const TQCString &function, const
 void MetaDataBase::removeFunction( TQObject *o, const TQString &function )
 {
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
@@ -812,7 +812,7 @@ void MetaDataBase::removeFunction( TQObject *o, const TQString &function )
 TQValueList<MetaDataBase::Function> MetaDataBase::functionList( TQObject *o, bool onlyFunctions )
 {
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
@@ -831,7 +831,7 @@ TQValueList<MetaDataBase::Function> MetaDataBase::functionList( TQObject *o, boo
 TQValueList<MetaDataBase::Function> MetaDataBase::slotList( TQObject *o )
 {
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
@@ -849,7 +849,7 @@ void MetaDataBase::changeFunction( TQObject *o, const TQString &function, const
 				   const TQString &returnType )
 {
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
@@ -873,7 +873,7 @@ void MetaDataBase::changeFunctionAttributes( TQObject *o, const TQString &oldNam
 					     const TQString &returnType )
 {
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
@@ -897,7 +897,7 @@ void MetaDataBase::changeFunctionAttributes( TQObject *o, const TQString &oldNam
 bool MetaDataBase::hasFunction( TQObject *o, const TQCString &function, bool onlyCustom )
 {
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
@@ -905,18 +905,18 @@ bool MetaDataBase::hasFunction( TQObject *o, const TQCString &function, bool onl
     }
 
     if ( !onlyCustom ) {
-	TQStrList functionList = o->metaObject()->slotNames( TRUE );
-	if ( functionList.find( function ) != -1 )
+	TQStrList functionList = o->tqmetaObject()->slotNames( TRUE );
+	if ( functionList.tqfind( function ) != -1 )
 	    return TRUE;
 
-	if ( ::qt_cast<FormWindow*>(o) ) {
-	    o = ( (FormWindow*)o )->mainContainer();
-	    functionList = o->metaObject()->slotNames( TRUE );
-	    if ( functionList.find( function ) != -1 )
+	if ( ::tqqt_cast<FormWindow*>(o) ) {
+	    o = TQT_TQOBJECT(( (FormWindow*)o )->mainContainer());
+	    functionList = o->tqmetaObject()->slotNames( TRUE );
+	    if ( functionList.tqfind( function ) != -1 )
 		return TRUE;
 	}
 
-	//if ( ::qt_cast<CustomWidget*>(o) ) {
+	//if ( ::tqqt_cast<CustomWidget*>(o) ) {
 	if ( o->inherits( "CustomWidget" ) ) {
 	    MetaDataBase::CustomWidget *w = ( (::CustomWidget*)o )->customWidget();
 	    for ( TQValueList<Function>::Iterator it = w->lstSlots.begin(); it != w->lstSlots.end(); ++it ) {
@@ -941,11 +941,11 @@ bool MetaDataBase::hasFunction( TQObject *o, const TQCString &function, bool onl
 TQString MetaDataBase::languageOfFunction( TQObject *o, const TQCString &function )
 {
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
-	return TQString::null;
+	return TQString();
     }
 
     TQString fu = normalizeFunction( function );
@@ -953,7 +953,7 @@ TQString MetaDataBase::languageOfFunction( TQObject *o, const TQCString &functio
 	if ( fu == normalizeFunction( (*it).function ) )
 	    return (*it).language;
     }
-    return TQString::null;
+    return TQString();
 }
 
 bool MetaDataBase::addCustomWidget( CustomWidget *wid )
@@ -1034,7 +1034,7 @@ bool MetaDataBase::hasCustomWidget( const TQString &className )
 void MetaDataBase::setTabOrder( TQWidget *w, const TQWidgetList &order )
 {
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*) w );
+    MetaDataBaseRecord *r = db->tqfind( (void*) w );
     if ( !r ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  w, w->name(), w->className() );
@@ -1047,7 +1047,7 @@ void MetaDataBase::setTabOrder( TQWidget *w, const TQWidgetList &order )
 TQWidgetList MetaDataBase::tabOrder( TQWidget *w )
 {
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*) w );
+    MetaDataBaseRecord *r = db->tqfind( (void*) w );
     if ( !r ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  w, w->name(), w->className() );
@@ -1060,7 +1060,7 @@ TQWidgetList MetaDataBase::tabOrder( TQWidget *w )
 void MetaDataBase::setIncludes( TQObject *o, const TQValueList<Include> &incs )
 {
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
@@ -1073,7 +1073,7 @@ void MetaDataBase::setIncludes( TQObject *o, const TQValueList<Include> &incs )
 TQValueList<MetaDataBase::Include> MetaDataBase::includes( TQObject *o )
 {
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
@@ -1086,7 +1086,7 @@ TQValueList<MetaDataBase::Include> MetaDataBase::includes( TQObject *o )
 void MetaDataBase::setForwards( TQObject *o, const TQStringList &fwds )
 {
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
@@ -1099,7 +1099,7 @@ void MetaDataBase::setForwards( TQObject *o, const TQStringList &fwds )
 TQStringList MetaDataBase::forwards( TQObject *o )
 {
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
@@ -1112,7 +1112,7 @@ TQStringList MetaDataBase::forwards( TQObject *o )
 void MetaDataBase::setVariables( TQObject *o, const TQValueList<Variable> &vars )
 {
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
@@ -1125,7 +1125,7 @@ void MetaDataBase::setVariables( TQObject *o, const TQValueList<Variable> &vars
 void MetaDataBase::addVariable( TQObject *o, const TQString &name, const TQString &access )
 {
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
@@ -1140,7 +1140,7 @@ void MetaDataBase::addVariable( TQObject *o, const TQString &name, const TQStrin
 void MetaDataBase::removeVariable( TQObject *o, const TQString &name )
 {
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
@@ -1158,7 +1158,7 @@ void MetaDataBase::removeVariable( TQObject *o, const TQString &name )
 TQValueList<MetaDataBase::Variable> MetaDataBase::variables( TQObject *o )
 {
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
@@ -1171,7 +1171,7 @@ TQValueList<MetaDataBase::Variable> MetaDataBase::variables( TQObject *o )
 bool MetaDataBase::hasVariable( TQObject *o, const TQString &name )
 {
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
@@ -1188,7 +1188,7 @@ bool MetaDataBase::hasVariable( TQObject *o, const TQString &name )
 
 TQString MetaDataBase::extractVariableName( const TQString &name )
 {
-    TQString n = name.right( name.length() - name.findRev( ' ' ) - 1 );
+    TQString n = name.right( name.length() - name.tqfindRev( ' ' ) - 1 );
     if ( n[ 0 ] == '*' || n[ 0 ] == '&' )
 	n[ 0 ] = ' ';
     if ( n[ (int)n.length() - 1 ] == ';' )
@@ -1199,7 +1199,7 @@ TQString MetaDataBase::extractVariableName( const TQString &name )
 void MetaDataBase::setSignalList( TQObject *o, const TQStringList &sigs )
 {
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
@@ -1213,10 +1213,10 @@ void MetaDataBase::setSignalList( TQObject *o, const TQStringList &sigs )
 	bool hasSemicolon = s.endsWith( ";" );
 	if ( hasSemicolon )
 	    s = s.left( s.length() - 1 );
-	int p = s.find( '(' );
+	int p = s.tqfind( '(' );
 	if ( p < 0 )
 	    p = s.length();
-	int sp = s.find( ' ' );
+	int sp = s.tqfind( ' ' );
 	if ( sp >= 0 && sp < p ) {
 	    s = s.mid( sp+1 );
 	    p -= sp + 1;
@@ -1232,7 +1232,7 @@ void MetaDataBase::setSignalList( TQObject *o, const TQStringList &sigs )
 TQStringList MetaDataBase::signalList( TQObject *o )
 {
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
@@ -1245,7 +1245,7 @@ TQStringList MetaDataBase::signalList( TQObject *o )
 void MetaDataBase::setMetaInfo( TQObject *o, MetaInfo mi )
 {
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
@@ -1258,7 +1258,7 @@ void MetaDataBase::setMetaInfo( TQObject *o, MetaInfo mi )
 MetaDataBase::MetaInfo MetaDataBase::metaInfo( TQObject *o )
 {
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
@@ -1276,7 +1276,7 @@ MetaDataBase::CustomWidget::CustomWidget()
     className = "MyCustomWidget";
     includeFile = "mywidget.h";
     includePolicy = Local;
-    sizeHint = TQSize( -1, -1 );
+    tqsizeHint = TQSize( -1, -1 );
     pixmap = new TQPixmap( BarIcon( "designer_customwidget.png", KDevDesignerPartFactory::instance() ) );
     id = -1;
     sizePolicy = TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred );
@@ -1288,7 +1288,7 @@ MetaDataBase::CustomWidget::CustomWidget( const CustomWidget &w )
     className = w.className;
     includeFile = w.includeFile;
     includePolicy = w.includePolicy;
-    sizeHint = w.sizeHint;
+    tqsizeHint = w.tqsizeHint;
     if ( w.pixmap )
 	pixmap = new TQPixmap( *w.pixmap );
     else
@@ -1304,7 +1304,7 @@ void MetaDataBase::setCursor( TQWidget *w, const TQCursor &c )
 	( (PropertyObject*)w )->mdSetCursor( c );
 	return;
     }
-    MetaDataBaseRecord *r = db->find( (void*)w );
+    MetaDataBaseRecord *r = db->tqfind( (void*)w );
     if ( !r ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  w, w->name(), w->className() );
@@ -1319,7 +1319,7 @@ TQCursor MetaDataBase::cursor( TQWidget *w )
     setupDataBase();
     if ( w->isA( "PropertyObject" ) )
 	return ( (PropertyObject*)w )->mdCursor();
-    MetaDataBaseRecord *r = db->find( (void*)w );
+    MetaDataBaseRecord *r = db->tqfind( (void*)w );
     if ( !r ) {
 	w->unsetCursor();
 	return w->cursor();
@@ -1339,7 +1339,7 @@ MetaDataBase::CustomWidget &MetaDataBase::CustomWidget::operator=( const CustomW
     className = w.className;
     includeFile = w.includeFile;
     includePolicy = w.includePolicy;
-    sizeHint = w.sizeHint;
+    tqsizeHint = w.tqsizeHint;
     if ( w.pixmap )
 	pixmap = new TQPixmap( *w.pixmap );
     else
@@ -1354,8 +1354,8 @@ MetaDataBase::CustomWidget &MetaDataBase::CustomWidget::operator=( const CustomW
 
 bool MetaDataBase::CustomWidget::hasSignal( const TQCString &signal ) const
 {
-    TQStrList sigList = TQWidget::staticMetaObject()->signalNames( TRUE );
-    if ( sigList.find( signal ) != -1 )
+    TQStrList sigList = TQWidget::tqstaticMetaObject()->signalNames( TRUE );
+    if ( sigList.tqfind( signal ) != -1 )
 	return TRUE;
     for ( TQValueList<TQCString>::ConstIterator it = lstSignals.begin(); it != lstSignals.end(); ++it ) {
 	if ( normalizeFunction( *it ) == normalizeFunction( signal ) )
@@ -1366,8 +1366,8 @@ bool MetaDataBase::CustomWidget::hasSignal( const TQCString &signal ) const
 
 bool MetaDataBase::CustomWidget::hasSlot( const TQCString &slot ) const
 {
-    TQStrList slotList = TQWidget::staticMetaObject()->slotNames( TRUE );
-    if ( slotList.find( normalizeFunction( slot ) ) != -1 )
+    TQStrList slotList = TQWidget::tqstaticMetaObject()->slotNames( TRUE );
+    if ( slotList.tqfind( normalizeFunction( slot ) ) != -1 )
 	return TRUE;
 
     for ( TQValueList<MetaDataBase::Function>::ConstIterator it = lstSlots.begin(); it != lstSlots.end(); ++it ) {
@@ -1379,8 +1379,8 @@ bool MetaDataBase::CustomWidget::hasSlot( const TQCString &slot ) const
 
 bool MetaDataBase::CustomWidget::hasProperty( const TQCString &prop ) const
 {
-    TQStrList propList = TQWidget::staticMetaObject()->propertyNames( TRUE );
-    if ( propList.find( prop ) != -1 )
+    TQStrList propList = TQWidget::tqstaticMetaObject()->propertyNames( TRUE );
+    if ( propList.tqfind( prop ) != -1 )
 	return TRUE;
 
     for ( TQValueList<MetaDataBase::Property>::ConstIterator it = lstProperties.begin(); it != lstProperties.end(); ++it ) {
@@ -1395,7 +1395,7 @@ void MetaDataBase::setPixmapArgument( TQObject *o, int pixmap, const TQString &a
     if ( !o )
 	return;
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
@@ -1409,16 +1409,16 @@ void MetaDataBase::setPixmapArgument( TQObject *o, int pixmap, const TQString &a
 TQString MetaDataBase::pixmapArgument( TQObject *o, int pixmap )
 {
     if ( !o )
-	return TQString::null;
+	return TQString();
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
-	return TQString::null;
+	return TQString();
     }
 
-    return *r->pixmapArguments.find( pixmap );
+    return *r->pixmapArguments.tqfind( pixmap );
 }
 
 void MetaDataBase::clearPixmapArguments( TQObject *o )
@@ -1426,7 +1426,7 @@ void MetaDataBase::clearPixmapArguments( TQObject *o )
     if ( !o )
 	return;
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
@@ -1446,7 +1446,7 @@ void MetaDataBase::setPixmapKey( TQObject *o, int pixmap, const TQString &arg )
 	( (PropertyObject*)o )->mdSetPixmapKey( pixmap, arg );
 	return;
     }
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
@@ -1460,25 +1460,25 @@ void MetaDataBase::setPixmapKey( TQObject *o, int pixmap, const TQString &arg )
 TQString MetaDataBase::pixmapKey( TQObject *o, int pixmap )
 {
     if ( !o )
-	return TQString::null;
+	return TQString();
     setupDataBase();
     if ( o->isA( "PropertyObject" ) )
 	return ( (PropertyObject*)o )->mdPixmapKey( pixmap );
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
-	return TQString::null;
+	return TQString();
     }
 
-    TQString s = *r->pixmapKeys.find( pixmap );
+    TQString s = *r->pixmapKeys.tqfind( pixmap );
     if ( !s.isNull() )
 	return s;
     if ( !o->isWidgetType() )
 	return s;
     TQWidget *w = (TQWidget*)o;
     if ( w->icon() )
-	return *r->pixmapKeys.find( w->icon()->serialNumber() );
+	return *r->pixmapKeys.tqfind( w->icon()->serialNumber() );
     return s;
 }
 
@@ -1487,7 +1487,7 @@ void MetaDataBase::clearPixmapKeys( TQObject *o )
     if ( !o )
 	return;
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
@@ -1504,7 +1504,7 @@ void MetaDataBase::setColumnFields( TQObject *o, const TQMap<TQString, TQString>
     if ( !o )
 	return;
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
@@ -1519,7 +1519,7 @@ TQMap<TQString, TQString> MetaDataBase::columnFields( TQObject *o )
     if ( !o )
 	return TQMap<TQString, TQString>();
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
@@ -1536,14 +1536,14 @@ void MetaDataBase::setEditor( const TQStringList &langs )
 
 bool MetaDataBase::hasEditor( const TQString &lang )
 {
-    return editorLangList.find( lang ) != editorLangList.end();
+    return editorLangList.tqfind( lang ) != editorLangList.end();
 }
 
 void MetaDataBase::setupInterfaceManagers( const TQString &plugDir )
 {
     if ( !languageInterfaceManager ) {
 	languageInterfaceManager =
-	    new QPluginManager<LanguageInterface>( IID_Language,
+	    new TQPluginManager<LanguageInterface>( IID_Language,
 						   TQApplication::libraryPaths(),
 //						   kapp->dirs()->resourceDirs("qtplugins"),
 						   plugDir );
@@ -1586,7 +1586,7 @@ void MetaDataBase::setBreakPoints( TQObject *o, const TQValueList<uint> &l )
     if ( !o )
 	return;
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
@@ -1599,8 +1599,8 @@ void MetaDataBase::setBreakPoints( TQObject *o, const TQValueList<uint> &l )
     while ( it != r->breakPointConditions.end() ) {
 	int line = it.key();
 	++it;
-	if ( r->breakPoints.find( line ) == r->breakPoints.end() )
-	    r->breakPointConditions.remove( r->breakPointConditions.find( line ) );
+	if ( r->breakPoints.tqfind( line ) == r->breakPoints.end() )
+	    r->breakPointConditions.remove( r->breakPointConditions.tqfind( line ) );
     }
 }
 
@@ -1609,7 +1609,7 @@ TQValueList<uint> MetaDataBase::breakPoints( TQObject *o )
     if ( !o )
 	return TQValueList<uint>();
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
@@ -1624,29 +1624,29 @@ void MetaDataBase::setBreakPointCondition( TQObject *o, int line, const TQString
     if ( !o )
 	return;
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
 	return;
     }
-    r->breakPointConditions.replace( line, condition );
+    r->breakPointConditions.tqreplace( line, condition );
 }
 
 TQString MetaDataBase::breakPointCondition( TQObject *o, int line )
 {
     if ( !o )
-	return TQString::null;
+	return TQString();
     setupDataBase();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
-	return TQString::null;
+	return TQString();
     }
-    TQMap<int, TQString>::Iterator it = r->breakPointConditions.find( line );
+    TQMap<int, TQString>::Iterator it = r->breakPointConditions.tqfind( line );
     if ( it == r->breakPointConditions.end() )
-	return TQString::null;
+	return TQString();
     return *it;
 }
 
@@ -1659,7 +1659,7 @@ void MetaDataBase::setExportMacro( TQObject *o, const TQString &macro )
 	( (PropertyObject*)o )->mdSetExportMacro( macro );
 	return;
     }
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
@@ -1676,7 +1676,7 @@ TQString MetaDataBase::exportMacro( TQObject *o )
     setupDataBase();
     if ( o->isA( "PropertyObject" ) )
 	return ( (PropertyObject*)o )->mdExportMacro();
-    MetaDataBaseRecord *r = db->find( (void*)o );
+    MetaDataBaseRecord *r = db->tqfind( (void*)o );
     if ( !r ) {
 	qWarning( "No entry for %p (%s, %s) found in MetaDataBase",
 		  o, o->name(), o->className() );
@@ -1688,5 +1688,5 @@ TQString MetaDataBase::exportMacro( TQObject *o )
 
 bool MetaDataBase::hasObject( TQObject *o )
 {
-    return !!db->find( o );
+    return !!db->tqfind( o );
 }
diff --git a/kdevdesigner/designer/metadatabase.h b/kdevdesigner/designer/metadatabase.h
index 0dbe5dee..9b00deb9 100644
--- a/kdevdesigner/designer/metadatabase.h
+++ b/kdevdesigner/designer/metadatabase.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -102,7 +102,7 @@ public:
 	TQString className;
 	TQString includeFile;
 	IncludePolicy includePolicy;
-	TQSize sizeHint;
+	TQSize tqsizeHint;
 	TQSizePolicy sizePolicy;
 	TQPixmap *pixmap;
 	TQValueList<TQCString> lstSignals;
diff --git a/kdevdesigner/designer/multilineeditor.ui b/kdevdesigner/designer/multilineeditor.ui
index 3a28f795..b7789288 100644
--- a/kdevdesigner/designer/multilineeditor.ui
+++ b/kdevdesigner/designer/multilineeditor.ui
@@ -25,7 +25,7 @@
 ** not clear to you.
 **
 *********************************************************************</comment>
-<widget class="QMainWindow">
+<widget class="TQMainWindow">
     <property name="name">
         <cstring>MultiLineEditorBase</cstring>
     </property>
@@ -53,7 +53,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>Layout4</cstring>
             </property>
@@ -67,7 +67,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
                         <cstring>Layout3</cstring>
                     </property>
@@ -81,7 +81,7 @@
                         <property name="spacing">
                             <number>6</number>
                         </property>
-                        <widget class="QPushButton">
+                        <widget class="TQPushButton">
                             <property name="name">
                                 <cstring>OkButton</cstring>
                             </property>
@@ -98,7 +98,7 @@
                                 <bool>true</bool>
                             </property>
                         </widget>
-                        <widget class="QPushButton">
+                        <widget class="TQPushButton">
                             <property name="name">
                                 <cstring>applyButton</cstring>
                             </property>
@@ -106,7 +106,7 @@
                                 <string>&amp;Apply</string>
                             </property>
                         </widget>
-                        <widget class="QPushButton">
+                        <widget class="TQPushButton">
                             <property name="name">
                                 <cstring>cancelButton</cstring>
                             </property>
@@ -124,14 +124,14 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
                                 </size>
                             </property>
                         </spacer>
-                        <widget class="QPushButton">
+                        <widget class="TQPushButton">
                             <property name="name">
                                 <cstring>helpButton</cstring>
                             </property>
@@ -172,10 +172,10 @@
         <slot>cancelClicked()</slot>
     </connection>
 </connections>
-<slots>
+<Q_SLOTS>
     <slot>applyClicked()</slot>
     <slot>okClicked()</slot>
     <slot>cancelClicked()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kdevdesigner/designer/multilineeditorimpl.cpp b/kdevdesigner/designer/multilineeditorimpl.cpp
index 1d859211..5d230e05 100644
--- a/kdevdesigner/designer/multilineeditorimpl.cpp
+++ b/kdevdesigner/designer/multilineeditorimpl.cpp
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -36,7 +36,7 @@
 #include "kdevdesigner_part.h"
 
 #include <tqtextedit.h>
-#include <./private/qrichtext_p.h>
+#include <./private/tqrichtext_p.h>
 #include <tqpushbutton.h>
 #include <tqlayout.h>
 #include <tqtoolbutton.h>
@@ -46,10 +46,10 @@
 
 #include <klocale.h>
 
-ToolBarItem::ToolBarItem( TQWidget *parent, TQWidget *toolBar,
+ToolBarItem::ToolBarItem( TQWidget *tqparent, TQWidget *toolBar,
 			  const TQString &label, const TQString &tagstr,
 			  const TQIconSet &icon, const TQKeySequence &key )
-    : TQAction( parent )
+    : TQAction( tqparent )
 {
     setIconSet( icon );
     setText( label );
@@ -69,22 +69,22 @@ void ToolBarItem::wasActivated()
     emit clicked( tag );
 }
 
-TextEdit::TextEdit( TQWidget *parent, const char *name )
-    : TQTextEdit( parent, name )
+TextEdit::TextEdit( TQWidget *tqparent, const char *name )
+    : TQTextEdit( tqparent, name )
 {
-    setTextFormat( Qt::PlainText );
+    setTextFormat( TQt::PlainText );
 }
 
-QTextParagraph* TextEdit::paragraph()
+TQTextParagraph* TextEdit::paragraph()
 {
-    QTextCursor *tc = new QTextCursor( TQTextEdit::document() );
+    TQTextCursor *tc = new TQTextCursor( TQTextEdit::document() );
     return tc->paragraph();
 }
 
 
-MultiLineEditor::MultiLineEditor( bool call_static, bool richtextMode, TQWidget *parent, TQWidget *editWidget,
+MultiLineEditor::MultiLineEditor( bool call_static, bool richtextMode, TQWidget *tqparent, TQWidget *editWidget,
 				  FormWindow *fw, const TQString &text )
-    : MultiLineEditorBase( parent, 0, WType_Dialog | WShowModal ), formwindow( fw ), doWrap( FALSE )
+    : MultiLineEditorBase( tqparent, 0, WType_Dialog | WShowModal ), formwindow( fw ), doWrap( FALSE )
 {
     callStatic = call_static;
 
@@ -126,45 +126,45 @@ MultiLineEditor::MultiLineEditor( bool call_static, bool richtextMode, TQWidget
 
 	basicToolBar->addSeparator();
 
-	TQPopupMenu *layoutMenu = new TQPopupMenu( this );
-	menuBar->insertItem( i18n( "&Layout" ), layoutMenu );
+	TQPopupMenu *tqlayoutMenu = new TQPopupMenu( this );
+	menuBar->insertItem( i18n( "&Layout" ), tqlayoutMenu );
 
 	TQAction *brAction = new TQAction( this );
 	brAction->setIconSet( BarIcon( "designer_textlinebreak.png", KDevDesignerPartFactory::instance() ) );
 	brAction->setText( i18n("Break" ) );
 	brAction->addTo( basicToolBar );
-	brAction->addTo( layoutMenu );
+	brAction->addTo( tqlayoutMenu );
 	connect( brAction, TQT_SIGNAL( activated() ) , this, TQT_SLOT( insertBR() ) );
 
 	ToolBarItem *p = new ToolBarItem( this, basicToolBar, i18n( "Paragraph" ),
 					  "p", BarIcon( "designer_textparagraph.png", KDevDesignerPartFactory::instance() ) );
-	p->addTo( layoutMenu );
+	p->addTo( tqlayoutMenu );
 	connect( p, TQT_SIGNAL( clicked( const TQString& ) ),
 		 this, TQT_SLOT( insertTags( const TQString& )));
-	layoutMenu->insertSeparator();
+	tqlayoutMenu->insertSeparator();
 	basicToolBar->addSeparator();
 
 	ToolBarItem *al = new ToolBarItem( this, basicToolBar, i18n( "Align left" ),
 					   "p align=\"left\"", BarIcon( "designer_textleft.png", KDevDesignerPartFactory::instance() ) );
-	al->addTo( layoutMenu );
+	al->addTo( tqlayoutMenu );
 	connect( al, TQT_SIGNAL( clicked( const TQString& ) ),
 		 this, TQT_SLOT( insertTags( const TQString& )));
 
 	ToolBarItem *ac = new ToolBarItem( this, basicToolBar, i18n( "Align center" ),
 					   "p align=\"center\"", BarIcon( "designer_textcenter.png", KDevDesignerPartFactory::instance() ) );
-	ac->addTo( layoutMenu );
+	ac->addTo( tqlayoutMenu );
 	connect( ac, TQT_SIGNAL( clicked( const TQString& ) ),
 		 this, TQT_SLOT( insertTags( const TQString& )));
 
 	ToolBarItem *ar = new ToolBarItem( this, basicToolBar, i18n( "Align right" ),
 					   "p align=\"right\"", BarIcon( "designer_textright.png", KDevDesignerPartFactory::instance() ) );
-	ar->addTo( layoutMenu );
+	ar->addTo( tqlayoutMenu );
 	connect( ar, TQT_SIGNAL( clicked( const TQString& ) ),
 		 this, TQT_SLOT( insertTags( const TQString& )));
 
 	ToolBarItem *block = new ToolBarItem( this, basicToolBar, i18n( "Blockquote" ),
 					      "blockquote", BarIcon( "designer_textjustify.png", KDevDesignerPartFactory::instance() ) );
-	block->addTo( layoutMenu );
+	block->addTo( tqlayoutMenu );
 	connect( block, TQT_SIGNAL( clicked( const TQString& ) ),
 		 this, TQT_SLOT( insertTags( const TQString& )));
 
@@ -223,16 +223,16 @@ MultiLineEditor::MultiLineEditor( bool call_static, bool richtextMode, TQWidget
 	wrapAction->setOn( doWrap );
 
 	connect( helpButton, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) );
-	textEdit->document()->setFormatter( new QTextFormatterBreakInWords );
+	textEdit->document()->setFormatter( new TQTextFormatterBreakInWords );
 	textEdit->document()->setUseFormatCollection( FALSE );
 	textEdit->document()->setPreProcessor( new SyntaxHighlighter_HTML );
 
-	if ( !callStatic && ::qt_cast<TQTextEdit*>(editWidget) ) {
+	if ( !callStatic && ::tqqt_cast<TQTextEdit*>(editWidget) ) {
 	    mlined = (TQTextEdit*)editWidget;
 	    mlined->setReadOnly( TRUE );
 
-	    const TQMetaProperty *wordWrap = mlined->metaObject()->property(
-					    mlined->metaObject()->findProperty( "wordWrap", TRUE ), TRUE );
+	    const TQMetaProperty *wordWrap = mlined->tqmetaObject()->property(
+					    mlined->tqmetaObject()->tqfindProperty( "wordWrap", TRUE ), TRUE );
 	    oldWrapMode = 0;
 	    oldWrapString = "NoWrap";
 	    if ( wordWrap ) {
@@ -241,7 +241,7 @@ MultiLineEditor::MultiLineEditor( bool call_static, bool richtextMode, TQWidget
 		if ( oldWrapString != "NoWrap" )
 		    doWrap = TRUE;
 	    }
-	    textEdit->setAlignment( mlined->alignment() );
+	    textEdit->tqsetAlignment( mlined->tqalignment() );
 	    textEdit->setWordWrap( mlined->wordWrap() );
 	    textEdit->setWrapColumnOrWidth( mlined->wrapColumnOrWidth() );
 	    textEdit->setWrapPolicy( mlined->wrapPolicy() );
@@ -263,7 +263,7 @@ int MultiLineEditor::exec()
 {
     res = 1;
     show();
-    qApp->enter_loop();
+    tqApp->enter_loop();
     return res;
 }
 
@@ -276,23 +276,23 @@ void MultiLineEditor::okClicked()
 void MultiLineEditor::applyClicked()
 {
     if ( !callStatic ) {
-	PopulateMultiLineEditCommand *cmd = new PopulateMultiLineEditCommand( i18n( "Set the Text of '%1'" ).arg( mlined->name() ),
+	PopulateMultiLineEditCommand *cmd = new PopulateMultiLineEditCommand( i18n( "Set the Text of '%1'" ).tqarg( mlined->name() ),
 						formwindow, mlined, textEdit->text() );
 	cmd->execute();
 	formwindow->commandHistory()->addCommand( cmd );
 
 	if ( oldDoWrap != doWrap ) {
-	    TQString pn( i18n( "Set 'wordWrap' of '%2'" ).arg( mlined->name() ) );
+	    TQString pn( i18n( "Set 'wordWrap' of '%2'" ).tqarg( mlined->name() ) );
 	    SetPropertyCommand *propcmd;
 	    if ( doWrap )
 		propcmd = new SetPropertyCommand( pn, formwindow,
-					mlined, MainWindow::self->propertyeditor(),
-					"wordWrap", WidgetFactory::property( mlined, "wordWrap" ),
+					TQT_TQOBJECT(mlined), MainWindow::self->propertyeditor(),
+					"wordWrap", WidgetFactory::property( TQT_TQOBJECT(mlined), "wordWrap" ),
 					TQVariant( 1 ), "WidgetWidth", oldWrapString );
 	    else
 		propcmd = new SetPropertyCommand( pn, formwindow,
-					mlined, MainWindow::self->propertyeditor(),
-					"wordWrap", WidgetFactory::property( mlined, "wordWrap" ),
+					TQT_TQOBJECT(mlined), MainWindow::self->propertyeditor(),
+					"wordWrap", WidgetFactory::property( TQT_TQOBJECT(mlined), "wordWrap" ),
 					TQVariant( 0 ), "NoWrap", oldWrapString );
 
 	    propcmd->execute();
@@ -313,7 +313,7 @@ void MultiLineEditor::cancelClicked()
 
 void MultiLineEditor::closeEvent( TQCloseEvent *e )
 {
-    qApp->exit_loop();
+    tqApp->exit_loop();
     MultiLineEditorBase::closeEvent( e );
 }
 
@@ -321,11 +321,11 @@ void MultiLineEditor::insertTags( const TQString &tag )
 {
     int pfrom, pto, ifrom, ito;
     TQString tagend(  tag.simplifyWhiteSpace() );
-    tagend.remove( tagend.find( ' ', 0 ), tagend.length() );
+    tagend.remove( tagend.tqfind( ' ', 0 ), tagend.length() );
     if ( textEdit->hasSelectedText() ) {
 	textEdit->getSelection( &pfrom, &ifrom, &pto, &ito );
 	TQString buf = textEdit->selectedText();
-	buf = TQString( "<%1>%3</%2>" ).arg( tag ).arg( tagend ).arg( buf );
+	buf = TQString( "<%1>%3</%2>" ).tqarg( tag ).tqarg( tagend ).tqarg( buf );
 	textEdit->removeSelectedText();
 	textEdit->insertAt( buf, pfrom, ifrom );
 	textEdit->setCursorPosition( pto, ito + 2 + tag.length() );
@@ -333,7 +333,7 @@ void MultiLineEditor::insertTags( const TQString &tag )
     else {
 	int para, index;
 	textEdit->getCursorPosition( &para, &index );
-	textEdit->insert( TQString( "<%1></%2>" ).arg( tag ).arg( tagend ) );
+	textEdit->insert( TQString( "<%1></%2>" ).tqarg( tag ).tqarg( tagend ) );
 	index += 2 + tag.length();
 	textEdit->setCursorPosition( para, index  );
     }
@@ -363,7 +363,7 @@ void MultiLineEditor::showFontDialog()
 	if ( fd->getFont() != "default" )
 	    font = "face=\"" + fd->getFont() + "\"";
 	TQString tag( TQString( "font %1 %2 %3" )
-	             .arg( color ).arg( size ).arg( font ) );
+	             .tqarg( color ).tqarg( size ).tqarg( font ) );
 
 	if ( selText )
 	    textEdit->setSelection( pfrom, ifrom, pto, ito );
@@ -378,16 +378,16 @@ TQString MultiLineEditor::getStaticText()
     return staticText.stripWhiteSpace();
 }
 
-TQString MultiLineEditor::getText( TQWidget *parent, const TQString &text, bool richtextMode, bool *useWrap )
+TQString MultiLineEditor::getText( TQWidget *tqparent, const TQString &text, bool richtextMode, bool *useWrap )
 {
-    MultiLineEditor medit( TRUE, richtextMode, parent, 0, 0, text );
+    MultiLineEditor medit( TRUE, richtextMode, tqparent, 0, 0, text );
     if ( richtextMode )
 	medit.setUseWrapping( *useWrap );
     if ( medit.exec() == TQDialog::Accepted ) {
 	*useWrap = medit.useWrapping();
 	return medit.getStaticText();
     }
-    return TQString::null;
+    return TQString();
 }
 
 void MultiLineEditor::changeWrapMode( bool b )
diff --git a/kdevdesigner/designer/multilineeditorimpl.h b/kdevdesigner/designer/multilineeditorimpl.h
index 4df9ddbc..b39aea71 100644
--- a/kdevdesigner/designer/multilineeditorimpl.h
+++ b/kdevdesigner/designer/multilineeditorimpl.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -29,30 +29,32 @@
 
 #include <tqaction.h>
 #include <tqtextedit.h>
-#include <private/qrichtext_p.h>
+#include <private/tqrichtext_p.h>
 #include "multilineeditor.h"
 
 class FormWindow;
 class TQToolBar;
-class QTextDocument;
+class TQTextDocument;
 
-class TextEdit : public QTextEdit
+class TextEdit : public TQTextEdit
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    TextEdit( TQWidget *parent = 0, const char *name = 0 );
-    QTextDocument *document() const { return TQTextEdit::document(); }
-    QTextParagraph *paragraph();
+    TextEdit( TQWidget *tqparent = 0, const char *name = 0 );
+    TQTextDocument *document() const { return TQTextEdit::document(); }
+    TQTextParagraph *paragraph();
 
 };
 
-class ToolBarItem : public QAction
+class ToolBarItem : public TQAction
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    ToolBarItem( TQWidget *parent, TQWidget *toolBar,
+    ToolBarItem( TQWidget *tqparent, TQWidget *toolBar,
                  const TQString &label, const TQString &tagstr,
 		 const TQIconSet &icon, const TQKeySequence &key = 0 );
     ~ToolBarItem();
@@ -69,13 +71,14 @@ private:
 class MultiLineEditor : public MultiLineEditorBase
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    MultiLineEditor( bool call_static, bool richtextMode, TQWidget *parent, TQWidget *editWidget,
-		     FormWindow *fw, const TQString &text = TQString::null );
+    MultiLineEditor( bool call_static, bool richtextMode, TQWidget *tqparent, TQWidget *editWidget,
+		     FormWindow *fw, const TQString &text = TQString() );
     bool useWrapping() const;
     void setUseWrapping( bool );
-    static TQString getText( TQWidget *parent, const TQString &text, bool richtextMode, bool *useWrap );
+    static TQString getText( TQWidget *tqparent, const TQString &text, bool richtextMode, bool *useWrap );
     int exec();
 
 protected slots:
diff --git a/kdevdesigner/designer/newform.ui b/kdevdesigner/designer/newform.ui
index cdfae7e4..c5f8f202 100644
--- a/kdevdesigner/designer/newform.ui
+++ b/kdevdesigner/designer/newform.ui
@@ -25,7 +25,7 @@
 ** not clear to you.
 **
 *********************************************************************</comment>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>NewFormBase</cstring>
     </property>
@@ -56,7 +56,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QLayoutWidget" row="2" column="0" rowspan="1" colspan="3">
+        <widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="3">
             <property name="name">
                 <cstring>Layout1</cstring>
             </property>
@@ -70,7 +70,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>helpButton</cstring>
                     </property>
@@ -91,14 +91,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonOk</cstring>
                     </property>
@@ -115,7 +115,7 @@
                         <string>Create a new form using the selected template.</string>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonCancel</cstring>
                     </property>
@@ -131,7 +131,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QIconView" row="1" column="0" rowspan="1" colspan="3">
+        <widget class="TQIconView" row="1" column="0" rowspan="1" colspan="3">
             <property name="name">
                 <cstring>templateView</cstring>
             </property>
@@ -151,7 +151,7 @@
                 <string>Displays a list of the available templates.</string>
             </property>
         </widget>
-        <widget class="QLabel" row="0" column="0">
+        <widget class="TQLabel" row="0" column="0">
             <property name="name">
                 <cstring>labelProject</cstring>
             </property>
@@ -162,7 +162,7 @@
                 <cstring>projectCombo</cstring>
             </property>
         </widget>
-        <widget class="QComboBox" row="0" column="1">
+        <widget class="TQComboBox" row="0" column="1">
             <property name="name">
                 <cstring>projectCombo</cstring>
             </property>
@@ -177,7 +177,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
@@ -201,25 +201,25 @@
     </connection>
     <connection>
         <sender>projectCombo</sender>
-        <signal>activated(const QString&amp;)</signal>
+        <signal>activated(const TQString&amp;)</signal>
         <receiver>NewFormBase</receiver>
-        <slot>projectChanged(const QString&amp;)</slot>
+        <slot>projectChanged(const TQString&amp;)</slot>
     </connection>
     <connection>
         <sender>templateView</sender>
-        <signal>currentChanged(QIconViewItem*)</signal>
+        <signal>currentChanged(TQIconViewItem*)</signal>
         <receiver>NewFormBase</receiver>
-        <slot>itemChanged(QIconViewItem*)</slot>
+        <slot>itemChanged(TQIconViewItem*)</slot>
     </connection>
     <connection>
         <sender>templateView</sender>
-        <signal>doubleClicked(QIconViewItem*)</signal>
+        <signal>doubleClicked(TQIconViewItem*)</signal>
         <receiver>NewFormBase</receiver>
         <slot>accept()</slot>
     </connection>
     <connection>
         <sender>templateView</sender>
-        <signal>returnPressed(QIconViewItem*)</signal>
+        <signal>returnPressed(TQIconViewItem*)</signal>
         <receiver>NewFormBase</receiver>
         <slot>accept()</slot>
     </connection>
@@ -230,9 +230,9 @@
     <tabstop>buttonOk</tabstop>
     <tabstop>buttonCancel</tabstop>
 </tabstops>
-<slots>
-    <slot access="protected">itemChanged( QIconViewItem * )</slot>
-    <slot access="protected">projectChanged( const QString &amp; )</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+<Q_SLOTS>
+    <slot access="protected">itemChanged( TQIconViewItem * )</slot>
+    <slot access="protected">projectChanged( const TQString &amp; )</slot>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kdevdesigner/designer/newformimpl.cpp b/kdevdesigner/designer/newformimpl.cpp
index 80bc6463..6fae9015 100644
--- a/kdevdesigner/designer/newformimpl.cpp
+++ b/kdevdesigner/designer/newformimpl.cpp
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000-2001 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -77,20 +77,20 @@ void FormItem::insert( Project *pro )
     FormFile *ff = new FormFile( FormFile::createUnnamedFileName(), TRUE, pro );
     fw = new FormWindow( ff, MainWindow::self, MainWindow::self->qWorkspace(), n );
     fw->setProject( pro );
-    MetaDataBase::addEntry( fw );
+    MetaDataBase::addEntry( TQT_TQOBJECT(fw) );
     if ( fType == Widget ) {
-	TQWidget *w = WidgetFactory::create( WidgetDatabase::idFromClassName( "TQWidget" ),
+	TQWidget *w = WidgetFactory::create( WidgetDatabase::idFromClassName( TQWIDGET_OBJECT_NAME_STRING ),
 					    fw, n.latin1() );
 	fw->setMainContainer( w );
     } else if ( fType == Dialog ) {
-	TQWidget *w = WidgetFactory::create( WidgetDatabase::idFromClassName( "TQDialog" ), fw, n.latin1() );
+	TQWidget *w = WidgetFactory::create( WidgetDatabase::idFromClassName( TQDIALOG_OBJECT_NAME_STRING ), fw, n.latin1() );
 	fw->setMainContainer( w );
     } else if ( fType == Wizard ) {
-	TQWidget *w = WidgetFactory::create( WidgetDatabase::idFromClassName( "TQWizard" ),
+	TQWidget *w = WidgetFactory::create( WidgetDatabase::idFromClassName( TQWIZARD_OBJECT_NAME_STRING ),
 					    fw, n.latin1() );
 	fw->setMainContainer( w );
     } else if ( fType == MainWindow ) {
-	TQWidget *w = WidgetFactory::create( WidgetDatabase::idFromClassName( "TQMainWindow" ),
+	TQWidget *w = WidgetFactory::create( WidgetDatabase::idFromClassName( TQMAINWINDOW_OBJECT_NAME_STRING ),
 					    fw, n.latin1() );
 	fw->setMainContainer( w );
     }
@@ -109,10 +109,10 @@ void FormItem::insert( Project *pro )
 
     // the wizard might have changed a lot, lets update everything
     MainWindow::self->actioneditor()->setFormWindow( fw );
-    MainWindow::self->objectHierarchy()->setFormWindow( fw, fw );
+    MainWindow::self->objectHierarchy()->setFormWindow( fw, TQT_TQOBJECT(fw) );
     MainWindow::self->objectHierarchy()->formDefinitionView()->refresh();
     MainWindow::self->objectHierarchy()->rebuild();
-    fw->killAccels( fw );
+    fw->killAccels( TQT_TQOBJECT(fw) );
     fw->project()->setModified( TRUE );
     fw->setFocus();
     if ( !pro->isDummy() ) {
@@ -138,12 +138,12 @@ static void unifyFormName( FormWindow *fw, TQWorkspace *qworkspace )
 	lst << w->name();
     }
 
-    if ( lst.findIndex( fw->name() ) == -1 )
+    if ( lst.tqfindIndex( fw->name() ) == -1 )
 	return;
     TQString origName = fw->name();
     TQString n = origName;
     int i = 1;
-    while ( lst.findIndex( n ) != -1 ) {
+    while ( lst.tqfindIndex( n ) != -1 ) {
 	n = origName + TQString::number( i++ );
     }
     fw->setName( n );
@@ -158,13 +158,13 @@ void CustomFormItem::insert( Project *pro )
 	FormFile *ff = new FormFile( filename, TRUE, pro );
 	if ( !resource.load( ff ) ) {
 	    TQMessageBox::information( MainWindow::self, i18n("Load Template"),
-				      i18n("Could not load form description from template '%1'" ).arg( filename ) );
+				      i18n("Could not load form description from template '%1'" ).tqarg( filename ) );
 	    delete ff;
 	    return;
 	}
-	ff->setFileName( TQString::null );
+	ff->setFileName( TQString() );
 	if ( MainWindow::self->formWindow() ) {
-	    MainWindow::self->formWindow()->setFileName( TQString::null );
+	    MainWindow::self->formWindow()->setFileName( TQString() );
 	    unifyFormName( MainWindow::self->formWindow(), MainWindow::self->qWorkspace() );
 	    if ( !pro->isDummy() ) {
 		MainWindow::self->formWindow()->setSavePixmapInProject( TRUE );
@@ -249,7 +249,7 @@ void NewForm::insertTemplates( TQIconView *tView,
     TQStringList languages = MetaDataBase::languages();
     if ( !MainWindow::self->singleProjectMode() ) {
 	for ( it = languages.begin(); it != languages.end(); ++it ) {
-	    ProjectItem *pi = new ProjectItem( tView, i18n("%1 Project" ).arg( *it ) );
+	    ProjectItem *pi = new ProjectItem( tView, i18n("%1 Project" ).tqarg( *it ) );
 	    allItems.append( pi );
 	    pi->setLanguage( *it );
 	    pi->setPixmap( BarIcon( "designer_project.png" , KDevDesignerPartFactory::instance()) );
@@ -282,7 +282,7 @@ void NewForm::insertTemplates( TQIconView *tView,
 
 	TQString templPath = templatePath;
 	TQStringList templRoots;
-	const char *qtdir = getenv( "QTDIR" );
+	const char *qtdir = getenv( "TQTDIR" );
 	if(qtdir)
 	    templRoots << qtdir;
 	templRoots << qInstallPathData();
@@ -297,16 +297,16 @@ void NewForm::insertTemplates( TQIconView *tView,
 	}
 	if ( !templPath.isEmpty() ) {
 	    TQDir dir( templPath  );
-	    const QFileInfoList *filist = dir.entryInfoList( TQDir::DefaultFilter, TQDir::DirsFirst | TQDir::Name );
+	    const TQFileInfoList *filist = dir.entryInfoList( TQDir::DefaultFilter, TQDir::DirsFirst | TQDir::Name );
 	    if ( filist ) {
-		QFileInfoListIterator it( *filist );
+		TQFileInfoListIterator it( *filist );
 		TQFileInfo *fi;
 		while ( ( fi = it.current() ) != 0 ) {
 		    ++it;
 		    if ( !fi->isFile() || fi->extension() != "ui" )
 			continue;
 		    TQString name = fi->baseName();
-		    name = name.replace( '_', ' ' );
+		    name = name.tqreplace( '_', ' ' );
 		    CustomFormItem *ci = new CustomFormItem( tView, name );
 		    allItems.append( ci );
 		    ci->setDragEnabled( FALSE );
@@ -364,9 +364,9 @@ NewForm::NewForm( TQIconView *templateView, const TQString &templatePath )
     projectChanged( i18n( "<No Project>" ) );
 }
 
-NewForm::NewForm( TQWidget *parent, const TQStringList& projects,
+NewForm::NewForm( TQWidget *tqparent, const TQStringList& projects,
 		  const TQString& currentProject, const TQString &templatePath )
-    : NewFormBase( parent, 0, TRUE )
+    : NewFormBase( tqparent, 0, TRUE )
 {
     connect( helpButton, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) );
 
diff --git a/kdevdesigner/designer/newformimpl.h b/kdevdesigner/designer/newformimpl.h
index b85e36c9..1ef5c1db 100644
--- a/kdevdesigner/designer/newformimpl.h
+++ b/kdevdesigner/designer/newformimpl.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -32,7 +32,7 @@
 
 class Project;
 
-class NewItem : public QIconViewItem
+class NewItem : public TQIconViewItem
 {
 public:
     enum Type {
@@ -143,10 +143,11 @@ private:
 class NewForm : public NewFormBase
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     NewForm( TQIconView *templateView, const TQString &templatePath );
-    NewForm( TQWidget *parent, const TQStringList& projects,
+    NewForm( TQWidget *tqparent, const TQStringList& projects,
 	     const TQString& currentProject, const TQString &templatePath );
     void insertTemplates( TQIconView*, const TQString& );
     void accept();
diff --git a/kdevdesigner/designer/orderindicator.cpp b/kdevdesigner/designer/orderindicator.cpp
index f3c50feb..115d68f8 100644
--- a/kdevdesigner/designer/orderindicator.cpp
+++ b/kdevdesigner/designer/orderindicator.cpp
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -69,7 +69,7 @@ void OrderIndicator::setOrder( int i, TQWidget* wid )
     TQFont f( font() );
     f.setBold( TRUE );
     setFont( f );
-    resize( QMAX( w, h ), h );
+    resize( TQMAX( w, h ), h );
     update(); // in case the size didn't change
     reposition();
     show();
@@ -78,7 +78,7 @@ void OrderIndicator::setOrder( int i, TQWidget* wid )
 
 void OrderIndicator::reposition()
 {
-    TQPoint p =parentWidget()->mapFromGlobal( widget->mapToGlobal( widget->rect().topLeft() ) );
+    TQPoint p =tqparentWidget()->mapFromGlobal( widget->mapToGlobal( widget->rect().topLeft() ) );
     move( p - TQPoint( width()/3, height()/3 ) );
 }
 
diff --git a/kdevdesigner/designer/orderindicator.h b/kdevdesigner/designer/orderindicator.h
index 5dd0185b..f936ac6e 100644
--- a/kdevdesigner/designer/orderindicator.h
+++ b/kdevdesigner/designer/orderindicator.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -31,9 +31,10 @@
 
 class FormWindow;
 
-class OrderIndicator : public QWidget
+class OrderIndicator : public TQWidget
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     OrderIndicator( int i, TQWidget* w, FormWindow* fw );
diff --git a/kdevdesigner/designer/outputwindow.cpp b/kdevdesigner/designer/outputwindow.cpp
index 17477a95..ec7418db 100644
--- a/kdevdesigner/designer/outputwindow.cpp
+++ b/kdevdesigner/designer/outputwindow.cpp
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2001-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -42,10 +42,10 @@
 static TQTextEdit *debugoutput = 0;
 bool debugToStderr = FALSE;
 
-QtMsgHandler OutputWindow::oldMsgHandler = 0;
+TQtMsgHandler OutputWindow::oldMsgHandler = 0;
 
-OutputWindow::OutputWindow( TQWidget *parent )
-    : TQTabWidget( parent, "output_window" ), debugView( 0 ), errorView( 0 )
+OutputWindow::OutputWindow( TQWidget *tqparent )
+    : TQTabWidget( tqparent, "output_window" ), debugView( 0 ), errorView( 0 )
 {
     setupDebug();
     setupError();
@@ -57,14 +57,14 @@ OutputWindow::~OutputWindow()
     debugoutput = debugView = 0;
     errorView = 0;
     if ( !debugToStderr )
-	qInstallMsgHandler( oldMsgHandler );
+	tqInstallMsgHandler( oldMsgHandler );
     delete iface;
 }
 
 void OutputWindow::shuttingDown()
 {
     if ( !debugToStderr )
-	qInstallMsgHandler( oldMsgHandler );
+	tqInstallMsgHandler( oldMsgHandler );
 }
 
 void OutputWindow::setupError()
@@ -86,13 +86,13 @@ void OutputWindow::setupError()
     errorView->addColumn( i18n( "Location" ) );
     errorView->setResizeMode( TQListView::LastColumn );
     errorView->setColumnWidth( 0, errorView->fontMetrics().width( "WARNING1234" ) );
-    errorView->setColumnWidth( 1, errorView->fontMetrics().width( "ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOP" ) );
+    errorView->setColumnWidth( 1, errorView->fontMetrics().width( "ABCDEFGHIJKLMNOPTQRSTUVWXYZABCDEFGHIJKLMNOPTQRSTUVWXYZABCDEFGHIJKLMNOP" ) );
     errorView->setColumnWidth( 2, errorView->fontMetrics().width( "9999999" ) );
-    errorView->setColumnAlignment( 2, Qt::AlignRight );
+    errorView->setColumnAlignment( 2, TQt::AlignRight );
     errorView->setAllColumnsShowFocus( TRUE );
 }
 
-static void debugMessageOutput( QtMsgType type, const char *msg )
+static void debugMessageOutput( TQtMsgType type, const char *msg )
 {
     TQString s( msg );
     s += "\n";
@@ -109,7 +109,7 @@ static void debugMessageOutput( QtMsgType type, const char *msg )
 	abort();
     }
 
-    qApp->flush();
+    tqApp->flush();
 }
 
 void OutputWindow::setupDebug()
@@ -119,7 +119,7 @@ void OutputWindow::setupDebug()
     addTab( debugView, "Debug Output" );
 
     if ( !debugToStderr )
-	oldMsgHandler = qInstallMsgHandler( debugMessageOutput );
+	oldMsgHandler = tqInstallMsgHandler( debugMessageOutput );
 }
 
 void OutputWindow::setErrorMessages( const TQStringList &errors, const TQValueList<uint> &lines,
@@ -175,14 +175,14 @@ void OutputWindow::currentErrorChanged( TQListViewItem *i )
 
 
 
-ErrorItem::ErrorItem( TQListView *parent, TQListViewItem *after, const TQString &message, int line,
+ErrorItem::ErrorItem( TQListView *tqparent, TQListViewItem *after, const TQString &message, int line,
 		      const TQString &locationString, TQObject *locationObject )
-    : TQListViewItem( parent, after )
+    : TQListViewItem( tqparent, after )
 {
     setMultiLinesEnabled( TRUE );
     TQString m( message );
     type = m.startsWith( "Warning: " ) ? Warning : Error;
-    m = m.mid( m.find( ':' ) + 1 );
+    m = m.mid( m.tqfind( ':' ) + 1 );
     setText( 0, type == Error ? "Error" : "Warning" );
     setText( 1, m );
     setText( 2, TQString::number( line ) );
@@ -190,20 +190,20 @@ ErrorItem::ErrorItem( TQListView *parent, TQListViewItem *after, const TQString
     object = locationObject;
     read = !after;
     if ( !after ) {
-	parent->setSelected( this, TRUE );
-	parent->setCurrentItem( this );
+	tqparent->setSelected( this, TRUE );
+	tqparent->setCurrentItem( this );
     }
 }
 
 void ErrorItem::paintCell( TQPainter *p, const TQColorGroup & cg,
-			   int column, int width, int alignment )
+			   int column, int width, int tqalignment )
 {
     TQColorGroup g( cg );
-    g.setColor( TQColorGroup::Text, type == Error ? Qt::red : Qt::darkYellow );
+    g.setColor( TQColorGroup::Text, type == Error ? TQt::red : TQt::darkYellow );
     if ( !read ) {
 	TQFont f( p->font() );
 	f.setBold( TRUE );
 	p->setFont( f );
     }
-    TQListViewItem::paintCell( p, g, column, width, alignment );
+    TQListViewItem::paintCell( p, g, column, width, tqalignment );
 }
diff --git a/kdevdesigner/designer/outputwindow.h b/kdevdesigner/designer/outputwindow.h
index 6e9ed4a1..9e1a5aaf 100644
--- a/kdevdesigner/designer/outputwindow.h
+++ b/kdevdesigner/designer/outputwindow.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2001 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -36,18 +36,18 @@ struct DesignerOutputDock;
 class TQTextEdit;
 class TQListView;
 
-class ErrorItem : public QListViewItem
+class ErrorItem : public TQListViewItem
 {
 public:
     enum Type { Error, Warning };
 
-    ErrorItem( TQListView *parent, TQListViewItem *after, const TQString &message, int line,
+    ErrorItem( TQListView *tqparent, TQListViewItem *after, const TQString &message, int line,
 	       const TQString &locationString, TQObject *locationObject );
 
     void paintCell( TQPainter *, const TQColorGroup & cg,
-		    int column, int width, int alignment );
+		    int column, int width, int tqalignment );
 
-    void setRead( bool b ) { read = b; repaint(); }
+    void setRead( bool b ) { read = b; tqrepaint(); }
 
     TQObject *location() const { return object; }
     int line() const { return text( 2 ).toInt(); }
@@ -59,12 +59,13 @@ private:
 
 };
 
-class OutputWindow : public QTabWidget
+class OutputWindow : public TQTabWidget
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    OutputWindow( TQWidget *parent );
+    OutputWindow( TQWidget *tqparent );
     ~OutputWindow();
 
     void setErrorMessages( const TQStringList &errors, const TQValueList<uint> &lines,
@@ -79,7 +80,7 @@ public:
 
     void shuttingDown();
 
-    static QtMsgHandler oldMsgHandler;
+    static TQtMsgHandler oldMsgHandler;
 
 private slots:
     void currentErrorChanged( TQListViewItem *i );
diff --git a/kdevdesigner/designer/paletteeditor.ui b/kdevdesigner/designer/paletteeditor.ui
index 8a87f0ea..79e04792 100644
--- a/kdevdesigner/designer/paletteeditor.ui
+++ b/kdevdesigner/designer/paletteeditor.ui
@@ -25,7 +25,7 @@
 ** not clear to you.
 **
 *********************************************************************</comment>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>PaletteEditorBase</cstring>
     </property>
@@ -56,7 +56,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>groupAutoPalette</cstring>
             </property>
@@ -69,7 +69,7 @@
             <property name="title">
                 <string>Build Palette</string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>AlignAuto</set>
             </property>
             <hbox>
@@ -82,7 +82,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>labelMainColor</cstring>
                     </property>
@@ -92,7 +92,7 @@
                             <vsizetype>1</vsizetype>
                         </sizepolicy>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>50</width>
                             <height>0</height>
@@ -110,7 +110,7 @@
                     <property name="text">
                         <string>&amp;3-D effects:</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignAuto|AlignVCenter</set>
                     </property>
                     <property name="buddy" stdset="0">
@@ -140,7 +140,7 @@
                         <string>Choose the effect-color for the generated palette.</string>
                     </property>
                 </widget>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>labelMainColor2</cstring>
                     </property>
@@ -150,7 +150,7 @@
                             <vsizetype>1</vsizetype>
                         </sizepolicy>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>50</width>
                             <height>0</height>
@@ -168,7 +168,7 @@
                     <property name="text">
                         <string>Back&amp;ground:</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignAuto|AlignVCenter</set>
                     </property>
                     <property name="buddy" stdset="0">
@@ -208,14 +208,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>btnAdvanced</cstring>
                     </property>
@@ -225,7 +225,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>GroupBox126</cstring>
             </property>
@@ -248,7 +248,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
                         <cstring>Layout2</cstring>
                     </property>
@@ -262,7 +262,7 @@
                         <property name="spacing">
                             <number>6</number>
                         </property>
-                        <widget class="QLabel">
+                        <widget class="TQLabel">
                             <property name="name">
                                 <cstring>TextLabel1</cstring>
                             </property>
@@ -273,7 +273,7 @@
                                 <cstring>paletteCombo</cstring>
                             </property>
                         </widget>
-                        <widget class="QComboBox">
+                        <widget class="TQComboBox">
                             <item>
                                 <property name="text">
                                     <string>Active Palette</string>
@@ -308,7 +308,7 @@
                 </widget>
             </vbox>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>Layout3</cstring>
             </property>
@@ -322,7 +322,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonHelp</cstring>
                     </property>
@@ -343,14 +343,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonOk</cstring>
                     </property>
@@ -367,7 +367,7 @@
                         <string>Close the dialog and apply all the changes.</string>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonCancel</cstring>
                     </property>
diff --git a/kdevdesigner/designer/paletteeditoradvanced.ui b/kdevdesigner/designer/paletteeditoradvanced.ui
index faa211c1..13c4615e 100644
--- a/kdevdesigner/designer/paletteeditoradvanced.ui
+++ b/kdevdesigner/designer/paletteeditoradvanced.ui
@@ -25,7 +25,7 @@
 ** not clear to you.
 **
 *********************************************************************</comment>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>PaletteEditorAdvancedBase</cstring>
     </property>
@@ -47,7 +47,7 @@
         <bool>true</bool>
     </property>
     <property name="whatsThis" stdset="0">
-        <string>&lt;b&gt;Edit Palette&lt;/b&gt;&lt;p&gt;Change the current widget or form's palette.&lt;/p&gt;&lt;p&gt;Use a generated palette or select colors for each color group and each color role.&lt;/p&gt;&lt;p&gt;The palette can be tested with different widget layouts in the preview section.&lt;/p&gt;</string>
+        <string>&lt;b&gt;Edit Palette&lt;/b&gt;&lt;p&gt;Change the current widget or form's palette.&lt;/p&gt;&lt;p&gt;Use a generated palette or select colors for each color group and each color role.&lt;/p&gt;&lt;p&gt;The palette can be tested with different widget tqlayouts in the preview section.&lt;/p&gt;</string>
     </property>
     <vbox>
         <property name="name">
@@ -59,7 +59,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>Layout14</cstring>
             </property>
@@ -73,7 +73,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>TextLabel1</cstring>
                     </property>
@@ -90,7 +90,7 @@
                         <cstring>paletteCombo</cstring>
                     </property>
                 </widget>
-                <widget class="QComboBox">
+                <widget class="TQComboBox">
                     <item>
                         <property name="text">
                             <string>Active Palette</string>
@@ -112,7 +112,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QButtonGroup">
+        <widget class="TQButtonGroup">
             <property name="name">
                 <cstring>ButtonGroup1</cstring>
             </property>
@@ -135,7 +135,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>checkBuildInactive</cstring>
                     </property>
@@ -146,7 +146,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>checkBuildDisabled</cstring>
                     </property>
@@ -159,7 +159,7 @@
                 </widget>
             </vbox>
         </widget>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>groupCentral</cstring>
             </property>
@@ -176,7 +176,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QComboBox">
+                <widget class="TQComboBox">
                     <item>
                         <property name="text">
                             <string>Background</string>
@@ -242,7 +242,7 @@
                         <string>&lt;b&gt;Select a color role.&lt;/b&gt;&lt;p&gt;Available central color roles are: &lt;ul&gt; &lt;li&gt;Background - general background color.&lt;/li&gt; &lt;li&gt;Foreground - general foreground color. &lt;/li&gt; &lt;li&gt;Base - used as the background color for example, for text entry widgets; it is usually white or another light color. &lt;/li&gt; &lt;li&gt;Text - the forground color used with Base. Usually this is the same as the Foreground, in which case it must provide good contrast both with the Background and with the Base. &lt;/li&gt; &lt;li&gt;Button - general button background color; useful where buttons need a background different from Background, as in the Macintosh style. &lt;/li&gt; &lt;li&gt;ButtonText - a foreground color used with the Button color. &lt;/li&gt; &lt;li&gt;Highlight - a color used to indicate a selected or highlighted item. &lt;/li&gt; &lt;li&gt;HighlightedText - a text color that contrasts to Highlight. &lt;/li&gt; &lt;li&gt;BrightText - a text color that is very different from Foreground and contrasts well with, for example, black. &lt;/li&gt; &lt;/ul&gt; &lt;/p&gt;</string>
                     </property>
                 </widget>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
                         <cstring>Layout32_2</cstring>
                     </property>
@@ -266,14 +266,14 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
                                 </size>
                             </property>
                         </spacer>
-                        <widget class="QLabel">
+                        <widget class="TQLabel">
                             <property name="name">
                                 <cstring>labelPixmap</cstring>
                             </property>
@@ -313,7 +313,7 @@
                                 <string>Choose a pixmap file for the selected central color role.</string>
                             </property>
                         </widget>
-                        <widget class="QLabel">
+                        <widget class="TQLabel">
                             <property name="name">
                                 <cstring>labelCentral</cstring>
                             </property>
@@ -323,7 +323,7 @@
                                     <vsizetype>1</vsizetype>
                                 </sizepolicy>
                             </property>
-                            <property name="minimumSize">
+                            <property name="tqminimumSize">
                                 <size>
                                     <width>0</width>
                                     <height>0</height>
@@ -363,7 +363,7 @@
                 </widget>
             </vbox>
         </widget>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>groupEffect</cstring>
             </property>
@@ -380,7 +380,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
                         <cstring>Layout32_3</cstring>
                     </property>
@@ -394,7 +394,7 @@
                         <property name="spacing">
                             <number>6</number>
                         </property>
-                        <widget class="QCheckBox">
+                        <widget class="TQCheckBox">
                             <property name="name">
                                 <cstring>checkBuildEffect</cstring>
                             </property>
@@ -411,7 +411,7 @@
                                 <string>Check to let 3D-effect colors be calculated from the button-color.</string>
                             </property>
                         </widget>
-                        <widget class="QComboBox">
+                        <widget class="TQComboBox">
                             <item>
                                 <property name="text">
                                     <string>Light</string>
@@ -449,7 +449,7 @@
                         </widget>
                     </hbox>
                 </widget>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
                         <cstring>Layout31_2</cstring>
                     </property>
@@ -473,14 +473,14 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
                                 </size>
                             </property>
                         </spacer>
-                        <widget class="QLabel">
+                        <widget class="TQLabel">
                             <property name="name">
                                 <cstring>labelEffect</cstring>
                             </property>
@@ -490,7 +490,7 @@
                                     <vsizetype>1</vsizetype>
                                 </sizepolicy>
                             </property>
-                            <property name="minimumSize">
+                            <property name="tqminimumSize">
                                 <size>
                                     <width>0</width>
                                     <height>0</height>
@@ -530,7 +530,7 @@
                 </widget>
             </vbox>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>Layout3</cstring>
             </property>
@@ -544,7 +544,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonHelp</cstring>
                     </property>
@@ -565,14 +565,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonOk</cstring>
                     </property>
@@ -589,7 +589,7 @@
                         <string>Close the dialog and apply all the changes.</string>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonCancel</cstring>
                     </property>
diff --git a/kdevdesigner/designer/paletteeditoradvancedimpl.cpp b/kdevdesigner/designer/paletteeditoradvancedimpl.cpp
index 86399bdf..bf05e0e5 100644
--- a/kdevdesigner/designer/paletteeditoradvancedimpl.cpp
+++ b/kdevdesigner/designer/paletteeditoradvancedimpl.cpp
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -41,7 +41,7 @@
     Class used by PaletteEditor for bold combobox items
 */
 
-class BoldListBoxText : public QListBoxText
+class BoldListBoxText : public TQListBoxText
 {
 public:
     BoldListBoxText( TQString text, TQListBox* lb = 0 );
@@ -65,9 +65,9 @@ void BoldListBoxText::paint( TQPainter* painter )
     TQListBoxText::paint( painter );
 }
 
-PaletteEditorAdvanced::PaletteEditorAdvanced( FormWindow *fw, TQWidget * parent,
+PaletteEditorAdvanced::PaletteEditorAdvanced( FormWindow *fw, TQWidget * tqparent,
 					      const char * name, bool modal, WFlags f )
-    : PaletteEditorAdvancedBase( parent, name, modal, f ), formWindow( fw ), selectedPalette(0)
+    : PaletteEditorAdvancedBase( tqparent, name, modal, f ), formWindow( fw ), selectedPalette(0)
 {
     connect( buttonHelp, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) );
 
@@ -250,15 +250,15 @@ void PaletteEditorAdvanced::onCentral( int item )
     case 0:
     default:
 	c = editPalette.active().color( centralFromItem(item) );
-	p = editPalette.active().brush( centralFromItem(item) ).pixmap();
+	p = editPalette.active().tqbrush( centralFromItem(item) ).pixmap();
 	break;
     case 1:
 	c = editPalette.inactive().color( centralFromItem(item) );
-	p = editPalette.inactive().brush( centralFromItem(item) ).pixmap();
+	p = editPalette.inactive().tqbrush( centralFromItem(item) ).pixmap();
 	break;
     case 2:
 	c =  editPalette.disabled().color( centralFromItem(item) );
-	p = editPalette.disabled().brush( centralFromItem(item) ).pixmap();
+	p = editPalette.disabled().tqbrush( centralFromItem(item) ).pixmap();
 	break;
     }
 
@@ -514,17 +514,17 @@ void PaletteEditorAdvanced::updateStyledButtons()
     default:
 	central = editPalette.active().color( centralFromItem( comboCentral->currentItem() ) );
 	effect = editPalette.active().color( effectFromItem( comboEffect->currentItem() ) );
-	pm = editPalette.active().brush( centralFromItem( comboCentral->currentItem() ) ).pixmap();
+	pm = editPalette.active().tqbrush( centralFromItem( comboCentral->currentItem() ) ).pixmap();
 	break;
     case 1:
 	central = editPalette.inactive().color( centralFromItem( comboCentral->currentItem() ) );
 	effect = editPalette.inactive().color( effectFromItem( comboEffect->currentItem() ) );
-	pm = editPalette.inactive().brush( centralFromItem( comboCentral->currentItem() ) ).pixmap();
+	pm = editPalette.inactive().tqbrush( centralFromItem( comboCentral->currentItem() ) ).pixmap();
 	break;
     case 2:
 	central = editPalette.disabled().color( centralFromItem( comboCentral->currentItem() ) );
 	effect = editPalette.disabled().color( effectFromItem( comboEffect->currentItem() ) );
-	pm = editPalette.disabled().brush( centralFromItem( comboCentral->currentItem() ) ).pixmap();
+	pm = editPalette.disabled().tqbrush( centralFromItem( comboCentral->currentItem() ) ).pixmap();
 	break;
     }
 
@@ -619,10 +619,10 @@ void PaletteEditorAdvanced::setupBackgroundMode( BackgroundMode mode )
 }
 
 TQPalette PaletteEditorAdvanced::getPalette( bool *ok, const TQPalette &init,
-					    BackgroundMode mode, TQWidget* parent,
+					    BackgroundMode mode, TQWidget* tqparent,
 					    const char* name, FormWindow *fw )
 {
-    PaletteEditorAdvanced* dlg = new PaletteEditorAdvanced( fw, parent, name, TRUE );
+    PaletteEditorAdvanced* dlg = new PaletteEditorAdvanced( fw, tqparent, name, TRUE );
     dlg->setupBackgroundMode( mode );
 
     if ( init != TQPalette() )
diff --git a/kdevdesigner/designer/paletteeditoradvancedimpl.h b/kdevdesigner/designer/paletteeditoradvancedimpl.h
index 1794d91f..477a5a79 100644
--- a/kdevdesigner/designer/paletteeditoradvancedimpl.h
+++ b/kdevdesigner/designer/paletteeditoradvancedimpl.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -34,13 +34,14 @@ class FormWindow;
 class PaletteEditorAdvanced : public PaletteEditorAdvancedBase
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    PaletteEditorAdvanced( FormWindow *fw, TQWidget * parent=0, const char * name=0,
+    PaletteEditorAdvanced( FormWindow *fw, TQWidget * tqparent=0, const char * name=0,
 			   bool modal=FALSE, WFlags f=0 );
     ~PaletteEditorAdvanced();
 
     static TQPalette getPalette( bool *ok, const TQPalette &pal, BackgroundMode mode = PaletteBackground,
-				TQWidget* parent = 0, const char* name = 0, FormWindow *fw = 0 );
+				TQWidget* tqparent = 0, const char* name = 0, FormWindow *fw = 0 );
 
 protected slots:
     void paletteSelected(int);
diff --git a/kdevdesigner/designer/paletteeditorimpl.cpp b/kdevdesigner/designer/paletteeditorimpl.cpp
index a6489370..edeba05f 100644
--- a/kdevdesigner/designer/paletteeditorimpl.cpp
+++ b/kdevdesigner/designer/paletteeditorimpl.cpp
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -36,8 +36,8 @@
 #include <tqapplication.h>
 #include <tqpushbutton.h>
 
-PaletteEditor::PaletteEditor( FormWindow *fw, TQWidget * parent, const char * name, bool modal, WFlags f )
-    : PaletteEditorBase( parent, name, modal, f ), formWindow( fw )
+PaletteEditor::PaletteEditor( FormWindow *fw, TQWidget * tqparent, const char * name, bool modal, WFlags f )
+    : PaletteEditorBase( tqparent, name, modal, f ), formWindow( fw )
 {
     connect( buttonHelp, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) );
 
@@ -281,9 +281,9 @@ TQPalette PaletteEditor::pal() const
 }
 
 TQPalette PaletteEditor::getPalette( bool *ok, const TQPalette &init, BackgroundMode mode,
-				    TQWidget* parent, const char* name, FormWindow *fw )
+				    TQWidget* tqparent, const char* name, FormWindow *fw )
 {
-    PaletteEditor* dlg = new PaletteEditor( fw, parent, name, TRUE );
+    PaletteEditor* dlg = new PaletteEditor( fw, tqparent, name, TRUE );
     dlg->setupBackgroundMode( mode );
 
     if ( init != TQPalette() )
diff --git a/kdevdesigner/designer/paletteeditorimpl.h b/kdevdesigner/designer/paletteeditorimpl.h
index ed911faa..ed1756ed 100644
--- a/kdevdesigner/designer/paletteeditorimpl.h
+++ b/kdevdesigner/designer/paletteeditorimpl.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -34,13 +34,14 @@ class FormWindow;
 class PaletteEditor : public PaletteEditorBase
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    PaletteEditor( FormWindow *fw, TQWidget * parent=0, const char * name=0, bool modal=FALSE, WFlags f=0 );
+    PaletteEditor( FormWindow *fw, TQWidget * tqparent=0, const char * name=0, bool modal=FALSE, WFlags f=0 );
     ~PaletteEditor();
 
     static TQPalette getPalette( bool *ok, const TQPalette &pal, BackgroundMode mode = PaletteBackground,
-				TQWidget* parent = 0, const char* name = 0, FormWindow *fw = 0 );
+				TQWidget* tqparent = 0, const char* name = 0, FormWindow *fw = 0 );
 
 protected slots:
     void onChooseMainColor();
diff --git a/kdevdesigner/designer/pixmapchooser.cpp b/kdevdesigner/designer/pixmapchooser.cpp
index 28912c62..4d6ad2ed 100644
--- a/kdevdesigner/designer/pixmapchooser.cpp
+++ b/kdevdesigner/designer/pixmapchooser.cpp
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000-2001 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -56,8 +56,8 @@
 static ImageIconProvider *imageIconProvider = 0;
 #endif
 
-PixmapView::PixmapView( TQWidget *parent )
-    : TQScrollView( parent )
+PixmapView::PixmapView( TQWidget *tqparent )
+    : TQScrollView( tqparent )
 {
     viewport()->setBackgroundMode( PaletteBase );
 }
@@ -66,12 +66,12 @@ void PixmapView::setPixmap( const TQPixmap &pix )
 {
     pixmap = pix;
     resizeContents( pixmap.size().width(), pixmap.size().height() );
-    viewport()->repaint( FALSE );
+    viewport()->tqrepaint( FALSE );
 }
 
 void PixmapView::drawContents( TQPainter *p, int cx, int cy, int cw, int ch )
 {
-    p->fillRect( cx, cy, cw, ch, colorGroup().brush( TQColorGroup::Base ) );
+    p->fillRect( cx, cy, cw, ch, tqcolorGroup().brush( TQColorGroup::Base ) );
     p->drawPixmap( 0, 0, pixmap );
 }
 
@@ -89,7 +89,7 @@ void PixmapView::previewUrl( const TQUrl &u )
 
 static void buildImageFormatList( TQString &filter, TQString &all )
 {
-    all = qApp->translate( "qChoosePixmap", "All Pixmaps (" );
+    all = tqApp->translate( "qChoosePixmap", "All Pixmaps (" );
     for ( uint i = 0; i < TQImageIO::outputFormats().count(); i++ ) {
 	TQString outputFormat = TQImageIO::outputFormats().at( i );
 	TQString outputExtension;
@@ -97,15 +97,15 @@ static void buildImageFormatList( TQString &filter, TQString &all )
 	   outputExtension = outputFormat.lower();
 	else
 	    outputExtension = "jpg;*.jpeg";
-	filter += qApp->translate( "qChoosePixmap", "%1-Pixmaps (%2)\n" ).
-		  arg( outputFormat ).arg( "*." + outputExtension);
+	filter += TQString(tqApp->translate( "qChoosePixmap", "%1-Pixmaps (%2)\n" )).
+		  tqarg( outputFormat ).tqarg( "*." + outputExtension);
 	all += "*." + outputExtension + ";";
     }
-    filter.prepend( all + qApp->translate( "qChoosePixmap", ")\n" ) );
-    filter += qApp->translate( "qChoosePixmap", "All Files (*)" );
+    filter.prepend( all + tqApp->translate( "qChoosePixmap", ")\n" ) );
+    filter += tqApp->translate( "qChoosePixmap", "All Files (*)" );
 
 }
-TQStringList qChoosePixmaps( TQWidget *parent )
+TQStringList qChoosePixmaps( TQWidget *tqparent )
 {
 /*    if ( !imageIconProvider && !TQFileDialog::iconProvider() )
 	TQFileDialog::setIconProvider( ( imageIconProvider = new ImageIconProvider ) );
@@ -114,21 +114,21 @@ TQStringList qChoosePixmaps( TQWidget *parent )
     TQString all;
     buildImageFormatList( filter, all );
 
-    TQFileDialog fd( TQString::null, filter, parent, 0, TRUE );
+    TQFileDialog fd( TQString(), filter, tqparent, 0, TRUE );
     fd.setMode( TQFileDialog::ExistingFiles );
     fd.setContentsPreviewEnabled( TRUE );
     PixmapView *pw = new PixmapView( &fd );
     fd.setContentsPreview( pw, pw );
     fd.setViewMode( TQFileDialog::List );
     fd.setPreviewMode( TQFileDialog::Contents );
-    fd.setCaption( qApp->translate( "qChoosePixmap", "Choose Images..." ) );
+    fd.setCaption( tqApp->translate( "qChoosePixmap", "Choose Images..." ) );
     if ( fd.exec() == TQDialog::Accepted )
 	return fd.selectedFiles();
     return TQStringList();*/
     TQStringList mimetypes = KImageIO::mimeTypes( KImageIO::Reading );
-    KFileDialog dlg(TQString::null, mimetypes.join(" "), parent, "filedialog", true);
+    KFileDialog dlg(TQString(), mimetypes.join(" "), tqparent, "filedialog", true);
     dlg.setOperationMode( KFileDialog::Opening );
-    dlg.setCaption( qApp->translate( "qChoosePixmap", "Choose Images..." ) );
+    dlg.setCaption( tqApp->translate( "qChoosePixmap", "Choose Images..." ) );
     dlg.setMode( KFile::Files );
     KImageFilePreview *ip = new KImageFilePreview( &dlg );
     dlg.setPreviewWidget( ip );
@@ -137,7 +137,7 @@ TQStringList qChoosePixmaps( TQWidget *parent )
     return TQStringList();
 }
 
-TQPixmap qChoosePixmap( TQWidget *parent, FormWindow *fw, const TQPixmap &old, TQString *fn )
+TQPixmap qChoosePixmap( TQWidget *tqparent, FormWindow *fw, const TQPixmap &old, TQString *fn )
 {
 #if defined(DESIGNER)
     if ( !fw || fw->savePixmapInline() ) {
@@ -148,13 +148,13 @@ TQPixmap qChoosePixmap( TQWidget *parent, FormWindow *fw, const TQPixmap &old, T
 	TQString all;
 	buildImageFormatList( filter, all );
 
-	TQFileDialog fd( TQString::null, filter, parent, 0, TRUE );
+	TQFileDialog fd( TQString(), filter, tqparent, 0, TRUE );
 	fd.setContentsPreviewEnabled( TRUE );
 	PixmapView *pw = new PixmapView( &fd );
 	fd.setContentsPreview( pw, pw );
 	fd.setViewMode( TQFileDialog::List );
 	fd.setPreviewMode( TQFileDialog::Contents );
-	fd.setCaption( qApp->translate( "qChoosePixmap", "Choose Pixmap" ) );
+	fd.setCaption( tqApp->translate( "qChoosePixmap", "Choose Pixmap" ) );
 	if ( fd.exec() == TQDialog::Accepted ) {
 	    TQPixmap pix( fd.selectedFile() );
 	    if ( fn )
@@ -163,9 +163,9 @@ TQPixmap qChoosePixmap( TQWidget *parent, FormWindow *fw, const TQPixmap &old, T
 	    return pix;
 	}*/
         TQStringList mimetypes = KImageIO::mimeTypes( KImageIO::Reading );
-        KFileDialog dlg(TQString::null, mimetypes.join(" "), parent, "filedialog", true);
+        KFileDialog dlg(TQString(), mimetypes.join(" "), tqparent, "filedialog", true);
         dlg.setOperationMode( KFileDialog::Opening );
-        dlg.setCaption( qApp->translate( "qChoosePixmap", "Choose Pixmap" ) );
+        dlg.setCaption( tqApp->translate( "qChoosePixmap", "Choose Pixmap" ) );
         dlg.setMode( KFile::File );
         KImageFilePreview *ip = new KImageFilePreview( &dlg );
         dlg.setPreviewWidget( ip );
@@ -174,44 +174,44 @@ TQPixmap qChoosePixmap( TQWidget *parent, FormWindow *fw, const TQPixmap &old, T
             TQPixmap pix( dlg.selectedURL().path() );
             if ( fn )
                 *fn = dlg.selectedURL().path();
-            MetaDataBase::setPixmapArgument( fw, pix.serialNumber(), dlg.selectedURL().path() );
+            MetaDataBase::setPixmapArgument( TQT_TQOBJECT(fw), pix.serialNumber(), dlg.selectedURL().path() );
             return pix;
         }
     } else if ( fw && fw->savePixmapInProject() ) {
-	PixmapCollectionEditor dia( parent, 0, TRUE );
+	PixmapCollectionEditor dia( tqparent, 0, TRUE );
 	dia.setProject( fw->project() );
 	dia.setChooserMode( TRUE );
-	dia.setCurrentItem( MetaDataBase::pixmapKey( fw, old.serialNumber() ) );
+	dia.setCurrentItem( MetaDataBase::pixmapKey( TQT_TQOBJECT(fw), old.serialNumber() ) );
 	if ( dia.exec() == TQDialog::Accepted ) {
 	    TQPixmap pix( fw->project()->pixmapCollection()->pixmap( dia.viewPixmaps->currentItem()->text() ) );
-	    MetaDataBase::setPixmapKey( fw, pix.serialNumber(), dia.viewPixmaps->currentItem()->text() );
+	    MetaDataBase::setPixmapKey( TQT_TQOBJECT(fw), pix.serialNumber(), dia.viewPixmaps->currentItem()->text() );
 	    return pix;
 	}
     } else {
-	PixmapFunction dia( parent, 0, TRUE );
+	PixmapFunction dia( tqparent, 0, TRUE );
 	TQObject::connect( dia.helpButton, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) );
 	dia.labelFunction->setText( fw->pixmapLoaderFunction() + "(" );
-	dia.editArguments->setText( MetaDataBase::pixmapArgument( fw, old.serialNumber() ) );
+	dia.editArguments->setText( MetaDataBase::pixmapArgument( TQT_TQOBJECT(fw), old.serialNumber() ) );
 	dia.editArguments->setFocus();
 	if ( dia.exec() == TQDialog::Accepted ) {
 	    TQPixmap pix;
 	    // we have to force the pixmap to get a new and unique serial number. Unfortunately detatch() doesn't do that
 	    pix.convertFromImage( BarIcon( "designer_image.png", KDevDesignerPartFactory::instance() ).convertToImage() );
 
-	    MetaDataBase::setPixmapArgument( fw, pix.serialNumber(), dia.editArguments->text() );
+	    MetaDataBase::setPixmapArgument( TQT_TQOBJECT(fw), pix.serialNumber(), dia.editArguments->text() );
 	    return pix;
 	}
     }
 #else
-    Q_UNUSED( parent );
+    Q_UNUSED( tqparent );
     Q_UNUSED( fw );
     Q_UNUSED( old );
 #endif
     return TQPixmap();
 }
 
-ImageIconProvider::ImageIconProvider( TQWidget *parent, const char *name )
-    : TQFileIconProvider( parent, name ), imagepm( BarIcon( "designer_image.png", KDevDesignerPartFactory::instance() ) )
+ImageIconProvider::ImageIconProvider( TQWidget *tqparent, const char *name )
+    : TQFileIconProvider( TQT_TQOBJECT(tqparent), name ), imagepm( BarIcon( "designer_image.png", KDevDesignerPartFactory::instance() ) )
 {
     fmts = TQImage::inputFormats();
 }
@@ -223,7 +223,7 @@ ImageIconProvider::~ImageIconProvider()
 const TQPixmap * ImageIconProvider::pixmap( const TQFileInfo &fi )
 {
     TQString ext = fi.extension().upper();
-    if ( fmts.contains( ext ) ) {
+    if ( fmts.tqcontains( ext ) ) {
 	return &imagepm;
     } else {
 	return TQFileIconProvider::pixmap( fi );
diff --git a/kdevdesigner/designer/pixmapchooser.h b/kdevdesigner/designer/pixmapchooser.h
index a03c6878..2513a4c9 100644
--- a/kdevdesigner/designer/pixmapchooser.h
+++ b/kdevdesigner/designer/pixmapchooser.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -35,12 +35,13 @@
 class FormWindow;
 
 class PixmapView : public TQScrollView,
-		   public QFilePreview
+		   public TQFilePreview
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    PixmapView( TQWidget *parent );
+    PixmapView( TQWidget *tqparent );
     void setPixmap( const TQPixmap &pix );
     void drawContents( TQPainter *p, int, int, int, int );
     void previewUrl( const TQUrl &u );
@@ -50,12 +51,13 @@ private:
 
 };
 
-class ImageIconProvider : public QFileIconProvider
+class ImageIconProvider : public TQFileIconProvider
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    ImageIconProvider( TQWidget *parent = 0, const char *name = 0 );
+    ImageIconProvider( TQWidget *tqparent = 0, const char *name = 0 );
     ~ImageIconProvider();
 
     const TQPixmap *pixmap( const TQFileInfo &fi );
@@ -66,7 +68,7 @@ private:
 
 };
 
-TQPixmap qChoosePixmap( TQWidget *parent, FormWindow *fw = 0, const TQPixmap &old = TQPixmap(),  TQString *fn = 0 );
-TQStringList qChoosePixmaps( TQWidget *parent );
+TQPixmap qChoosePixmap( TQWidget *tqparent, FormWindow *fw = 0, const TQPixmap &old = TQPixmap(),  TQString *fn = 0 );
+TQStringList qChoosePixmaps( TQWidget *tqparent );
 
 #endif
diff --git a/kdevdesigner/designer/pixmapcollection.cpp b/kdevdesigner/designer/pixmapcollection.cpp
index d0692de1..880423a3 100644
--- a/kdevdesigner/designer/pixmapcollection.cpp
+++ b/kdevdesigner/designer/pixmapcollection.cpp
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
diff --git a/kdevdesigner/designer/pixmapcollection.h b/kdevdesigner/designer/pixmapcollection.h
index 3fb12a36..10d630fc 100644
--- a/kdevdesigner/designer/pixmapcollection.h
+++ b/kdevdesigner/designer/pixmapcollection.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -43,7 +43,7 @@ public:
 	TQPixmap pix;
 	TQString name;
 	TQString absname;
-	Q_DUMMY_COMPARISON_OPERATOR( Pixmap )
+	TQ_DUMMY_COMPARISON_OPERATOR( Pixmap )
     };
 
     PixmapCollection( Project *pro );
diff --git a/kdevdesigner/designer/pixmapcollectioneditor.ui b/kdevdesigner/designer/pixmapcollectioneditor.ui
index c4888193..5d7608fd 100644
--- a/kdevdesigner/designer/pixmapcollectioneditor.ui
+++ b/kdevdesigner/designer/pixmapcollectioneditor.ui
@@ -25,7 +25,7 @@
 ** not clear to you.
 **
 *********************************************************************</comment>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>PixmapCollectionEditor</cstring>
     </property>
@@ -50,7 +50,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QIconView">
+        <widget class="TQIconView">
             <property name="name">
                 <cstring>viewPixmaps</cstring>
             </property>
@@ -61,7 +61,7 @@
                 <bool>false</bool>
             </property>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>Layout2</cstring>
             </property>
@@ -75,7 +75,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>PushButton2</cstring>
                     </property>
@@ -83,7 +83,7 @@
                         <string>&amp;Add...</string>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>PushButton3</cstring>
                     </property>
@@ -101,14 +101,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonOk</cstring>
                     </property>
@@ -119,7 +119,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonCancel</cstring>
                     </property>
@@ -127,7 +127,7 @@
                         <string>&amp;Cancel</string>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonClose</cstring>
                     </property>
@@ -157,9 +157,9 @@
     </connection>
     <connection>
         <sender>viewPixmaps</sender>
-        <signal>currentChanged(QIconViewItem*)</signal>
+        <signal>currentChanged(TQIconViewItem*)</signal>
         <receiver>PixmapCollectionEditor</receiver>
-        <slot>currentChanged(QIconViewItem*)</slot>
+        <slot>currentChanged(TQIconViewItem*)</slot>
     </connection>
     <connection>
         <sender>buttonOk</sender>
@@ -190,9 +190,9 @@
     <include location="local" impldecl="in implementation">pixmapcollection.h</include>
     <include location="local" impldecl="in implementation">pixmapchooser.h</include>
     <include location="local" impldecl="in implementation">project.h</include>
-    <include location="global" impldecl="in implementation">qfileinfo.h</include>
-    <include location="global" impldecl="in implementation">qimage.h</include>
-    <include location="global" impldecl="in declaration">qpixmap.h</include>
+    <include location="global" impldecl="in implementation">tqfileinfo.h</include>
+    <include location="global" impldecl="in implementation">tqimage.h</include>
+    <include location="global" impldecl="in declaration">tqpixmap.h</include>
     <include location="local" impldecl="in implementation">pixmapcollectioneditor.ui.h</include>
 </includes>
 <forwards>
@@ -202,17 +202,17 @@
     <variable>Project *project;</variable>
     <variable>bool chooser;</variable>
 </variables>
-<slots>
+<Q_SLOTS>
     <slot>init()</slot>
     <slot>destroy()</slot>
     <slot>addPixmap()</slot>
     <slot>removePixmap()</slot>
     <slot>updateView()</slot>
-    <slot>currentChanged(QIconViewItem * i)</slot>
+    <slot>currentChanged(TQIconViewItem * i)</slot>
     <slot>setChooserMode(bool c)</slot>
-    <slot>setCurrentItem(const QString &amp; name)</slot>
+    <slot>setCurrentItem(const TQString &amp; name)</slot>
     <slot>setProject(Project * pro)</slot>
-    <slot returnType="QPixmap">scaledPixmap(const QPixmap &amp; p)</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+    <slot returnType="TQPixmap">scaledPixmap(const TQPixmap &amp; p)</slot>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kdevdesigner/designer/pixmapcollectioneditor.ui.h b/kdevdesigner/designer/pixmapcollectioneditor.ui.h
index 03cd300c..1865f72f 100644
--- a/kdevdesigner/designer/pixmapcollectioneditor.ui.h
+++ b/kdevdesigner/designer/pixmapcollectioneditor.ui.h
@@ -2,15 +2,15 @@
 /**********************************************************************
 ** Copyright (C) 2001-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -18,7 +18,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -61,7 +61,7 @@ void PixmapCollectionEditor::addPixmap()
     }
 
     updateView();
-    TQIconViewItem *item = viewPixmaps->findItem( lastName );
+    TQIconViewItem *item = viewPixmaps->tqfindItem( lastName );
     if ( item ) {
 	viewPixmaps->setCurrentItem( item );
 	viewPixmaps->ensureItemVisible( item );
@@ -124,7 +124,7 @@ void PixmapCollectionEditor::setChooserMode( bool c )
 
 void PixmapCollectionEditor::setCurrentItem( const TQString & name )
 {
-    TQIconViewItem *i = viewPixmaps->findItem( name );
+    TQIconViewItem *i = viewPixmaps->tqfindItem( name );
     if ( i ) {
 	viewPixmaps->setCurrentItem( i );
 	currentChanged( i );
diff --git a/kdevdesigner/designer/pixmapfunction.ui b/kdevdesigner/designer/pixmapfunction.ui
index 7eb5fb94..5f34bf37 100644
--- a/kdevdesigner/designer/pixmapfunction.ui
+++ b/kdevdesigner/designer/pixmapfunction.ui
@@ -25,7 +25,7 @@
 ** not clear to you.
 **
 *********************************************************************</comment>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>PixmapFunction</cstring>
     </property>
@@ -53,7 +53,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QLabel">
+        <widget class="TQLabel">
             <property name="name">
                 <cstring>TextLabel3</cstring>
             </property>
@@ -64,7 +64,7 @@
                 <cstring>editArguments</cstring>
             </property>
         </widget>
-        <widget class="QFrame">
+        <widget class="TQFrame">
             <property name="name">
                 <cstring>Frame9</cstring>
             </property>
@@ -77,9 +77,9 @@
             <property name="lineWidth">
                 <number>2</number>
             </property>
-            <property name="layoutMargin" stdset="0">
+            <property name="tqlayoutMargin" stdset="0">
             </property>
-            <property name="layoutSpacing" stdset="0">
+            <property name="tqlayoutSpacing" stdset="0">
             </property>
             <hbox>
                 <property name="name">
@@ -91,7 +91,7 @@
                 <property name="spacing">
                     <number>0</number>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>labelFunction</cstring>
                     </property>
@@ -607,7 +607,7 @@
                         <bool>false</bool>
                     </property>
                 </widget>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>TextLabel5</cstring>
                     </property>
@@ -877,14 +877,14 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
                 </size>
             </property>
         </spacer>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>Layout3</cstring>
             </property>
@@ -898,7 +898,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>helpButton</cstring>
                     </property>
@@ -919,14 +919,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonOk</cstring>
                     </property>
@@ -940,7 +940,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonCancel</cstring>
                     </property>
@@ -969,7 +969,7 @@
         <slot>reject()</slot>
     </connection>
 </connections>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klineedit.h</includehint>
 </includehints>
diff --git a/kdevdesigner/designer/popupmenueditor.cpp b/kdevdesigner/designer/popupmenueditor.cpp
index 6e208de1..b106c3db 100644
--- a/kdevdesigner/designer/popupmenueditor.cpp
+++ b/kdevdesigner/designer/popupmenueditor.cpp
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2003 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -51,10 +51,10 @@
 
 // Drag Object Declaration -------------------------------------------
 
-class PopupMenuEditorItemPtrDrag : public QStoredDrag
+class PopupMenuEditorItemPtrDrag : public TQStoredDrag
 {
 public:
-    PopupMenuEditorItemPtrDrag( PopupMenuEditorItem * item, TQWidget * parent = 0,
+    PopupMenuEditorItemPtrDrag( PopupMenuEditorItem * item, TQWidget * tqparent = 0,
 				const char * name = 0 );
     ~PopupMenuEditorItemPtrDrag() {};
     static bool canDecode( TQDragMoveEvent * e );
@@ -64,12 +64,12 @@ public:
 // Drag Object Implementation ---------------------------------------
 
 PopupMenuEditorItemPtrDrag::PopupMenuEditorItemPtrDrag( PopupMenuEditorItem * item,
-							TQWidget * parent, const char * name )
-    : TQStoredDrag( "qt/popupmenueditoritemptr", parent, name )
+							TQWidget * tqparent, const char * name )
+    : TQStoredDrag( "qt/popupmenueditoritemptr", tqparent, name )
 {
-    TQByteArray data( sizeof( Q_LONG ) );
+    TQByteArray data( sizeof( TQ_LONG ) );
     TQDataStream stream( data, IO_WriteOnly );
-    stream << ( Q_LONG ) item;
+    stream << ( TQ_LONG ) item;
     setEncodedData( data );
 }
 
@@ -80,13 +80,13 @@ bool PopupMenuEditorItemPtrDrag::canDecode( TQDragMoveEvent * e )
 
 bool PopupMenuEditorItemPtrDrag::decode( TQDropEvent * e, PopupMenuEditorItem ** i )
 {
-    TQByteArray data = e->encodedData( "qt/popupmenueditoritemptr" );
+    TQByteArray data = e->tqencodedData( "qt/popupmenueditoritemptr" );
     TQDataStream stream( data, IO_ReadOnly );
 
     if ( !data.size() )
 	return FALSE;
 
-    Q_LONG p = 0;
+    TQ_LONG p = 0;
     stream >> p;
     *i = ( PopupMenuEditorItem *) p;
 
@@ -95,8 +95,8 @@ bool PopupMenuEditorItemPtrDrag::decode( TQDropEvent * e, PopupMenuEditorItem **
 
 // PopupMenuEditorItem Implementation -----------------------------------
 
-PopupMenuEditorItem::PopupMenuEditorItem( PopupMenuEditor * menu, TQObject * parent, const char * name )
-    : TQObject( parent, name ),
+PopupMenuEditorItem::PopupMenuEditorItem( PopupMenuEditor * menu, TQObject * tqparent, const char * name )
+    : TQObject( tqparent, name ),
       a( 0 ),
       s( 0 ),
       m( menu ),
@@ -110,8 +110,8 @@ PopupMenuEditorItem::PopupMenuEditorItem( PopupMenuEditor * menu, TQObject * par
 
 
 PopupMenuEditorItem::PopupMenuEditorItem( TQAction * action, PopupMenuEditor * menu,
-					  TQObject * parent, const char * name )
-    : TQObject( parent, name ),
+					  TQObject * tqparent, const char * name )
+    : TQObject( tqparent, name ),
       a( action ),
       s( 0 ),
       m( menu ),
@@ -119,15 +119,15 @@ PopupMenuEditorItem::PopupMenuEditorItem( TQAction * action, PopupMenuEditor * m
       removable( TRUE )
 {
     init();
-    if ( /*a->name() == "qt_separator_action" ||*/ ::qt_cast<QSeparatorAction*>(a) )
+    if ( /*a->name() == "qt_separator_action" ||*/ ::tqqt_cast<TQSeparatorAction*>(a) )
 	separator = TRUE;
-    if ( a && a->children() )
+    if ( a && !a->childrenListObject().isEmpty() )
  	a->installEventFilter( this );
 }
 
 PopupMenuEditorItem::PopupMenuEditorItem( PopupMenuEditorItem * item, PopupMenuEditor * menu,
-					  TQObject * parent, const char * name )
-    : TQObject( parent, name ),
+					  TQObject * tqparent, const char * name )
+    : TQObject( tqparent, name ),
       a( item->a ),
       s( 0 ),
       m( menu ),
@@ -135,7 +135,7 @@ PopupMenuEditorItem::PopupMenuEditorItem( PopupMenuEditorItem * item, PopupMenuE
       removable( item->removable )
 {
     init();
-    if ( ::qt_cast<TQActionGroup*>(a) )
+    if ( ::tqqt_cast<TQActionGroup*>(a) )
  	a->installEventFilter( this );
 }
 
@@ -151,9 +151,9 @@ void PopupMenuEditorItem::init()
 	if ( m && !isSeparator() ) {
 	    s = new PopupMenuEditor( m->formWindow(), m );
 	    TQString n = "PopupMenuEditor";
-	    m->formWindow()->unify( s, n, TRUE );
+	    m->formWindow()->unify( TQT_TQOBJECT(s), n, TRUE );
 	    s->setName( n );
-	    MetaDataBase::addEntry( s );
+	    MetaDataBase::addEntry( TQT_TQOBJECT(s) );
 	}
     }
 }
@@ -170,12 +170,12 @@ PopupMenuEditorItem::ItemType PopupMenuEditorItem::type() const
 void PopupMenuEditorItem::setVisible( bool enable )
 {
     if ( a )
-	a->setVisible( enable );
+	a->tqsetVisible( enable );
 }
 
 bool PopupMenuEditorItem::isVisible() const
 {
-    TQActionGroup *g = ::qt_cast<TQActionGroup*>(a);
+    TQActionGroup *g = ::tqqt_cast<TQActionGroup*>(a);
     if ( g )
 	return ( g->isVisible() && g->usesDropDown() );
     else if ( a )
@@ -212,25 +212,25 @@ int PopupMenuEditorItem::count() const
 {
     if ( s ) {
 	return s->count();
-    } else if ( ::qt_cast<TQActionGroup*>(a) ) {
-	const TQObjectList * l = a->children();
-	if ( l )
-	    return l->count();
+    } else if ( ::tqqt_cast<TQActionGroup*>(a) ) {
+	const TQObjectList l = a->childrenListObject();
+	if ( !l.isEmpty() )
+	    return l.count();
     }
     return 0;
 }
 
 bool PopupMenuEditorItem::eventFilter( TQObject * o, TQEvent * event )
 {
-    if ( ! ::qt_cast<TQActionGroup*>( o ) )
+    if ( ! ::tqqt_cast<TQActionGroup*>( o ) )
 	return FALSE;
     if ( event->type() == TQEvent::ChildInserted ) {
 	TQChildEvent * ce = ( TQChildEvent * ) event;
-	TQObject * c = ce->child();
-	TQAction * action = ::qt_cast<TQAction*>( c );
-	if ( s->find( action ) != -1 ) // avoid duplicates
+	TQObject * c = TQT_TQOBJECT(ce->child());
+	TQAction * action = ::tqqt_cast<TQAction*>( c );
+	if ( s->tqfind( action ) != -1 ) // avoid duplicates
 	    return FALSE;
-	TQActionGroup * actionGroup = ::qt_cast<TQActionGroup*>( c );
+	TQActionGroup * actionGroup = ::tqqt_cast<TQActionGroup*>( c );
 	if ( actionGroup )
 	    s->insert( actionGroup );
  	else if ( action )
@@ -242,7 +242,7 @@ bool PopupMenuEditorItem::eventFilter( TQObject * o, TQEvent * event )
 void PopupMenuEditorItem::selfDestruct()
 {
     hideMenu();
-    int i = m->find( s );
+    int i = m->tqfind( s );
     if ( i != -1 && i < m->count() )
 	m->remove( i ); // remove this item
     a = 0; // the selfDestruct call was caused by the deletion of the action
@@ -255,10 +255,10 @@ PopupMenuEditorItem * PopupMenuEditor::draggedItem = 0;
 int PopupMenuEditor::clipboardOperation = 0;
 PopupMenuEditorItem * PopupMenuEditor::clipboardItem = 0;
 
-PopupMenuEditor::PopupMenuEditor( FormWindow * fw, TQWidget * parent, const char * name )
+PopupMenuEditor::PopupMenuEditor( FormWindow * fw, TQWidget * tqparent, const char * name )
     : TQWidget( 0, name, WStyle_Customize | WStyle_NoBorder | WRepaintNoErase | WResizeNoErase ),
       formWnd( fw ),
-      parentMenu( parent ),
+      tqparentMenu( tqparent ),
       iconWidth( 0 ),
       textWidth( 0 ),
       accelWidth( 0 ),
@@ -271,10 +271,10 @@ PopupMenuEditor::PopupMenuEditor( FormWindow * fw, TQWidget * parent, const char
 }
 
 PopupMenuEditor::PopupMenuEditor( FormWindow * fw, PopupMenuEditor * menu,
-				  TQWidget * parent, const char * name )
+				  TQWidget * tqparent, const char * name )
     : TQWidget( 0, name, WStyle_Customize | WStyle_NoBorder | WRepaintNoErase ),
       formWnd( fw ),
-      parentMenu( parent ),
+      tqparentMenu( tqparent ),
       iconWidth( menu->iconWidth ),
       textWidth( menu->textWidth ),
       accelWidth( menu->accelWidth ),
@@ -304,7 +304,7 @@ void PopupMenuEditor::init()
     addSeparator.action()->setMenuText( i18n("new separator") );
 
     setAcceptDrops( TRUE );
-    setFocusPolicy( StrongFocus );
+    setFocusPolicy( TQ_StrongFocus );
 
     lineEdit = new TQLineEdit( this );
     lineEdit->hide();
@@ -314,8 +314,8 @@ void PopupMenuEditor::init()
     lineEdit->setBackgroundMode(PaletteButton);
     lineEdit->installEventFilter( this );
 
-    dropLine = new TQWidget( this, 0, Qt::WStyle_NoBorder | WStyle_StaysOnTop );
-    dropLine->setBackgroundColor( Qt::red );
+    dropLine = new TQWidget( this, 0, TQt::WStyle_NoBorder | WStyle_StaysOnTop );
+    dropLine->setBackgroundColor( TQt::red );
     dropLine->hide();
 
     hide();
@@ -335,10 +335,10 @@ void PopupMenuEditor::insert( PopupMenuEditorItem * item, int index )
 	    currentIndex = index;
     }
     item->m = this;
-    item->s->parentMenu = this;
+    item->s->tqparentMenu = this;
     resizeToContents();
-    if ( isVisible() && parentMenu )
-	parentMenu->update(); // draw arrow in parent menu
+    if ( isVisible() && tqparentMenu )
+	tqparentMenu->update(); // draw arrow in tqparent menu
     emit inserted( item->action() );
 }
 
@@ -361,7 +361,7 @@ void PopupMenuEditor::insert( TQActionGroup * actionGroup, int index )
     TQObjectListIterator it( *l );
     insert( i, index );
     for ( ; it.current(); ++it ) {
-	g = ::qt_cast<TQActionGroup*>(it.current());
+	g = ::tqqt_cast<TQActionGroup*>(it.current());
 	if ( g ) {
 	    if ( dropdown )
 		i->s->insert( g );
@@ -374,7 +374,7 @@ void PopupMenuEditor::insert( TQActionGroup * actionGroup, int index )
     delete l;
 }
 
-int PopupMenuEditor::find( const TQAction * action )
+int PopupMenuEditor::tqfind( const TQAction * action )
 {
     PopupMenuEditorItem * i = itemList.first();
     while ( i ) {
@@ -385,7 +385,7 @@ int PopupMenuEditor::find( const TQAction * action )
     return -1;
 }
 
-int PopupMenuEditor::find( PopupMenuEditor * menu )
+int PopupMenuEditor::tqfind( PopupMenuEditor * menu )
 {
     PopupMenuEditorItem * i = itemList.first();
     while ( i ) {
@@ -414,8 +414,8 @@ void PopupMenuEditor::exchange( int a, int b )
 	 ia == &addItem || ia == &addSeparator ||
 	 ib == &addItem || ib == &addSeparator )
 	return; // do nothing
-    itemList.replace( b, ia );
-    itemList.replace( a, ib );
+    itemList.tqreplace( b, ia );
+    itemList.tqreplace( a, ib );
 }
 
 void PopupMenuEditor::cut( int index )
@@ -532,17 +532,17 @@ void PopupMenuEditor::showLineEdit( int index )
     lineEdit->setFocus();
 }
 
-void PopupMenuEditor::setAccelerator( int key, Qt::ButtonState state, int index )
+void PopupMenuEditor::setAccelerator( int key, TQt::ButtonState state, int index )
 {
     // FIXME: make this a command
 
     int idx = ( index == -1 ? currentIndex : index );
 
-    if ( key == Qt::Key_Shift ||
-	 key == Qt::Key_Control ||
-	 key == Qt::Key_Alt ||
-	 key == Qt::Key_Meta ||
-	 key == Qt::Key_unknown )
+    if ( key == TQt::Key_Shift ||
+	 key == TQt::Key_Control ||
+	 key == TQt::Key_Alt ||
+	 key == TQt::Key_Meta ||
+	 key == TQt::Key_unknown )
 	return; // ignore these keys when they are pressed
 
     PopupMenuEditorItem * i = 0;
@@ -552,10 +552,10 @@ void PopupMenuEditor::setAccelerator( int key, Qt::ButtonState state, int index
     else
 	i = itemList.at( idx );
 
-    int shift = ( state & Qt::ShiftButton ? Qt::SHIFT : 0 );
-    int ctrl = ( state & Qt::ControlButton ? Qt::CTRL : 0 );
-    int alt = ( state & Qt::AltButton ? Qt::ALT : 0 );
-    int meta = ( state & Qt::MetaButton ? Qt::META : 0 );
+    int shift = ( state & TQt::ShiftButton ? TQt::SHIFT : 0 );
+    int ctrl = ( state & TQt::ControlButton ? TQt::CTRL : 0 );
+    int alt = ( state & TQt::AltButton ? TQt::ALT : 0 );
+    int meta = ( state & TQt::MetaButton ? TQt::META : 0 );
 
     TQAction * a = i->action();
     TQKeySequence ks = a->accel();
@@ -644,8 +644,8 @@ void PopupMenuEditor::removeItem( int index )
 									       idx );
 	formWnd->commandHistory()->addCommand( cmd );
 	cmd->execute();
-	if ( itemList.count() == 0 && parentMenu )
-	    parentMenu->update();
+	if ( itemList.count() == 0 && tqparentMenu )
+	    tqparentMenu->update();
 	resizeToContents();
     }
 }
@@ -714,7 +714,7 @@ void PopupMenuEditor::setFocusAt( const TQPoint & pos )
 
 bool PopupMenuEditor::eventFilter( TQObject * o, TQEvent * e )
 {
-    if ( o == lineEdit  && e->type() == TQEvent::FocusOut ) {
+    if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(lineEdit)  && e->type() == TQEvent::FocusOut ) {
 	leaveEditMode( 0 );
 	update();
     }
@@ -730,7 +730,7 @@ void PopupMenuEditor::paintEvent( TQPaintEvent * )
 		 rect().width() - borderSize * 2, rect().height() - borderSize * 2 );
     reg -= mid;
     p.setClipRegion( reg );
-    style().drawPrimitive( TQStyle::PE_PanelPopup, &p, rect(), colorGroup() );
+    tqstyle().tqdrawPrimitive( TQStyle::PE_PanelPopup, &p, rect(), tqcolorGroup() );
     p.restore();
     drawItems( &p );
 }
@@ -747,7 +747,7 @@ void PopupMenuEditor::mouseDoubleClickEvent( TQMouseEvent * )
 {
     setFocusAt( mousePressPos );
     if ( currentItem() == &addSeparator ) {
-	PopupMenuEditorItem * i = createItem( new QSeparatorAction( 0 ) );
+	PopupMenuEditorItem * i = createItem( new TQSeparatorAction( 0 ) );
 	i->setSeparator( TRUE );
 	return;
     }
@@ -771,7 +771,7 @@ void PopupMenuEditor::mouseMoveEvent( TQMouseEvent * e )
 		cmd.execute();
                 // FIXME: start rename after drop
 	    } else if ( draggedItem == &addSeparator ) {
-		draggedItem = createItem( new QSeparatorAction( 0 ) );
+		draggedItem = createItem( new TQSeparatorAction( 0 ) );
 		draggedItem->setSeparator( TRUE );
 	    }
 
@@ -786,7 +786,7 @@ void PopupMenuEditor::mouseMoveEvent( TQMouseEvent * e )
 	    // If the item is dropped in the same list,
 	    //  we will have two instances of the same pointer
 	    // in the list. We use node instead.
-	    int idx = itemList.find( draggedItem );
+	    int idx = itemList.tqfind( draggedItem );
 	    TQLNode * node = itemList.currentNode();
 
 	    d->dragCopy(); // dragevents and stuff happens
@@ -857,7 +857,7 @@ void PopupMenuEditor::dropEvent( TQDropEvent * e )
 	PopupMenuEditorItemPtrDrag::decode( e, &i );
     } else {
 	if ( e->provides( "application/x-designer-actiongroup" ) ) {
-	    TQActionGroup * g = ::qt_cast<QDesignerActionGroup*>(ActionDrag::action());
+	    TQActionGroup * g = ::tqqt_cast<TQDesignerActionGroup*>(ActionDrag::action());
 	    if ( g->usesDropDown() ) {
 		i = new PopupMenuEditorItem( g, this );
 		TQString n = TQString( g->name() ) + "Item";
@@ -866,7 +866,7 @@ void PopupMenuEditor::dropEvent( TQDropEvent * e )
 		TQObjectList *l = g->queryList( TQACTION_OBJECT_NAME_STRING, 0, FALSE, FALSE );
 		TQObjectListIterator it( *l );
 		for ( ; it.current(); ++it ) {
-		    g = ::qt_cast<TQActionGroup*>(it.current());
+		    g = ::tqqt_cast<TQActionGroup*>(it.current());
 		    if ( g )
 			i->s->insert( g );
 		    else
@@ -877,7 +877,7 @@ void PopupMenuEditor::dropEvent( TQDropEvent * e )
 		dropInPlace( g, e->pos().y() );
 	    }
 	} else if ( e->provides( "application/x-designer-actions" ) ) {
-	    TQAction *a = ::qt_cast<QDesignerAction*>(ActionDrag::action());
+	    TQAction *a = ::tqqt_cast<TQDesignerAction*>(ActionDrag::action());
 	    i = new PopupMenuEditorItem( a, this );
 	}
     }
@@ -899,65 +899,65 @@ void PopupMenuEditor::keyPressEvent( TQKeyEvent * e )
 
 	switch ( e->key() ) {
 
-	case Qt::Key_Delete:
+	case TQt::Key_Delete:
 	    hideSubMenu();
 	    removeItem();
 	    showSubMenu();
 	    break;
 
-	case Qt::Key_Backspace:
+	case TQt::Key_Backspace:
 	    clearCurrentField();
 	    break;
 
-	case Qt::Key_Up:
-	    navigateUp( e->state() & Qt::ControlButton );
+	case TQt::Key_Up:
+	    navigateUp( e->state() & TQt::ControlButton );
 	    break;
 
-	case Qt::Key_Down:
-	    navigateDown( e->state() & Qt::ControlButton );
+	case TQt::Key_Down:
+	    navigateDown( e->state() & TQt::ControlButton );
 	    break;
 
-	case Qt::Key_Left:
+	case TQt::Key_Left:
 	    navigateLeft();
 	    break;
 
-	case Qt::Key_Right:
+	case TQt::Key_Right:
 	    navigateRight();
 	    break;
 
-	case Qt::Key_PageUp:
+	case TQt::Key_PageUp:
 	    currentIndex = 0;
 	    break;
 
-	case Qt::Key_PageDown:
+	case TQt::Key_PageDown:
 	    currentIndex = itemList.count();
 	    break;
 
-	case Qt::Key_Enter:
-	case Qt::Key_Return:
-	case Qt::Key_F2:
+	case TQt::Key_Enter:
+	case TQt::Key_Return:
+	case TQt::Key_F2:
 	    enterEditMode( e );
 	    // move on
-	case Qt::Key_Alt:
-	case Qt::Key_Shift:
-	case Qt::Key_Control:
+	case TQt::Key_Alt:
+	case TQt::Key_Shift:
+	case TQt::Key_Control:
 	    // do nothing
 	    return;
 
-	case Qt::Key_Escape:
+	case TQt::Key_Escape:
 	    currentField = 0;
 	    navigateLeft();
 	    break;
 
-	case Qt::Key_C:
-	    if ( e->state() & Qt::ControlButton &&
+	case TQt::Key_C:
+	    if ( e->state() & TQt::ControlButton &&
 		 currentIndex < (int)itemList.count() ) {
 		copy( currentIndex );
 		break;
 	    }
 
-	case Qt::Key_X:
-	    if ( e->state() & Qt::ControlButton &&
+	case TQt::Key_X:
+	    if ( e->state() & TQt::ControlButton &&
 		 currentIndex < (int)itemList.count() ) {
 		hideSubMenu();
 		cut( currentIndex );
@@ -965,8 +965,8 @@ void PopupMenuEditor::keyPressEvent( TQKeyEvent * e )
 		break;
 	    }
 
-	case Qt::Key_V:
-	    if ( e->state() & Qt::ControlButton ) {
+	case TQt::Key_V:
+	    if ( e->state() & TQt::ControlButton ) {
 		hideSubMenu();
 		paste( currentIndex < (int)itemList.count() ? currentIndex + 1: itemList.count() );
 		showSubMenu();
@@ -991,9 +991,9 @@ void PopupMenuEditor::keyPressEvent( TQKeyEvent * e )
 
     } else { // In edit mode
 	switch ( e->key() ) {
-	case Qt::Key_Enter:
-	case Qt::Key_Return:
-	case Qt::Key_Escape:
+	case TQt::Key_Enter:
+	case TQt::Key_Return:
+	case TQt::Key_Escape:
 	    leaveEditMode( e );
 	    e->accept();
 	    return;
@@ -1006,20 +1006,20 @@ void PopupMenuEditor::focusInEvent( TQFocusEvent * )
 {
     showSubMenu();
     update();
-    parentMenu->update();
+    tqparentMenu->update();
 }
 
 void PopupMenuEditor::focusOutEvent( TQFocusEvent * )
 {
-    TQWidget * fw = qApp->focusWidget();
-    if ( !fw || ( !::qt_cast<PopupMenuEditor*>(fw) && fw != lineEdit ) ) {
+    TQWidget * fw = tqApp->tqfocusWidget();
+    if ( !fw || ( !::tqqt_cast<PopupMenuEditor*>(fw) && fw != lineEdit ) ) {
 	hideSubMenu();
-	if ( fw && ::qt_cast<MenuBarEditor*>(fw) )
+	if ( fw && ::tqqt_cast<MenuBarEditor*>(fw) )
 	    return;
 	TQWidget * w = this;
-	while ( w && w != fw && ::qt_cast<PopupMenuEditor*>(w) ) { // hide all popups
+	while ( w && w != fw && ::tqqt_cast<PopupMenuEditor*>(w) ) { // hide all popups
 	    w->hide();
-	    w = ((PopupMenuEditor *)w)->parentEditor();
+	    w = ((PopupMenuEditor *)w)->tqparentEditor();
 	}
     }
 }
@@ -1031,20 +1031,20 @@ void PopupMenuEditor::drawItem( TQPainter * p, PopupMenuEditorItem * i,
     int y = r.y();
     int h = r.height();
 
-    p->fillRect( r, colorGroup().brush( TQColorGroup::Background ) );
+    p->fillRect( r, tqcolorGroup().brush( TQColorGroup::Background ) );
 
     if ( i->isSeparator() ) {
-	style().drawPrimitive( TQStyle::PE_Separator, p,
+	tqstyle().tqdrawPrimitive( TQStyle::PE_Separator, p,
 			       TQRect( r.x(), r.y() + 2, r.width(), 1 ),
-			       colorGroup(), TQStyle::Style_Sunken | f );
+			       tqcolorGroup(), TQStyle::Style_Sunken | f );
 	return;
     }
 
     const TQAction * a = i->action();
     if ( a->isToggleAction() && a->isOn() ) {
-	style().drawPrimitive( TQStyle::PE_CheckMark, p,
+	tqstyle().tqdrawPrimitive( TQStyle::PE_CheckMark, p,
 			       TQRect( x , y, iconWidth, h ),
-			       colorGroup(), f );
+			       tqcolorGroup(), f );
     } else {
 	TQPixmap icon = a->iconSet().pixmap( TQIconSet::Automatic, TQIconSet::Normal );
 	p->drawPixmap( x + ( iconWidth - icon.width() ) / 2,
@@ -1055,8 +1055,8 @@ void PopupMenuEditor::drawItem( TQPainter * p, PopupMenuEditorItem * i,
     p->drawText( x, y, textWidth, h,
 		 TQPainter::AlignLeft |
 		 TQPainter::AlignVCenter |
-		 Qt::ShowPrefix |
-		 Qt::SingleLine,
+		 TQt::ShowPrefix |
+		 TQt::SingleLine,
 		 a->menuText() );
 
     x += textWidth + borderSize * 3;
@@ -1064,9 +1064,9 @@ void PopupMenuEditor::drawItem( TQPainter * p, PopupMenuEditorItem * i,
 		 TQPainter::AlignLeft | TQPainter::AlignVCenter,
 		 a->accel() );
     if ( i->count() ) // Item has submenu
-	style().drawPrimitive( TQStyle::PE_ArrowRight, p,
+	tqstyle().tqdrawPrimitive( TQStyle::PE_ArrowRight, p,
 			       TQRect( r.width() - arrowWidth, r.y(), arrowWidth, r.height() ),
-			       colorGroup(), f );
+			       tqcolorGroup(), f );
 }
 
 void PopupMenuEditor::drawWinFocusRect( TQPainter * p, const TQRect & r ) const
@@ -1092,8 +1092,8 @@ void PopupMenuEditor::drawItems( TQPainter * p )
     int flags = 0;
     int idx = 0;
 
-    TQColorGroup enabled = colorGroup();
-    TQColorGroup disabled = palette().disabled();
+    TQColorGroup enabled = tqcolorGroup();
+    TQColorGroup disabled = tqpalette().disabled();
     TQRect focus;
     TQRect rect( borderSize, borderSize, width() - borderSize * 2, 0 );
 
@@ -1152,11 +1152,11 @@ TQSize PopupMenuEditor::contentsSize()
 		a = i->action();
 		w = a->iconSet().pixmap( TQIconSet::Automatic, TQIconSet::Normal ).rect().width() +
 		    borderSize; // padding
-		iconWidth = QMAX( iconWidth, w );
+		iconWidth = TQMAX( iconWidth, w );
 		w = fontMetrics().boundingRect( a->menuText() ).width();
-		textWidth = QMAX( textWidth, w );
+		textWidth = TQMAX( textWidth, w );
 		w = fontMetrics().boundingRect( a->accel() ).width() + 2; // added padding?
-		accelWidth = QMAX( accelWidth, w );
+		accelWidth = TQMAX( accelWidth, w );
 	    }
 	    h += itemHeight( i );
 	}
@@ -1176,8 +1176,8 @@ int PopupMenuEditor::itemHeight( const PopupMenuEditorItem * item ) const
     int padding =  + borderSize * 6;
     TQAction * a = item->action();
     int h = a->iconSet().pixmap( TQIconSet::Automatic, TQIconSet::Normal ).rect().height();
-    h = QMAX( h, fontMetrics().boundingRect( a->menuText() ).height() + padding );
-    h = QMAX( h, fontMetrics().boundingRect( a->accel() ).height() + padding );
+    h = TQMAX( h, fontMetrics().boundingRect( a->menuText() ).height() + padding );
+    h = TQMAX( h, fontMetrics().boundingRect( a->accel() ).height() + padding );
     return h;
 }
 
@@ -1229,7 +1229,7 @@ void PopupMenuEditor::dropInPlace( PopupMenuEditorItem * i, int y )
 	idx++;
 	n = itemList.next();
     }
-    int same = itemList.findRef( i );
+    int same = itemList.tqfindRef( i );
     AddActionToPopupCommand * cmd = new AddActionToPopupCommand( i18n( "Drop Item" ), formWnd, this, i, idx );
     formWnd->commandHistory()->addCommand( cmd );
     cmd->execute();
@@ -1239,12 +1239,12 @@ void PopupMenuEditor::dropInPlace( PopupMenuEditorItem * i, int y )
 
 void PopupMenuEditor::dropInPlace( TQActionGroup * g, int y )
 {
-    if (!g->children())
+    TQObjectList l = g->childrenListObject();
+    if (l.isEmpty())
 	return;
-    TQObjectList l = *g->children();
     for ( int i = 0; i < (int)l.count(); ++i ) {
-	TQAction *a = ::qt_cast<TQAction*>(l.at(i));
-	TQActionGroup *g = ::qt_cast<TQActionGroup*>(l.at(i));
+	TQAction *a = ::tqqt_cast<TQAction*>(l.at(i));
+	TQActionGroup *g = ::tqqt_cast<TQActionGroup*>(l.at(i));
 	if ( g )
 	    dropInPlace( g, y );
 	else if ( a )
@@ -1259,8 +1259,8 @@ void PopupMenuEditor::safeDec()
     } while ( currentIndex > 0 && !currentItem()->isVisible() );
     if ( currentIndex == 0 &&
 	 !currentItem()->isVisible() &&
-	 parentMenu ) {
-	parentMenu->setFocus();
+	 tqparentMenu ) {
+	tqparentMenu->setFocus();
     }
 }
 
@@ -1317,9 +1317,9 @@ void PopupMenuEditor::navigateUp( bool ctrl )
 	    safeDec();
 	}
 	showSubMenu();
-    } else if ( parentMenu ) {
-	parentMenu->setFocus();
-	parentMenu->update();
+    } else if ( tqparentMenu ) {
+	tqparentMenu->setFocus();
+	tqparentMenu->update();
     }
 }
 
@@ -1351,9 +1351,9 @@ void PopupMenuEditor::navigateLeft()
     if ( currentItem()->isSeparator() ||
 	 currentIndex >= (int)itemList.count() ||
 	 currentField == 0 ) {
-	if ( parentMenu ) {
+	if ( tqparentMenu ) {
 	    hideSubMenu();
-	    parentMenu->setFocus();
+	    tqparentMenu->setFocus();
 	} else if ( !currentItem()->isSeparator() ) {
 	    currentField = 2;
 	}
@@ -1380,7 +1380,7 @@ void PopupMenuEditor::enterEditMode( TQKeyEvent * e )
     PopupMenuEditorItem * i = currentItem();
 
     if ( i == &addSeparator ) {
-	i = createItem( new QSeparatorAction( 0 ) );
+	i = createItem( new TQSeparatorAction( 0 ) );
     } else if ( i->isSeparator() ) {
 	return;
     } else if ( currentField == 0 ) {
@@ -1401,7 +1401,7 @@ void PopupMenuEditor::leaveEditMode( TQKeyEvent * e )
     lineEdit->hide();
 
     PopupMenuEditorItem * i = 0;
-    if ( e && e->key() == Qt::Key_Escape ) {
+    if ( e && e->key() == TQt::Key_Escape ) {
  	update();
 	return;
     }
@@ -1410,7 +1410,7 @@ void PopupMenuEditor::leaveEditMode( TQKeyEvent * e )
 	// new item was created
 	TQAction * a = formWnd->mainWindow()->actioneditor()->newActionEx();
 	TQString actionText = lineEdit->text();
-	actionText.replace("&&", "&");
+	actionText.tqreplace("&&", "&");
 	TQString menuText = lineEdit->text();
 	a->setText( actionText );
 	a->setMenuText( menuText );
@@ -1448,14 +1448,14 @@ TQString PopupMenuEditor::constructName( PopupMenuEditorItem *item )
 {
     TQString s;
     TQString name = item->action()->menuText();
-    TQWidget *e = parentEditor();
-    PopupMenuEditor *p = ::qt_cast<PopupMenuEditor*>(e);
+    TQWidget *e = tqparentEditor();
+    PopupMenuEditor *p = ::tqqt_cast<PopupMenuEditor*>(e);
     if ( p ) {
-	int idx = p->find( item->m );
+	int idx = p->tqfind( item->m );
 	PopupMenuEditorItem * i = ( idx > -1 ? p->at( idx ) : 0 );
 	s = ( i ? TQString( i->action()->name() ).remove( "Action" ) : TQString( "" ) );
     } else {
-	MenuBarEditor *b = ::qt_cast<MenuBarEditor*>(e);
+	MenuBarEditor *b = ::tqqt_cast<MenuBarEditor*>(e);
 	if ( b ) {
 	    int idx = b->findItem( item->m );
 	    MenuBarEditorItem * i = ( idx > -1 ? b->item( idx ) : 0 );
diff --git a/kdevdesigner/designer/popupmenueditor.h b/kdevdesigner/designer/popupmenueditor.h
index 8c024e34..29ffcf4c 100644
--- a/kdevdesigner/designer/popupmenueditor.h
+++ b/kdevdesigner/designer/popupmenueditor.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2003 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -34,13 +34,14 @@
 class PopupMenuEditor;
 class TQMenuItem;
 
-class PopupMenuEditorItem : public QObject
+class PopupMenuEditorItem : public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
 
     friend class PopupMenuEditor;
 
-    PopupMenuEditorItem( PopupMenuEditor * menu = 0, TQObject * parent = 0, const char * name = 0 );
+    PopupMenuEditorItem( PopupMenuEditor * menu = 0, TQObject * tqparent = 0, const char * name = 0 );
 
 public:
     enum ItemType {
@@ -50,9 +51,9 @@ public:
     };
 
     PopupMenuEditorItem( TQAction * action, PopupMenuEditor * menu,
-			 TQObject * parent = 0, const char * name = 0 );
+			 TQObject * tqparent = 0, const char * name = 0 );
     PopupMenuEditorItem( PopupMenuEditorItem * item, PopupMenuEditor * menu,
-			 TQObject * parent = 0, const char * name = 0 );
+			 TQObject * tqparent = 0, const char * name = 0 );
     ~PopupMenuEditorItem();
 
     void init();
@@ -97,17 +98,18 @@ class TQLineEdit;
 
 #include <tqpopupmenu.h>
 
-class PopupMenuEditor : public QWidget
+class PopupMenuEditor : public TQWidget
 {
     Q_OBJECT
+  TQ_OBJECT
 
     friend class PopupMenuEditorItem;
     friend class MenuBarEditor;
     friend class Resource;
 
 public:
-    PopupMenuEditor( FormWindow * fw, TQWidget * parent = 0, const char * name = 0 );
-    PopupMenuEditor( FormWindow * fw, PopupMenuEditor * menu, TQWidget * parent, const char * name = 0 );
+    PopupMenuEditor( FormWindow * fw, TQWidget * tqparent = 0, const char * name = 0 );
+    PopupMenuEditor( FormWindow * fw, PopupMenuEditor * menu, TQWidget * tqparent, const char * name = 0 );
     ~PopupMenuEditor();
 
     void init();
@@ -115,8 +117,8 @@ public:
     void insert( PopupMenuEditorItem * item, int index = -1 );
     void insert( TQAction * action, int index = -1 );
     void insert( TQActionGroup * actionGroup, int index = -1 );
-    int find( const TQAction * action );
-    int find( PopupMenuEditor * menu );
+    int tqfind( const TQAction * action );
+    int tqfind( PopupMenuEditor * menu );
     int count();
     PopupMenuEditorItem * at( int index );
     PopupMenuEditorItem * at( TQPoint pos ) { return itemAt( pos.y() ); }
@@ -131,14 +133,14 @@ public:
     void show();
     void choosePixmap( int index = -1 );
     void showLineEdit( int index = -1);
-    void setAccelerator( int key, Qt::ButtonState state, int index = -1 );
+    void setAccelerator( int key, TQt::ButtonState state, int index = -1 );
 
     FormWindow * formWindow() { return formWnd; }
     bool isCreatingAccelerator() { return ( currentField == 2 ); }
 
     TQPtrList<PopupMenuEditorItem> * items() { return &itemList; }
 
-    TQWidget * parentEditor() { return parentMenu; }
+    TQWidget * tqparentEditor() { return tqparentMenu; }
 
 signals:
     void inserted( TQAction * );
@@ -151,7 +153,7 @@ public slots:
     void paste() { paste( currentIndex ); }
 
     void remove( int index );
-    void remove( TQAction * a ) { remove( find( a ) ); }
+    void remove( TQAction * a ) { remove( tqfind( a ) ); }
 
     void resizeToContents();
     void showSubMenu();
@@ -210,7 +212,7 @@ private:
     TQPtrList<PopupMenuEditorItem> itemList;
     PopupMenuEditorItem addItem;
     PopupMenuEditorItem addSeparator;
-    TQWidget * parentMenu;
+    TQWidget * tqparentMenu;
 
     int iconWidth;
     int textWidth;
diff --git a/kdevdesigner/designer/preferences.ui b/kdevdesigner/designer/preferences.ui
index 58cc7def..ea57a056 100644
--- a/kdevdesigner/designer/preferences.ui
+++ b/kdevdesigner/designer/preferences.ui
@@ -25,7 +25,7 @@
 ** not clear to you.
 **
 *********************************************************************</comment>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>Preferences</cstring>
     </property>
@@ -56,11 +56,11 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QTabWidget">
+        <widget class="TQTabWidget">
             <property name="name">
                 <cstring>tabWidget</cstring>
             </property>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>pageGeneral</cstring>
                 </property>
@@ -71,7 +71,7 @@
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QGroupBox" row="1" column="1">
+                    <widget class="TQGroupBox" row="1" column="1">
                         <property name="name">
                             <cstring>groupBox4</cstring>
                         </property>
@@ -82,7 +82,7 @@
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QCheckBox">
+                            <widget class="TQCheckBox">
                                 <property name="name">
                                     <cstring>checkBoxAutoSave</cstring>
                                 </property>
@@ -93,15 +93,15 @@
                                     <bool>true</bool>
                                 </property>
                             </widget>
-                            <widget class="QLayoutWidget">
+                            <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>layout3</cstring>
+                                    <cstring>tqlayout3</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
                                         <cstring>unnamed</cstring>
                                     </property>
-                                    <widget class="QLabel">
+                                    <widget class="TQLabel">
                                         <property name="name">
                                             <cstring>textLabelAutoSave</cstring>
                                         </property>
@@ -112,7 +112,7 @@
                                             <cstring>timeEditAutoSave</cstring>
                                         </property>
                                     </widget>
-                                    <widget class="QTimeEdit">
+                                    <widget class="TQTimeEdit">
                                         <property name="name">
                                             <cstring>timeEditAutoSave</cstring>
                                         </property>
@@ -128,7 +128,7 @@
                             </widget>
                         </vbox>
                     </widget>
-                    <widget class="QButtonGroup" row="2" column="0" rowspan="1" colspan="2">
+                    <widget class="TQButtonGroup" row="2" column="0" rowspan="1" colspan="2">
                         <property name="name">
                             <cstring>buttonGroup2</cstring>
                         </property>
@@ -139,7 +139,7 @@
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="QTextEdit">
+                            <widget class="TQTextEdit">
                                 <property name="name">
                                     <cstring>textEditPluginPaths</cstring>
                                 </property>
@@ -156,7 +156,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
@@ -166,7 +166,7 @@
                             <string>A splash screen is displayed when starting Qt Designer if this option is checked.</string>
                         </property>
                     </spacer>
-                    <widget class="QGroupBox" row="1" column="0">
+                    <widget class="TQGroupBox" row="1" column="0">
                         <property name="name">
                             <cstring>GroupBox5</cstring>
                         </property>
@@ -183,7 +183,7 @@
                             <property name="spacing">
                                 <number>6</number>
                             </property>
-                            <widget class="QCheckBox">
+                            <widget class="TQCheckBox">
                                 <property name="name">
                                     <cstring>checkBoxWorkspace</cstring>
                                 </property>
@@ -200,7 +200,7 @@
                                     <string>The current workspace settings will be restored the next time you start Qt Designer if this option is checked.</string>
                                 </property>
                             </widget>
-                            <widget class="QCheckBox">
+                            <widget class="TQCheckBox">
                                 <property name="name">
                                     <cstring>checkBoxSplash</cstring>
                                 </property>
@@ -217,7 +217,7 @@
                                     <string>A splash screen is displayed when starting Qt Designer if this option is checked.</string>
                                 </property>
                             </widget>
-                            <widget class="QCheckBox">
+                            <widget class="TQCheckBox">
                                 <property name="name">
                                     <cstring>checkBoxStartDialog</cstring>
                                 </property>
@@ -228,7 +228,7 @@
                                     <bool>true</bool>
                                 </property>
                             </widget>
-                            <widget class="QCheckBox">
+                            <widget class="TQCheckBox">
                                 <property name="name">
                                     <cstring>checkAutoEdit</cstring>
                                 </property>
@@ -239,7 +239,7 @@
                                     <bool>true</bool>
                                 </property>
                             </widget>
-                            <widget class="QCheckBox">
+                            <widget class="TQCheckBox">
                                 <property name="name">
                                     <cstring>checkBoxTextLabels</cstring>
                                 </property>
@@ -255,7 +255,7 @@
                             </widget>
                         </vbox>
                     </widget>
-                    <widget class="QGroupBox" row="0" column="1">
+                    <widget class="TQGroupBox" row="0" column="1">
                         <property name="name">
                             <cstring>groupBoxGrid</cstring>
                         </property>
@@ -278,7 +278,7 @@
                             <property name="spacing">
                                 <number>6</number>
                             </property>
-                            <widget class="QCheckBox">
+                            <widget class="TQCheckBox">
                                 <property name="name">
                                     <cstring>checkBoxSnapGrid</cstring>
                                 </property>
@@ -295,7 +295,7 @@
                                     <string>&lt;b&gt;Customize the grid-settings for all forms.&lt;/b&gt;&lt;p&gt;When &lt;b&gt;Snap to Grid&lt;/b&gt; is checked, the widgets snap to the grid using the the X/Y resolution.&lt;/p&gt;</string>
                                 </property>
                             </widget>
-                            <widget class="QLayoutWidget">
+                            <widget class="TQLayoutWidget">
                                 <property name="name">
                                     <cstring>Layout4</cstring>
                                 </property>
@@ -309,7 +309,7 @@
                                     <property name="spacing">
                                         <number>6</number>
                                     </property>
-                                    <widget class="QSpinBox" row="0" column="1">
+                                    <widget class="TQSpinBox" row="0" column="1">
                                         <property name="name">
                                             <cstring>spinGridX</cstring>
                                         </property>
@@ -329,7 +329,7 @@
                                             <string>&lt;b&gt;Customize the grid-settings for all forms.&lt;/b&gt;&lt;p&gt;When &lt;b&gt;Show Grid&lt;/b&gt; is checked, a grid is shown on all forms using the X/Y resolution.&lt;/p&gt;</string>
                                         </property>
                                     </widget>
-                                    <widget class="QSpinBox" row="1" column="1">
+                                    <widget class="TQSpinBox" row="1" column="1">
                                         <property name="name">
                                             <cstring>spinGridY</cstring>
                                         </property>
@@ -349,7 +349,7 @@
                                             <string>&lt;b&gt;Customize the grid-settings for all forms.&lt;/b&gt;&lt;p&gt;When &lt;b&gt;Show Grid&lt;/b&gt; is checked, a grid is shown on all forms using the X/Y resolution.&lt;/p&gt;</string>
                                         </property>
                                     </widget>
-                                    <widget class="QLabel" row="0" column="0">
+                                    <widget class="TQLabel" row="0" column="0">
                                         <property name="name">
                                             <cstring>Label1</cstring>
                                         </property>
@@ -360,7 +360,7 @@
                                             <cstring>spinGridX</cstring>
                                         </property>
                                     </widget>
-                                    <widget class="QLabel" row="1" column="0">
+                                    <widget class="TQLabel" row="1" column="0">
                                         <property name="name">
                                             <cstring>Label1_2</cstring>
                                         </property>
@@ -375,7 +375,7 @@
                             </widget>
                         </vbox>
                     </widget>
-                    <widget class="QButtonGroup" row="0" column="0">
+                    <widget class="TQButtonGroup" row="0" column="0">
                         <property name="name">
                             <cstring>ButtonGroup1</cstring>
                         </property>
@@ -420,7 +420,7 @@
                                     <string>Select a color in the color dialog.</string>
                                 </property>
                             </widget>
-                            <widget class="QRadioButton" row="0" column="0">
+                            <widget class="TQRadioButton" row="0" column="0">
                                 <property name="name">
                                     <cstring>radioColor</cstring>
                                 </property>
@@ -437,7 +437,7 @@
                                     <string>Use a background color.</string>
                                 </property>
                             </widget>
-                            <widget class="QRadioButton" row="1" column="0">
+                            <widget class="TQRadioButton" row="1" column="0">
                                 <property name="name">
                                     <cstring>radioPixmap</cstring>
                                 </property>
@@ -484,7 +484,7 @@
                 </grid>
             </widget>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>Layout6</cstring>
             </property>
@@ -498,7 +498,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>helpButton</cstring>
                     </property>
@@ -519,14 +519,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonOk</cstring>
                     </property>
@@ -543,7 +543,7 @@
                         <string>Close the dialog and apply all the changes.</string>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonCancel</cstring>
                     </property>
@@ -636,11 +636,11 @@
     <tabstop>checkBoxTextLabels</tabstop>
     <tabstop>helpButton</tabstop>
 </tabstops>
-<slots>
+<Q_SLOTS>
     <slot access="protected">init()</slot>
     <slot access="protected">destroy()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>styledbutton.h</includehint>
     <includehint>styledbutton.h</includehint>
diff --git a/kdevdesigner/designer/previewframe.cpp b/kdevdesigner/designer/previewframe.cpp
index 98c3c9b0..1722d765 100644
--- a/kdevdesigner/designer/previewframe.cpp
+++ b/kdevdesigner/designer/previewframe.cpp
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -29,15 +29,15 @@
 
 #include "previewframe.h"
 
-PreviewFrame::PreviewFrame( TQWidget *parent, const char *name )
-    : TQVBox( parent, name )
+PreviewFrame::PreviewFrame( TQWidget *tqparent, const char *name )
+    : TQVBox( tqparent, name )
 {
     setMinimumSize(200, 200);
     setFrameStyle(TQFrame::StyledPanel | TQFrame::Sunken);
     setLineWidth(1);
 
     PreviewWorkspace * w = new PreviewWorkspace( this );
-    w->setEraseColor(colorGroup().dark());
+    w->setEraseColor(tqcolorGroup().dark());
     previewWidget = new PreviewWidget( w );
     previewWidget->move( 10, 10 );
 }
diff --git a/kdevdesigner/designer/previewframe.h b/kdevdesigner/designer/previewframe.h
index 0834c178..23af94ad 100644
--- a/kdevdesigner/designer/previewframe.h
+++ b/kdevdesigner/designer/previewframe.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -32,24 +32,26 @@
 
 #include "previewwidgetimpl.h"
 
-class PreviewWorkspace : public QWorkspace
+class PreviewWorkspace : public TQWorkspace
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    PreviewWorkspace( TQWidget* parent = 0, const char* name = 0 )
-        : TQWorkspace( parent, name ) {}
+    PreviewWorkspace( TQWidget* tqparent = 0, const char* name = 0 )
+        : TQWorkspace( tqparent, name ) {}
     ~PreviewWorkspace() {}
 
 protected:
     void paintEvent( TQPaintEvent* );
 };
 
-class PreviewFrame : public QVBox
+class PreviewFrame : public TQVBox
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    PreviewFrame( TQWidget *parent = 0, const char *name = 0 );
+    PreviewFrame( TQWidget *tqparent = 0, const char *name = 0 );
     void setPreviewPalette(TQPalette);
 
 private:
diff --git a/kdevdesigner/designer/previewwidget.ui b/kdevdesigner/designer/previewwidget.ui
index f297d2d4..0cc680c8 100644
--- a/kdevdesigner/designer/previewwidget.ui
+++ b/kdevdesigner/designer/previewwidget.ui
@@ -25,7 +25,7 @@
 ** not clear to you.
 **
 *********************************************************************</comment>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>PreviewWidgetBase</cstring>
     </property>
@@ -56,7 +56,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>Layout6</cstring>
             </property>
@@ -70,7 +70,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
                         <cstring>Layout17</cstring>
                     </property>
@@ -84,7 +84,7 @@
                         <property name="spacing">
                             <number>6</number>
                         </property>
-                        <widget class="QButtonGroup">
+                        <widget class="TQButtonGroup">
                             <property name="name">
                                 <cstring>ButtonGroup1</cstring>
                             </property>
@@ -101,7 +101,7 @@
                                 <property name="spacing">
                                     <number>6</number>
                                 </property>
-                                <widget class="QRadioButton">
+                                <widget class="TQRadioButton">
                                     <property name="name">
                                         <cstring>RadioButton1</cstring>
                                     </property>
@@ -112,7 +112,7 @@
                                         <bool>true</bool>
                                     </property>
                                 </widget>
-                                <widget class="QRadioButton">
+                                <widget class="TQRadioButton">
                                     <property name="name">
                                         <cstring>RadioButton2</cstring>
                                     </property>
@@ -120,7 +120,7 @@
                                         <string>RadioButton2</string>
                                     </property>
                                 </widget>
-                                <widget class="QRadioButton">
+                                <widget class="TQRadioButton">
                                     <property name="name">
                                         <cstring>RadioButton3</cstring>
                                     </property>
@@ -130,7 +130,7 @@
                                 </widget>
                             </vbox>
                         </widget>
-                        <widget class="QButtonGroup">
+                        <widget class="TQButtonGroup">
                             <property name="name">
                                 <cstring>ButtonGroup2</cstring>
                             </property>
@@ -147,7 +147,7 @@
                                 <property name="spacing">
                                     <number>6</number>
                                 </property>
-                                <widget class="QCheckBox">
+                                <widget class="TQCheckBox">
                                     <property name="name">
                                         <cstring>CheckBox1</cstring>
                                     </property>
@@ -158,7 +158,7 @@
                                         <bool>true</bool>
                                     </property>
                                 </widget>
-                                <widget class="QCheckBox">
+                                <widget class="TQCheckBox">
                                     <property name="name">
                                         <cstring>CheckBox2</cstring>
                                     </property>
@@ -168,7 +168,7 @@
                                 </widget>
                             </vbox>
                         </widget>
-                        <widget class="QProgressBar">
+                        <widget class="TQProgressBar">
                             <property name="name">
                                 <cstring>ProgressBar1</cstring>
                             </property>
@@ -178,7 +178,7 @@
                         </widget>
                     </vbox>
                 </widget>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
                         <cstring>Layout5</cstring>
                     </property>
@@ -200,7 +200,7 @@
                                 <string>LineEdit</string>
                             </property>
                         </widget>
-                        <widget class="QComboBox">
+                        <widget class="TQComboBox">
                             <item>
                                 <property name="text">
                                     <string>ComboBox</string>
@@ -210,7 +210,7 @@
                                 <cstring>ComboBox1</cstring>
                             </property>
                         </widget>
-                        <widget class="QLayoutWidget">
+                        <widget class="TQLayoutWidget">
                             <property name="name">
                                 <cstring>Layout13</cstring>
                             </property>
@@ -224,12 +224,12 @@
                                 <property name="spacing">
                                     <number>6</number>
                                 </property>
-                                <widget class="QSpinBox">
+                                <widget class="TQSpinBox">
                                     <property name="name">
                                         <cstring>SpinBox1</cstring>
                                     </property>
                                 </widget>
-                                <widget class="QPushButton">
+                                <widget class="TQPushButton">
                                     <property name="name">
                                         <cstring>PushButton1</cstring>
                                     </property>
@@ -239,7 +239,7 @@
                                 </widget>
                             </hbox>
                         </widget>
-                        <widget class="QScrollBar">
+                        <widget class="TQScrollBar">
                             <property name="name">
                                 <cstring>ScrollBar1</cstring>
                             </property>
@@ -247,7 +247,7 @@
                                 <enum>Horizontal</enum>
                             </property>
                         </widget>
-                        <widget class="QSlider">
+                        <widget class="TQSlider">
                             <property name="name">
                                 <cstring>Slider1</cstring>
                             </property>
@@ -255,11 +255,11 @@
                                 <enum>Horizontal</enum>
                             </property>
                         </widget>
-                        <widget class="QTextView">
+                        <widget class="TQTextView">
                             <property name="name">
                                 <cstring>textView</cstring>
                             </property>
-                            <property name="maximumSize">
+                            <property name="tqmaximumSize">
                                 <size>
                                     <width>32767</width>
                                     <height>50</height>
@@ -288,7 +288,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
diff --git a/kdevdesigner/designer/previewwidgetimpl.cpp b/kdevdesigner/designer/previewwidgetimpl.cpp
index a2226ac2..3279b284 100644
--- a/kdevdesigner/designer/previewwidgetimpl.cpp
+++ b/kdevdesigner/designer/previewwidgetimpl.cpp
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -27,8 +27,8 @@
 #include "tqobjectlist.h"
 #include "previewwidgetimpl.h"
 
-PreviewWidget::PreviewWidget( TQWidget *parent, const char *name )
-    : PreviewWidgetBase( parent, name )
+PreviewWidget::PreviewWidget( TQWidget *tqparent, const char *name )
+    : PreviewWidgetBase( tqparent, name )
 {
     // install event filter on child widgets
     TQObjectList *l = queryList(TQWIDGET_OBJECT_NAME_STRING);
@@ -37,7 +37,7 @@ PreviewWidget::PreviewWidget( TQWidget *parent, const char *name )
     while ((obj = it.current()) != 0) {
         ++it;
         obj->installEventFilter(this);
-	((TQWidget*)obj)->setFocusPolicy(NoFocus);
+	((TQWidget*)obj)->setFocusPolicy(TQ_NoFocus);
     }
 }
 
diff --git a/kdevdesigner/designer/previewwidgetimpl.h b/kdevdesigner/designer/previewwidgetimpl.h
index 497e2fe0..49f56875 100644
--- a/kdevdesigner/designer/previewwidgetimpl.h
+++ b/kdevdesigner/designer/previewwidgetimpl.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -32,9 +32,10 @@
 class PreviewWidget : public PreviewWidgetBase
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    PreviewWidget( TQWidget *parent = 0, const char *name = 0 );
+    PreviewWidget( TQWidget *tqparent = 0, const char *name = 0 );
 
     void closeEvent(TQCloseEvent *);
     bool eventFilter(TQObject *, TQEvent *);
diff --git a/kdevdesigner/designer/project.cpp b/kdevdesigner/designer/project.cpp
index a714bd07..5c700a0f 100644
--- a/kdevdesigner/designer/project.cpp
+++ b/kdevdesigner/designer/project.cpp
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-**1 This file is part of Qt Designer.
+**1 This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -29,7 +29,7 @@
 #include "designerappiface.h"
 #include "../interfaces/languageinterface.h"
 #include "pixmapcollection.h"
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 #include "dbconnectionimpl.h"
 #endif
 #include "resource.h"
@@ -48,7 +48,7 @@
 #include "mainwindow.h"
 #include <tqworkspace.h>
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 #include <tqsqldatabase.h>
 #include <tqsqlrecord.h>
 #include <tqdatatable.h>
@@ -61,7 +61,7 @@
 
 #include <klocale.h>
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 DatabaseConnection::~DatabaseConnection()
 {
     delete iface;
@@ -69,7 +69,7 @@ DatabaseConnection::~DatabaseConnection()
 
 bool DatabaseConnection::refreshCatalog()
 {
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     if ( loaded )
 	return TRUE;
     if ( !open() )
@@ -91,7 +91,7 @@ bool DatabaseConnection::refreshCatalog()
 #endif
 }
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 void DatabaseConnection::remove()
 {
     if ( nm == "(default)" )
@@ -105,15 +105,15 @@ void DatabaseConnection::remove()
 
 bool DatabaseConnection::open( bool suppressDialog )
 {
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     // register our name, if nec
     if ( nm == "(default)" ) {
-	if ( !TQSqlDatabase::contains() ) // default doesn't exists?
+	if ( !TQSqlDatabase::tqcontains() ) // default doesn't exists?
 	    conn = TQSqlDatabase::addDatabase( drv );
 	else
 	    conn = TQSqlDatabase::database();
     } else {
-	if ( !TQSqlDatabase::contains( nm ) )
+	if ( !TQSqlDatabase::tqcontains( nm ) )
 	    conn = TQSqlDatabase::addDatabase( drv, nm );
 	else
 	    conn = TQSqlDatabase::database( nm );
@@ -152,7 +152,7 @@ bool DatabaseConnection::open( bool suppressDialog )
 					  + TQString( "[" + conn->lastError().driverText() + "\n" +
 						     conn->lastError().databaseText() + "]\n" ),
 					  i18n( "&OK" ),
-					  i18n( "&Cancel" ), TQString::null, 0, 1 ) ) {
+					  i18n( "&Cancel" ), TQString(), 0, 1 ) ) {
 	    case 0: // OK or Enter
 		continue;
 	    case 1: // Cancel or Escape
@@ -178,7 +178,7 @@ void DatabaseConnection::close()
 {
     if ( !loaded )
 	return;
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     if ( conn ) {
 	conn->close();
     }
@@ -202,7 +202,7 @@ bool Project::isDummy() const
 }
 
 Project::Project( const TQString &fn, const TQString &pName,
-		  QPluginManager<ProjectSettingsInterface> *pm, bool isDummy,
+		  TQPluginManager<ProjectSettingsInterface> *pm, bool isDummy,
 		  const TQString &l )
     : proName( pName ), projectSettingsPluginManager( pm ), isDummyProject( isDummy )
 {
@@ -236,7 +236,7 @@ void Project::setModified( bool b )
     emit projectModified();
 }
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 DatabaseConnection *Project::databaseConnection( const TQString &name )
 {
     for ( DatabaseConnection *conn = dbConnections.first();
@@ -285,8 +285,8 @@ void Project::setFileName( const TQString &fn, bool doClear )
     }
 
 
-    if ( proName.contains( '.' ) )
-	proName = proName.left( proName.find( '.' ) );
+    if ( proName.tqcontains( '.' ) )
+	proName = proName.left( proName.tqfind( '.' ) );
 
     if ( !doClear )
 	return;
@@ -389,7 +389,7 @@ TQStringList parse_multiline_part( const TQString &contents, const TQString &key
 		       c == '$' || c == '-' || c == '(' || c == ')' || c == ':'  || c == '+' || c == ',' || c == '~' ) &&
 		     c != ' ' && c != '\t' && c != '\n' ) {
 		    if ( !inName )
-			currName = TQString::null;
+			currName = TQString();
 		    if ( c != '\\' || contents[i+1] != '\n' ) {
 			currName += c;
 			inName = TRUE;
@@ -424,7 +424,7 @@ void Project::parse()
 
     TQStringList::ConstIterator it;
 
-    int i = contents.find( "LANGUAGE" );
+    int i = contents.tqfind( "LANGUAGE" );
     if ( i != -1 ) {
 	lang = "";
 	is_cpp = FALSE;
@@ -433,7 +433,7 @@ void Project::parse()
 	is_cpp = lang == "C++";
     }
 
-    i = contents.find( "DBFILE" );
+    i = contents.tqfind( "DBFILE" );
     if ( i != -1 ) {
 	dbFile = "";
 	TQString part = contents.mid( i + TQString( "DBFILE" ).length() );
@@ -449,7 +449,7 @@ void Project::parse()
     }
 
 
-    i = contents.find( "TEMPLATE" );
+    i = contents.tqfind( "TEMPLATE" );
     if ( i != -1 ) {
 	templ = "";
 	TQString part = contents.mid( i + TQString( "TEMPLATE" ).length() );
@@ -477,12 +477,12 @@ void Project::parse()
     updateCustomSettings();
 
     for ( it = csList.begin(); it != csList.end(); ++it ) {
-	i = contents.find( *it );
+	i = contents.tqfind( *it );
 	if ( i != -1 ) {
 	    TQString val = "";
 	    TQString part = contents.mid( i + TQString( *it ).length() );
 	    val = parse_part( part );
-	    customSettings.replace( *it, val );
+	    customSettings.tqreplace( *it, val );
 	}
     }
 
@@ -511,7 +511,7 @@ void Project::clear()
 
 bool Project::removeSourceFile( SourceFile *sf )
 {
-    if ( !sourcefiles.containsRef( sf ) )
+    if ( !sourcefiles.tqcontainsRef( sf ) )
 	return FALSE;
     if ( !sf->close() )
 	return FALSE;
@@ -569,10 +569,10 @@ TQString Project::makeRelative( const TQString &f )
 
 static void remove_contents( TQString &contents, const TQString &s )
 {
-    int i = contents.find( s );
+    int i = contents.tqfind( s );
     if ( i != -1 ) {
 	int start = i;
-	int end = contents.find( '\n', i );
+	int end = contents.tqfind( '\n', i );
 	if ( end == -1 )
 	    end = contents.length() - 1;
 	contents.remove( start, end - start + 1 );
@@ -581,7 +581,7 @@ static void remove_contents( TQString &contents, const TQString &s )
 
 static void remove_multiline_contents( TQString &contents, const TQString &s, int *strt = 0 )
 {
-    int i = contents.find( s );
+    int i = contents.tqfind( s );
     if ( strt )
 	*strt = i;
     int start = i;
@@ -691,7 +691,7 @@ void Project::save( bool onlyProjectFile )
  	contents +=
  	    "unix {\n"
  	    "  UI_DIR = .ui\n"
- 	    "  MOC_DIR = .moc\n"
+ 	    "  TQMOC_DIR = .tqmoc\n"
  	    "  OBJECTS_DIR = .obj\n"
  	    "}\n";
     }
@@ -704,7 +704,7 @@ void Project::save( bool onlyProjectFile )
 	    TQString key = iface->projectKeyForExtension( TQFileInfo( f->fileName() ).extension() );
 	    TQStringList lst = sourceToKey[ key ];
 	    lst << makeRelative( f->fileName() );
-	    sourceToKey.replace( key, lst );
+	    sourceToKey.tqreplace( key, lst );
 	}
 
 	for ( TQMap<TQString, TQStringList>::Iterator skit = sourceToKey.begin();
@@ -751,7 +751,7 @@ void Project::save( bool onlyProjectFile )
 
     // custom settings
     for ( TQStringList::Iterator it = csList.begin(); it != csList.end(); ++it ) {
-	TQString val = *customSettings.find( *it );
+	TQString val = *customSettings.tqfind( *it );
 	if ( !val.isEmpty() )
 	    contents += *it + "\t= " + val + "\n";
     }
@@ -778,21 +778,21 @@ void Project::save( bool onlyProjectFile )
     }
 }
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 TQPtrList<DatabaseConnection> Project::databaseConnections() const
 {
     return dbConnections;
 }
 #endif
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 void Project::setDatabaseConnections( const TQPtrList<DatabaseConnection> &lst )
 {
     dbConnections = lst;
 }
 #endif
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 void Project::addDatabaseConnection( DatabaseConnection *conn )
 {
     dbConnections.append( conn );
@@ -800,7 +800,7 @@ void Project::addDatabaseConnection( DatabaseConnection *conn )
 }
 #endif
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 void Project::removeDatabaseConnection( const TQString &c )
 {
     for ( DatabaseConnection *conn = dbConnections.first(); conn; conn = dbConnections.next() ) {
@@ -814,7 +814,7 @@ void Project::removeDatabaseConnection( const TQString &c )
 }
 #endif
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 TQStringList Project::databaseConnectionList()
 {
     TQStringList lst;
@@ -824,7 +824,7 @@ TQStringList Project::databaseConnectionList()
 }
 #endif
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 TQStringList Project::databaseTableList( const TQString &connection )
 {
     DatabaseConnection *conn = databaseConnection( connection );
@@ -835,7 +835,7 @@ TQStringList Project::databaseTableList( const TQString &connection )
 }
 #endif
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 TQStringList Project::databaseFieldList( const TQString &connection, const TQString &table )
 {
     DatabaseConnection *conn = databaseConnection( connection );
@@ -845,7 +845,7 @@ TQStringList Project::databaseFieldList( const TQString &connection, const TQStr
 }
 #endif
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 static TQString makeIndent( int indent )
 {
     TQString s;
@@ -854,7 +854,7 @@ static TQString makeIndent( int indent )
 }
 #endif
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 static void saveSingleProperty( TQTextStream &ts, const TQString& name, const TQString& value, int indent )
 {
     ts << makeIndent( indent ) << "<property name=\"" << name << "\">" << endl;
@@ -867,7 +867,7 @@ static void saveSingleProperty( TQTextStream &ts, const TQString& name, const TQ
 
 void Project::saveConnections()
 {
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     if ( dbFile.isEmpty() ) {
 	TQFileInfo fi( fileName() );
 	setDatabaseDescription( fi.baseName() + ".db" );
@@ -934,7 +934,7 @@ void Project::saveConnections()
 #endif
 }
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 static TQDomElement loadSingleProperty( TQDomElement e, const TQString& name )
 {
     TQDomElement n;
@@ -950,7 +950,7 @@ static TQDomElement loadSingleProperty( TQDomElement e, const TQString& name )
 
 void Project::loadConnections()
 {
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     if ( dbFile.isEmpty() || !TQFile::exists( makeAbsolute( dbFile ) ) )
 	return;
 
@@ -1021,7 +1021,7 @@ can be closed again with closeDatabase().
 
 bool Project::openDatabase( const TQString &connection, bool suppressDialog )
 {
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     DatabaseConnection *conn = databaseConnection( connection );
     if ( connection.isEmpty() && !conn )
 	conn = databaseConnection( "(default)" );
@@ -1040,7 +1040,7 @@ bool Project::openDatabase( const TQString &connection, bool suppressDialog )
 */
 void Project::closeDatabase( const TQString &connection )
 {
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     DatabaseConnection *conn = databaseConnection( connection );
     if ( connection.isEmpty() && !conn )
 	conn = databaseConnection( "(default)" );
@@ -1105,7 +1105,7 @@ void Project::setCustomSetting( const TQString &key, const TQString &value )
 
 TQString Project::customSetting( const TQString &key ) const
 {
-    return *customSettings.find( key );
+    return *customSettings.tqfind( key );
 }
 
 void Project::updateCustomSettings()
@@ -1115,14 +1115,14 @@ void Project::updateCustomSettings()
 
 /*
     ProjectSettingsInterface *iface = 0;
-    projectSettingsPluginManager->queryInterface( lang, (QUnknownInterface**)&iface );
+    projectSettingsPluginManager->queryInterface( lang, (TQUnknownInterface**)&iface );
     if ( !iface )
 	return;
     csList = iface->projectSettings();
     iface->release();
 */
 
-    QInterfacePtr<ProjectSettingsInterface> iface;
+    TQInterfacePtr<ProjectSettingsInterface> iface;
     projectSettingsPluginManager->queryInterface( lang, &iface );
     if ( !iface )
 	return;
@@ -1170,23 +1170,23 @@ void Project::setIncludePath( const TQString &platform, const TQString &path )
 {
     if ( inclPath[platform] == path )
 	return;
-    inclPath.replace( platform, path );
+    inclPath.tqreplace( platform, path );
     modified = TRUE;
 }
 
 void Project::setLibs( const TQString &platform, const TQString &path )
 {
-    lbs.replace( platform, path );
+    lbs.tqreplace( platform, path );
 }
 
 void Project::setDefines( const TQString &platform, const TQString &path )
 {
-    defs.replace( platform, path );
+    defs.tqreplace( platform, path );
 }
 
 void Project::setConfig( const TQString &platform, const TQString &config )
 {
-    cfg.replace( platform, config );
+    cfg.tqreplace( platform, config );
 }
 
 TQString Project::config( const TQString &platform ) const
@@ -1223,8 +1223,8 @@ void Project::readPlatformSettings( const TQString &contents,
 				    const TQString &setting,
 				    TQMap<TQString, TQString> &res )
 {
-    const TQString platforms[] = { "", "win32", "unix", "mac", TQString::null };
-    for ( int i = 0; platforms[ i ] != TQString::null; ++i ) {
+    const TQString platforms[] = { "", "win32", "unix", "mac", TQString() };
+    for ( int i = 0; platforms[ i ] != TQString(); ++i ) {
 	TQString p = platforms[ i ];
 	if ( !p.isEmpty() )
 	    p += ":";
@@ -1233,14 +1233,14 @@ void Project::readPlatformSettings( const TQString &contents,
 	TQString key = platforms[ i ];
 	if ( key.isEmpty() )
 	    key = "(all)";
-	res.replace( key, s );
+	res.tqreplace( key, s );
     }
 }
 
 void Project::removePlatformSettings( TQString &contents, const TQString &setting )
 {
-    const TQString platforms[] = { "win32", "unix", "mac", "", TQString::null };
-    for ( int i = 0; platforms[ i ] != TQString::null; ++i ) {
+    const TQString platforms[] = { "win32", "unix", "mac", "", TQString() };
+    for ( int i = 0; platforms[ i ] != TQString(); ++i ) {
 	TQString p = platforms[ i ];
 	if ( !p.isEmpty() )
 	    p += ":";
@@ -1251,21 +1251,21 @@ void Project::removePlatformSettings( TQString &contents, const TQString &settin
 void Project::writePlatformSettings( TQString &contents, const TQString &setting,
 				     const TQMap<TQString, TQString> &input )
 {
-    const TQString platforms[] = { "", "win32", "unix", "mac", TQString::null };
+    const TQString platforms[] = { "", "win32", "unix", "mac", TQString() };
     int i;
     LanguageInterface *iface = MetaDataBase::languageInterface( lang );
     if (iface && (setting == "SOURCES" || setting == "HEADERS")) // The (all) part will be saved later on
         i = 1;
     else
 	i = 0;
-    for (; platforms[ i ] != TQString::null; ++i ) {
+    for (; platforms[ i ] != TQString(); ++i ) {
 	TQString p = platforms[ i ];
 	if ( !p.isEmpty() )
 	    p += ":";
 	TQString key = platforms[ i ];
 	if ( key.isEmpty() )
 	    key = "(all)";
-	TQMap<TQString, TQString>::ConstIterator it = input.find( key );
+	TQMap<TQString, TQString>::ConstIterator it = input.tqfind( key );
 	if ( it == input.end() || (*it).isEmpty() )
 	    continue;
 	contents += p + setting + "\t+= " + *it + "\n";
@@ -1281,7 +1281,7 @@ void Project::addFormFile( FormFile *ff )
 
 bool Project::removeFormFile( FormFile *ff )
 {
-    if ( !formfiles.containsRef( ff ) )
+    if ( !formfiles.tqcontainsRef( ff ) )
 	return FALSE;
     if ( !ff->close() )
 	return FALSE;
@@ -1300,8 +1300,8 @@ void Project::addObject( TQObject *o )
     fakeFormFiles.insert( (void*)o, ff );
     MetaDataBase::addEntry( o );
     if ( hasGUI() ) {
-	TQWidget *parent = MainWindow::self ? MainWindow::self->qWorkspace() : 0;
-	FormWindow *fw = new FormWindow( ff, MainWindow::self, parent, "qt_fakewindow" );
+	TQWidget *tqparent = MainWindow::self ? MainWindow::self->qWorkspace() : 0;
+	FormWindow *fw = new FormWindow( ff, MainWindow::self, tqparent, "qt_fakewindow" );
 	fw->setProject( this );
 	if ( TQFile::exists( ff->absFileName() ) )
 	    Resource::loadExtraSource( ff, ff->absFileName(),
@@ -1316,8 +1316,8 @@ void Project::addObject( TQObject *o )
 		     TQT_SLOT( updateUndoRedo( bool, bool, const TQString &, const TQString & ) )
 		);
 	}
-	if ( fw->parentWidget() ) {
-	    fw->parentWidget()->setFixedSize( 1, 1 );
+	if ( fw->tqparentWidget() ) {
+	    fw->tqparentWidget()->setFixedSize( 1, 1 );
 	    fw->show();
 	}
     } else {
@@ -1352,7 +1352,7 @@ TQObjectList Project::objects() const
 
 FormFile *Project::fakeFormFileFor( TQObject *o ) const
 {
-    return fakeFormFiles.find( (void*)o );
+    return fakeFormFiles.tqfind( (void*)o );
 }
 
 TQObject *Project::objectForFakeForm( FormWindow *fw ) const
@@ -1396,7 +1396,7 @@ void Project::removeTempProject()
     }
     d.remove( TQFileInfo( filename ).dirPath() );
 #if defined(Q_OS_UNIX)
-    // ##### implement for all platforms, ideally should be in Qt
+    // ##### implement for all platforms, ideally should be in TQt
     ::rmdir( TQFile::encodeName( d.absPath() ) );
 #endif
 }
@@ -1411,14 +1411,14 @@ void Project::addAndEditFunction( const TQString &function, const TQString &func
 		return;
 	    iface->functions( f->text(), &funcs );
 	    TQString func = function;
-	    int i = func.find( '(' );
+	    int i = func.tqfind( '(' );
 	    if ( i != -1 )
 		func = func.left( i );
 
 	    bool found = FALSE;
 	    for ( TQValueList<LanguageInterface::Function>::Iterator it = funcs.begin();
 		  it != funcs.end(); ++it ) {
-		if ( (*it).name.left( (*it).name.find( '(' ) ) == func ) {
+		if ( (*it).name.left( (*it).name.tqfind( '(' ) ) == func ) {
 		    found = TRUE;
 		    break;
 		}
@@ -1460,12 +1460,12 @@ bool Project::hasParentObject( TQObject *o )
 TQString Project::qualifiedName( TQObject *o )
 {
     TQString name = o->name();
-    TQObject *p = o->parent();
+    TQObject *p = o->tqparent();
     while ( p ) {
 	name.prepend( TQString( p->name() ) + "." );
-	if ( objs.findRef( p ) != -1 )
+	if ( objs.tqfindRef( p ) != -1 )
 	    break;
-	p = p->parent();
+	p = p->tqparent();
     }
     return name;
 }
@@ -1494,7 +1494,7 @@ void Project::designerCreated()
 	fw->reparent( MainWindow::self->qWorkspace(), TQPoint( 0, 0 ), FALSE );
 	TQApplication::sendPostedEvents( MainWindow::self->qWorkspace(),
 					TQEvent::ChildInserted );
-	fw->parentWidget()->setFixedSize( 1, 1 );
+	fw->tqparentWidget()->setFixedSize( 1, 1 );
 	fw->show();
     }
 }
@@ -1509,13 +1509,13 @@ void Project::formOpened( FormWindow *fw )
 TQString Project::locationOfObject( TQObject *o )
 {
     if ( !o )
-	return TQString::null;
+	return TQString();
 
     if ( MainWindow::self ) {
 	TQWidgetList windows = MainWindow::self->qWorkspace()->windowList();
 	for ( TQWidget *w = windows.first(); w; w = windows.next() ) {
-	    FormWindow *fw = ::qt_cast<FormWindow*>(w);
-	    SourceEditor *se = ::qt_cast<SourceEditor*>(w);
+	    FormWindow *fw = ::tqqt_cast<FormWindow*>(w);
+	    SourceEditor *se = ::tqqt_cast<SourceEditor*>(w);
 	    if ( fw ) {
 		if ( fw->isFake() )
 		    return objectForFakeForm( fw )->name() + TQString( " [Source]" );
@@ -1532,7 +1532,7 @@ TQString Project::locationOfObject( TQObject *o )
 	}
     }
 
-    if ( ::qt_cast<SourceFile*>(o) ) {
+    if ( ::tqqt_cast<SourceFile*>(o) ) {
 	for ( TQPtrListIterator<SourceFile> sources = sourceFiles();
 	      sources.current(); ++sources ) {
 	    SourceFile* f = sources.current();
@@ -1544,15 +1544,15 @@ TQString Project::locationOfObject( TQObject *o )
     extern TQMap<TQWidget*, TQString> *qwf_forms;
     if ( !qwf_forms ) {
 	qWarning( "Project::locationOfObject: qwf_forms is NULL!" );
-	return TQString::null;
+	return TQString();
     }
 
-    TQString s = makeRelative( *qwf_forms->find( (TQWidget*)o ) );
+    TQString s = makeRelative( *qwf_forms->tqfind( (TQWidget*)o ) );
     s += " [Source]";
     return s;
 }
 
 bool Project::hasGUI() const
 {
-    return qApp->type() != TQApplication::Tty;
+    return tqApp->type() != TQApplication::Tty;
 }
diff --git a/kdevdesigner/designer/project.h b/kdevdesigner/designer/project.h
index 25ec499d..350fd6f0 100644
--- a/kdevdesigner/designer/project.h
+++ b/kdevdesigner/designer/project.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -33,7 +33,7 @@
 #include <tqstringlist.h>
 #include <tqptrlist.h>
 #include <tqmap.h>
-#include <private/qpluginmanager_p.h>
+#include <private/tqpluginmanager_p.h>
 #include "../interfaces/projectsettingsiface.h"
 #include "sourcefile.h"
 #include "formfile.h"
@@ -47,14 +47,14 @@ struct DesignerDatabase;
 class PixmapCollection;
 class Project;
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 class TQSqlDatabase;
 
 class DatabaseConnection
 {
 public:
     DatabaseConnection( Project *p ) :
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 	conn( 0 ),
 #endif
 	project( p ), loaded( FALSE ), iface( 0 ) {}
@@ -86,7 +86,7 @@ public:
     TQStringList tables() const { return tbls; }
     TQStringList fields( const TQString& t ) { return flds[t]; }
     TQMap<TQString, TQStringList> fields() { return flds; }
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     TQSqlDatabase* connection() const { return conn; }
     void remove();
 #endif
@@ -98,7 +98,7 @@ private:
     int prt;
     TQStringList tbls;
     TQMap<TQString, TQStringList> flds;
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     TQSqlDatabase *conn;
 #endif
     Project *project;
@@ -108,14 +108,15 @@ private:
 
 #endif
 
-class Project : public QObject
+class Project : public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
     friend class DatabaseConnection;
 
 public:
-    Project( const TQString &fn, const TQString &pName = TQString::null,
-	     QPluginManager<ProjectSettingsInterface> *pm = 0, bool isDummy = FALSE,
+    Project( const TQString &fn, const TQString &pName = TQString(),
+	     TQPluginManager<ProjectSettingsInterface> *pm = 0, bool isDummy = FALSE,
 	     const TQString &l = "C++" );
     ~Project();
 
@@ -143,7 +144,7 @@ public:
 
     void save( bool onlyProjectFile = FALSE );
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     TQPtrList<DatabaseConnection> databaseConnections() const;
     void setDatabaseConnections( const TQPtrList<DatabaseConnection> &lst );
     void addDatabaseConnection( DatabaseConnection *conn );
@@ -248,14 +249,14 @@ private:
     TQString proName;
     TQString desc;
     TQString dbFile;
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     TQPtrList<DatabaseConnection> dbConnections;
 #endif
     TQString lang;
     DesignerProject *iface;
     TQMap<TQString, TQString> customSettings;
     TQStringList csList;
-    QPluginManager<ProjectSettingsInterface> *projectSettingsPluginManager;
+    TQPluginManager<ProjectSettingsInterface> *projectSettingsPluginManager;
     PixmapCollection *pixCollection;
     TQPtrList<SourceFile> sourcefiles;
     TQPtrList<FormFile> formfiles;
diff --git a/kdevdesigner/designer/projectsettings.ui b/kdevdesigner/designer/projectsettings.ui
index 258b7739..14ce1f0a 100644
--- a/kdevdesigner/designer/projectsettings.ui
+++ b/kdevdesigner/designer/projectsettings.ui
@@ -25,7 +25,7 @@
 ** not clear to you.
 **
 *********************************************************************</comment>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>ProjectSettingsBase</cstring>
     </property>
@@ -53,11 +53,11 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QTabWidget">
+        <widget class="TQTabWidget">
             <property name="name">
                 <cstring>tabWidget</cstring>
             </property>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>tabSettings</cstring>
                 </property>
@@ -68,7 +68,7 @@
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QLabel" row="0" column="0">
+                    <widget class="TQLabel" row="0" column="0">
                         <property name="name">
                             <cstring>TextLabel1_2</cstring>
                         </property>
@@ -79,7 +79,7 @@
                             <cstring>editProjectFile</cstring>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="1" column="0">
+                    <widget class="TQLabel" row="1" column="0">
                         <property name="name">
                             <cstring>TextLabel1_3</cstring>
                         </property>
@@ -90,7 +90,7 @@
                             <cstring>comboLanguage</cstring>
                         </property>
                     </widget>
-                    <widget class="QToolButton" row="2" column="2">
+                    <widget class="TQToolButton" row="2" column="2">
                         <property name="name">
                             <cstring>buttonDatabaseFile_2</cstring>
                         </property>
@@ -103,7 +103,7 @@
                             <cstring>editDatabaseFile</cstring>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="2" column="0">
+                    <widget class="TQLabel" row="2" column="0">
                         <property name="name">
                             <cstring>TextLabel1_2_2_2</cstring>
                         </property>
@@ -114,7 +114,7 @@
                             <cstring>editDatabaseFile</cstring>
                         </property>
                     </widget>
-                    <widget class="QComboBox" row="1" column="1" rowspan="1" colspan="2">
+                    <widget class="TQComboBox" row="1" column="1" rowspan="1" colspan="2">
                         <property name="name">
                             <cstring>comboLanguage</cstring>
                         </property>
@@ -122,7 +122,7 @@
                             <bool>false</bool>
                         </property>
                     </widget>
-                    <widget class="QLayoutWidget" row="0" column="1" rowspan="1" colspan="2">
+                    <widget class="TQLayoutWidget" row="0" column="1" rowspan="1" colspan="2">
                         <property name="name">
                             <cstring>Layout1</cstring>
                         </property>
@@ -141,7 +141,7 @@
                                     <cstring>editProjectFile</cstring>
                                 </property>
                             </widget>
-                            <widget class="QToolButton">
+                            <widget class="TQToolButton">
                                 <property name="name">
                                     <cstring>buttonProject</cstring>
                                 </property>
@@ -161,7 +161,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>21</width>
                                 <height>71</height>
@@ -171,7 +171,7 @@
                 </grid>
             </widget>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>Layout4</cstring>
             </property>
@@ -185,7 +185,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonHelp</cstring>
                     </property>
@@ -206,14 +206,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonOk</cstring>
                     </property>
@@ -230,7 +230,7 @@
                         <string>Close the dialog and apply all the changes.</string>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonCancel</cstring>
                     </property>
@@ -288,7 +288,7 @@
     <tabstop>buttonOk</tabstop>
     <tabstop>buttonCancel</tabstop>
 </tabstops>
-<slots>
+<Q_SLOTS>
     <slot access="protected">chooseDatabaseFile()</slot>
     <slot access="protected">chooseProjectFile()</slot>
     <slot access="protected">destroy()</slot>
@@ -296,6 +296,6 @@
     <slot access="protected">init()</slot>
     <slot access="protected">languageChanged( const QString &amp; )</slot>
     <slot access="protected">okClicked()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kdevdesigner/designer/projectsettingsimpl.cpp b/kdevdesigner/designer/projectsettingsimpl.cpp
index 8d213a0a..b616930d 100644
--- a/kdevdesigner/designer/projectsettingsimpl.cpp
+++ b/kdevdesigner/designer/projectsettingsimpl.cpp
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000-2001 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -48,14 +48,14 @@
 #include <tqlabel.h>
 
 /*
- *  Constructs a ProjectSettings which is a child of 'parent', with the
+ *  Constructs a ProjectSettings which is a child of 'tqparent', with the
  *  name 'name' and widget flags set to 'f'
  *
  *  The dialog will by default be modeless, unless you set 'modal' to
  *  TRUE to construct a modal dialog.
  */
-ProjectSettings::ProjectSettings( Project *pro, TQWidget* parent,  const char* name, bool modal, WFlags fl )
-    : ProjectSettingsBase( parent, name, modal, fl ), project( pro )
+ProjectSettings::ProjectSettings( Project *pro, TQWidget* tqparent,  const char* name, bool modal, WFlags fl )
+    : ProjectSettingsBase( tqparent, name, modal, fl ), project( pro )
 {
     connect( buttonHelp, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) );
 
diff --git a/kdevdesigner/designer/projectsettingsimpl.h b/kdevdesigner/designer/projectsettingsimpl.h
index bce8a1b9..301ceb70 100644
--- a/kdevdesigner/designer/projectsettingsimpl.h
+++ b/kdevdesigner/designer/projectsettingsimpl.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -37,9 +37,10 @@ class SourceFile;
 class ProjectSettings : public ProjectSettingsBase
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    ProjectSettings( Project *pro, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
+    ProjectSettings( Project *pro, TQWidget* tqparent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
     ~ProjectSettings();
 
 protected slots:
diff --git a/kdevdesigner/designer/propertyeditor.cpp b/kdevdesigner/designer/propertyeditor.cpp
index 3ef4d687..4294deb5 100644
--- a/kdevdesigner/designer/propertyeditor.cpp
+++ b/kdevdesigner/designer/propertyeditor.cpp
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -81,7 +81,7 @@
 #include <tqprocess.h>
 #include <tqstyle.h>
 #include <tqdatetimeedit.h>
-#include <qassistantclient.h>
+#include <tqassistantclient.h>
 #include <tqdrawutil.h>
 #include <tqmultilineedit.h> // FIXME: obsolete
 #include <tqsplitter.h>
@@ -94,7 +94,7 @@
 static TQFontDatabase *fontDataBase = 0;
 TQString assistantPath();
 
-#ifdef Q_WS_MAC
+#ifdef TQ_WS_MAC
 #include <tqwindowsstyle.h>
 static void setupStyle(TQWidget *w)
 {
@@ -119,11 +119,11 @@ static TQStringList getFontList()
 	fontDataBase = new TQFontDatabase;
 	qAddPostRoutine( cleanupFontDatabase );
     }
-    return fontDataBase->families();
+    return fontDataBase->tqfamilies();
 }
 
 
-class PropertyWhatsThis : public QWhatsThis
+class PropertyWhatsThis : public TQWhatsThis
 {
 public:
     PropertyWhatsThis( PropertyList *l );
@@ -148,7 +148,7 @@ TQString PropertyWhatsThis::text( const TQPoint &pos )
 bool PropertyWhatsThis::clicked( const TQString& href )
 {
     if ( !href.isEmpty() ) {
-	QAssistantClient *ac = MainWindow::self->assistantClient();
+	TQAssistantClient *ac = MainWindow::self->assistantClient();
 	ac->showPage( TQString( qInstallPathDocs() ) + "/html/" + href );
     }
     return FALSE; // do not hide window
@@ -167,7 +167,7 @@ bool PropertyWhatsThis::clicked( const TQString& href )
 */
 
 /*!  If this item should be a child of another property item, specify
-  \a prop as the parent item.
+  \a prop as the tqparent item.
 */
 
 PropertyItem::PropertyItem( PropertyList *l, PropertyItem *after, PropertyItem *prop, const TQString &propName )
@@ -184,7 +184,7 @@ PropertyItem::PropertyItem( PropertyList *l, PropertyItem *after, PropertyItem *
 PropertyItem::~PropertyItem()
 {
     if ( resetButton )
-	delete resetButton->parentWidget();
+	delete resetButton->tqparentWidget();
     resetButton = 0;
 }
 
@@ -234,8 +234,8 @@ void PropertyItem::paintCell( TQPainter *p, const TQColorGroup &cg, int column,
 {
     TQColorGroup g( cg );
     g.setColor( TQColorGroup::Base, backgroundColor() );
-    g.setColor( TQColorGroup::Foreground, Qt::black );
-    g.setColor( TQColorGroup::Text, Qt::black );
+    g.setColor( TQColorGroup::Foreground, TQt::black );
+    g.setColor( TQColorGroup::Text, TQt::black );
     int indent = 0;
     if ( column == 0 ) {
 	indent = 20 + ( property ? 20 : 0 );
@@ -294,7 +294,7 @@ void PropertyItem::paintBranches( TQPainter * p, const TQColorGroup & cg,
 void PropertyItem::paintFocus( TQPainter *p, const TQColorGroup &cg, const TQRect &r )
 {
     p->save();
-    TQApplication::style().drawPrimitive(TQStyle::PE_Panel, p, r, cg,
+    TQApplication::tqstyle().tqdrawPrimitive(TQStyle::PE_Panel, p, r, cg,
 					TQStyle::Style_Sunken, TQStyleOption(1,1) );
     p->restore();
 }
@@ -308,7 +308,7 @@ bool PropertyItem::hasSubItems() const
     return FALSE;
 }
 
-/*!  Returns the parent property item here if this is a child or 0
+/*!  Returns the tqparent property item here if this is a child or 0
  otherwise.
  */
 
@@ -329,17 +329,17 @@ void PropertyItem::setOpen( bool b )
     open = b;
 
     if ( !open ) {
-	children.setAutoDelete( TRUE );
-	children.clear();
-	children.setAutoDelete( FALSE );
-	qApp->processEvents();
+	tqchildren.setAutoDelete( TRUE );
+	tqchildren.clear();
+	tqchildren.setAutoDelete( FALSE );
+	tqApp->processEvents();
 	listview->updateEditorSize();
 	return;
     }
 
     createChildren();
     initChildren();
-    qApp->processEvents();
+    tqApp->processEvents();
     listview->updateEditorSize();
 }
 
@@ -349,7 +349,7 @@ void PropertyItem::setOpen( bool b )
 void PropertyItem::showEditor()
 {
     createResetButton();
-    resetButton->parentWidget()->show();
+    resetButton->tqparentWidget()->show();
 }
 
 /*!  Subclasses have to hide the editor of the item here
@@ -358,7 +358,7 @@ void PropertyItem::showEditor()
 void PropertyItem::hideEditor()
 {
     createResetButton();
-    resetButton->parentWidget()->hide();
+    resetButton->tqparentWidget()->hide();
 }
 
 /*!  This is called to init the value of the item. Reimplement in
@@ -387,7 +387,7 @@ void PropertyItem::setChanged( bool b, bool updateDb )
     if ( changed == b )
 	return;
     changed = b;
-    repaint();
+    tqrepaint();
     if ( updateDb ) {
 	MetaDataBase::setPropertyChanged( listview->propertyEditor()->widget(), name(), changed );
     }
@@ -402,7 +402,7 @@ TQString PropertyItem::name() const
 void PropertyItem::createResetButton()
 {
     if ( resetButton ) {
-	resetButton->parentWidget()->lower();
+	resetButton->tqparentWidget()->lower();
 	return;
     }
     const TQPixmap DesignerResetPix = SmallIcon( "designer_resetproperty.png" , KDevDesignerPartFactory::instance());
@@ -413,8 +413,8 @@ void PropertyItem::createResetButton()
     resetButton = new TQPushButton( hbox );
     setupStyle( resetButton );
     resetButton->setPixmap( DesignerResetPix );
-    resetButton->setFixedWidth( resetButton->sizeHint().width() );
-    hbox->layout()->setAlignment( Qt::AlignRight );
+    resetButton->setFixedWidth( resetButton->tqsizeHint().width() );
+    hbox->tqlayout()->tqsetAlignment( TQt::AlignRight );
     listview->addChild( hbox );
     hbox->hide();
     TQObject::connect( resetButton, TQT_SIGNAL( clicked() ),
@@ -441,13 +441,13 @@ void PropertyItem::updateResetButtonState()
 void PropertyItem::placeEditor( TQWidget *w )
 {
     createResetButton();
-    TQRect r = listview->itemRect( this );
+    TQRect r = listview->tqitemRect( this );
     if ( !r.size().isValid() ) {
 	listview->ensureItemVisible( this );
-#if defined(Q_WS_WIN)
-	listview->repaintContents( FALSE );
+#if defined(TQ_WS_WIN)
+	listview->tqrepaintContents( FALSE );
 #endif
-	r = listview->itemRect( this );
+	r = listview->tqitemRect( this );
     }
     r.setX( listview->header()->sectionPos( 1 ) );
     r.setWidth( listview->header()->sectionSize( 1 ) - 1 );
@@ -455,9 +455,9 @@ void PropertyItem::placeEditor( TQWidget *w )
     r = TQRect( listview->viewportToContents( r.topLeft() ), r.size() );
     w->resize( r.size() );
     listview->moveChild( w, r.x(), r.y() );
-    resetButton->parentWidget()->resize( resetButton->sizeHint().width() + 10, r.height() );
-    listview->moveChild( resetButton->parentWidget(), r.x() + r.width() - 8, r.y() );
-    resetButton->setFixedHeight( QMAX( 0, r.height() - 3 ) );
+    resetButton->tqparentWidget()->resize( resetButton->tqsizeHint().width() + 10, r.height() );
+    listview->moveChild( resetButton->tqparentWidget(), r.x() + r.width() - 8, r.y() );
+    resetButton->setFixedHeight( TQMAX( 0, r.height() - 3 ) );
 }
 
 /*!  This should be called by subclasses if the user changed the value
@@ -491,18 +491,18 @@ void PropertyItem::childValueChanged( PropertyItem * )
 
 void PropertyItem::addChild( PropertyItem *i )
 {
-    children.append( i );
+    tqchildren.append( i );
 }
 
 int PropertyItem::childCount() const
 {
-    return children.count();
+    return tqchildren.count();
 }
 
 PropertyItem *PropertyItem::child( int i ) const
 {
     // ARRRRRRRRG
-    return ( (PropertyItem*)this )->children.at( i );
+    return ( (PropertyItem*)this )->tqchildren.at( i );
 }
 
 /*!  If the contents of the item is not displayable with a text, but
@@ -525,7 +525,7 @@ void PropertyItem::drawCustomContents( TQPainter *, const TQRect & )
 
 TQString PropertyItem::currentItem() const
 {
-    return TQString::null;
+    return TQString();
 }
 
 int PropertyItem::currentIntItem() const
@@ -548,15 +548,15 @@ int PropertyItem::currentIntItemFromObject() const
 
 TQString PropertyItem::currentItemFromObject() const
 {
-    return TQString::null;
+    return TQString();
 }
 
 void PropertyItem::setFocus( TQWidget *w )
 {
-    if ( !qApp->focusWidget() ||
+    if ( !tqApp->tqfocusWidget() ||
 	 listview->propertyEditor()->formWindow() &&
-	 ( !MainWindow::self->isAFormWindowChild( qApp->focusWidget() ) &&
-	   !qApp->focusWidget()->inherits( "Editor" ) ) )
+	 ( !MainWindow::self->isAFormWindowChild( TQT_TQOBJECT(tqApp->tqfocusWidget()) ) &&
+	   !tqApp->tqfocusWidget()->inherits( "Editor" ) ) )
 	w->setFocus();
 }
 
@@ -564,7 +564,7 @@ void PropertyItem::setText( int col, const TQString &t )
 {
     TQString txt( t );
     if ( col == 1 )
-	txt = txt.replace( "\n", " " );
+	txt = txt.tqreplace( "\n", " " );
     TQListViewItem::setText( col, txt );
 }
 
@@ -598,7 +598,7 @@ TQLineEdit *PropertyTextItem::lined()
 
     if ( asciiOnly ) {
 	if ( PropertyItem::name() == "name" ) {
-	    lin->setValidator( new AsciiValidator( TQString(":"), lin, "ascii_validator" ) );
+	    lin->setValidator( new AsciiValidator( TQString(":"), TQT_TQOBJECT(lin), "ascii_validator" ) );
 	    if ( listview->propertyEditor()->formWindow()->isFake() )
 		lin->setEnabled( FALSE );
 	} else {
@@ -606,7 +606,7 @@ TQLineEdit *PropertyTextItem::lined()
 							   "\xa1\xa2\xa3\xa4\xa5\xa6\xa7\xa8\xa9"
 							   "\xaa\xab\xac\xad\xae\xaf\xb1\xb2\xb3"
 							   "\xb4\xb5\xb6\xb7\xb8\xb9\xba\xbb\xbc"
-							   "\xbd\xbe\xbf"), lin, "ascii_validator" ) );
+							   "\xbd\xbe\xbf"), TQT_TQOBJECT(lin), "ascii_validator" ) );
 	}
     } if ( !hasMultiLines ) {
 	lin->hide();
@@ -753,7 +753,7 @@ void PropertyTextItem::setValue()
 
 void PropertyTextItem::getText()
 {
-    bool richText = !::qt_cast<TQButton*>(listview->propertyEditor()->widget()) ||
+    bool richText = !::tqqt_cast<TQButton*>(listview->propertyEditor()->widget()) ||
 		    ( text( 0 ) == "whatsThis" );
     bool doWrap = FALSE;
     TQString txt = MultiLineEditor::getText( listview, value().toString(), richText, &doWrap );
@@ -781,7 +781,7 @@ TQLineEdit *PropertyDoubleItem::lined()
     if ( lin )
 	return lin;
     lin = new TQLineEdit( listview->viewport() );
-    lin->setValidator( new TQDoubleValidator( lin, "double_validator" ) );
+    lin->setValidator( new TQDoubleValidator( TQT_TQOBJECT(lin), "double_validator" ) );
 
     connect( lin, TQT_SIGNAL( returnPressed() ),
 	     this, TQT_SLOT( setValue() ) );
@@ -856,11 +856,11 @@ PropertyDateItem::PropertyDateItem( PropertyList *l, PropertyItem *after, Proper
     lin = 0;
 }
 
-QDateEdit *PropertyDateItem::lined()
+TQDateEdit *PropertyDateItem::lined()
 {
     if ( lin )
 	return lin;
-    lin = new QDateEdit( listview->viewport() );
+    lin = new TQDateEdit( listview->viewport() );
     TQObjectList *l = lin->queryList( TQLINEEDIT_OBJECT_NAME_STRING );
     for ( TQObject *o = l->first(); o; o = l->next() )
 	o->installEventFilter( listview );
@@ -872,7 +872,7 @@ QDateEdit *PropertyDateItem::lined()
 
 PropertyDateItem::~PropertyDateItem()
 {
-    delete (QDateEdit*)lin;
+    delete (TQDateEdit*)lin;
     lin = 0;
 }
 
@@ -931,11 +931,11 @@ PropertyTimeItem::PropertyTimeItem( PropertyList *l, PropertyItem *after, Proper
     lin = 0;
 }
 
-QTimeEdit *PropertyTimeItem::lined()
+TQTimeEdit *PropertyTimeItem::lined()
 {
     if ( lin )
 	return lin;
-    lin = new QTimeEdit( listview->viewport() );
+    lin = new TQTimeEdit( listview->viewport() );
     connect( lin, TQT_SIGNAL( valueChanged( const TQTime & ) ),
 	     this, TQT_SLOT( setValue() ) );
     TQObjectList *l = lin->queryList( TQLINEEDIT_OBJECT_NAME_STRING );
@@ -947,7 +947,7 @@ QTimeEdit *PropertyTimeItem::lined()
 
 PropertyTimeItem::~PropertyTimeItem()
 {
-    delete (QTimeEdit*)lin;
+    delete (TQTimeEdit*)lin;
     lin = 0;
 }
 
@@ -1006,11 +1006,11 @@ PropertyDateTimeItem::PropertyDateTimeItem( PropertyList *l, PropertyItem *after
     lin = 0;
 }
 
-QDateTimeEdit *PropertyDateTimeItem::lined()
+TQDateTimeEdit *PropertyDateTimeItem::lined()
 {
     if ( lin )
 	return lin;
-    lin = new QDateTimeEdit( listview->viewport() );
+    lin = new TQDateTimeEdit( listview->viewport() );
     connect( lin, TQT_SIGNAL( valueChanged( const TQDateTime & ) ),
 	     this, TQT_SLOT( setValue() ) );
     TQObjectList *l = lin->queryList( TQLINEEDIT_OBJECT_NAME_STRING );
@@ -1022,7 +1022,7 @@ QDateTimeEdit *PropertyDateTimeItem::lined()
 
 PropertyDateTimeItem::~PropertyDateTimeItem()
 {
-    delete (QDateTimeEdit*)lin;
+    delete (TQDateTimeEdit*)lin;
     lin = 0;
 }
 
@@ -1635,8 +1635,8 @@ PropertyPixmapItem::PropertyPixmapItem( PropertyList *l, PropertyItem *after, Pr
     box = new TQHBox( listview->viewport() );
     box->hide();
     pixPrev = new TQLabel( box );
-    pixPrev->setSizePolicy( TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Minimum ) );
-    pixPrev->setBackgroundColor( pixPrev->colorGroup().color( TQColorGroup::Base ) );
+    pixPrev->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Minimum ) );
+    pixPrev->setBackgroundColor( pixPrev->tqcolorGroup().color( TQColorGroup::Base ) );
     button = new TQPushButton( "...", box );
     setupStyle( button );
     button->setFixedWidth( 20 );
@@ -1679,7 +1679,7 @@ void PropertyPixmapItem::setValue( const TQVariant &v )
     else
 	pixPrev->setPixmap( v.toImage() );
     PropertyItem::setValue( v );
-    repaint();
+    tqrepaint();
 }
 
 void PropertyPixmapItem::getPixmap()
@@ -1714,8 +1714,8 @@ void PropertyPixmapItem::drawCustomContents( TQPainter *p, const TQRect &r )
 
     if ( !pix.isNull() ) {
 	p->save();
-	p->setClipRect( TQRect( TQPoint( (int)(p->worldMatrix().dx() + r.x()),
-				       (int)(p->worldMatrix().dy() + r.y()) ),
+	p->setClipRect( TQRect( TQPoint( (int)(p->tqworldMatrix().dx() + r.x()),
+				       (int)(p->tqworldMatrix().dy() + r.y()) ),
 			       r.size() ) );
 	p->drawPixmap( r.x(), r.y() + ( r.height() - pix.height() ) / 2, pix );
 	p->restore();
@@ -1726,8 +1726,8 @@ void PropertyPixmapItem::drawCustomContents( TQPainter *p, const TQRect &r )
 // --------------------------------------------------------------
 
 PropertyColorItem::PropertyColorItem( PropertyList *l, PropertyItem *after, PropertyItem *prop,
-				      const TQString &propName, bool children )
-    : PropertyItem( l, after, prop, propName ), withChildren( children )
+				      const TQString &propName, bool tqchildren )
+    : PropertyItem( l, after, prop, propName ), withChildren( tqchildren )
 {
     box = new TQHBox( listview->viewport() );
     box->hide();
@@ -1829,7 +1829,7 @@ void PropertyColorItem::childValueChanged( PropertyItem *child )
 
 void PropertyColorItem::getColor()
 {
-    TQColor c = QColorDialog::getColor( val.asColor(), listview );
+    TQColor c = TQColorDialog::getColor( val.asColor(), listview );
     if ( c.isValid() ) {
 	setValue( c );
 	notifyValueChange();
@@ -1945,7 +1945,7 @@ void PropertyFontItem::setValue( const TQVariant &v )
 void PropertyFontItem::getFont()
 {
     bool ok = FALSE;
-    TQFont f = QFontDialog::getFont( &ok, val.toFont(), listview );
+    TQFont f = TQFontDialog::getFont( &ok, val.toFont(), listview );
     if ( ok && f != val.toFont() ) {
 	setValue( f );
 	notifyValueChange();
@@ -2013,7 +2013,7 @@ void PropertyDatabaseItem::createChildren()
 
 void PropertyDatabaseItem::initChildren()
 {
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     PropertyItem *item = 0;
     TQStringList lst = value().toStringList();
     TQString conn, table;
@@ -2026,13 +2026,13 @@ void PropertyDatabaseItem::initChildren()
 	    else if ( lst.count() > 0 )
 		item->setValue( TQStringList( lst[ 0 ] ) );
 	    else if ( withField )
-		item->setValue( TQStringList( MetaDataBase::fakeProperty( listview->propertyEditor()->formWindow()->mainContainer(),
+		item->setValue( TQStringList( MetaDataBase::fakeProperty( TQT_TQOBJECT(listview->propertyEditor()->formWindow()->mainContainer()),
 									 "database" ).toStringList()[ 0 ] ) );
 
 	    if ( lst.count() > 0 && !lst[ 0 ].isEmpty() )
 		item->setCurrentItem( lst[ 0 ] );
 	    else if ( !isChanged() && withField )
-		item->setCurrentItem( MetaDataBase::fakeProperty( listview->propertyEditor()->formWindow()->mainContainer(),
+		item->setCurrentItem( MetaDataBase::fakeProperty( TQT_TQOBJECT(listview->propertyEditor()->formWindow()->mainContainer()),
 								  "database" ).toStringList()[ 0 ] );
 	    else
 		item->setCurrentItem( 0 );
@@ -2044,7 +2044,7 @@ void PropertyDatabaseItem::initChildren()
 	    else if ( lst.count() > 1 )
 		item->setValue( TQStringList( lst[ 1 ] ) );
 	    else if ( withField ) {
-		TQStringList fakeLst = MetaDataBase::fakeProperty( listview->propertyEditor()->formWindow()->mainContainer(), "database" ).toStringList();
+		TQStringList fakeLst = MetaDataBase::fakeProperty( TQT_TQOBJECT(listview->propertyEditor()->formWindow()->mainContainer()), "database" ).toStringList();
 		if ( fakeLst.count() > 1 )
 		    item->setValue( fakeLst[ 1 ] );
 	    }
@@ -2052,7 +2052,7 @@ void PropertyDatabaseItem::initChildren()
 	    if ( lst.count() > 1 && !lst[ 1 ].isEmpty() )
 		item->setCurrentItem( lst[ 1 ] );
 	    else if ( !isChanged() && withField ) {
-		TQStringList fakeLst = MetaDataBase::fakeProperty( listview->propertyEditor()->formWindow()->mainContainer(), "database" ).toStringList();
+		TQStringList fakeLst = MetaDataBase::fakeProperty( TQT_TQOBJECT(listview->propertyEditor()->formWindow()->mainContainer()), "database" ).toStringList();
 		if ( fakeLst.count() > 1 )
 		    item->setCurrentItem( fakeLst[ 1 ] );
 	        else
@@ -2115,7 +2115,7 @@ bool PropertyDatabaseItem::hasSubItems() const
 
 void PropertyDatabaseItem::childValueChanged( PropertyItem *c )
 {
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     TQStringList lst;
     lst << ( (PropertyListItem*)PropertyItem::child( 0 ) )->currentItem()
 	<< ( (PropertyListItem*)PropertyItem::child( 1 ) )->currentItem();
@@ -2224,7 +2224,7 @@ void PropertySizePolicyItem::setValue( const TQVariant &v )
 	return;
 
     TQString s = i18n( "%1/%2/%3/%4" );
-    s = s.arg( size_type_to_string( v.toSizePolicy().horData() ) ).
+    s = s.tqarg( size_type_to_string( v.toSizePolicy().horData() ) ).
 	arg( size_type_to_string( v.toSizePolicy().verData() ) ).
 	arg( v.toSizePolicy().horStretch() ).
 	arg( v.toSizePolicy().verStretch() );
@@ -2298,7 +2298,7 @@ void PropertyPaletteItem::setValue( const TQVariant &v )
     TQString s;
     palettePrev->setPalette( v.toPalette() );
     PropertyItem::setValue( v );
-    repaint();
+    tqrepaint();
 }
 
 void PropertyPaletteItem::getPalette()
@@ -2307,11 +2307,11 @@ void PropertyPaletteItem::getPalette()
 	return;
     bool ok = FALSE;
     TQWidget *w = (TQWidget*)listview->propertyEditor()->widget();
-    if ( ::qt_cast<TQScrollView*>(w) )
+    if ( ::tqqt_cast<TQScrollView*>(w) )
 	w = ( (TQScrollView*)w )->viewport();
     TQPalette pal = PaletteEditor::getPalette( &ok, val.toPalette(),
-#if defined(QT_NON_COMMERCIAL)
-					      w->backgroundMode(), listview->topLevelWidget(),
+#if defined(TQT_NON_COMMERCIAL)
+					      w->backgroundMode(), listview->tqtopLevelWidget(),
 #else
 					      w->backgroundMode(), listview,
 #endif
@@ -2331,8 +2331,8 @@ void PropertyPaletteItem::drawCustomContents( TQPainter *p, const TQRect &r )
 {
     TQPalette pal( value().toPalette() );
     p->save();
-    p->setClipRect( TQRect( TQPoint( (int)(p->worldMatrix().dx() + r.x()),
-				   (int)(p->worldMatrix().dy() + r.y()) ),
+    p->setClipRect( TQRect( TQPoint( (int)(p->tqworldMatrix().dx() + r.x()),
+				   (int)(p->tqworldMatrix().dy() + r.y()) ),
 			   r.size() ) );
     TQRect r2( r );
     r2.setX( r2.x() + 2 );
@@ -2382,16 +2382,16 @@ TQComboBox *PropertyCursorItem::combo()
     comb->insertItem( CrossPix, i18n("Cross"), TQObject::CrossCursor );
     comb->insertItem( WaitPix, i18n("Waiting"), TQObject::WaitCursor );
     comb->insertItem( IBeamPix, i18n("iBeam"), TQObject::IbeamCursor );
-    comb->insertItem( SizeVPix, i18n("Size Vertical"), TQObject::SizeVerCursor );
-    comb->insertItem( SizeHPix, i18n("Size Horizontal"), TQObject::SizeHorCursor );
+    comb->insertItem( SizeVPix, i18n("SizeQt::Vertical"), TQObject::SizeVerCursor );
+    comb->insertItem( SizeHPix, i18n("SizeQt::Horizontal"), TQObject::SizeHorCursor );
     comb->insertItem( SizeFPix, i18n("Size Slash"), TQObject::SizeBDiagCursor );
     comb->insertItem( SizeBPix, i18n("Size Backslash"), TQObject::SizeFDiagCursor );
     comb->insertItem( SizeAllPix, i18n("Size All"), TQObject::SizeAllCursor );
     cur = TQBitmap( 25, 25, 1 );
     cur.setMask( cur );
     comb->insertItem( cur, i18n("Blank"), TQObject::BlankCursor );
-    comb->insertItem( VSplitPix, i18n("Split Vertical"), TQObject::SplitVCursor );
-    comb->insertItem( HSplitPix, i18n("Split Horizontal"), TQObject::SplitHCursor );
+    comb->insertItem( VSplitPix, i18n("SplitQt::Vertical"), TQObject::SplitVCursor );
+    comb->insertItem( HSplitPix, i18n("SplitQt::Horizontal"), TQObject::SplitHCursor );
     comb->insertItem( HandPix, i18n("Pointing Hand"), TQObject::PointingHandCursor );
     comb->insertItem( NoPix, i18n("Forbidden"), TQObject::ForbiddenCursor );
 
@@ -2411,7 +2411,7 @@ void PropertyCursorItem::showEditor()
     PropertyItem::showEditor();
     if ( !comb ) {
 	combo()->blockSignals( TRUE );
-	combo()->setCurrentItem( (int)value().toCursor().shape() );
+	combo()->setCurrentItem( (int)value().toCursor().tqshape() );
 	combo()->blockSignals( FALSE );
     }
     placeEditor( combo() );
@@ -2434,7 +2434,7 @@ void PropertyCursorItem::setValue( const TQVariant &v )
 	return;
 
     combo()->blockSignals( TRUE );
-    combo()->setCurrentItem( (int)v.toCursor().shape() );
+    combo()->setCurrentItem( (int)v.toCursor().tqshape() );
     combo()->blockSignals( FALSE );
     setText( 1, combo()->currentText() );
     PropertyItem::setValue( v );
@@ -2592,12 +2592,12 @@ void PropertyKeysequenceItem::setValue( const TQVariant &v )
 
 // --------------------------------------------------------------
 
-EnumPopup::EnumPopup( TQWidget *parent, const char *name, WFlags f )
-    : TQFrame( parent, name, f )
+EnumPopup::EnumPopup( TQWidget *tqparent, const char *name, WFlags f )
+    : TQFrame( tqparent, name, f )
 {
     setLineWidth( 1 );
     setFrameStyle( Panel | Plain );
-    setPaletteBackgroundColor( Qt::white );
+    setPaletteBackgroundColor( TQt::white );
     popLayout = new TQVBoxLayout( this, 3 );
     checkBoxList.setAutoDelete( TRUE );
 }
@@ -2654,8 +2654,8 @@ TQValueList<EnumItem> EnumPopup::enumList() const
     return itemList;
 }
 
-EnumBox::EnumBox( TQWidget *parent, const char *name )
-    : TQComboBox( parent, name )
+EnumBox::EnumBox( TQWidget *tqparent, const char *name )
+    : TQComboBox( tqparent, name )
 {
     pop = new EnumPopup( this, "popup", TQObject::WType_Popup );
     connect( pop, TQT_SIGNAL( hidden() ), this, TQT_SLOT( popupHidden() ) );
@@ -2678,7 +2678,7 @@ void EnumBox::popupClosed()
 void EnumBox::paintEvent( TQPaintEvent * )
 {
     TQPainter p( this );
-    const TQColorGroup & g = colorGroup();
+    const TQColorGroup & g = tqcolorGroup();
     p.setPen(g.text());
 
     TQStyle::SFlags flags = TQStyle::Style_Default;
@@ -2692,15 +2692,15 @@ void EnumBox::paintEvent( TQPaintEvent * )
 		&g.brush( TQColorGroup::Button ) );
 	return;
     }
-    style().drawComplexControl( TQStyle::CC_ComboBox, &p, this, rect(), g,
+    tqstyle().tqdrawComplexControl( TQStyle::CC_ComboBox, &p, this, rect(), g,
 				    flags, TQStyle::SC_All,
 				    (arrowDown ?
 				     TQStyle::SC_ComboBoxArrow :
 				     TQStyle::SC_None ));
 
-    TQRect re = style().querySubControlMetrics( TQStyle::CC_ComboBox, this,
+    TQRect re = tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, this,
 	    TQStyle::SC_ComboBoxEditField );
-    re = TQStyle::visualRect(re, this);
+    re = TQStyle::tqvisualRect(re, this);
     p.setClipRect( re );
 
     if ( !str.isNull() ) {
@@ -2730,7 +2730,7 @@ void EnumBox::popup()
 	popupShown = FALSE;
 	return;
     }
-    pop->move( ((TQWidget*)parent())->mapToGlobal( geometry().bottomLeft() ) );
+    pop->move( ((TQWidget*)tqparent())->mapToGlobal( tqgeometry().bottomLeft() ) );
     pop->setMinimumWidth( width() );
     emit aboutToShowPopup();
     pop->show();
@@ -2739,18 +2739,18 @@ void EnumBox::popup()
 
 void EnumBox::mousePressEvent( TQMouseEvent *e )
 {
-    if ( e->button() != LeftButton )
+    if ( e->button() != Qt::LeftButton )
 	return;
 
-    TQRect arrowRect = style().querySubControlMetrics( TQStyle::CC_ComboBox, this,
+    TQRect arrowRect = tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, this,
 						      TQStyle::SC_ComboBoxArrow);
-    arrowRect = TQStyle::visualRect(arrowRect, this);
+    arrowRect = TQStyle::tqvisualRect(arrowRect, this);
 
-    arrowRect.setHeight( QMAX(  height() - (2 * arrowRect.y()), arrowRect.height() ) );
+    arrowRect.setHeight( TQMAX(  height() - (2 * arrowRect.y()), arrowRect.height() ) );
 
-    if ( arrowRect.contains( e->pos() ) ) {
+    if ( arrowRect.tqcontains( e->pos() ) ) {
 	arrowDown = TRUE;
-	repaint( FALSE );
+	tqrepaint( FALSE );
     }
 
     popup();
@@ -2770,13 +2770,13 @@ void EnumBox::keyPressEvent( TQKeyEvent *e )
 void EnumBox::restoreArrow()
 {
     arrowDown = FALSE;
-    repaint( FALSE );
+    tqrepaint( FALSE );
 }
 
 void EnumBox::setText( const TQString &text )
 {
     str = text;
-    repaint( FALSE );
+    tqrepaint( FALSE );
 }
 
 
@@ -2847,7 +2847,7 @@ void PropertyEnumItem::setValue()
 	    enumString += "|" + (*it).key;
     }
     if ( !enumString.isEmpty() )
-	enumString.replace( 0, 1, "" );
+	enumString.tqreplace( 0, 1, "" );
 
     box->setText( enumString );
     setText( 1, enumString );
@@ -2870,7 +2870,7 @@ void PropertyEnumItem::setCurrentValues( TQStrList lst )
 	}
     }
     if ( !enumString.isEmpty() )
-	enumString.replace( 0, 1, "" );
+	enumString.tqreplace( 0, 1, "" );
     box->setText( enumString );
     setText( 1, enumString );
 }
@@ -2982,9 +2982,9 @@ static TQVariant::Type type_to_variant( const TQString &s )
     if ( s == "Palette" )
 	return TQVariant::Palette;
     if ( s == "ColorGroup" )
-	return TQVariant::ColorGroup;
+	return (QVariant::Type)TQVariant::ColorGroup;
     if ( s == "IconSet" )
-	return TQVariant::IconSet;
+	return (QVariant::Type)TQVariant::IconSet;
     if ( s == "Point" )
 	return TQVariant::Point;
     if ( s == "Image" )
@@ -2998,9 +2998,9 @@ static TQVariant::Type type_to_variant( const TQString &s )
     if ( s == "Double" )
 	return TQVariant::Double;
     if ( s == "CString" )
-	return TQVariant::CString;
+	return (QVariant::Type)TQVariant::CString;
     if ( s == "PointArray" )
-	return TQVariant::PointArray;
+	return (QVariant::Type)TQVariant::PointArray;
     if ( s == "Region" )
 	return TQVariant::Region;
     if ( s == "Bitmap" )
@@ -3018,14 +3018,14 @@ static TQVariant::Type type_to_variant( const TQString &s )
     return TQVariant::Invalid;
 }
 
-#ifndef QT_NO_SQL
-static bool parent_is_data_aware( TQWidget *w )
+#ifndef TQT_NO_SQL
+static bool tqparent_is_data_aware( TQWidget *w )
 {
-    TQWidget *p = w ? w->parentWidget() : 0;
+    TQWidget *p = w ? w->tqparentWidget() : 0;
     while ( p && !p->isTopLevel() ) {
-	if ( ::qt_cast<QDesignerDataBrowser*>(p) || ::qt_cast<QDesignerDataView*>(p) )
+	if ( ::tqqt_cast<TQDesignerDataBrowser*>(p) || ::tqqt_cast<TQDesignerDataView*>(p) )
 	    return TRUE;
-	p = p->parentWidget();
+	p = p->tqparentWidget();
     }
     return FALSE;
 }
@@ -3039,26 +3039,26 @@ void PropertyList::setupProperties()
 {
     if ( !editor->widget() )
 	return;
-    bool allProperties = !::qt_cast<Spacer*>(editor->widget());
-    TQStrList lst = editor->widget()->metaObject()->propertyNames( allProperties );
+    bool allProperties = !::tqqt_cast<Spacer*>(editor->widget());
+    TQStrList lst = editor->widget()->tqmetaObject()->propertyNames( allProperties );
     PropertyItem *item = 0;
     TQMap<TQString, bool> unique;
     TQObject *w = editor->widget();
     TQStringList valueSet;
-    bool parentHasLayout =
+    bool tqparentHasLayout =
 	w->isWidgetType() &&
-	!editor->formWindow()->isMainContainer( (TQWidget*)w ) && ( (TQWidget*)w )->parentWidget() &&
-	WidgetFactory::layoutType( ( (TQWidget*)w )->parentWidget() ) != WidgetFactory::NoLayout;
+	!editor->formWindow()->isMainContainer( TQT_TQOBJECT(w) ) && ( (TQWidget*)w )->tqparentWidget() &&
+	WidgetFactory::tqlayoutType( ( (TQWidget*)w )->tqparentWidget() ) != WidgetFactory::NoLayout;
     for ( TQPtrListIterator<char> it( lst ); it.current(); ++it ) {
 	const TQMetaProperty* p =
-	    editor->widget()->metaObject()->
-	    property( editor->widget()->metaObject()->findProperty( it.current(), allProperties), allProperties );
+	    editor->widget()->tqmetaObject()->
+	    property( editor->widget()->tqmetaObject()->tqfindProperty( it.current(), allProperties), allProperties );
 	if ( !p )
 	    continue;
-	if ( unique.contains( TQString::fromLatin1( it.current() ) ) )
+	if ( unique.tqcontains( TQString::tqfromLatin1( it.current() ) ) )
 	    continue;
-	if ( ::qt_cast<QDesignerToolBar*>(editor->widget()) ||
-	     ::qt_cast<MenuBarEditor*>(editor->widget()) ) {
+	if ( ::tqqt_cast<TQDesignerToolBar*>(editor->widget()) ||
+	     ::tqqt_cast<MenuBarEditor*>(editor->widget()) ) {
 	    if ( qstrcmp( p->name(), "minimumHeight" ) == 0 )
 		continue;
 	    if ( qstrcmp( p->name(), "minimumWidth" ) == 0 )
@@ -3071,14 +3071,14 @@ void PropertyList::setupProperties()
 		continue;
 	    if ( qstrcmp( p->name(), "sizePolicy" ) == 0 )
 		continue;
-	    if ( qstrcmp( p->name(), "minimumSize" ) == 0 )
+	    if ( qstrcmp( p->name(), "tqminimumSize" ) == 0 )
 		continue;
-	    if ( qstrcmp( p->name(), "maximumSize" ) == 0 )
+	    if ( qstrcmp( p->name(), "tqmaximumSize" ) == 0 )
 		continue;
 	}
-	unique.insert( TQString::fromLatin1( it.current() ), TRUE );
+	unique.insert( TQString::tqfromLatin1( it.current() ), TRUE );
 	if ( editor->widget()->isWidgetType() &&
-	     editor->formWindow()->isMainContainer( (TQWidget*)editor->widget() ) ) {
+	     editor->formWindow()->isMainContainer( TQT_TQOBJECT(editor->widget()) ) ) {
 	    if ( qstrcmp( p->name(), "geometry" ) == 0 )
 		continue;
 	} else { // hide some toplevel-only stuff
@@ -3092,9 +3092,9 @@ void PropertyList::setupProperties()
 		continue;
 	    if ( qstrcmp( p->name(), "baseSize" ) == 0 )
 		continue;
-	    if ( parentHasLayout && qstrcmp( p->name(), "geometry" ) == 0 )
+	    if ( tqparentHasLayout && qstrcmp( p->name(), "geometry" ) == 0 )
 		continue;
-	    if ( ::qt_cast<QLayoutWidget*>(w) || ::qt_cast<Spacer*>(w) ) {
+	    if ( ::tqqt_cast<TQLayoutWidget*>(w) || ::tqqt_cast<Spacer*>(w) ) {
 		if ( qstrcmp( p->name(), "sizePolicy" ) == 0 )
 		    continue;
 		if ( qstrcmp( p->name(), "minimumHeight" ) == 0 )
@@ -3107,9 +3107,9 @@ void PropertyList::setupProperties()
 		    continue;
 		if ( qstrcmp( p->name(), "geometry" ) == 0 )
 		    continue;
-		if ( qstrcmp( p->name(), "minimumSize" ) == 0 )
+		if ( qstrcmp( p->name(), "tqminimumSize" ) == 0 )
 		    continue;
-		if ( qstrcmp( p->name(), "maximumSize" ) == 0 )
+		if ( qstrcmp( p->name(), "tqmaximumSize" ) == 0 )
 		    continue;
 		if ( qstrcmp( p->name(), "enabled" ) == 0 )
 		    continue;
@@ -3137,7 +3137,7 @@ void PropertyList::setupProperties()
 		    continue;
 	    }
 	}
-	if ( ::qt_cast<TQActionGroup*>(w) ) {
+	if ( ::tqqt_cast<TQActionGroup*>(w) ) {
 	    if ( qstrcmp( p->name(), "usesDropDown" ) == 0 )
 		continue;
 	    if ( qstrcmp( p->name(), "toggleAction" ) == 0 )
@@ -3151,10 +3151,10 @@ void PropertyList::setupProperties()
 	    continue;
 	if ( qstrcmp( p->name(), "maximumWidth" ) == 0 )
 	    continue;
-	if ( qstrcmp( p->name(), "buttonGroupId" ) == 0 ) { // #### remove this when designable in Q_PROPERTY can take a function (isInButtonGroup() in this case)
+	if ( qstrcmp( p->name(), "buttonGroupId" ) == 0 ) { // #### remove this when designable in TQ_PROPERTY can take a function (isInButtonGroup() in this case)
 	    if ( !editor->widget()->isWidgetType() ||
-		 !editor->widget()->parent() ||
-		 !::qt_cast<TQButtonGroup*>(editor->widget()->parent()) )
+		 !editor->widget()->tqparent() ||
+		 !::tqqt_cast<TQButtonGroup*>(editor->widget()->tqparent()) )
 		continue;
 	}
 
@@ -3164,7 +3164,7 @@ void PropertyList::setupProperties()
 	       isPropertyObject && p->designable( ( (PropertyObject*)w )->widgetList().first() ) ) &&
 	     ( !isPropertyObject || qstrcmp( p->name(), "name" ) != 0 ) ) {
 	    if ( p->isSetType() ) {
-		if ( TQString( p->name() ) == "alignment" ) {
+		if ( TQString( p->name() ) == "tqalignment" ) {
 		    TQStringList lst;
 		    lst << p->valueToKey( AlignAuto )
 			<< p->valueToKey( AlignLeft )
@@ -3176,7 +3176,7 @@ void PropertyList::setupProperties()
 		    setPropertyValue( item );
 		    if ( MetaDataBase::isPropertyChanged( editor->widget(), "hAlign" ) )
 			item->setChanged( TRUE, FALSE );
-		    if ( !::qt_cast<TQMultiLineEdit*>(editor->widget()) ) {
+		    if ( !::tqqt_cast<TQMultiLineEdit*>(editor->widget()) ) {
 			lst.clear();
 			lst << p->valueToKey( AlignTop )
 			    << p->valueToKey( AlignVCenter )
@@ -3187,7 +3187,7 @@ void PropertyList::setupProperties()
 			if ( MetaDataBase::isPropertyChanged( editor->widget(), "vAlign" ) )
 			    item->setChanged( TRUE, FALSE );
 			item = new PropertyBoolItem( this, item, 0, "wordwrap" );
-			if ( ::qt_cast<TQGroupBox*>(w) )
+			if ( ::tqqt_cast<TQGroupBox*>(w) )
 			    item->setVisible( FALSE );
 			setPropertyValue( item );
 			if ( MetaDataBase::isPropertyChanged( editor->widget(), "wordwrap" ) )
@@ -3212,7 +3212,7 @@ void PropertyList::setupProperties()
 		TQStringList lst;
 		for ( uint i = 0; i < l.count(); ++i ) {
 		    TQString k = l.at( i );
-		    // filter out enum-masks
+		    // filter out enum-tqmasks
 		    if ( k[0] == 'M' && k[1].category() == TQChar::Letter_Uppercase )
 			continue;
 		    lst << k;
@@ -3226,7 +3226,7 @@ void PropertyList::setupProperties()
 	    }
 	}
 	if ( item && !p->isSetType() ) {
-	    if ( valueSet.findIndex( item->name() ) == -1 ) {
+	    if ( valueSet.tqfindIndex( item->name() ) == -1 ) {
 		setPropertyValue( item );
 		valueSet << item->name();
 	    }
@@ -3235,25 +3235,25 @@ void PropertyList::setupProperties()
 	}
     }
 
-    if ( !::qt_cast<TQSplitter*>(w) && !::qt_cast<MenuBarEditor*>(w) && !::qt_cast<QDesignerToolBar*>(w) &&
-	 w->isWidgetType() && WidgetFactory::layoutType( (TQWidget*)w ) != WidgetFactory::NoLayout ) {
-	item = new PropertyLayoutItem( this, item, 0, "layoutSpacing" );
+    if ( !::tqqt_cast<TQSplitter*>(w) && !::tqqt_cast<MenuBarEditor*>(w) && !::tqqt_cast<TQDesignerToolBar*>(w) &&
+	 w->isWidgetType() && WidgetFactory::tqlayoutType( (TQWidget*)w ) != WidgetFactory::NoLayout ) {
+	item = new PropertyLayoutItem( this, item, 0, "tqlayoutSpacing" );
 	setPropertyValue( item );
-	if ( MetaDataBase::isPropertyChanged( editor->widget(), "layoutSpacing" )
+	if ( MetaDataBase::isPropertyChanged( editor->widget(), "tqlayoutSpacing" )
 	     || MetaDataBase::spacing( editor->widget() ) != -1 )
-	    layoutInitValue( item, TRUE );
+	    tqlayoutInitValue( item, TRUE );
 	else
-	    layoutInitValue( item );
-	item = new PropertyLayoutItem( this, item, 0, "layoutMargin" );
+	    tqlayoutInitValue( item );
+	item = new PropertyLayoutItem( this, item, 0, "tqlayoutMargin" );
 	setPropertyValue( item );
-	if ( MetaDataBase::isPropertyChanged( editor->widget(), "layoutMargin" )
+	if ( MetaDataBase::isPropertyChanged( editor->widget(), "tqlayoutMargin" )
 	     || MetaDataBase::margin( editor->widget() ) != -1 )
-	    layoutInitValue( item, TRUE );
+	    tqlayoutInitValue( item, TRUE );
 	else
-	    layoutInitValue( item );
+	    tqlayoutInitValue( item );
 	TQWidget *widget = (TQWidget*)w;
-	if ( ( !::qt_cast<QLayoutWidget*>(widget) &&
-	       widget->parentWidget() && ::qt_cast<FormWindow*>(widget->parentWidget()) ) ) {
+	if ( ( !::tqqt_cast<TQLayoutWidget*>(widget) &&
+	       widget->tqparentWidget() && ::tqqt_cast<FormWindow*>(widget->tqparentWidget()) ) ) {
 	    item = new PropertyListItem( this, item, 0, "resizeMode", FALSE );
 	    TQStringList lst;
 	    lst << "Auto" << "FreeResize" << "Minimum" << "Fixed";
@@ -3268,8 +3268,8 @@ void PropertyList::setupProperties()
 	}
     }
 
-    if ( !::qt_cast<Spacer*>(w) && !::qt_cast<QLayoutWidget*>(w) &&
-	 !::qt_cast<MenuBarEditor*>(w) && !::qt_cast<QDesignerToolBar*>(w) ) {
+    if ( !::tqqt_cast<Spacer*>(w) && !::tqqt_cast<TQLayoutWidget*>(w) &&
+	 !::tqqt_cast<MenuBarEditor*>(w) && !::tqqt_cast<TQDesignerToolBar*>(w) ) {
 	item = new PropertyTextItem( this, item, 0, "toolTip", TRUE, FALSE );
 	setPropertyValue( item );
 	if ( MetaDataBase::isPropertyChanged( editor->widget(), "toolTip" ) )
@@ -3280,17 +3280,17 @@ void PropertyList::setupProperties()
 	    item->setChanged( TRUE, FALSE );
     }
 
-#ifndef QT_NO_SQL
-    if ( !::qt_cast<TQDataTable*>(editor->widget()) && !::qt_cast<TQDataBrowser*>(editor->widget()) &&
-	 !::qt_cast<TQDataView*>(editor->widget()) && parent_is_data_aware( ::qt_cast<TQWidget*>(editor->widget()) ) ) {
-	item = new PropertyDatabaseItem( this, item, 0, "database", editor->formWindow()->mainContainer() != w );
+#ifndef TQT_NO_SQL
+    if ( !::tqqt_cast<TQDataTable*>(editor->widget()) && !::tqqt_cast<TQDataBrowser*>(editor->widget()) &&
+	 !::tqqt_cast<TQDataView*>(editor->widget()) && tqparent_is_data_aware( ::tqqt_cast<TQWidget*>(editor->widget()) ) ) {
+	item = new PropertyDatabaseItem( this, item, 0, "database", TQT_BASE_OBJECT(editor->formWindow()->mainContainer()) != TQT_BASE_OBJECT(w) );
 	setPropertyValue( item );
 	if ( MetaDataBase::isPropertyChanged( editor->widget(), "database" ) )
 	    item->setChanged( TRUE, FALSE );
     }
 
-    if ( ::qt_cast<TQDataTable*>(editor->widget()) || ::qt_cast<TQDataBrowser*>(editor->widget()) ||
-	 ::qt_cast<TQDataView*>(editor->widget()) ) {
+    if ( ::tqqt_cast<TQDataTable*>(editor->widget()) || ::tqqt_cast<TQDataBrowser*>(editor->widget()) ||
+	 ::tqqt_cast<TQDataView*>(editor->widget()) ) {
 	item = new PropertyDatabaseItem( this, item, 0, "database", FALSE );
 	setPropertyValue( item );
 	if ( MetaDataBase::isPropertyChanged( editor->widget(), "database" ) )
@@ -3324,7 +3324,7 @@ void PropertyList::setupProperties()
 	sort();
 	setSorting( -1 );
 	setCurrentItem( firstChild() );
-	qApp->processEvents();
+	tqApp->processEvents();
     }
 
     updateEditorSize();
@@ -3339,7 +3339,7 @@ void PropertyList::setupCusWidgetProperties( MetaDataBase::CustomWidget *cw,
 
     for ( TQValueList<MetaDataBase::Property>::Iterator it =
 	  cw->lstProperties.begin(); it != cw->lstProperties.end(); ++it ) {
-	if ( unique.contains( TQString( (*it).property ) ) )
+	if ( unique.tqcontains( TQString( (*it).property ) ) )
 	    continue;
 	unique.insert( TQString( (*it).property ), TRUE );
 	addPropertyItem( item, (*it).property, type_to_variant( (*it).type ) );
@@ -3359,7 +3359,7 @@ bool PropertyList::addPropertyItem( PropertyItem *&item, const TQCString &name,
 	l << "";
 	while ( it.current() ) {
 	    if ( editor->formWindow()->canBeBuddy( it.current() ) ) {
-		if ( l.find( it.current()->name() ) == l.end() )
+		if ( l.tqfind( it.current()->name() ) == l.end() )
 		    l << it.current()->name();
 	    }
 	    ++it;
@@ -3373,14 +3373,14 @@ bool PropertyList::addPropertyItem( PropertyItem *&item, const TQCString &name,
     switch ( t ) {
     case TQVariant::String:
 	item = new PropertyTextItem( this, item, 0, name, TRUE,
-				     ::qt_cast<TQLabel*>(editor->widget()) ||
-				     ::qt_cast<TQTextView*>(editor->widget()) ||
-				     ::qt_cast<TQButton*>(editor->widget()) );
+				     ::tqqt_cast<TQLabel*>(editor->widget()) ||
+				     ::tqqt_cast<TQTextView*>(editor->widget()) ||
+				     ::tqqt_cast<TQButton*>(editor->widget()) );
 	break;
     case TQVariant::CString:
 	item = new PropertyTextItem( this, item, 0,
 				     name, name == "name" &&
-				     editor->widget() == editor->formWindow()->mainContainer(),
+				     TQT_BASE_OBJECT(editor->widget()) == TQT_BASE_OBJECT(editor->formWindow()->mainContainer()),
 				     FALSE, TRUE );
 	break;
     case TQVariant::Bool:
@@ -3392,7 +3392,7 @@ bool PropertyList::addPropertyItem( PropertyItem *&item, const TQCString &name,
     case TQVariant::Int:
 	if ( name == "accel" )
 	    item = new PropertyTextItem( this, item, 0, name, FALSE, FALSE, FALSE, TRUE );
-	else if ( name == "layoutSpacing" || name == "layoutMargin" )
+	else if ( name == "tqlayoutSpacing" || name == "tqlayoutMargin" )
 	    item = new PropertyLayoutItem( this, item, 0, name );
 	else if ( name == "resizeMode" )
 	    item = new PropertyListItem( this, item, 0, name, TRUE );
@@ -3486,7 +3486,7 @@ void PropertyList::valueChanged( PropertyItem *i )
 {
     if ( !editor->widget() )
 	return;
-    TQString pn( i18n( "Set '%1' of '%2'" ).arg( i->name() ).arg( editor->widget()->name() ) );
+    TQString pn( i18n( "Set '%1' of '%2'" ).tqarg( i->name() ).tqarg( editor->widget()->name() ) );
     SetPropertyCommand *cmd = new SetPropertyCommand( pn, editor->formWindow(),
 						      editor->widget(), editor,
 						      i->name(), WidgetFactory::property( editor->widget(), i->name() ),
@@ -3496,11 +3496,11 @@ void PropertyList::valueChanged( PropertyItem *i )
     editor->formWindow()->commandHistory()->addCommand( cmd, TRUE );
 }
 
-void PropertyList::layoutInitValue( PropertyItem *i, bool changed )
+void PropertyList::tqlayoutInitValue( PropertyItem *i, bool changed )
 {
     if ( !editor->widget() )
 	return;
-    TQString pn( i18n( "Set '%1' of '%2'" ).arg( i->name() ).arg( editor->widget()->name() ) );
+    TQString pn( i18n( "Set '%1' of '%2'" ).tqarg( i->name() ).tqarg( editor->widget()->name() ) );
     SetPropertyCommand *cmd = new SetPropertyCommand( pn, editor->formWindow(),
 						      editor->widget(), editor,
 						      i->name(), WidgetFactory::property( editor->widget(), i->name() ),
@@ -3546,15 +3546,15 @@ bool PropertyList::eventFilter( TQObject *o, TQEvent *e )
     else if ( e->type() == TQEvent::MouseButtonPress )
 	theLastEvent = MouseEvent;
 
-    if ( o != this &&e->type() == TQEvent::KeyPress ) {
+    if ( TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(this) &&e->type() == TQEvent::KeyPress ) {
 	TQKeyEvent *ke = (TQKeyEvent*)e;
 	if ( ( ke->key() == Key_Up || ke->key() == Key_Down ) &&
-	     ( o != this || o != viewport() ) &&
+	     ( TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(this) || TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(viewport()) ) &&
 	     !( ke->state() & ControlButton ) ) {
 	    TQApplication::sendEvent( this, (TQKeyEvent*)e );
 	    return TRUE;
-	} else if ( ( !::qt_cast<TQLineEdit*>(o) ||
-		      ( ::qt_cast<TQLineEdit*>(o) && ( (TQLineEdit*)o )->isReadOnly() ) ) &&
+	} else if ( ( !::tqqt_cast<TQLineEdit*>(o) ||
+		      ( ::tqqt_cast<TQLineEdit*>(o) && ( (TQLineEdit*)o )->isReadOnly() ) ) &&
 		    i && i->hasSubItems() ) {
 	    if ( !i->isOpen() &&
 		 ( ke->key() == Key_Plus ||
@@ -3564,21 +3564,21 @@ bool PropertyList::eventFilter( TQObject *o, TQEvent *e )
 		      ( ke->key() == Key_Minus ||
 			ke->key() == Key_Left ) )
 		i->setOpen( FALSE );
-	} else if ( ( ke->key() == Key_Return || ke->key() == Key_Enter ) && ::qt_cast<TQComboBox*>(o) ) {
+	} else if ( ( ke->key() == Key_Return || ke->key() == Key_Enter ) && ::tqqt_cast<TQComboBox*>(o) ) {
 	    TQKeyEvent ke2( TQEvent::KeyPress, Key_Space, 0, 0 );
 	    TQApplication::sendEvent( o, &ke2 );
 	    return TRUE;
 	}
-    } else if ( e->type() == TQEvent::FocusOut && ::qt_cast<TQLineEdit*>(o) && editor->formWindow() ) {
+    } else if ( e->type() == TQEvent::FocusOut && ::tqqt_cast<TQLineEdit*>(o) && editor->formWindow() ) {
 	TQTimer::singleShot( 100, editor->formWindow()->commandHistory(), TQT_SLOT( checkCompressedCommand() ) );
-    } else if ( o == viewport() ) {
+    } else if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(viewport()) ) {
 	TQMouseEvent *me;
 	PropertyListItem* i;
 	switch ( e->type() ) {
 	case TQEvent::MouseButtonPress:
 	    me = (TQMouseEvent*)e;
 	    i = (PropertyListItem*) itemAt( me->pos() );
-	    if ( i && ( ::qt_cast<PropertyColorItem*>(i) || ::qt_cast<PropertyPixmapItem*>(i) ) ) {
+	    if ( i && ( ::tqqt_cast<PropertyColorItem*>(i) || ::tqqt_cast<PropertyPixmapItem*>(i) ) ) {
 		pressItem = i;
 		pressPos = me->pos();
 		mousePressed = TRUE;
@@ -3586,13 +3586,13 @@ bool PropertyList::eventFilter( TQObject *o, TQEvent *e )
 	    break;
 	case TQEvent::MouseMove:
 	    me = (TQMouseEvent*)e;
-	    if ( me && me->state() & LeftButton && mousePressed) {
+	    if ( me && me->state() & Qt::LeftButton && mousePressed) {
 
 		i = (PropertyListItem*) itemAt( me->pos() );
 		if ( i  && i == pressItem ) {
 
 		    if (( pressPos - me->pos() ).manhattanLength() > TQApplication::startDragDistance() ){
-			if ( ::qt_cast<PropertyColorItem*>(i) ) {
+			if ( ::tqqt_cast<PropertyColorItem*>(i) ) {
 			    TQColor col = i->value().asColor();
 			    TQColorDrag *drg = new TQColorDrag( col, this );
 			    TQPixmap pix( 25, 25 );
@@ -3604,7 +3604,7 @@ bool PropertyList::eventFilter( TQObject *o, TQEvent *e )
 			    mousePressed = FALSE;
 			    drg->dragCopy();
 			}
-			else if ( ::qt_cast<PropertyPixmapItem*>(i) ) {
+			else if ( ::tqqt_cast<PropertyPixmapItem*>(i) ) {
 			    TQPixmap pix = i->value().asPixmap();
 			    if( !pix.isNull() ) {
 				TQImage img = pix.convertToImage();
@@ -3621,7 +3621,7 @@ bool PropertyList::eventFilter( TQObject *o, TQEvent *e )
 	default:
 	    break;
 	}
-    } else if ( o == header() ) {
+    } else if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(header()) ) {
 	if ( e->type() == TQEvent::ContextMenu ) {
 	    ((TQContextMenuEvent *)e)->accept();
 	    TQPopupMenu menu( 0 );
@@ -3663,7 +3663,7 @@ void PropertyList::refetchData()
 	if ( i->hasSubItems() )
 	    i->initChildren();
 	bool changed = MetaDataBase::isPropertyChanged( editor->widget(), i->name() );
-	if ( ( i->name() == "layoutSpacing" || i->name() == "layoutMargin" ) ) {
+	if ( ( i->name() == "tqlayoutSpacing" || i->name() == "tqlayoutMargin" ) ) {
 	    if ( i->value().toString() != "-1" )
 		i->setChanged( TRUE, FALSE );
 	    else
@@ -3679,9 +3679,9 @@ static void clearAlignList( TQStrList &l )
 {
     if ( l.count() == 1 )
 	return;
-    if ( l.find( "AlignAuto" ) != -1 )
+    if ( l.tqfind( "AlignAuto" ) != -1 )
 	l.remove( "AlignAuto" );
-    if ( l.find( "WordBreak" ) != -1 )
+    if ( l.tqfind( "WordBreak" ) != -1 )
 	l.remove( "WordBreak" );
 }
 
@@ -3692,35 +3692,35 @@ static void clearAlignList( TQStrList &l )
 void PropertyList::setPropertyValue( PropertyItem *i )
 {
     const TQMetaProperty *p =
-	editor->widget()->metaObject()->
-	property( editor->widget()->metaObject()->findProperty( i->name(), TRUE), TRUE );
+	editor->widget()->tqmetaObject()->
+	property( editor->widget()->tqmetaObject()->tqfindProperty( i->name(), TRUE), TRUE );
     if ( !p ) {
 	if ( i->name() == "hAlign" ) {
-	    int align = editor->widget()->property( "alignment" ).toInt();
-	    p = editor->widget()->metaObject()->
-		property( editor->widget()->metaObject()->findProperty( "alignment", TRUE ), TRUE );
+	    int align = editor->widget()->property( "tqalignment" ).toInt();
+	    p = editor->widget()->tqmetaObject()->
+		property( editor->widget()->tqmetaObject()->tqfindProperty( "tqalignment", TRUE ), TRUE );
 	    align &= ~AlignVertical_Mask;
 	    TQStrList l = p->valueToKeys( align );
 	    clearAlignList( l );
 	    ( (PropertyListItem*)i )->setCurrentItem( l.last() );
 	} else if ( i->name() == "vAlign" ) {
-	    int align = editor->widget()->property( "alignment" ).toInt();
-	    p = editor->widget()->metaObject()->
-		property( editor->widget()->metaObject()->findProperty( "alignment", TRUE ), TRUE );
+	    int align = editor->widget()->property( "tqalignment" ).toInt();
+	    p = editor->widget()->tqmetaObject()->
+		property( editor->widget()->tqmetaObject()->tqfindProperty( "tqalignment", TRUE ), TRUE );
 	    align &= ~AlignHorizontal_Mask;
 	    ( (PropertyListItem*)i )->setCurrentItem( p->valueToKeys( align ).last() );
 	} else if ( i->name() == "wordwrap" ) {
-	    int align = editor->widget()->property( "alignment" ).toInt();
+	    int align = editor->widget()->property( "tqalignment" ).toInt();
 	    if ( align & WordBreak )
 		i->setValue( TQVariant( TRUE, 0 ) );
 	    else
 		i->setValue( TQVariant( FALSE, 0 ) );
-	} else if ( i->name() == "layoutSpacing" ) {
-	    ( (PropertyLayoutItem*)i )->setValue( MetaDataBase::spacing( WidgetFactory::containerOfWidget( (TQWidget*)editor->widget() ) ) );
-	} else if ( i->name() == "layoutMargin" ) {
-	    ( (PropertyLayoutItem*)i )->setValue( MetaDataBase::margin( WidgetFactory::containerOfWidget( (TQWidget*)editor->widget() ) ) );
+	} else if ( i->name() == "tqlayoutSpacing" ) {
+	    ( (PropertyLayoutItem*)i )->setValue( MetaDataBase::spacing( TQT_TQOBJECT(WidgetFactory::containerOfWidget( TQT_TQWIDGET(editor->widget()) ) ) ));
+	} else if ( i->name() == "tqlayoutMargin" ) {
+	    ( (PropertyLayoutItem*)i )->setValue( MetaDataBase::margin( TQT_TQOBJECT(WidgetFactory::containerOfWidget( TQT_TQWIDGET(editor->widget()) ) ) ));
 	} else if ( i->name() == "resizeMode" ) {
-	    ( (PropertyListItem*)i )->setCurrentItem( MetaDataBase::resizeMode( WidgetFactory::containerOfWidget( (TQWidget*)editor->widget() ) ) );
+	    ( (PropertyListItem*)i )->setCurrentItem( MetaDataBase::resizeMode( TQT_TQOBJECT(WidgetFactory::containerOfWidget( TQT_TQWIDGET(editor->widget()) ) )) );
 	} else if ( i->name() == "toolTip" || i->name() == "whatsThis" || i->name() == "database" || i->name() == "frameworkCode" ) {
 	    i->setValue( MetaDataBase::fakeProperty( editor->widget(), i->name() ) );
 	} else if ( editor->widget()->inherits( "CustomWidget" ) ) {
@@ -3769,7 +3769,7 @@ void PropertyList::resetProperty()
     PropertyItem *i = (PropertyItem*)currentItem();
     if ( !MetaDataBase::isPropertyChanged( editor->widget(), i->PropertyItem::name() ) )
 	return;
-    TQString pn( i18n( "Reset '%1' of '%2'" ).arg( i->name() ).arg( editor->widget()->name() ) );
+    TQString pn( i18n( "Reset '%1' of '%2'" ).tqarg( i->name() ).tqarg( editor->widget()->name() ) );
     SetPropertyCommand *cmd = new SetPropertyCommand( pn, editor->formWindow(),
 						      editor->widget(), editor,
 						      i->name(), i->value(),
@@ -3790,9 +3790,9 @@ void PropertyList::viewportDragEnterEvent( TQDragEnterEvent *e )
 	return;
     }
 
-    if ( ::qt_cast<PropertyColorItem*>(i) && TQColorDrag::canDecode( e ) )
+    if ( ::tqqt_cast<PropertyColorItem*>(i) && TQColorDrag::canDecode( e ) )
 	e->accept();
-    else if ( ::qt_cast<PropertyPixmapItem*>(i) && TQImageDrag::canDecode( e ) )
+    else if ( ::tqqt_cast<PropertyPixmapItem*>(i) && TQImageDrag::canDecode( e ) )
 	e->accept();
     else
 	e->ignore();
@@ -3806,9 +3806,9 @@ void PropertyList::viewportDragMoveEvent ( TQDragMoveEvent *e )
 	return;
     }
 
-    if ( ::qt_cast<PropertyColorItem*>(i) && TQColorDrag::canDecode( e ) )
+    if ( ::tqqt_cast<PropertyColorItem*>(i) && TQColorDrag::canDecode( e ) )
 	e->accept();
-    else if ( ::qt_cast<PropertyPixmapItem*>(i) && TQImageDrag::canDecode( e ) )
+    else if ( ::tqqt_cast<PropertyPixmapItem*>(i) && TQImageDrag::canDecode( e ) )
 	e->accept();
     else
 	e->ignore();
@@ -3822,14 +3822,14 @@ void PropertyList::viewportDropEvent ( TQDropEvent *e )
 	return;
     }
 
-    if ( ::qt_cast<PropertyColorItem*>(i) && TQColorDrag::canDecode( e ) ) {
+    if ( ::tqqt_cast<PropertyColorItem*>(i) && TQColorDrag::canDecode( e ) ) {
 	TQColor color;
 	TQColorDrag::decode( e, color );
 	i->setValue( TQVariant( color ) );
 	valueChanged( i );
 	e->accept();
     }
-    else if ( ::qt_cast<PropertyPixmapItem*>(i)  && TQImageDrag::canDecode( e ) ) {
+    else if ( ::tqqt_cast<PropertyPixmapItem*>(i)  && TQImageDrag::canDecode( e ) ) {
 	TQImage img;
 	TQImageDrag::decode( e, img );
 	TQPixmap pm;
@@ -3859,24 +3859,24 @@ void PropertyList::showCurrentWhatsThis()
 TQString PropertyList::whatsThisText( TQListViewItem *i )
 {
     if ( !i || !editor->widget() )
-	return TQString::null;
+	return TQString();
     readPropertyDocs();
     if ( ( (PropertyItem*)i )->propertyParent() )
 	i = ( (PropertyItem*)i )->propertyParent();
 
-    const TQMetaObject *mo = editor->widget()->metaObject();
+    const TQMetaObject *mo = editor->widget()->tqmetaObject();
     TQString prop = ( (PropertyItem*)i )->name();
     while ( mo ) {
 	TQString s;
 	s = TQString( mo->className() ) + "::" + prop;
 	TQMap<TQString, TQString>::Iterator it;
-	if ( ( it = propertyDocs.find( s ) ) != propertyDocs.end() ) {
+	if ( ( it = propertyDocs.tqfind( s ) ) != propertyDocs.end() ) {
 	    return *it;
 	}
-	mo = mo->superClass();
+	mo = mo->tqsuperClass();
     }
 
-    return i18n( "<p><b>TQWidget::%1</b></p><p>There is no documentation available for this property.</p>" ).arg( prop );
+    return i18n( "<p><b>TQWidget::%1</b></p><p>There is no documentation available for this property.</p>" ).tqarg( prop );
 }
 
 void PropertyList::readPropertyDocs()
@@ -3916,8 +3916,8 @@ PropertyList::LastEventType PropertyList::lastEvent()
 }
 // ------------------------------------------------------------
 
-EventList::EventList( TQWidget *parent, FormWindow *fw, PropertyEditor *e )
-    : HierarchyList( parent, fw, TRUE ), editor( e )
+EventList::EventList( TQWidget *tqparent, FormWindow *fw, PropertyEditor *e )
+    : HierarchyList( tqparent, fw, TRUE ), editor( e )
 {
     header()->hide();
     removeColumn( 1 );
@@ -3929,15 +3929,15 @@ EventList::EventList( TQWidget *parent, FormWindow *fw, PropertyEditor *e )
 TQString clean_arguments( const TQString &s )
 {
     TQString slot = s;
-    TQString arg = slot.mid( slot.find( '(' ) + 1 );
-    arg = arg.left( arg.findRev( ')' ) );
+    TQString arg = slot.mid( slot.tqfind( '(' ) + 1 );
+    arg = arg.left( arg.tqfindRev( ')' ) );
     TQStringList args = TQStringList::split( ',', arg );
-    slot = slot.left( slot.find( '(' ) + 1 );
+    slot = slot.left( slot.tqfind( '(' ) + 1 );
     int num = 0;
     for ( TQStringList::Iterator it = args.begin(); it != args.end(); ++it, ++num ) {
 	TQString a = *it;
 	int i;
-	if ( ( i =a.find( ':' ) ) == -1 )
+	if ( ( i =a.tqfind( ':' ) ) == -1 )
 	    slot += a.simplifyWhiteSpace();
 	else
 	    slot += a.mid( i + 1 ).simplifyWhiteSpace();
@@ -3967,10 +3967,10 @@ void EventList::setup()
     TQStrListIterator it( sigs );
     while ( it.current() ) {
 	HierarchyItem *eventItem = new HierarchyItem( HierarchyItem::Event, this, (HierarchyItem*)0,
-						      it.current(), TQString::null, TQString::null );
+						      it.current(), TQString(), TQString() );
 	eventItem->setOpen( TRUE );
 	TQValueList<MetaDataBase::Connection> conns =
-	    MetaDataBase::connections( formWindow, editor->widget(), formWindow->mainContainer() );
+	    MetaDataBase::connections( TQT_TQOBJECT(formWindow), TQT_TQOBJECT(editor->widget()), TQT_TQOBJECT(formWindow->mainContainer()) );
 	HierarchyItem *item = 0;
 	for ( TQValueList<MetaDataBase::Connection>::Iterator cit = conns.begin();
 	      cit != conns.end(); ++cit ) {
@@ -3979,7 +3979,7 @@ void EventList::setup()
 		 MetaDataBase::normalizeFunction( clean_arguments( s ) ) )
 		continue;
 	    item = new HierarchyItem( HierarchyItem::EventFunction, eventItem, item,
-						     (*cit).slot, TQString::null, TQString::null );
+						     (*cit).slot, TQString(), TQString() );
 	    item->setPixmap( 0, DesignerEditSlotsPix );
 	}
 	++it;
@@ -3991,12 +3991,12 @@ extern TQListViewItem *newItem;
 void EventList::contentsMouseDoubleClickEvent( TQMouseEvent *e )
 {
     TQListViewItem *i = itemAt( contentsToViewport( e->pos() ) );
-    if ( !i || i->parent() )
+    if ( !i || i->tqparent() )
 	return;
     TQString s;
     if ( !formWindow->project()->isCpp() ) {
 	TQString s1 = i->text( 0 );
-	int pt = s1.find( "(" );
+	int pt = s1.tqfind( "(" );
 	if ( pt != -1 )
 	    s1 = s1.left( pt );
 	s = TQString( editor->widget()->name() ) + "_" + s1;
@@ -4014,7 +4014,7 @@ void EventList::setCurrent( TQWidget * )
 
 void EventList::objectClicked( TQListViewItem *i )
 {
-    if ( !i || !i->parent() )
+    if ( !i || !i->tqparent() )
 	return;
 //    formWindow->clearSelection(false);
     formWindow->mainWindow()->part()->emitEditFunction(formWindow->fileName(), i->text( 0 ));
@@ -4034,20 +4034,20 @@ void EventList::showRMBMenu( TQListViewItem *i, const TQPoint &pos )
     if ( res == NEW_ITEM ) {
 	TQString s;
 	if ( !formWindow->project()->isCpp() ) {
-	    TQString s1 = ( i->parent() ? i->parent() : i )->text( 0 );
-	    int pt = s1.find( "(" );
+	    TQString s1 = ( i->tqparent() ? i->tqparent() : i )->text( 0 );
+	    int pt = s1.tqfind( "(" );
 	    if ( pt != -1 )
 		s1 = s1.left( pt );
 	    s = TQString( editor->widget()->name() ) + "_" + s1;
 	} else {
-	    s = TQString( editor->widget()->name() ) + "_" + ( i->parent() ? i->parent() : i )->text( 0 );
+	    s = TQString( editor->widget()->name() ) + "_" + ( i->tqparent() ? i->tqparent() : i )->text( 0 );
 	}
-	insertEntry( i->parent() ? i->parent() : i, SmallIcon( "designer_editslots.png" , KDevDesignerPartFactory::instance()), s );
-    } else if ( res == DEL_ITEM && i->parent() ) {
+	insertEntry( i->tqparent() ? i->tqparent() : i, SmallIcon( "designer_editslots.png" , KDevDesignerPartFactory::instance()), s );
+    } else if ( res == DEL_ITEM && i->tqparent() ) {
 	MetaDataBase::Connection conn;
 	conn.sender = editor->widget();
-	conn.receiver = formWindow->mainContainer();
-	conn.signal = i->parent()->text( 0 );
+	conn.receiver = TQT_TQOBJECT(formWindow->mainContainer());
+	conn.signal = i->tqparent()->text( 0 );
 	conn.slot = i->text( 0 );
 	delete i;
 	RemoveConnectionCommand *cmd = new RemoveConnectionCommand( i18n( "Remove Connection" ),
@@ -4063,9 +4063,9 @@ void EventList::renamed( TQListViewItem *i )
 {
     if ( newItem == i )
 	newItem = 0;
-    if ( !i->parent() )
+    if ( !i->tqparent() )
 	return;
-    TQListViewItem *itm = i->parent()->firstChild();
+    TQListViewItem *itm = i->tqparent()->firstChild();
     bool del = FALSE;
     while ( itm ) {
 	if ( itm != i && itm->text( 0 ) == i->text( 0 ) ) {
@@ -4080,8 +4080,8 @@ void EventList::renamed( TQListViewItem *i )
     } else {
 	MetaDataBase::Connection conn;
 	conn.sender = editor->widget();
-	conn.receiver = formWindow->mainContainer();
-	conn.signal = i->parent()->text( 0 );
+	conn.receiver = TQT_TQOBJECT(formWindow->mainContainer());
+	conn.signal = i->tqparent()->text( 0 );
 	conn.slot = i->text( 0 );
 	AddConnectionCommand *cmd = new AddConnectionCommand( i18n( "Add Connection" ),
 							      formWindow,
@@ -4090,9 +4090,9 @@ void EventList::renamed( TQListViewItem *i )
 	// #### we should look if the specified slot already
 	// exists and if we can connect to this one
 	TQString funcname = i->text( 0 ).latin1();
-	if ( funcname.find( '(' ) == -1 ) { // try to create a signature
-	    TQString sig = i->parent()->text( 0 );
-	    sig = sig.mid( sig.find( '(' ) + 1 );
+	if ( funcname.tqfind( '(' ) == -1 ) { // try to create a signature
+	    TQString sig = i->tqparent()->text( 0 );
+	    sig = sig.mid( sig.tqfind( '(' ) + 1 );
 	    sig.remove( (int)sig.length() - 1, 1 );
 	    LanguageInterface *iface = MetaDataBase::languageInterface( formWindow->project()->language() );
 	    if ( iface )
@@ -4110,7 +4110,7 @@ void EventList::renamed( TQListViewItem *i )
 /*	MetaDataBase::addFunction( formWindow, funcname.latin1(), "virtual", "public",
 				   "slot", formWindow->project()->language(), "void" );
 	editor->formWindow()->mainWindow()->
-	    editFunction( i->text( 0 ).left( i->text( 0 ).find( "(" ) ), TRUE );*/
+	    editFunction( i->text( 0 ).left( i->text( 0 ).tqfind( "(" ) ), TRUE );*/
 	cmd->execute();
         cmd2->execute();
 	editor->formWindow()->mainWindow()->objectHierarchy()->updateFormDefinitionView();
@@ -4138,8 +4138,8 @@ void EventList::save( TQListViewItem *p )
   listview for editing properties.
 */
 
-PropertyEditor::PropertyEditor( TQWidget *parent )
-    : TQTabWidget( parent, 0, WStyle_Customize | WStyle_NormalBorder | WStyle_Title |
+PropertyEditor::PropertyEditor( TQWidget *tqparent )
+    : TQTabWidget( tqparent, 0, WStyle_Customize | WStyle_NormalBorder | WStyle_Title |
 		  WStyle_StaysOnTop | WStyle_Tool |WStyle_MinMax | WStyle_SysMenu )
 {
     setCaption( i18n( "Property Editor" ) );
@@ -4165,11 +4165,11 @@ void PropertyEditor::setWidget( TQObject *w, FormWindow *fw )
 	// if there is no properties displayed then we really should show them.
 	// to do this check the number of properties in the list.
 	bool ret = (listview->childCount() > 0) ? TRUE : FALSE;
-	if ( wid->isWidgetType() && WidgetFactory::layoutType( (TQWidget*)wid ) != WidgetFactory::NoLayout ) {
+	if ( wid->isWidgetType() && WidgetFactory::tqlayoutType( (TQWidget*)wid ) != WidgetFactory::NoLayout ) {
 	    TQListViewItemIterator it( listview );
 	    ret = FALSE;
 	    while ( it.current() ) {
-		if ( it.current()->text( 0 ) == "layoutSpacing" || it.current()->text( 0 ) == "layoutMargin" ) {
+		if ( it.current()->text( 0 ) == "tqlayoutSpacing" || it.current()->text( 0 ) == "tqlayoutMargin" ) {
 		    ret = TRUE;
 		    break;
 		}
@@ -4190,7 +4190,7 @@ void PropertyEditor::setWidget( TQObject *w, FormWindow *fw )
 
     wid = w;
     formwindow = fw;
-    setCaption( i18n( "Property Editor (%1)" ).arg( formwindow->name() ) );
+    setCaption( i18n( "Property Editor (%1)" ).tqarg( formwindow->name() ) );
     listview->viewport()->setUpdatesEnabled( FALSE );
     listview->setUpdatesEnabled( FALSE );
     clear();
@@ -4262,7 +4262,7 @@ FormWindow *PropertyEditor::formWindow() const
 TQString PropertyEditor::currentProperty() const
 {
     if ( !wid )
-	return TQString::null;
+	return TQString();
     if ( ( (PropertyItem*)listview->currentItem() )->propertyParent() )
 	return ( (PropertyItem*)listview->currentItem() )->propertyParent()->name();
     return ( (PropertyItem*)listview->currentItem() )->name();
@@ -4271,24 +4271,24 @@ TQString PropertyEditor::currentProperty() const
 TQString PropertyEditor::classOfCurrentProperty() const
 {
     if ( !wid )
-	return TQString::null;
+	return TQString();
     TQObject *o = wid;
     TQString curr = currentProperty();
-    TQMetaObject *mo = o->metaObject();
+    TQMetaObject *mo = o->tqmetaObject();
     while ( mo ) {
 	TQStrList props = mo->propertyNames( FALSE );
-	if ( props.find( curr.latin1() ) != -1 )
+	if ( props.tqfind( curr.latin1() ) != -1 )
 	    return mo->className();
-	mo = mo->superClass();
+	mo = mo->tqsuperClass();
     }
-    return TQString::null;
+    return TQString();
 }
 
-TQMetaObject* PropertyEditor::metaObjectOfCurrentProperty() const
+TQMetaObject* PropertyEditor::tqmetaObjectOfCurrentProperty() const
 {
     if ( !wid )
 	return 0;
-    return wid->metaObject();
+    return wid->tqmetaObject();
 }
 
 void PropertyEditor::resetFocus()
@@ -4323,10 +4323,10 @@ void PropertyEditor::setSignalHandlersEnabled( bool b )
 void PropertyEditor::updateWindow()
 {
     if ( isHidden() && count() ) {
-	parentWidget()->show();
-	MainWindow::self->setAppropriate( (TQDockWindow*)parentWidget(), TRUE );
+	tqparentWidget()->show();
+	MainWindow::self->setAppropriate( (TQDockWindow*)tqparentWidget(), TRUE );
     } else if ( isShown() && !count() ) {
-	parentWidget()->hide();
-	MainWindow::self->setAppropriate( (TQDockWindow*)parentWidget(), FALSE );
+	tqparentWidget()->hide();
+	MainWindow::self->setAppropriate( (TQDockWindow*)tqparentWidget(), FALSE );
     }
 }
diff --git a/kdevdesigner/designer/propertyeditor.h b/kdevdesigner/designer/propertyeditor.h
index 17673086..55341fb4 100644
--- a/kdevdesigner/designer/propertyeditor.h
+++ b/kdevdesigner/designer/propertyeditor.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -55,11 +55,11 @@ class FormWindow;
 class TQCloseEvent;
 class TQResizeEvent;
 class PropertyWhatsThis;
-class QDateEdit;
-class QTimeEdit;
-class QDateTimeEdit;
+class TQDateEdit;
+class TQTimeEdit;
+class TQDateTimeEdit;
 
-class PropertyItem : public QListViewItem
+class PropertyItem : public TQListViewItem
 {
 public:
     PropertyItem( PropertyList *l, PropertyItem *after, PropertyItem *prop, const TQString &propName );
@@ -129,7 +129,7 @@ private:
     bool open, changed;
     PropertyItem *property;
     TQString propertyName;
-    TQPtrList<PropertyItem> children;
+    TQPtrList<PropertyItem> tqchildren;
     TQColor backColor;
     TQPushButton *resetButton;
 
@@ -139,6 +139,7 @@ class PropertyTextItem : public TQObject,
 			 public PropertyItem
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     PropertyTextItem( PropertyList *l, PropertyItem *after, PropertyItem *prop,
@@ -175,6 +176,7 @@ class PropertyBoolItem : public TQObject,
 			 public PropertyItem
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     PropertyBoolItem( PropertyList *l, PropertyItem *after, PropertyItem *prop, const TQString &propName );
@@ -199,6 +201,7 @@ class PropertyIntItem : public TQObject,
 			public PropertyItem
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     PropertyIntItem( PropertyList *l, PropertyItem *after, PropertyItem *prop,
@@ -224,6 +227,7 @@ class PropertyLayoutItem : public TQObject,
 			public PropertyItem
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     PropertyLayoutItem( PropertyList *l, PropertyItem *after, PropertyItem *prop,
@@ -248,6 +252,7 @@ class PropertyDoubleItem : public TQObject,
 			public PropertyItem
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     PropertyDoubleItem( PropertyList *l, PropertyItem *after, PropertyItem *prop,
@@ -271,6 +276,7 @@ class PropertyListItem : public TQObject,
 			 public PropertyItem
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     PropertyListItem( PropertyList *l, PropertyItem *after, PropertyItem *prop,
@@ -306,6 +312,7 @@ class PropertyFontItem : public TQObject,
 			 public PropertyItem
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     PropertyFontItem( PropertyList *l, PropertyItem *after, PropertyItem *prop, const TQString &propName );
@@ -335,6 +342,7 @@ class PropertyCoordItem : public TQObject,
 			  public PropertyItem
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     enum Type { Rect, Size, Point };
@@ -364,10 +372,11 @@ class PropertyColorItem : public TQObject,
 			  public PropertyItem
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     PropertyColorItem( PropertyList *l, PropertyItem *after, PropertyItem *prop,
-		       const TQString &propName, bool children );
+		       const TQString &propName, bool tqchildren );
     ~PropertyColorItem();
 
     virtual void createChildren();
@@ -398,6 +407,7 @@ class PropertyPixmapItem : public TQObject,
 			   public PropertyItem
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     enum Type { Pixmap, IconSet, Image };
@@ -430,6 +440,7 @@ class PropertySizePolicyItem : public TQObject,
 			  public PropertyItem
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     PropertySizePolicyItem( PropertyList *l, PropertyItem *after, PropertyItem *prop,
@@ -456,6 +467,7 @@ class PropertyPaletteItem : public TQObject,
 			    public PropertyItem
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     PropertyPaletteItem( PropertyList *l, PropertyItem *after, PropertyItem *prop,
@@ -484,6 +496,7 @@ class PropertyCursorItem : public TQObject,
 			   public PropertyItem
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     PropertyCursorItem( PropertyList *l, PropertyItem *after, PropertyItem *prop,
@@ -508,6 +521,7 @@ class PropertyKeysequenceItem : public TQObject,
 				public PropertyItem
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     PropertyKeysequenceItem( PropertyList *l, PropertyItem *after, PropertyItem *prop,
@@ -538,6 +552,7 @@ class PropertyDatabaseItem : public TQObject,
 			     public PropertyItem
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     PropertyDatabaseItem( PropertyList *l, PropertyItem *after, PropertyItem *prop, const TQString &propName, bool wField );
@@ -564,7 +579,7 @@ private:
 struct EnumItem {
     EnumItem( const TQString &k, bool s )
 	: key( k ), selected( s ) {}
-    EnumItem() : key( TQString::null ), selected( FALSE ) {}
+    EnumItem() : key( TQString() ), selected( FALSE ) {}
     bool operator==( const EnumItem &item ) const {
 	return key == item.key;
     }
@@ -572,12 +587,13 @@ struct EnumItem {
     bool selected;
 };
 
-class EnumPopup : public QFrame
+class EnumPopup : public TQFrame
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    EnumPopup( TQWidget *parent, const char *name, WFlags f=0 );
+    EnumPopup( TQWidget *tqparent, const char *name, WFlags f=0 );
     ~EnumPopup();
     void insertEnums( TQValueList<EnumItem> lst );
     TQValueList<EnumItem> enumList() const;
@@ -596,12 +612,13 @@ private:
     TQVBoxLayout *popLayout;
 };
 
-class EnumBox : public QComboBox
+class EnumBox : public TQComboBox
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    EnumBox( TQWidget *parent, const char *name = 0 );
+    EnumBox( TQWidget *tqparent, const char *name = 0 );
     ~EnumBox() {}
     void setText( const TQString &text );
     void insertEnums( TQValueList<EnumItem> lst );
@@ -633,6 +650,7 @@ class PropertyEnumItem : public TQObject,
 			 public PropertyItem
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     PropertyEnumItem( PropertyList *l, PropertyItem *after, PropertyItem *prop,
@@ -656,9 +674,10 @@ private:
     TQString enumString;
 };
 
-class PropertyList : public QListView
+class PropertyList : public TQListView
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     PropertyList( PropertyEditor *e );
@@ -671,7 +690,7 @@ public:
     virtual void setPropertyValue( PropertyItem *i );
     virtual void setCurrentProperty( const TQString &n );
 
-    void layoutInitValue( PropertyItem *i, bool changed = FALSE );
+    void tqlayoutInitValue( PropertyItem *i, bool changed = FALSE );
     PropertyEditor *propertyEditor() const;
     TQString whatsThisAt( const TQPoint &p );
     void showCurrentWhatsThis();
@@ -721,9 +740,10 @@ private:
 class EventList : public HierarchyList
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    EventList( TQWidget *parent, FormWindow *fw, PropertyEditor *e );
+    EventList( TQWidget *tqparent, FormWindow *fw, PropertyEditor *e );
 
     void setup();
     void setCurrent( TQWidget *w );
@@ -745,12 +765,13 @@ private:
 };
 
 
-class PropertyEditor : public QTabWidget
+class PropertyEditor : public TQTabWidget
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    PropertyEditor( TQWidget *parent );
+    PropertyEditor( TQWidget *tqparent );
 
     TQObject *widget() const;
 
@@ -768,7 +789,7 @@ public:
 
     TQString currentProperty() const;
     TQString classOfCurrentProperty() const;
-    TQMetaObject* metaObjectOfCurrentProperty() const;
+    TQMetaObject* tqmetaObjectOfCurrentProperty() const;
 
     void resetFocus();
 
@@ -799,6 +820,7 @@ class PropertyDateItem : public TQObject,
 			 public PropertyItem
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     PropertyDateItem( PropertyList *l, PropertyItem *after, PropertyItem *prop, const TQString &propName );
@@ -813,8 +835,8 @@ private slots:
     void setValue();
 
 private:
-    QDateEdit *lined();
-    TQGuardedPtr<QDateEdit> lin;
+    TQDateEdit *lined();
+    TQGuardedPtr<TQDateEdit> lin;
 
 };
 
@@ -822,6 +844,7 @@ class PropertyTimeItem : public TQObject,
 			 public PropertyItem
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     PropertyTimeItem( PropertyList *l, PropertyItem *after, PropertyItem *prop, const TQString &propName );
@@ -836,8 +859,8 @@ private slots:
     void setValue();
 
 private:
-    QTimeEdit *lined();
-    TQGuardedPtr<QTimeEdit> lin;
+    TQTimeEdit *lined();
+    TQGuardedPtr<TQTimeEdit> lin;
 
 };
 
@@ -845,6 +868,7 @@ class PropertyDateTimeItem : public TQObject,
 			 public PropertyItem
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     PropertyDateTimeItem( PropertyList *l, PropertyItem *after, PropertyItem *prop, const TQString &propName );
@@ -859,8 +883,8 @@ private slots:
     void setValue();
 
 private:
-    QDateTimeEdit *lined();
-    TQGuardedPtr<QDateTimeEdit> lin;
+    TQDateTimeEdit *lined();
+    TQGuardedPtr<TQDateTimeEdit> lin;
 
 };
 
diff --git a/kdevdesigner/designer/propertyobject.cpp b/kdevdesigner/designer/propertyobject.cpp
index 8053501e..39d23b48 100644
--- a/kdevdesigner/designer/propertyobject.cpp
+++ b/kdevdesigner/designer/propertyobject.cpp
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -38,12 +38,12 @@ PropertyObject::PropertyObject( const TQWidgetList &objs )
     v.resize( objects.count() );
     v.setAutoDelete( TRUE );
 
-    for ( TQObject *o = objects.first(); o; o = objects.next() ) {
-	const TQMetaObject *m = o->metaObject();
+    for ( TQObject *o = TQT_TQOBJECT(objects.first()); o; o = TQT_TQOBJECT(objects.next()) ) {
+	const TQMetaObject *m = o->tqmetaObject();
 	TQPtrList<TQMetaObject> *mol = new TQPtrList<TQMetaObject>;
 	while ( m ) {
 	    mol->insert( 0, m );
-	    m = m->superClass();
+	    m = m->tqsuperClass();
 	}
 	v.insert( v.count(), mol );
     }
@@ -74,7 +74,7 @@ PropertyObject::PropertyObject( const TQWidgetList &objs )
 
 bool PropertyObject::setProperty( const char *name, const TQVariant& value )
 {
-    for ( TQObject *o = objects.first(); o; o = objects.next() )
+    for ( TQObject *o = TQT_TQOBJECT(objects.first()); o; o = TQT_TQOBJECT(objects.next()) )
 	o->setProperty( name, value );
 
     return TRUE;
@@ -87,13 +87,13 @@ TQVariant PropertyObject::property( const char *name ) const
 
 void PropertyObject::mdPropertyChanged( const TQString &property, bool changed )
 {
-    for ( TQObject *o = objects.first(); o; o = objects.next() )
+    for ( TQObject *o = TQT_TQOBJECT(objects.first()); o; o = TQT_TQOBJECT(objects.next()) )
 	MetaDataBase::setPropertyChanged( o, property, changed );
 }
 
 bool PropertyObject::mdIsPropertyChanged( const TQString &property )
 {
-    for ( TQObject *o = objects.first(); o; o = objects.next() ) {
+    for ( TQObject *o = TQT_TQOBJECT(objects.first()); o; o = TQT_TQOBJECT(objects.next()) ) {
 	if ( MetaDataBase::isPropertyChanged( o, property ) )
 	    return TRUE;
     }
@@ -102,29 +102,29 @@ bool PropertyObject::mdIsPropertyChanged( const TQString &property )
 
 void PropertyObject::mdSetPropertyComment( const TQString &property, const TQString &comment )
 {
-    for ( TQObject *o = objects.first(); o; o = objects.next() )
+    for ( TQObject *o = TQT_TQOBJECT(objects.first()); o; o = TQT_TQOBJECT(objects.next()) )
 	MetaDataBase::setPropertyComment( o, property, comment );
 }
 
 TQString PropertyObject::mdPropertyComment( const TQString &property )
 {
-    return MetaDataBase::propertyComment( objects.first(), property );
+    return MetaDataBase::propertyComment( TQT_TQOBJECT(objects.first()), property );
 }
 
 void PropertyObject::mdSetFakeProperty( const TQString &property, const TQVariant &value )
 {
-    for ( TQObject *o = objects.first(); o; o = objects.next() )
+    for ( TQObject *o = TQT_TQOBJECT(objects.first()); o; o = TQT_TQOBJECT(objects.next()) )
 	MetaDataBase::setFakeProperty( o, property, value );
 }
 
 TQVariant PropertyObject::mdFakeProperty( const TQString &property )
 {
-    return MetaDataBase::fakeProperty( objects.first(), property );
+    return MetaDataBase::fakeProperty( TQT_TQOBJECT(objects.first()), property );
 }
 
 void PropertyObject::mdSetCursor( const TQCursor &c )
 {
-    for ( TQObject *o = objects.first(); o; o = objects.next() ) {
+    for ( TQObject *o = TQT_TQOBJECT(objects.first()); o; o = TQT_TQOBJECT(objects.next()) ) {
 	if ( o->isWidgetType() )
 	    MetaDataBase::setCursor( (TQWidget*)o, c );
     }
@@ -137,22 +137,22 @@ TQCursor PropertyObject::mdCursor()
 
 void PropertyObject::mdSetPixmapKey( int pixmap, const TQString &arg )
 {
-    for ( TQObject *o = objects.first(); o; o = objects.next() )
+    for ( TQObject *o = TQT_TQOBJECT(objects.first()); o; o = TQT_TQOBJECT(objects.next()) )
 	MetaDataBase::setPixmapKey( o, pixmap, arg );
 }
 
 TQString PropertyObject::mdPixmapKey( int pixmap )
 {
-    return MetaDataBase::pixmapKey( objects.first(), pixmap );
+    return MetaDataBase::pixmapKey( TQT_TQOBJECT(objects.first()), pixmap );
 }
 
 void PropertyObject::mdSetExportMacro( const TQString &macro )
 {
-    for ( TQObject *o = objects.first(); o; o = objects.next() )
+    for ( TQObject *o = TQT_TQOBJECT(objects.first()); o; o = TQT_TQOBJECT(objects.next()) )
 	MetaDataBase::setExportMacro( o, macro );
 }
 
 TQString PropertyObject::mdExportMacro()
 {
-    return MetaDataBase::exportMacro( objects.first() );
+    return MetaDataBase::exportMacro( TQT_TQOBJECT(objects.first()) );
 }
diff --git a/kdevdesigner/designer/propertyobject.h b/kdevdesigner/designer/propertyobject.h
index 784fa74b..4cfb54fd 100644
--- a/kdevdesigner/designer/propertyobject.h
+++ b/kdevdesigner/designer/propertyobject.h
@@ -5,10 +5,10 @@
 #include <tqwidgetlist.h>
 #include <tqcursor.h>
 
-class PropertyObject : public QObject
+class PropertyObject : public TQObject
 {
 public:
-    TQMetaObject *metaObject() const { return (TQMetaObject*)mobj; }
+    TQMetaObject *tqmetaObject() const { return (TQMetaObject*)mobj; }
     const char *className() const { return "PropertyObject"; }
     TQObject* qObject() { return (TQObject*)this; }
 private:
diff --git a/kdevdesigner/designer/qcompletionedit.cpp b/kdevdesigner/designer/qcompletionedit.cpp
index c00e9b84..f963cf51 100644
--- a/kdevdesigner/designer/qcompletionedit.cpp
+++ b/kdevdesigner/designer/qcompletionedit.cpp
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2001 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -30,8 +30,8 @@
 #include <tqapplication.h>
 #include <tqvbox.h>
 
-QCompletionEdit::QCompletionEdit( TQWidget *parent, const char *name )
-    : TQLineEdit( parent, name ), aAdd( FALSE ), caseSensitive( FALSE )
+TQCompletionEdit::TQCompletionEdit( TQWidget *tqparent, const char *name )
+    : TQLineEdit( tqparent, name ), aAdd( FALSE ), caseSensitive( FALSE )
 {
     popup = new TQVBox( 0, 0, WType_Popup );
     popup->setFrameStyle( TQFrame::Box | TQFrame::Plain );
@@ -51,27 +51,27 @@ QCompletionEdit::QCompletionEdit( TQWidget *parent, const char *name )
     installEventFilter( this );
 }
 
-bool QCompletionEdit::autoAdd() const
+bool TQCompletionEdit::autoAdd() const
 {
     return aAdd;
 }
 
-TQStringList QCompletionEdit::completionList() const
+TQStringList TQCompletionEdit::completionList() const
 {
     return compList;
 }
 
-void QCompletionEdit::setCompletionList( const TQStringList &l )
+void TQCompletionEdit::setCompletionList( const TQStringList &l )
 {
     compList = l;
 }
 
-void QCompletionEdit::setAutoAdd( bool add )
+void TQCompletionEdit::setAutoAdd( bool add )
 {
     aAdd = add;
 }
 
-void QCompletionEdit::textDidChange( const TQString &text )
+void TQCompletionEdit::textDidChange( const TQString &text )
 {
     if ( text.isEmpty() ) {
 	popup->close();
@@ -81,15 +81,15 @@ void QCompletionEdit::textDidChange( const TQString &text )
     placeListBox();
 }
 
-void QCompletionEdit::placeListBox()
+void TQCompletionEdit::placeListBox()
 {
     if ( listbox->count() == 0 ) {
 	popup->close();
 	return;
     }
 
-    popup->resize( QMAX( listbox->sizeHint().width() + listbox->verticalScrollBar()->width() + 4, width() ),
-		   listbox->sizeHint().height() + listbox->horizontalScrollBar()->height() + 4 );
+    popup->resize( TQMAX( listbox->tqsizeHint().width() + listbox->verticalScrollBar()->width() + 4, width() ),
+		   listbox->tqsizeHint().height() + listbox->horizontalScrollBar()->height() + 4 );
 
     TQPoint p( mapToGlobal( TQPoint( 0, 0 ) ) );
     if ( p.y() + height() + popup->height() <= TQApplication::desktop()->height() )
@@ -102,7 +102,7 @@ void QCompletionEdit::placeListBox()
     setFocus();
 }
 
-void QCompletionEdit::updateListBox()
+void TQCompletionEdit::updateListBox()
 {
     listbox->clear();
     if ( compList.isEmpty() )
@@ -114,9 +114,9 @@ void QCompletionEdit::updateListBox()
     }
 }
 
-bool QCompletionEdit::eventFilter( TQObject *o, TQEvent *e )
+bool TQCompletionEdit::eventFilter( TQObject *o, TQEvent *e )
 {
-    if ( o == popup || o == listbox || o == listbox->viewport() ) {
+    if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(popup) || TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(listbox) || TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(listbox->viewport()) ) {
 	if ( e->type() == TQEvent::KeyPress ) {
 	    TQKeyEvent *ke = (TQKeyEvent*)e;
 	    if ( ke->key() == Key_Enter || ke->key() == Key_Return || ke->key() == Key_Tab ) {
@@ -159,7 +159,7 @@ bool QCompletionEdit::eventFilter( TQObject *o, TQEvent *e )
 	    emit chosen( text() );
 	    return TRUE;
 	}
-    } else if ( o == this ) {
+    } else if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(this) ) {
 	if ( e->type() == TQEvent::KeyPress ) {
 	    TQKeyEvent *ke = (TQKeyEvent*)e;
 	    if ( ke->key() == Key_Up ||
@@ -178,32 +178,32 @@ bool QCompletionEdit::eventFilter( TQObject *o, TQEvent *e )
     return TQLineEdit::eventFilter( o, e );
 }
 
-void QCompletionEdit::addCompletionEntry( const TQString &entry )
+void TQCompletionEdit::addCompletionEntry( const TQString &entry )
 {
-    if ( compList.find( entry ) == compList.end() ) {
+    if ( compList.tqfind( entry ) == compList.end() ) {
 	compList << entry;
 	compList.sort();
     }
 }
 
-void QCompletionEdit::removeCompletionEntry( const TQString &entry )
+void TQCompletionEdit::removeCompletionEntry( const TQString &entry )
 {
-    TQStringList::Iterator it = compList.find( entry );
+    TQStringList::Iterator it = compList.tqfind( entry );
     if ( it != compList.end() )
 	compList.remove( it );
 }
 
-void QCompletionEdit::setCaseSensitive( bool b )
+void TQCompletionEdit::setCaseSensitive( bool b )
 {
     caseSensitive = b;
 }
 
-bool QCompletionEdit::isCaseSensitive() const
+bool TQCompletionEdit::isCaseSensitive() const
 {
     return caseSensitive;
 }
 
-void QCompletionEdit::clear()
+void TQCompletionEdit::clear()
 {
     TQLineEdit::clear();
     compList.clear();
diff --git a/kdevdesigner/designer/qcompletionedit.h b/kdevdesigner/designer/qcompletionedit.h
index e2044435..8bc7e72d 100644
--- a/kdevdesigner/designer/qcompletionedit.h
+++ b/kdevdesigner/designer/qcompletionedit.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2001 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,15 +17,15 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
-#ifndef QCOMPLETIONEDIT_H
-#define QCOMPLETIONEDIT_H
+#ifndef TQCOMPLETIONEDIT_H
+#define TQCOMPLETIONEDIT_H
 
 #include <tqlineedit.h>
 #include <tqstringlist.h>
@@ -33,14 +33,15 @@
 class TQListBox;
 class TQVBox;
 
-class QCompletionEdit : public QLineEdit
+class TQCompletionEdit : public TQLineEdit
 {
     Q_OBJECT
-    Q_PROPERTY( bool autoAdd READ autoAdd WRITE setAutoAdd )
-    Q_PROPERTY( bool caseSensitive READ isCaseSensitive WRITE setCaseSensitive )
+  TQ_OBJECT
+    TQ_PROPERTY( bool autoAdd READ autoAdd WRITE setAutoAdd )
+    TQ_PROPERTY( bool caseSensitive READ isCaseSensitive WRITE setCaseSensitive )
 
 public:
-    QCompletionEdit( TQWidget *parent = 0, const char *name = 0 );
+    TQCompletionEdit( TQWidget *tqparent = 0, const char *name = 0 );
 
     bool autoAdd() const;
     TQStringList completionList() const;
diff --git a/kdevdesigner/designer/replacedialog.ui b/kdevdesigner/designer/replacedialog.ui
index 41a211ea..546cdeaa 100644
--- a/kdevdesigner/designer/replacedialog.ui
+++ b/kdevdesigner/designer/replacedialog.ui
@@ -25,7 +25,7 @@
 ** not clear to you.
 **
 *********************************************************************</comment>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>ReplaceDialog</cstring>
     </property>
@@ -50,7 +50,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QLayoutWidget" row="0" column="0" rowspan="1" colspan="2">
+        <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>Layout3</cstring>
             </property>
@@ -64,7 +64,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QLabel" row="1" column="0">
+                <widget class="TQLabel" row="1" column="0">
                     <property name="name">
                         <cstring>TextLabel2</cstring>
                     </property>
@@ -75,7 +75,7 @@
                         <cstring>comboReplace</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="0" column="0">
+                <widget class="TQLabel" row="0" column="0">
                     <property name="name">
                         <cstring>TextLabel1</cstring>
                     </property>
@@ -86,7 +86,7 @@
                         <cstring>comboFind</cstring>
                     </property>
                 </widget>
-                <widget class="QComboBox" row="0" column="1">
+                <widget class="TQComboBox" row="0" column="1">
                     <property name="name">
                         <cstring>comboFind</cstring>
                     </property>
@@ -102,7 +102,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QComboBox" row="1" column="1">
+                <widget class="TQComboBox" row="1" column="1">
                     <property name="name">
                         <cstring>comboReplace</cstring>
                     </property>
@@ -120,7 +120,7 @@
                 </widget>
             </grid>
         </widget>
-        <widget class="QLayoutWidget" row="2" column="0" rowspan="1" colspan="2">
+        <widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>Layout5</cstring>
             </property>
@@ -144,14 +144,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonReplace</cstring>
                     </property>
@@ -162,7 +162,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonReplaceAll</cstring>
                     </property>
@@ -170,7 +170,7 @@
                         <string>Replace &amp;All</string>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>PushButton2</cstring>
                     </property>
@@ -180,7 +180,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QButtonGroup" row="1" column="0">
+        <widget class="TQButtonGroup" row="1" column="0">
             <property name="name">
                 <cstring>ButtonGroup1</cstring>
             </property>
@@ -197,7 +197,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>checkWords</cstring>
                     </property>
@@ -205,7 +205,7 @@
                         <string>&amp;Whole words only</string>
                     </property>
                 </widget>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>checkCase</cstring>
                     </property>
@@ -213,7 +213,7 @@
                         <string>Case &amp;sensitive</string>
                     </property>
                 </widget>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>checkBegin</cstring>
                     </property>
@@ -223,7 +223,7 @@
                 </widget>
             </vbox>
         </widget>
-        <widget class="QButtonGroup" row="1" column="1">
+        <widget class="TQButtonGroup" row="1" column="1">
             <property name="name">
                 <cstring>ButtonGroup2</cstring>
             </property>
@@ -240,7 +240,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QRadioButton">
+                <widget class="TQRadioButton">
                     <property name="name">
                         <cstring>radioForward</cstring>
                     </property>
@@ -251,7 +251,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QRadioButton">
+                <widget class="TQRadioButton">
                     <property name="name">
                         <cstring>radioBackward</cstring>
                     </property>
@@ -297,7 +297,7 @@
 </tabstops>
 <includes>
     <include location="local" impldecl="in implementation">../interfaces/editorinterface.h</include>
-    <include location="global" impldecl="in implementation">qlineedit.h</include>
+    <include location="global" impldecl="in implementation">tqlineedit.h</include>
     <include location="local" impldecl="in implementation">replacedialog.ui.h</include>
 </includes>
 <forwards>
@@ -305,14 +305,14 @@
 </forwards>
 <variables>
     <variable>EditorInterface *editor;</variable>
-    <variable>QObject *formWindow;</variable>
+    <variable>TQObject *formWindow;</variable>
 </variables>
-<slots>
+<Q_SLOTS>
     <slot>init()</slot>
     <slot>destroy()</slot>
     <slot>doReplace()</slot>
     <slot>doReplaceAll()</slot>
-    <slot>setEditor( EditorInterface * e, QObject * fw )</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+    <slot>setEditor( EditorInterface * e, TQObject * fw )</slot>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kdevdesigner/designer/replacedialog.ui.h b/kdevdesigner/designer/replacedialog.ui.h
index 7867d0c6..3b43488d 100644
--- a/kdevdesigner/designer/replacedialog.ui.h
+++ b/kdevdesigner/designer/replacedialog.ui.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2001 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -44,7 +44,7 @@ void ReplaceDialog::doReplace()
     if ( !editor ) 
 	return; 
      
-    if ( !editor->replace( comboFind->currentText(), comboReplace->currentText(), checkCase->isChecked(), 
+    if ( !editor->tqreplace( comboFind->currentText(), comboReplace->currentText(), checkCase->isChecked(), 
 	checkWords->isChecked(), radioForward->isChecked(), !checkBegin->isChecked(), FALSE ) ) 
 	checkBegin->setChecked( TRUE ); 
     else 
@@ -56,7 +56,7 @@ void ReplaceDialog::doReplaceAll()
     if ( !editor )  
 	return;  
       
-    if ( !editor->replace( comboFind->currentText(), comboReplace->currentText(), checkCase->isChecked(),  
+    if ( !editor->tqreplace( comboFind->currentText(), comboReplace->currentText(), checkCase->isChecked(),  
 	checkWords->isChecked(), radioForward->isChecked(), !checkBegin->isChecked(), TRUE ) )  
 	checkBegin->setChecked( TRUE );  
     else  
diff --git a/kdevdesigner/designer/resource.cpp b/kdevdesigner/designer/resource.cpp
index eff7c84c..0e342060 100644
--- a/kdevdesigner/designer/resource.cpp
+++ b/kdevdesigner/designer/resource.cpp
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -26,7 +26,7 @@
 
 #include "actiondnd.h"
 #include "command.h"
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 #include "database.h"
 #endif
 #include "formfile.h"
@@ -63,7 +63,7 @@
 #include <tqobject.h>
 #include <tqobjectlist.h>
 #include <tqtabbar.h>
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
 #include <tqtable.h>
 #include <tqdatatable.h>
 #endif
@@ -79,7 +79,7 @@
 #include <tqworkspace.h>
 #include <tqworkspace.h>
 #include <tqsplitter.h>
-#include <private/qucom_p.h>
+#include <private/tqucom_p.h>
 
 #include <kiconloader.h>
 #include <kfiledialog.h>
@@ -97,109 +97,109 @@ static TQString makeIndent( int indent )
 static TQString entitize( const TQString &s, bool attribute = FALSE )
 {
     TQString s2 = s;
-    s2 = s2.replace( "&", "&amp;" );
-    s2 = s2.replace( ">", "&gt;" );
-    s2 = s2.replace( "<", "&lt;" );
+    s2 = s2.tqreplace( "&", "&amp;" );
+    s2 = s2.tqreplace( ">", "&gt;" );
+    s2 = s2.tqreplace( "<", "&lt;" );
     if ( attribute ) {
-	s2 = s2.replace( "\"", "&quot;" );
-	s2 = s2.replace( "'", "&apos;" );
+	s2 = s2.tqreplace( "\"", "&quot;" );
+	s2 = s2.tqreplace( "'", "&apos;" );
     }
     return s2;
 }
 
-#ifdef Q_WS_MACX
+#ifdef TQ_WS_MACX
 static struct {
     int key;
     const char* name;
 } keyname[] = {
-    { Qt::Key_Space,        QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Space" ) },
-    { Qt::Key_Escape,       QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Esc" ) },
-    { Qt::Key_Tab,          QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Tab" ) },
-    { Qt::Key_Backtab,      QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Backtab" ) },
-    { Qt::Key_Backspace,    QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Backspace" ) },
-    { Qt::Key_Return,       QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Return" ) },
-    { Qt::Key_Enter,        QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Enter" ) },
-    { Qt::Key_Insert,       QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Ins" ) },
-    { Qt::Key_Delete,       QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Del" ) },
-    { Qt::Key_Pause,        QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Pause" ) },
-    { Qt::Key_Print,        QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Print" ) },
-    { Qt::Key_SysReq,       QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "SysReq" ) },
-    { Qt::Key_Home,         QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Home" ) },
-    { Qt::Key_End,          QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "End" ) },
-    { Qt::Key_Left,         QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Left" ) },
-    { Qt::Key_Up,           QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Up" ) },
-    { Qt::Key_Right,        QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Right" ) },
-    { Qt::Key_Down,         QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Down" ) },
-    { Qt::Key_Prior,        QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "PgUp" ) },
-    { Qt::Key_Next,         QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "PgDown" ) },
-    { Qt::Key_CapsLock,     QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "CapsLock" ) },
-    { Qt::Key_NumLock,      QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "NumLock" ) },
-    { Qt::Key_ScrollLock,   QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "ScrollLock" ) },
-    { Qt::Key_Menu,         QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Menu" ) },
-    { Qt::Key_Help,         QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Help" ) },
+    { TQt::Key_Space,        TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Space" ) },
+    { TQt::Key_Escape,       TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Esc" ) },
+    { TQt::Key_Tab,          TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Tab" ) },
+    { TQt::Key_Backtab,      TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Backtab" ) },
+    { TQt::Key_Backspace,    TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Backspace" ) },
+    { TQt::Key_Return,       TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Return" ) },
+    { TQt::Key_Enter,        TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Enter" ) },
+    { TQt::Key_Insert,       TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Ins" ) },
+    { TQt::Key_Delete,       TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Del" ) },
+    { TQt::Key_Pause,        TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Pause" ) },
+    { TQt::Key_Print,        TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Print" ) },
+    { TQt::Key_SysReq,       TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "SysReq" ) },
+    { TQt::Key_Home,         TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Home" ) },
+    { TQt::Key_End,          TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "End" ) },
+    { TQt::Key_Left,         TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Left" ) },
+    { TQt::Key_Up,           TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Up" ) },
+    { TQt::Key_Right,        TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Right" ) },
+    { TQt::Key_Down,         TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Down" ) },
+    { TQt::Key_Prior,        TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "PgUp" ) },
+    { TQt::Key_Next,         TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "PgDown" ) },
+    { TQt::Key_CapsLock,     TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "CapsLock" ) },
+    { TQt::Key_NumLock,      TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "NumLock" ) },
+    { TQt::Key_ScrollLock,   TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "ScrollLock" ) },
+    { TQt::Key_Menu,         TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Menu" ) },
+    { TQt::Key_Help,         TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Help" ) },
 
     // Multimedia keys
-    { Qt::Key_Back,         QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Back" ) },
-    { Qt::Key_Forward,      QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Forward" ) },
-    { Qt::Key_Stop,         QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Stop" ) },
-    { Qt::Key_Refresh,      QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Refresh" ) },
-    { Qt::Key_VolumeDown,   QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Volume Down" ) },
-    { Qt::Key_VolumeMute,   QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Volume Mute" ) },
-    { Qt::Key_VolumeUp,     QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Volume Up" ) },
-    { Qt::Key_BassBoost,    QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Bass Boost" ) },
-    { Qt::Key_BassUp,       QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Bass Up" ) },
-    { Qt::Key_BassDown,     QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Bass Down" ) },
-    { Qt::Key_TrebleUp,     QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Treble Up" ) },
-    { Qt::Key_TrebleDown,   QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Treble Down" ) },
-    { Qt::Key_MediaPlay,    QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Media Play" ) },
-    { Qt::Key_MediaStop,    QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Media Stop" ) },
-    { Qt::Key_MediaPrev,    QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Media Previous" ) },
-    { Qt::Key_MediaNext,    QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Media Next" ) },
-    { Qt::Key_MediaRecord,  QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Media Record" ) },
-    { Qt::Key_HomePage,     QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Home" ) },
-    { Qt::Key_Favorites,    QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Favorites" ) },
-    { Qt::Key_Search,       QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Search" ) },
-    { Qt::Key_Standby,      QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Standby" ) },
-    { Qt::Key_OpenUrl,      QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Open URL" ) },
-    { Qt::Key_LaunchMail,   QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch Mail" ) },
-    { Qt::Key_LaunchMedia,  QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch Media" ) },
-    { Qt::Key_Launch0,      QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch (0)" ) },
-    { Qt::Key_Launch1,      QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch (1)" ) },
-    { Qt::Key_Launch2,      QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch (2)" ) },
-    { Qt::Key_Launch3,      QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch (3)" ) },
-    { Qt::Key_Launch4,      QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch (4)" ) },
-    { Qt::Key_Launch5,      QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch (5)" ) },
-    { Qt::Key_Launch6,      QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch (6)" ) },
-    { Qt::Key_Launch7,      QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch (7)" ) },
-    { Qt::Key_Launch8,      QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch (8)" ) },
-    { Qt::Key_Launch9,      QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch (9)" ) },
-    { Qt::Key_LaunchA,      QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch (A)" ) },
-    { Qt::Key_LaunchB,      QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch (B)" ) },
-    { Qt::Key_LaunchC,      QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch (C)" ) },
-    { Qt::Key_LaunchD,      QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch (D)" ) },
-    { Qt::Key_LaunchE,      QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch (E)" ) },
-    { Qt::Key_LaunchF,      QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch (F)" ) },
+    { TQt::Key_Back,         TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Back" ) },
+    { TQt::Key_Forward,      TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Forward" ) },
+    { TQt::Key_Stop,         TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Stop" ) },
+    { TQt::Key_Refresh,      TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Refresh" ) },
+    { TQt::Key_VolumeDown,   TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Volume Down" ) },
+    { TQt::Key_VolumeMute,   TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Volume Mute" ) },
+    { TQt::Key_VolumeUp,     TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Volume Up" ) },
+    { TQt::Key_BassBoost,    TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Bass Boost" ) },
+    { TQt::Key_BassUp,       TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Bass Up" ) },
+    { TQt::Key_BassDown,     TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Bass Down" ) },
+    { TQt::Key_TrebleUp,     TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Treble Up" ) },
+    { TQt::Key_TrebleDown,   TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Treble Down" ) },
+    { TQt::Key_MediaPlay,    TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Media Play" ) },
+    { TQt::Key_MediaStop,    TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Media Stop" ) },
+    { TQt::Key_MediaPrev,    TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Media Previous" ) },
+    { TQt::Key_MediaNext,    TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Media Next" ) },
+    { TQt::Key_MediaRecord,  TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Media Record" ) },
+    { TQt::Key_HomePage,     TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Home" ) },
+    { TQt::Key_Favorites,    TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Favorites" ) },
+    { TQt::Key_Search,       TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Search" ) },
+    { TQt::Key_Standby,      TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Standby" ) },
+    { TQt::Key_OpenUrl,      TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Open URL" ) },
+    { TQt::Key_LaunchMail,   TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch Mail" ) },
+    { TQt::Key_LaunchMedia,  TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch Media" ) },
+    { TQt::Key_Launch0,      TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch (0)" ) },
+    { TQt::Key_Launch1,      TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch (1)" ) },
+    { TQt::Key_Launch2,      TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch (2)" ) },
+    { TQt::Key_Launch3,      TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch (3)" ) },
+    { TQt::Key_Launch4,      TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch (4)" ) },
+    { TQt::Key_Launch5,      TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch (5)" ) },
+    { TQt::Key_Launch6,      TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch (6)" ) },
+    { TQt::Key_Launch7,      TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch (7)" ) },
+    { TQt::Key_Launch8,      TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch (8)" ) },
+    { TQt::Key_Launch9,      TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch (9)" ) },
+    { TQt::Key_LaunchA,      TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch (A)" ) },
+    { TQt::Key_LaunchB,      TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch (B)" ) },
+    { TQt::Key_LaunchC,      TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch (C)" ) },
+    { TQt::Key_LaunchD,      TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch (D)" ) },
+    { TQt::Key_LaunchE,      TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch (E)" ) },
+    { TQt::Key_LaunchF,      TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Launch (F)" ) },
 
     // --------------------------------------------------------------
     // More consistent namings
-    { Qt::Key_Print,        QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Print Screen" ) },
-    { Qt::Key_Prior,        QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Page Up" ) },
-    { Qt::Key_Next,         QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Page Down" ) },
-    { Qt::Key_CapsLock,     QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Caps Lock" ) },
-    { Qt::Key_NumLock,      QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Num Lock" ) },
-    { Qt::Key_NumLock,      QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Number Lock" ) },
-    { Qt::Key_ScrollLock,   QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Scroll Lock" ) },
-    { Qt::Key_Insert,       QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Insert" ) },
-    { Qt::Key_Delete,       QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Delete" ) },
-    { Qt::Key_Escape,       QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Escape" ) },
-    { Qt::Key_SysReq,       QT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "System Request" ) },
+    { TQt::Key_Print,        TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Print Screen" ) },
+    { TQt::Key_Prior,        TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Page Up" ) },
+    { TQt::Key_Next,         TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Page Down" ) },
+    { TQt::Key_CapsLock,     TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Caps Lock" ) },
+    { TQt::Key_NumLock,      TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Num Lock" ) },
+    { TQt::Key_NumLock,      TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Number Lock" ) },
+    { TQt::Key_ScrollLock,   TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Scroll Lock" ) },
+    { TQt::Key_Insert,       TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Insert" ) },
+    { TQt::Key_Delete,       TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Delete" ) },
+    { TQt::Key_Escape,       TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "Escape" ) },
+    { TQt::Key_SysReq,       TQT_TRANSLATE_NOOP( TQACCEL_OBJECT_NAME_STRING, "System Request" ) },
 
     { 0, 0 }
 };
 #endif
 static TQString platformNeutralKeySequence(const TQKeySequence &ks)
 {
-#ifndef Q_WS_MACX
+#ifndef TQ_WS_MACX
     return TQString(ks);
 #else
     uint k;
@@ -207,26 +207,26 @@ static TQString platformNeutralKeySequence(const TQKeySequence &ks)
     TQString p;
     for (k = 0; k < ks.count(); ++k) {
 	int keycombo = ks[k];
-	int basekey = keycombo & ~(Qt::SHIFT | Qt::CTRL | Qt::ALT | Qt::META);
-	if (keycombo & Qt::CTRL)
+	int basekey = keycombo & ~(TQt::SHIFT | TQt::CTRL | TQt::ALT | TQt::META);
+	if (keycombo & TQt::CTRL)
 	    str += "Ctrl+";
-	if (keycombo & Qt::ALT)
+	if (keycombo & TQt::ALT)
 	    str += "Alt+";
-	if (keycombo & Qt::META)
+	if (keycombo & TQt::META)
 	    str += "Meta+";
-	if (keycombo & Qt::SHIFT)
+	if (keycombo & TQt::SHIFT)
 	    str += "Shift+";
 
 	// begin copy and paste from TQKeySequence :(
-	if (basekey & Qt::UNICODE_ACCEL) {
+	if (basekey & TQt::UNICODE_ACCEL) {
 	    // Note: This character should NOT be upper()'ed, since
 	    // the encoded string should indicate EXACTLY what the
 	    // key represents! Hence a 'Ctrl+Shift+c' is posible to
 	    // represent, but is clearly impossible to trigger...
 	    p = TQChar(basekey & 0xffff);
-	} else if ( basekey >= Qt::Key_F1 && basekey <= Qt::Key_F35 ) {
-	    p = TQAccel::tr( "F%1" ).arg(basekey - Qt::Key_F1 + 1);
-	} else if ( basekey > Qt::Key_Space && basekey <= Qt::Key_AsciiTilde ) {
+	} else if ( basekey >= TQt::Key_F1 && basekey <= TQt::Key_F35 ) {
+	    p = TQAccel::tr( "F%1" ).tqarg(basekey - TQt::Key_F1 + 1);
+	} else if ( basekey > TQt::Key_Space && basekey <= TQt::Key_AsciiTilde ) {
 	    p.sprintf( "%c", basekey );
 	} else {
 	    int i = 0;
@@ -238,7 +238,7 @@ static TQString platformNeutralKeySequence(const TQKeySequence &ks)
 		++i;
 	    }
 	    // If we can't find the actual translatable keyname,
-	    // fall back on the unicode representation of it...
+	    // fall back on the tqunicode representation of it...
 	    // Or else characters like Key_aring may not get displayed
 	    // ( Really depends on you locale )
 	    if ( !keyname[i].name )
@@ -319,7 +319,7 @@ bool Resource::load( FormFile *ff, Project *defProject )
     TQFile f( ff->absFileName() );
     f.open( IO_ReadOnly | IO_Translate );
 
-    bool b = load( ff, &f, defProject );
+    bool b = load( ff, TQT_TQIODEVICE(&f), defProject );
     f.close();
 
     return b;
@@ -347,10 +347,10 @@ bool Resource::load( FormFile *ff, TQIODevice* dev, Project *defProject )
 	formwindow->setProject( MainWindow::self->currProject() );
     if ( mainwindow )
 	formwindow->setMainWindow( mainwindow );
-    MetaDataBase::addEntry( formwindow );
+    MetaDataBase::addEntry( TQT_TQOBJECT(formwindow) );
 
     if ( !langIface ) {
-	TQString lang = "Qt Script";
+	TQString lang = "TQt Script";
 	if ( mainwindow )
 	    lang = mainwindow->currProject()->language();
 	langIface = MetaDataBase::languageInterface( lang );
@@ -460,10 +460,10 @@ bool Resource::load( FormFile *ff, TQIODevice* dev, Project *defProject )
 	    }
 	} else if ( e.tagName() == "exportmacro" ) {
 	    exportMacro = e.firstChild().toText().data();
-	} else if ( e.tagName() == "layoutdefaults" ) {
-	    formwindow->setLayoutDefaultSpacing( e.attribute( "spacing", TQString::number( formwindow->layoutDefaultSpacing() ) ).toInt() );
-	    formwindow->setLayoutDefaultMargin( e.attribute( "margin", TQString::number( formwindow->layoutDefaultMargin() ) ).toInt() );
-	} else if ( e.tagName() == "layoutfunctions" ) {
+	} else if ( e.tagName() == "tqlayoutdefaults" ) {
+	    formwindow->setLayoutDefaultSpacing( e.attribute( "spacing", TQString::number( formwindow->tqlayoutDefaultSpacing() ) ).toInt() );
+	    formwindow->setLayoutDefaultMargin( e.attribute( "margin", TQString::number( formwindow->tqlayoutDefaultMargin() ) ).toInt() );
+	} else if ( e.tagName() == "tqlayoutfunctions" ) {
 	    formwindow->setSpacingFunction( e.attribute( "spacing" ) );
 	    formwindow->setMarginFunction( e.attribute( "margin" ) );
 	    if ( !formwindow->marginFunction().isEmpty() || !formwindow->spacingFunction().isEmpty() )
@@ -478,13 +478,13 @@ bool Resource::load( FormFile *ff, TQIODevice* dev, Project *defProject )
     if ( !customWidgets.isNull() )
 	loadCustomWidgets( customWidgets, this );
 
-#if defined (QT_NON_COMMERCIAL)
+#if defined (TQT_NON_COMMERCIAL)
     bool previewMode = MainWindow::self ? MainWindow::self->isPreviewing() : FALSE;
     TQWidget *w = (TQWidget*)createObject( widget, !previewMode ? (TQWidget*)formwindow : MainWindow::self );
     if ( !w )
 	return FALSE;
     if ( previewMode )
-	w->reparent( MainWindow::self, Qt::WType_TopLevel,  w->pos(), TRUE );
+	w->reparent( MainWindow::self, TQt::WType_TopLevel,  w->pos(), TRUE );
 #else
     if ( !createObject( widget, formwindow) )
 	return FALSE;
@@ -552,11 +552,11 @@ bool Resource::load( FormFile *ff, TQIODevice* dev, Project *defProject )
 		    function.returnType = "void";
 		function.type = "slot";
 		function.function = n.firstChild().toText().data();
-		if ( !MetaDataBase::hasFunction( formwindow, function.function, TRUE ) )
-		    MetaDataBase::addFunction( formwindow, function.function, function.specifier,
+		if ( !MetaDataBase::hasFunction( TQT_TQOBJECT(formwindow), function.function, TRUE ) )
+		    MetaDataBase::addFunction( TQT_TQOBJECT(formwindow), function.function, function.specifier,
 					       function.access, "slot", function.language, function.returnType );
 		else
-		    MetaDataBase::changeFunctionAttributes( formwindow, function.function, function.function,
+		    MetaDataBase::changeFunctionAttributes( TQT_TQOBJECT(formwindow), function.function, function.function,
 							    function.specifier, function.access,
 							    "slot", function.language,
 							    function.returnType );
@@ -580,12 +580,12 @@ bool Resource::load( FormFile *ff, TQIODevice* dev, Project *defProject )
 		if ( function.returnType.isEmpty() )
 		    function.returnType = "void";
 		function.function = n.firstChild().toText().data();
-		if ( !MetaDataBase::hasFunction( formwindow, function.function, TRUE ) )
-		    MetaDataBase::addFunction( formwindow, function.function, function.specifier,
+		if ( !MetaDataBase::hasFunction( TQT_TQOBJECT(formwindow), function.function, TRUE ) )
+		    MetaDataBase::addFunction( TQT_TQOBJECT(formwindow), function.function, function.specifier,
 					       function.access, function.type, function.language,
 					       function.returnType );
 		else
-		    MetaDataBase::changeFunctionAttributes( formwindow, function.function, function.function,
+		    MetaDataBase::changeFunctionAttributes( TQT_TQOBJECT(formwindow), function.function, function.function,
 							    function.specifier, function.access,
 							    function.type, function.language, function.returnType );
 	    }
@@ -606,13 +606,13 @@ bool Resource::load( FormFile *ff, TQIODevice* dev, Project *defProject )
 	loadTabOrder( tabOrder );
 
     if ( formwindow ) {
-	MetaDataBase::setIncludes( formwindow, metaIncludes );
-	MetaDataBase::setForwards( formwindow, metaForwards );
-	MetaDataBase::setVariables( formwindow, metaVariables );
-	MetaDataBase::setSignalList( formwindow, metaSignals );
+	MetaDataBase::setIncludes( TQT_TQOBJECT(formwindow), metaIncludes );
+	MetaDataBase::setForwards( TQT_TQOBJECT(formwindow), metaForwards );
+	MetaDataBase::setVariables( TQT_TQOBJECT(formwindow), metaVariables );
+	MetaDataBase::setSignalList( TQT_TQOBJECT(formwindow), metaSignals );
 	metaInfo.classNameChanged = metaInfo.className != TQString( formwindow->name() );
-	MetaDataBase::setMetaInfo( formwindow, metaInfo );
-	MetaDataBase::setExportMacro( formwindow->mainContainer(), exportMacro );
+	MetaDataBase::setMetaInfo( TQT_TQOBJECT(formwindow), metaInfo );
+	MetaDataBase::setExportMacro( TQT_TQOBJECT(formwindow->mainContainer()), exportMacro );
     }
 
     loadExtraSource( formwindow->formFile(), currFileName, langIface, hasFunctions );
@@ -621,14 +621,14 @@ bool Resource::load( FormFile *ff, TQIODevice* dev, Project *defProject )
 	mainwindow->insertFormWindow( formwindow );
 
     if ( formwindow ) {
-	formwindow->killAccels( formwindow );
-	if ( formwindow->layout() )
-	    formwindow->layout()->activate();
+	formwindow->killAccels( TQT_TQOBJECT(formwindow) );
+	if ( formwindow->tqlayout() )
+	    formwindow->tqlayout()->activate();
 	if ( hadGeometry )
-	    formwindow->resize( formwindow->size().expandedTo( formwindow->minimumSize().
-							       expandedTo( formwindow->minimumSizeHint() ) ) );
+	    formwindow->resize( formwindow->size().expandedTo( formwindow->tqminimumSize().
+							       expandedTo( formwindow->tqminimumSizeHint() ) ) );
 	else
-	    formwindow->resize( formwindow->size().expandedTo( formwindow->sizeHint() ) );
+	    formwindow->resize( formwindow->size().expandedTo( formwindow->tqsizeHint() ) );
     }
 
     return TRUE;
@@ -650,7 +650,7 @@ bool Resource::save( const TQString& filename, bool formCodeOnly )
     if ( !formwindow || filename.isEmpty() )
 	return FALSE;
     if (!langIface) {
-	TQString lang = "Qt Script";
+	TQString lang = "TQt Script";
 	if ( mainwindow )
 	    lang = mainwindow->currProject()->language();
 	langIface = MetaDataBase::languageInterface( lang );
@@ -678,7 +678,7 @@ bool Resource::save( const TQString& filename, bool formCodeOnly )
     TQFile f( filename );
     if ( !f.open( IO_WriteOnly | IO_Translate ) )
 	return FALSE;
-    bool b = save( &f );
+    bool b = save( TQT_TQIODEVICE(&f) );
     f.close();
     return b;
 }
@@ -702,19 +702,19 @@ bool Resource::save( TQIODevice* dev )
 
     ts << "<!DOCTYPE UI><UI version=\"3.3\" stdsetdef=\"1\">" << endl;
     saveMetaInfoBefore( ts, 0 );
-    saveObject( formwindow->mainContainer(), 0, ts, 0 );
-    if ( ::qt_cast<TQMainWindow*>(formwindow->mainContainer()) ) {
+    saveObject( TQT_TQOBJECT(formwindow->mainContainer()), 0, ts, 0 );
+    if ( ::tqqt_cast<TQMainWindow*>(formwindow->mainContainer()) ) {
 	saveMenuBar( (TQMainWindow*)formwindow->mainContainer(), ts, 0 );
 	saveToolBars( (TQMainWindow*)formwindow->mainContainer(), ts, 0 );
     }
     if ( !MetaDataBase::customWidgets()->isEmpty() && !usedCustomWidgets.isEmpty() )
 	saveCustomWidgets( ts, 0 );
-    if ( ::qt_cast<TQMainWindow*>(formwindow->mainContainer()) )
+    if ( ::tqqt_cast<TQMainWindow*>(formwindow->mainContainer()) )
 	saveActions( formwindow->actionList(), ts, 0 );
     if ( !images.isEmpty() )
 	saveImageCollection( ts, 0 );
-    if ( !MetaDataBase::connections( formwindow ).isEmpty() ||
-	 !MetaDataBase::slotList( formwindow ).isEmpty() )
+    if ( !MetaDataBase::connections( TQT_TQOBJECT(formwindow) ).isEmpty() ||
+	 !MetaDataBase::slotList( TQT_TQOBJECT(formwindow) ).isEmpty() )
 	saveConnections( ts, 0 );
     saveTabOrder( ts, 0 );
     saveMetaInfoAfter( ts, 0 );
@@ -729,7 +729,7 @@ bool Resource::save( TQIODevice* dev )
 TQString Resource::copy()
 {
     if ( !formwindow )
-	return TQString::null;
+	return TQString();
 
     copying = TRUE;
     TQString s;
@@ -739,17 +739,17 @@ TQString Resource::copy()
     TQWidgetList widgets = formwindow->selectedWidgets();
     TQWidgetList tmp( widgets );
     for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) {
-	TQWidget *p = w->parentWidget();
+	TQWidget *p = w->tqparentWidget();
 	bool save = TRUE;
 	while ( p ) {
-	    if ( tmp.findRef( p ) != -1 ) {
+	    if ( tmp.tqfindRef( p ) != -1 ) {
 		save = FALSE;
 		break;
 	    }
-	    p = p->parentWidget();
+	    p = p->tqparentWidget();
 	}
 	if ( save )
-	    saveObject( w, 0, ts, 0 );
+	    saveObject( TQT_TQOBJECT(w), 0, ts, 0 );
     }
     if ( !MetaDataBase::customWidgets()->isEmpty() && !usedCustomWidgets.isEmpty() )
 	saveCustomWidgets( ts, 0 );
@@ -761,7 +761,7 @@ TQString Resource::copy()
 }
 
 
-void Resource::paste( const TQString &cb, TQWidget *parent )
+void Resource::paste( const TQString &cb, TQWidget *tqparent )
 {
     if ( !formwindow )
 	return;
@@ -795,33 +795,33 @@ void Resource::paste( const TQString &cb, TQWidget *parent )
     formwindow->clearSelection( FALSE );
     while ( !firstWidget.isNull() ) {
 	if ( firstWidget.tagName() == "widget" ) {
-	    TQWidget *w = (TQWidget*)createObject( firstWidget, parent, 0 );
+	    TQWidget *w = (TQWidget*)createObject( firstWidget, tqparent, 0 );
 	    if ( !w )
 		continue;
 	    widgets.append( w );
 	    int x = w->x() + formwindow->grid().x();
 	    int y = w->y() + formwindow->grid().y();
-	    if ( w->x() + w->width() > parent->width() )
-		x = QMAX( 0, parent->width() - w->width() );
-	    if ( w->y() + w->height() > parent->height() )
-		y = QMAX( 0, parent->height() - w->height() );
+	    if ( w->x() + w->width() > tqparent->width() )
+		x = TQMAX( 0, tqparent->width() - w->width() );
+	    if ( w->y() + w->height() > tqparent->height() )
+		y = TQMAX( 0, tqparent->height() - w->height() );
 	    if ( x != w->x() || y != w->y() )
 		w->move( x, y );
-	    formwindow->selectWidget( w );
+	    formwindow->selectWidget( TQT_TQOBJECT(w) );
 	} else if ( firstWidget.tagName() == "spacer" ) {
-	    TQWidget *w = createSpacer( firstWidget, parent, 0, firstWidget.tagName() == "vspacer" ? Qt::Vertical : Qt::Horizontal );
+	    TQWidget *w = createSpacer( firstWidget, tqparent, 0, firstWidget.tagName() == "vspacer" ? Qt::Vertical : Qt::Horizontal );
 	    if ( !w )
 		continue;
 	    widgets.append( w );
 	    int x = w->x() + formwindow->grid().x();
 	    int y = w->y() + formwindow->grid().y();
-	    if ( w->x() + w->width() > parent->width() )
-		x = QMAX( 0, parent->width() - w->width() );
-	    if ( w->y() + w->height() > parent->height() )
-		y = QMAX( 0, parent->height() - w->height() );
+	    if ( w->x() + w->width() > tqparent->width() )
+		x = TQMAX( 0, tqparent->width() - w->width() );
+	    if ( w->y() + w->height() > tqparent->height() )
+		y = TQMAX( 0, tqparent->height() - w->height() );
 	    if ( x != w->x() || y != w->y() )
 		w->move( x, y );
-	    formwindow->selectWidget( w );
+	    formwindow->selectWidget( TQT_TQOBJECT(w) );
 	}
 	firstWidget = firstWidget.nextSibling().toElement();
     }
@@ -832,7 +832,7 @@ void Resource::paste( const TQString &cb, TQWidget *parent )
     formwindow->commandHistory()->addCommand( cmd );
 }
 
-void Resource::saveObject( TQObject *obj, QDesignerGridLayout* grid, TQTextStream &ts, int indent )
+void Resource::saveObject( TQObject *obj, TQDesignerGridLayout* grid, TQTextStream &ts, int indent )
 {
     if ( obj && obj->isWidgetType() && ( (TQWidget*)obj )->isHidden() )
 	return;
@@ -846,12 +846,12 @@ void Resource::saveObject( TQObject *obj, QDesignerGridLayout* grid, TQTextStrea
 	    includeHints << WidgetDatabase::includeFile( classID );
 	}
 
-	if ( obj != formwindow && !formwindow->widgets()->find( (TQWidget*)obj ) )
+	if ( TQT_BASE_OBJECT(obj) != TQT_BASE_OBJECT(formwindow) && !formwindow->widgets()->tqfind( (TQWidget*)obj ) )
 	    return; // we don't know anything about this thing
 
 	TQString attributes;
 	if ( grid ) {
-	    QDesignerGridLayout::Item item = grid->items[ (TQWidget*)obj ];
+	    TQDesignerGridLayout::Item item = grid->items[ (TQWidget*)obj ];
 	    attributes += TQString(" row=\"") + TQString::number(item.row) + "\"";
 	    attributes += TQString(" column=\"") + TQString::number(item.column) + "\"";
 	    if ( item.rowspan * item.colspan != 1 ) {
@@ -877,13 +877,13 @@ void Resource::saveObject( TQObject *obj, QDesignerGridLayout* grid, TQTextStrea
 	return;
     }
 
-    QDesignerWidgetStack* ws = 0;
+    TQDesignerWidgetStack* ws = 0;
 
-    if ( ::qt_cast<TQTabWidget*>(obj) ) {
+    if ( ::tqqt_cast<TQTabWidget*>(obj) ) {
 	TQTabWidget* tw = (TQTabWidget*) obj;
 	TQObjectList* tmpl = tw->queryList( TQWIDGETSTACK_OBJECT_NAME_STRING );
 	TQWidgetStack *ws = (TQWidgetStack*)tmpl->first();
-	TQTabBar *tb = ( (QDesignerTabWidget*)obj )->tabBar();
+	TQTabBar *tb = ( (TQDesignerTabWidget*)obj )->tabBar();
 	for ( int i = 0; i < tb->count(); ++i ) {
 	    TQTab *t = tb->tabAt( i );
 	    if ( !t )
@@ -891,9 +891,9 @@ void Resource::saveObject( TQObject *obj, QDesignerGridLayout* grid, TQTextStrea
 	    TQWidget *w = ws->widget( t->identifier() );
 	    if ( !w )
 		continue;
-	    if ( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf(w) ) == -1 )
+	    if ( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf(TQT_TQOBJECT(w)) ) == -1 )
 		continue; // we don't know this widget
-	    ts << makeIndent( indent ) << "<widget class=\"QWidget\">" << endl;
+	    ts << makeIndent( indent ) << "<widget class=\"TQWidget\">" << endl;
 	    ++indent;
 	    ts << makeIndent( indent ) << "<property name=\"name\">" << endl;
 	    indent++;
@@ -906,19 +906,19 @@ void Resource::saveObject( TQObject *obj, QDesignerGridLayout* grid, TQTextStrea
 	    ts << makeIndent( indent ) << "<string>" << entitize( t->text() ) << "</string>" << endl;
 	    indent--;
 	    ts << makeIndent( indent ) << "</attribute>" << endl;
-	    saveChildrenOf( w, ts, indent );
+	    saveChildrenOf( TQT_TQOBJECT(w), ts, indent );
 	    --indent;
 	    ts << makeIndent( indent ) << "</widget>" << endl;
 	}
 	delete tmpl;
-    } else if ( (ws = ::qt_cast<QDesignerWidgetStack*>(obj)) != 0 ) {
+    } else if ( (ws = ::tqqt_cast<TQDesignerWidgetStack*>(obj)) != 0 ) {
 	for ( int i = 0; i < ws->count(); ++i ) {
 	    TQWidget *w = ws->page( i );
 	    if ( !w )
 		continue;
-	    if ( WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(w)) == -1 )
+	    if ( WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(TQT_TQOBJECT(w))) == -1 )
 		continue; // we don't know this widget
-	    ts << makeIndent( indent ) << "<widget class=\"QWidget\">" << endl;
+	    ts << makeIndent( indent ) << "<widget class=\"TQWidget\">" << endl;
 	    ++indent;
 	    ts << makeIndent( indent ) << "<property name=\"name\">" << endl;
 	    indent++;
@@ -930,19 +930,19 @@ void Resource::saveObject( TQObject *obj, QDesignerGridLayout* grid, TQTextStrea
 	    ts << makeIndent( indent ) << "<number>" << TQString::number(i) << "</number>" << endl;
 	    indent--;
 	    ts << makeIndent( indent ) << "</attribute>" << endl;
-	    saveChildrenOf( w, ts, indent );
+	    saveChildrenOf( TQT_TQOBJECT(w), ts, indent );
 	    --indent;
 	    ts << makeIndent( indent ) << "</widget>" << endl;
 	}
-    } else if ( ::qt_cast<TQToolBox*>(obj) ) {
+    } else if ( ::tqqt_cast<TQToolBox*>(obj) ) {
 	TQToolBox* tb = (TQToolBox*)obj;
 	for ( int i = 0; i < tb->count(); ++i ) {
 	    TQWidget *w = tb->item( i );
 	    if ( !w )
 		continue;
-	    if ( WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(w)) == -1 )
+	    if ( WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(TQT_TQOBJECT(w))) == -1 )
 		continue; // we don't know this widget
-	    ts << makeIndent( indent ) << "<widget class=\"QWidget\">" << endl;
+	    ts << makeIndent( indent ) << "<widget class=\"TQWidget\">" << endl;
 	    ++indent;
 	    ts << makeIndent( indent ) << "<property name=\"name\">" << endl;
 	    indent++;
@@ -951,7 +951,7 @@ void Resource::saveObject( TQObject *obj, QDesignerGridLayout* grid, TQTextStrea
 	    ts << makeIndent( indent ) << "</property>" << endl;
 	    ts << makeIndent( indent ) << "<property name=\"backgroundMode\">" << endl;
 	    indent++;
-	    saveEnumProperty( w, "backgroundMode", TQVariant::Invalid, ts, indent );
+	    saveEnumProperty( TQT_TQOBJECT(w), "backgroundMode", TQVariant::Invalid, ts, indent );
 	    indent--;
 	    ts << makeIndent( indent ) << "</property>" << endl;
 	    ts << makeIndent( indent ) << "<attribute name=\"label\">" << endl;
@@ -959,19 +959,19 @@ void Resource::saveObject( TQObject *obj, QDesignerGridLayout* grid, TQTextStrea
 	    ts << makeIndent( indent ) << "<string>" << entitize( tb->itemLabel( tb->indexOf(w) ) ) << "</string>" << endl;
 	    indent--;
 	    ts << makeIndent( indent ) << "</attribute>" << endl;
-	    saveChildrenOf( w, ts, indent );
+	    saveChildrenOf( TQT_TQOBJECT(w), ts, indent );
 	    --indent;
 	    ts << makeIndent( indent ) << "</widget>" << endl;
 	}
-    } else if ( ::qt_cast<TQWizard*>(obj) ) {
+    } else if ( ::tqqt_cast<TQWizard*>(obj) ) {
 	TQWizard* wiz = (TQWizard*)obj;
 	for ( int i = 0; i < wiz->pageCount(); ++i ) {
 	    TQWidget *w = wiz->page( i );
 	    if ( !w )
 		continue;
-	    if ( WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(w)) == -1 )
+	    if ( WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(TQT_TQOBJECT(w))) == -1 )
 		continue; // we don't know this widget
-	    ts << makeIndent( indent ) << "<widget class=\"QWidget\">" << endl;
+	    ts << makeIndent( indent ) << "<widget class=\"TQWidget\">" << endl;
 	    ++indent;
 	    ts << makeIndent( indent ) << "<property name=\"name\">" << endl;
 	    indent++;
@@ -984,21 +984,21 @@ void Resource::saveObject( TQObject *obj, QDesignerGridLayout* grid, TQTextStrea
 	    ts << makeIndent( indent ) << "<string>" << entitize( wiz->title( w ) ) << "</string>" << endl;
 	    indent--;
 	    ts << makeIndent( indent ) << "</attribute>" << endl;
-	    saveChildrenOf( w, ts, indent );
+	    saveChildrenOf( TQT_TQOBJECT(w), ts, indent );
 	    --indent;
 	    ts << makeIndent( indent ) << "</widget>" << endl;
 	}
-    } else if ( ::qt_cast<TQMainWindow*>(obj) ) {
-	saveChildrenOf( ( (TQMainWindow*)obj )->centralWidget(), ts, indent );
+    } else if ( ::tqqt_cast<TQMainWindow*>(obj) ) {
+	saveChildrenOf( TQT_TQOBJECT(( (TQMainWindow*)obj )->centralWidget()), ts, indent );
     } else {
 	bool saved = FALSE;
-#ifdef QT_CONTAINER_CUSTOM_WIDGETS
+#ifdef TQT_CONTAINER_CUSTOM_WIDGETS
 	if ( isPlugin ) {
 	    WidgetInterface *iface = 0;
 	    widgetManager()->queryInterface( className, &iface );
 	    if ( iface ) {
-		QWidgetContainerInterfacePrivate *iface2 = 0;
-		iface->queryInterface( IID_QWidgetContainer, (QUnknownInterface**)&iface2 );
+		TQWidgetContainerInterfacePrivate *iface2 = 0;
+		iface->queryInterface( IID_TQWidgetContainer, (TQUnknownInterface**)&iface2 );
 		if ( iface2 ) {
 		    if ( iface2->supportsPages( className ) )  {
 			TQWidgetList containers = iface2->pages( className, (TQWidget*)obj );
@@ -1007,10 +1007,10 @@ void Resource::saveObject( TQObject *obj, QDesignerGridLayout* grid, TQTextStrea
 			    int i = 0;
 			    for ( TQWidget *w = containers.first(); w; w = containers.next(), ++i ) {
 				if ( WidgetDatabase::
-				     idFromClassName( WidgetFactory::classNameOf( w ) ) == -1 )
+				     idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(w) ) ) == -1 )
 				    continue; // we don't know this widget
 				ts << makeIndent( indent ) << "<widget class=\""
-				   << WidgetFactory::classNameOf( w )
+				   << WidgetFactory::classNameOf( TQT_TQOBJECT(w) )
 				   << "\">" << endl;
 				++indent;
 				ts << makeIndent( indent ) << "<property name=\"name\">" << endl;
@@ -1036,7 +1036,7 @@ void Resource::saveObject( TQObject *obj, QDesignerGridLayout* grid, TQTextStrea
 			TQWidget *w = iface2->containerOfWidget( className, (TQWidget*)obj );
 			if ( obj != w ) {
 			    ts << makeIndent( indent ) << "<widget class=\""
-			       << WidgetFactory::classNameOf( w )
+			       << WidgetFactory::classNameOf( TQT_TQOBJECT(w) )
 			       << "\">" << endl;
 			    ++indent;
 			    ts << makeIndent( indent ) << "<property name=\"name\">" << endl;
@@ -1054,14 +1054,14 @@ void Resource::saveObject( TQObject *obj, QDesignerGridLayout* grid, TQTextStrea
 			MetaDataBase::CustomWidget *cw = new MetaDataBase::CustomWidget;
 			cw->className = className;
 			cw->includeFile =  WidgetDatabase::includeFile( classID );
-			TQStrList lst = w->metaObject()->signalNames( TRUE );
+			TQStrList lst = w->tqmetaObject()->signalNames( TRUE );
 			for ( TQPtrListIterator<char> it(lst); it.current(); ++it )
 			    cw->lstSignals.append(it.current());
 
 			int i;
-			int total = w->metaObject()->numProperties( TRUE );
+			int total = w->tqmetaObject()->numProperties( TRUE );
 			for ( i = 0; i < total; i++ ) {
-			    const TQMetaProperty *p = w->metaObject()->property( i, TRUE );
+			    const TQMetaProperty *p = w->tqmetaObject()->property( i, TRUE );
 			    if ( p->designable(w) ) {
 				MetaDataBase::Property prop;
 				prop.property = p->name();
@@ -1079,27 +1079,27 @@ void Resource::saveObject( TQObject *obj, QDesignerGridLayout* grid, TQTextStrea
 			    }
 			}
 
-			total = w->metaObject()->numSlots( TRUE );
+			total = w->tqmetaObject()->numSlots( TRUE );
 			for ( i = 0; i < total; i++ ) {
-			    const QMetaData *md = w->metaObject()->slot( i, TRUE );
+			    const TQMetaData *md = w->tqmetaObject()->slot( i, TRUE );
 			    MetaDataBase::Function funky;
 			    // Find out if we have a return type.
 			    if ( md->method->count > 0 ) {
-				const QUParameter p = md->method->parameters[0];
-				if ( p.inOut == QUParameter::InOut )
+				const TQUParameter p = md->method->parameters[0];
+				if ( p.inOut == TQUParameter::InOut )
 				    funky.returnType = p.type->desc();
 			    }
 
 			    funky.function = md->name;
 			    funky.language = "C++";
 			    switch ( md->access ) {
-				case QMetaData::Public:
+				case TQMetaData::Public:
 				    funky.access = "public";
 				    break;
-				case QMetaData::Protected:
+				case TQMetaData::Protected:
 				    funky.access = "protected";
 				    break;
-				case QMetaData::Private:
+				case TQMetaData::Private:
 				    funky.access = "private";
 				    break;
 			    }
@@ -1112,7 +1112,7 @@ void Resource::saveObject( TQObject *obj, QDesignerGridLayout* grid, TQTextStrea
 		iface->release();
 	    }
 	}
-#endif // QT_CONTAINER_CUSTOM_WIDGETS
+#endif // TQT_CONTAINER_CUSTOM_WIDGETS
 	if ( !saved )
 	    saveChildrenOf( obj, ts, indent );
     }
@@ -1123,9 +1123,9 @@ void Resource::saveObject( TQObject *obj, QDesignerGridLayout* grid, TQTextStrea
 
 void Resource::saveItems( TQObject *obj, TQTextStream &ts, int indent )
 {
-    if ( ::qt_cast<TQListBox*>(obj) || ::qt_cast<TQComboBox*>(obj) ) {
+    if ( ::tqqt_cast<TQListBox*>(obj) || ::tqqt_cast<TQComboBox*>(obj) ) {
 	TQListBox *lb = 0;
-	if ( ::qt_cast<TQListBox*>(obj) )
+	if ( ::tqqt_cast<TQListBox*>(obj) )
 	    lb = (TQListBox*)obj;
 	else
 	    lb = ( (TQComboBox*)obj )->listBox();
@@ -1143,7 +1143,7 @@ void Resource::saveItems( TQObject *obj, TQTextStream &ts, int indent )
 	    indent--;
 	    ts << makeIndent( indent ) << "</item>" << endl;
 	}
-    } else if ( ::qt_cast<TQIconView*>(obj) ) {
+    } else if ( ::tqqt_cast<TQIconView*>(obj) ) {
 	TQIconView *iv = (TQIconView*)obj;
 
 	TQIconViewItem *i = iv->firstItem();
@@ -1159,7 +1159,7 @@ void Resource::saveItems( TQObject *obj, TQTextStream &ts, int indent )
 	    indent--;
 	    ts << makeIndent( indent ) << "</item>" << endl;
 	}
-    } else if ( ::qt_cast<TQListView*>(obj) ) {
+    } else if ( ::tqqt_cast<TQListView*>(obj) ) {
 	TQListView *lv = (TQListView*)obj;
 	int i;
 	for ( i = 0; i < lv->header()->count(); ++i ) {
@@ -1187,13 +1187,13 @@ void Resource::saveItems( TQObject *obj, TQTextStream &ts, int indent )
 	}
 	saveItem( lv->firstChild(), ts, indent - 1 );
     }
-#if !defined (QT_NO_TABLE)
-    else if ( ::qt_cast<TQTable*>(obj) ) {
+#if !defined (TQT_NO_TABLE)
+    else if ( ::tqqt_cast<TQTable*>(obj) ) {
 	TQTable *table = (TQTable*)obj;
 	int i;
-	TQMap<TQString, TQString> columnFields = MetaDataBase::columnFields( table );
-#  ifndef QT_NO_SQL
-	bool isDataTable = ::qt_cast<TQDataTable*>(table);
+	TQMap<TQString, TQString> columnFields = MetaDataBase::columnFields( TQT_TQOBJECT(table) );
+#  ifndef TQT_NO_SQL
+	bool isDataTable = ::tqqt_cast<TQDataTable*>(table);
 #  else
         bool isDataTable = false;
 #  endif
@@ -1214,7 +1214,7 @@ void Resource::saveItems( TQObject *obj, TQTextStream &ts, int indent )
 		if ( isDataTable && !columnFields.isEmpty() ) {
 		    ts << makeIndent( indent ) << "<property name=\"field\">" << endl;
 		    indent++;
-		    ts << makeIndent( indent ) << "<string>" << entitize( *columnFields.find( l[ 0 ] ) ) << "</string>" << endl;
+		    ts << makeIndent( indent ) << "<string>" << entitize( *columnFields.tqfind( l[ 0 ] ) ) << "</string>" << endl;
 		    indent--;
 		    ts << makeIndent( indent ) << "</property>" << endl;
 		}
@@ -1277,10 +1277,10 @@ void Resource::savePixmap( const TQPixmap &p, TQTextStream &ts, int indent, cons
     if ( formwindow && formwindow->savePixmapInline() )
 	ts << makeIndent( indent ) << "<" << tagname << ">" << saveInCollection( p ) << "</" << tagname << ">" << endl;
     else if ( formwindow && formwindow->savePixmapInProject() )
-	ts << makeIndent( indent ) << "<" << tagname << ">" << MetaDataBase::pixmapKey( formwindow, p.serialNumber() )
+	ts << makeIndent( indent ) << "<" << tagname << ">" << MetaDataBase::pixmapKey( TQT_TQOBJECT(formwindow), p.serialNumber() )
 	   << "</" << tagname << ">" << endl;
     else
-	ts << makeIndent( indent ) << "<" << tagname << ">" << MetaDataBase::pixmapArgument( formwindow, p.serialNumber() )
+	ts << makeIndent( indent ) << "<" << tagname << ">" << MetaDataBase::pixmapArgument( TQT_TQOBJECT(formwindow), p.serialNumber() )
 	   << "</" << tagname << ">" << endl;
 }
 
@@ -1292,7 +1292,7 @@ TQPixmap Resource::loadPixmap( const TQDomElement &e, const TQString &/*tagname*
 	TQImage img = loadFromCollection( arg );
 	TQPixmap pix;
 	pix.convertFromImage( img );
-	MetaDataBase::setPixmapArgument( formwindow, pix.serialNumber(), arg );
+	MetaDataBase::setPixmapArgument( TQT_TQOBJECT(formwindow), pix.serialNumber(), arg );
 	return pix;
     } else if ( formwindow && formwindow->savePixmapInProject() ) {
 	TQPixmap pix;
@@ -1304,13 +1304,13 @@ TQPixmap Resource::loadPixmap( const TQDomElement &e, const TQString &/*tagname*
 	    pix.convertFromImage( pix.convertToImage() );
 	}
 
-	MetaDataBase::setPixmapKey( formwindow, pix.serialNumber(), arg );
+	MetaDataBase::setPixmapKey( TQT_TQOBJECT(formwindow), pix.serialNumber(), arg );
 	return pix;
     }
     TQPixmap pix = BarIcon( "designer_image.png", KDevDesignerPartFactory::instance() );
     // we have to force the pixmap to get a new and unique serial number. Unfortunately detatch() doesn't do that
     pix.convertFromImage( pix.convertToImage() );
-    MetaDataBase::setPixmapArgument( formwindow, pix.serialNumber(), arg );
+    MetaDataBase::setPixmapArgument( TQT_TQOBJECT(formwindow), pix.serialNumber(), arg );
     return pix;
 }
 
@@ -1342,19 +1342,19 @@ void Resource::saveItem( const TQStringList &text,
 
 void Resource::saveChildrenOf( TQObject* obj, TQTextStream &ts, int indent )
 {
-    const TQObjectList *l = obj->children();
-    if ( !l )
-	return; // no children to save
+    const TQObjectList l = obj->childrenListObject();
+    if ( l.isEmpty() )
+	return; // no tqchildren to save
 
     TQString closeTag;
-    // if the widget has a layout we pretend that all widget's childs are childs of the layout - makes the structure nicer
-    TQLayout *layout = 0;
-    QDesignerGridLayout* grid = 0;
-    if ( !::qt_cast<TQSplitter*>(obj) &&
+    // if the widget has a tqlayout we pretend that all widget's childs are childs of the tqlayout - makes the structure nicer
+    TQLayout *tqlayout = 0;
+    TQDesignerGridLayout* grid = 0;
+    if ( !::tqqt_cast<TQSplitter*>(obj) &&
 	 WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( obj ) ) ) &&
 	 obj->isWidgetType() &&
-	 WidgetFactory::layoutType( (TQWidget*)obj, layout ) != WidgetFactory::NoLayout ) {
-	WidgetFactory::LayoutType lay = WidgetFactory::layoutType( (TQWidget*)obj, layout );
+	 WidgetFactory::tqlayoutType( (TQWidget*)obj, tqlayout ) != WidgetFactory::NoLayout ) {
+	WidgetFactory::LayoutType lay = WidgetFactory::tqlayoutType( (TQWidget*)obj, tqlayout );
 	switch ( lay ) {
 	case WidgetFactory::HBox:
 	    closeTag = makeIndent( indent ) + "</hbox>";
@@ -1370,20 +1370,20 @@ void Resource::saveChildrenOf( TQObject* obj, TQTextStream &ts, int indent )
 	    closeTag = makeIndent( indent ) + "</grid>";
 	    ts << makeIndent( indent ) << "<grid>" << endl;
 	    ++indent;
-	    grid = (QDesignerGridLayout*) layout;
+	    grid = (TQDesignerGridLayout*) tqlayout;
 	    break;
 	default:
 	    break;
 	}
 
-	// save properties of layout
+	// save properties of tqlayout
 	if ( lay != WidgetFactory::NoLayout )
-	    saveObjectProperties( layout, ts, indent );
+	    saveObjectProperties( TQT_TQOBJECT(tqlayout), ts, indent );
 
     }
 
     TQObject *o = 0;
-    for ( TQPtrListIterator<TQObject> it ( *l ); ( o = it.current() ); ++it )
+    for ( TQPtrListIterator<TQObject> it ( l ); ( o = it.current() ); ++it )
 	if ( !TQString( o->name() ).startsWith( "qt_dead_widget_" ) )
 	    saveObject( o, grid, ts, indent );
     if ( !closeTag.isEmpty() ) {
@@ -1398,55 +1398,55 @@ void Resource::saveObjectProperties( TQObject *w, TQTextStream &ts, int indent )
     TQStringList changed;
     changed = MetaDataBase::changedProperties( w );
     if ( w->isWidgetType() ) {
-	if ( ::qt_cast<Spacer*>(w) ) {
-	    if ( !changed.contains( "sizeHint" ) )
-		changed << "sizeHint";
-	    if ( !changed.contains( "geometry" ) )
+	if ( ::tqqt_cast<Spacer*>(w) ) {
+	    if ( !changed.tqcontains( "tqsizeHint" ) )
+		changed << "tqsizeHint";
+	    if ( !changed.tqcontains( "geometry" ) )
 		changed << "geometry";
  	} else {
-	    TQToolButton *tb = ::qt_cast<TQToolButton*>(w);
+	    TQToolButton *tb = ::tqqt_cast<TQToolButton*>(w);
 	    if ( tb && !tb->iconSet().isNull() ) {
 		changed << "iconSet";
 	    }
 	}
-    } else if ( ::qt_cast<TQLayout*>(w) ) {
-	if ( MetaDataBase::spacing( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( (TQLayout*)w ) ) ) > -1 )
+    } else if ( ::tqqt_cast<TQLayout*>(w) ) {
+	if ( MetaDataBase::spacing( TQT_TQOBJECT( WidgetFactory::containerOfWidget( WidgetFactory::tqlayoutParent( (TQLayout*)(w) ) ) ) ) > -1 )
 	    changed << "spacing";
-	if ( MetaDataBase::margin( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( (TQLayout*)w ) ) ) > -1 )
+	if ( MetaDataBase::margin( TQT_TQOBJECT( WidgetFactory::containerOfWidget( WidgetFactory::tqlayoutParent( (TQLayout*)(w) ) ) ) ) > -1 )
 	    changed << "margin";
-	if ( MetaDataBase::resizeMode( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( (TQLayout*)w ) ) ) != "Auto"
-	     && !MetaDataBase::resizeMode( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( (TQLayout*)w ) ) ).isEmpty() )
+	if ( MetaDataBase::resizeMode( TQT_TQOBJECT( WidgetFactory::containerOfWidget( WidgetFactory::tqlayoutParent( (TQLayout*)(w) ) ) ) ) != "Auto"
+	     && !MetaDataBase::resizeMode( TQT_TQOBJECT( WidgetFactory::containerOfWidget( WidgetFactory::tqlayoutParent( (TQLayout*)(w) ) ) ) ).isEmpty() )
 	    changed << "resizeMode";
     }
 
-    if ( w == formwindow->mainContainer() ) {
-	if ( changed.findIndex( "geometry" ) == -1 )
+    if ( TQT_BASE_OBJECT(w) == TQT_BASE_OBJECT(formwindow->mainContainer()) ) {
+	if ( changed.tqfindIndex( "geometry" ) == -1 )
 	    changed << "geometry";
-	if ( changed.findIndex( "caption" ) == -1 )
+	if ( changed.tqfindIndex( "caption" ) == -1 )
 	    changed << "caption";
     }
 
     if ( changed.isEmpty() )
 	    return;
 
-    bool inLayout = w != formwindow->mainContainer() && !copying && w->isWidgetType() && ( (TQWidget*)w )->parentWidget() &&
-		    WidgetFactory::layoutType( ( (TQWidget*)w )->parentWidget() ) != WidgetFactory::NoLayout;
+    bool inLayout = TQT_BASE_OBJECT(w) != TQT_BASE_OBJECT(formwindow->mainContainer()) && !copying && w->isWidgetType() && ( (TQWidget*)w )->tqparentWidget() &&
+		    WidgetFactory::tqlayoutType( ( (TQWidget*)w )->tqparentWidget() ) != WidgetFactory::NoLayout;
 
-    TQStrList lst = w->metaObject()->propertyNames( !::qt_cast<Spacer*>(w) );
+    TQStrList lst = w->tqmetaObject()->propertyNames( !::tqqt_cast<Spacer*>(w) );
     for ( TQPtrListIterator<char> it( lst ); it.current(); ++it ) {
-	if ( changed.find( TQString::fromLatin1( it.current() ) ) == changed.end() )
+	if ( changed.tqfind( TQString::tqfromLatin1( it.current() ) ) == changed.end() )
 	    continue;
-	if ( saved.find( TQString::fromLatin1( it.current() ) ) != saved.end() )
+	if ( saved.tqfind( TQString::tqfromLatin1( it.current() ) ) != saved.end() )
 	    continue;
-	saved << TQString::fromLatin1( it.current() );
-	const TQMetaProperty* p = w->metaObject()->
-				 property( w->metaObject()->findProperty( it.current(), TRUE ), TRUE );
+	saved << TQString::tqfromLatin1( it.current() );
+	const TQMetaProperty* p = w->tqmetaObject()->
+				 property( w->tqmetaObject()->tqfindProperty( it.current(), TRUE ), TRUE );
 	if ( !p || !p->stored( w ) || ( inLayout && qstrcmp( p->name(), "geometry" ) == 0 ) )
 	    continue;
-	if ( ::qt_cast<TQLabel*>(w) && qstrcmp( p->name(), "pixmap" ) == 0 &&
+	if ( ::tqqt_cast<TQLabel*>(w) && qstrcmp( p->name(), "pixmap" ) == 0 &&
 	     ( !( (TQLabel*)w )->pixmap() || ( (TQLabel*)w )->pixmap()->isNull() ) )
 	    continue;
-	if ( ::qt_cast<MenuBarEditor*>(w) &&
+	if ( ::tqqt_cast<MenuBarEditor*>(w) &&
 	     ( qstrcmp( p->name(), "itemName" ) == 0 || qstrcmp( p->name(), "itemNumber" ) == 0 ||
 	       qstrcmp( p->name(), "itemText" ) == 0 ) )
 	    continue;
@@ -1460,7 +1460,7 @@ void Resource::saveObjectProperties( TQObject *w, TQTextStream &ts, int indent )
 	    ts << " stdset=\"0\"";
 	ts << ">" << endl;
 	indent++;
-	if ( strcmp( it.current(), "resizeMode" ) == 0 && ::qt_cast<TQLayout*>(w) ) {
+	if ( strcmp( it.current(), "resizeMode" ) == 0 && ::tqqt_cast<TQLayout*>(w) ) {
 	    saveProperty( w, it.current(), "", TQVariant::String, ts, indent );
 	} else if ( p->isSetType() ) {
 	    saveSetProperty( w, it.current(), TQVariant::nameToType( p->type() ), ts, indent );
@@ -1496,7 +1496,7 @@ void Resource::saveObjectProperties( TQObject *w, TQTextStream &ts, int indent )
 
 void Resource::saveSetProperty( TQObject *w, const TQString &name, TQVariant::Type, TQTextStream &ts, int indent )
 {
-    const TQMetaProperty *p = w->metaObject()->property( w->metaObject()->findProperty( name, TRUE ), TRUE );
+    const TQMetaProperty *p = w->tqmetaObject()->property( w->tqmetaObject()->tqfindProperty( name, TRUE ), TRUE );
     TQStrList l( p->valueToKeys( w->property( name ).toInt() ) );
     TQString v;
     for ( uint i = 0; i < l.count(); ++i ) {
@@ -1509,25 +1509,25 @@ void Resource::saveSetProperty( TQObject *w, const TQString &name, TQVariant::Ty
 
 void Resource::saveEnumProperty( TQObject *w, const TQString &name, TQVariant::Type, TQTextStream &ts, int indent )
 {
-    const TQMetaProperty *p = w->metaObject()->property( w->metaObject()->findProperty( name, TRUE ), TRUE );
+    const TQMetaProperty *p = w->tqmetaObject()->property( w->tqmetaObject()->tqfindProperty( name, TRUE ), TRUE );
     ts << makeIndent( indent ) << "<enum>" << p->valueToKey( w->property( name ).toInt() ) << "</enum>" << endl;
 }
 
 void Resource::saveProperty( TQObject *w, const TQString &name, const TQVariant &value, TQVariant::Type t, TQTextStream &ts, int indent )
 {
     if ( name == "hAlign" || name =="vAlign" || name == "wordwrap" ||
-	 name == "layoutMargin" || name =="layoutSpacing" )
+	 name == "tqlayoutMargin" || name =="tqlayoutSpacing" )
 	return;
     int num;
     uint unum;
     double dob;
     TQString comment;
-    if ( w && formwindow->widgets()->find( (TQWidget*)w ) || formwindow->actionList().find( (TQAction*)w ) )
+    if ( w && formwindow->widgets()->tqfind( (TQWidget*)w ) || formwindow->actionList().tqfind( (TQAction*)w ) )
 	comment = MetaDataBase::propertyComment( w, name );
     switch ( t ) {
     case TQVariant::String:
 	if ( name == "resizeMode" ) {
-	    TQString resmod = MetaDataBase::resizeMode( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( (TQLayout*)w ) ) );
+	    TQString resmod = MetaDataBase::resizeMode( TQT_TQOBJECT( WidgetFactory::containerOfWidget( WidgetFactory::tqlayoutParent( (TQLayout*)(w) ) ) ) );
 	    if ( !resmod.isNull() && resmod != "Auto" ) {
 		ts << makeIndent( indent ) << "<enum>";
 		ts << resmod;
@@ -1547,12 +1547,12 @@ void Resource::saveProperty( TQObject *w, const TQString &name, const TQVariant
 	ts << makeIndent( indent ) << "<bool>" << mkBool( value.toBool() ) << "</bool>" << endl;
 	break;
     case TQVariant::Int:
-	if ( ::qt_cast<TQLayout*>(w) ) {
+	if ( ::tqqt_cast<TQLayout*>(w) ) {
 	    num = -1;
 	    if ( name == "spacing" )
-		num = MetaDataBase::spacing( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( (TQLayout*)w ) ) );
+		num = MetaDataBase::spacing( TQT_TQOBJECT( WidgetFactory::containerOfWidget( WidgetFactory::tqlayoutParent( (TQLayout*)(w) ) ) ) );
 	    else if ( name == "margin" )
-		num = MetaDataBase::margin( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( (TQLayout*)w ) ) );
+		num = MetaDataBase::margin( TQT_TQOBJECT( WidgetFactory::containerOfWidget( WidgetFactory::tqlayoutParent( (TQLayout*)(w) ) ) ) );
 	    if ( num != -1 )
 		ts << makeIndent( indent ) << "<number>" << TQString::number( num ) << "</number>" << endl;
 	} else {
@@ -1612,9 +1612,9 @@ void Resource::saveProperty( TQObject *w, const TQString &name, const TQVariant
     case TQVariant::Font: {
 	TQVariant v( value );
 	ts << makeIndent( indent ) << "<font>" << endl;
-	TQFont f( qApp->font() );
-	if ( w && w->isWidgetType() && ((TQWidget*)w)->parentWidget() )
-	    f = ((TQWidget*)w)->parentWidget()->font();
+	TQFont f( tqApp->font() );
+	if ( w && w->isWidgetType() && ((TQWidget*)w)->tqparentWidget() )
+	    f = ((TQWidget*)w)->tqparentWidget()->font();
 	TQFont f2( v.toFont() );
 	indent++;
 	if ( f.family() != f2.family() )
@@ -1680,7 +1680,7 @@ void Resource::saveProperty( TQObject *w, const TQString &name, const TQVariant
 	ts << makeIndent( indent ) << "</palette>" << endl;
     } break;
     case TQVariant::Cursor:
-	ts << makeIndent( indent ) << "<cursor>" << value.toCursor().shape() << "</cursor>" << endl;
+	ts << makeIndent( indent ) << "<cursor>" << value.toCursor().tqshape() << "</cursor>" << endl;
 	break;
     case TQVariant::StringList: {
 	TQStringList lst = value.toStringList();
@@ -1743,7 +1743,7 @@ void Resource::saveColorGroup( TQTextStream &ts, int indent, const TQColorGroup
 	saveColor( ts, indent, cg.color( (TQColorGroup::ColorRole)r ) );
 	indent--;
 	ts << makeIndent( indent ) << "</color>" << endl;
-	TQPixmap* pm = cg.brush( (TQColorGroup::ColorRole)r ).pixmap();
+	TQPixmap* pm = cg.tqbrush( (TQColorGroup::ColorRole)r ).pixmap();
 	if ( pm && !pm->isNull() )
 	    savePixmap( *pm, ts, indent );
     }
@@ -1756,7 +1756,7 @@ void Resource::saveColor( TQTextStream &ts, int indent, const TQColor &c )
     ts << makeIndent( indent ) << "<blue>" << TQString::number( c.blue() ) << "</blue>" << endl;
 }
 
-TQObject *Resource::createObject( const TQDomElement &e, TQWidget *parent, TQLayout* layout )
+TQObject *Resource::createObject( const TQDomElement &e, TQWidget *tqparent, TQLayout* tqlayout )
 {
     lastItem = 0;
     TQDomElement n = e.firstChild().toElement();
@@ -1773,21 +1773,21 @@ TQObject *Resource::createObject( const TQDomElement &e, TQWidget *parent, TQLay
 	colspan = 1;
 
     TQString className = e.attribute( "class", TQWIDGET_OBJECT_NAME_STRING );
-#ifdef QT_CONTAINER_CUSTOM_WIDGETS
-    TQString parentClassName = WidgetFactory::classNameOf( parent );
+#ifdef TQT_CONTAINER_CUSTOM_WIDGETS
+    TQString tqparentClassName = WidgetFactory::classNameOf( tqparent );
     bool isPlugin =
-	WidgetDatabase::isCustomPluginWidget( WidgetDatabase::idFromClassName( parentClassName ) );
+	WidgetDatabase::isCustomPluginWidget( WidgetDatabase::idFromClassName( tqparentClassName ) );
     if ( isPlugin )
 	qWarning( "####### loading custom container widgets without page support not implemented!" );
     // ### TODO loading for custom container widgets without pages
 #endif
     if ( !className.isNull() ) {
-	obj = WidgetFactory::create( WidgetDatabase::idFromClassName( className ), parent, 0, FALSE );
+	obj = TQT_TQOBJECT(WidgetFactory::create( WidgetDatabase::idFromClassName( className ), tqparent, 0, FALSE ));
 	if ( !obj ) {
 	    TQMessageBox::critical( MainWindow::self, i18n( "Loading File" ),
 				   i18n( "Error loading %1.\n"
 						   "The widget %2 could not be created." ).
-				   arg( currFileName ).arg( className ) );
+				   tqarg( currFileName ).tqarg( className ) );
 	    return 0;
 	}
 	if ( !mainContainerSet ) {
@@ -1796,18 +1796,18 @@ TQObject *Resource::createObject( const TQDomElement &e, TQWidget *parent, TQLay
 	    mainContainerSet = TRUE;
 	}
 	w = (TQWidget*)obj;
-	if ( ::qt_cast<TQMainWindow*>(w) )
+	if ( ::tqqt_cast<TQMainWindow*>(w) )
 	    w = ( (TQMainWindow*)w )->centralWidget();
-	if ( layout ) {
-	    switch ( WidgetFactory::layoutType( layout ) ) {
+	if ( tqlayout ) {
+	    switch ( WidgetFactory::tqlayoutType( tqlayout ) ) {
 	    case WidgetFactory::HBox:
-		( (TQHBoxLayout*)layout )->addWidget( w );
+		( (TQHBoxLayout*)tqlayout )->addWidget( w );
 		break;
 	    case WidgetFactory::VBox:
-		( (TQVBoxLayout*)layout )->addWidget( w );
+		( (TQVBoxLayout*)tqlayout )->addWidget( w );
 		break;
 	    case WidgetFactory::Grid:
-		( (QDesignerGridLayout*)layout )->addMultiCellWidget( w, row, row + rowspan - 1,
+		( (TQDesignerGridLayout*)tqlayout )->addMultiCellWidget( w, row, row + rowspan - 1,
 								      col, col + colspan - 1 );
 		break;
 	    default:
@@ -1817,29 +1817,29 @@ TQObject *Resource::createObject( const TQDomElement &e, TQWidget *parent, TQLay
 
 	if ( !toplevel )
 	    toplevel = w;
-	layout = 0;
+	tqlayout = 0;
 
 	if ( w && formwindow ) {
-	    if ( !parent ||
-		 ( !::qt_cast<TQTabWidget*>(parent) &&
-		   !::qt_cast<TQWidgetStack*>(parent) &&
-		   !::qt_cast<TQToolBox*>(parent) &&
-		   !::qt_cast<TQWizard*>(parent)
-#ifdef QT_CONTAINER_CUSTOM_WIDGETS
+	    if ( !tqparent ||
+		 ( !::tqqt_cast<TQTabWidget*>(tqparent) &&
+		   !::tqqt_cast<TQWidgetStack*>(tqparent) &&
+		   !::tqqt_cast<TQToolBox*>(tqparent) &&
+		   !::tqqt_cast<TQWizard*>(tqparent)
+#ifdef TQT_CONTAINER_CUSTOM_WIDGETS
                    && !isPlugin
 #endif
                      ) )
 		formwindow->insertWidget( w, pasting );
-	    else if ( parent &&
-		      ( ::qt_cast<TQTabWidget*>(parent) ||
-			::qt_cast<TQWidgetStack*>(parent) ||
-			::qt_cast<TQToolBox*>(parent) ||
-			::qt_cast<TQWizard*>(parent)
-#ifdef QT_CONTAINER_CUSTOM_WIDGETS
+	    else if ( tqparent &&
+		      ( ::tqqt_cast<TQTabWidget*>(tqparent) ||
+			::tqqt_cast<TQWidgetStack*>(tqparent) ||
+			::tqqt_cast<TQToolBox*>(tqparent) ||
+			::tqqt_cast<TQWizard*>(tqparent)
+#ifdef TQT_CONTAINER_CUSTOM_WIDGETS
                         || isPlugin
 #endif
                           ) )
-		MetaDataBase::addEntry( w );
+		MetaDataBase::addEntry( TQT_TQOBJECT(w) );
 	}
     }
 
@@ -1848,22 +1848,22 @@ TQObject *Resource::createObject( const TQDomElement &e, TQWidget *parent, TQLay
 
     while ( !n.isNull() ) {
 	if ( n.tagName() == "spacer" ) {
-	    createSpacer( n, w, layout, Qt::Horizontal );
+	    createSpacer( n, w, tqlayout, Qt::Horizontal );
 	} else if ( n.tagName() == "widget" ) {
-	    createObject( n, w, layout );
+	    createObject( n, w, tqlayout );
 	} else if ( n.tagName() == "hbox" ) {
-	    layout = WidgetFactory::createLayout( w, layout, WidgetFactory::HBox );
-	    obj = layout;
+	    tqlayout = WidgetFactory::createLayout( w, tqlayout, WidgetFactory::HBox );
+	    obj = TQT_TQOBJECT(tqlayout);
 	    n = n.firstChild().toElement();
 	    continue;
 	} else if ( n.tagName() == "grid" ) {
-	    layout = WidgetFactory::createLayout( w, layout, WidgetFactory::Grid );
-	    obj = layout;
+	    tqlayout = WidgetFactory::createLayout( w, tqlayout, WidgetFactory::Grid );
+	    obj = TQT_TQOBJECT(tqlayout);
 	    n = n.firstChild().toElement();
 	    continue;
 	} else if ( n.tagName() == "vbox" ) {
-	    layout = WidgetFactory::createLayout( w, layout, WidgetFactory::VBox );
-	    obj = layout;
+	    tqlayout = WidgetFactory::createLayout( w, tqlayout, WidgetFactory::VBox );
+	    obj = TQT_TQOBJECT(tqlayout);
 	    n = n.firstChild().toElement();
 	    continue;
 	} else if ( n.tagName() == "property" && obj ) {
@@ -1877,35 +1877,35 @@ TQObject *Resource::createObject( const TQDomElement &e, TQWidget *parent, TQLay
 	} else if ( n.tagName() == "attribute" && w ) {
 	    TQString attrib = n.attribute( "name" );
 	    TQVariant v = DomTool::elementToVariant( n.firstChild().toElement(), TQVariant() );
-	    if ( ::qt_cast<TQTabWidget*>(parent) ) {
+	    if ( ::tqqt_cast<TQTabWidget*>(tqparent) ) {
 		if ( attrib == "title" )
-		    ( (TQTabWidget*)parent )->insertTab( w, v.toString() );
-	    } else if ( ::qt_cast<TQWidgetStack*>(parent) ) {
+		    ( (TQTabWidget*)tqparent )->insertTab( w, v.toString() );
+	    } else if ( ::tqqt_cast<TQWidgetStack*>(tqparent) ) {
 		if ( attrib == "id" )
-		    ( (QDesignerWidgetStack*)parent )->insertPage( w, v.toInt() );
-	    } else if ( ::qt_cast<TQToolBox*>(parent) ) {
+		    ( (TQDesignerWidgetStack*)tqparent )->insertPage( w, v.toInt() );
+	    } else if ( ::tqqt_cast<TQToolBox*>(tqparent) ) {
 		if ( attrib == "label" )
-		    ( (TQToolBox*)parent )->addItem( w, v.toString() );
-	    } else if ( ::qt_cast<TQWizard*>(parent) ) {
+		    ( (TQToolBox*)tqparent )->addItem( w, v.toString() );
+	    } else if ( ::tqqt_cast<TQWizard*>(tqparent) ) {
 		if ( attrib == "title" )
-		    ( (TQWizard*)parent )->addPage( w, v.toString() );
-#ifdef QT_CONTAINER_CUSTOM_WIDGETS
+		    ( (TQWizard*)tqparent )->addPage( w, v.toString() );
+#ifdef TQT_CONTAINER_CUSTOM_WIDGETS
 	    } else if ( isPlugin ) {
 		if ( attrib == "label" ) {
 		    WidgetInterface *iface = 0;
-		    widgetManager()->queryInterface( parentClassName, &iface );
+		    widgetManager()->queryInterface( tqparentClassName, &iface );
 		    if ( iface ) {
-			QWidgetContainerInterfacePrivate *iface2 = 0;
-			iface->queryInterface( IID_QWidgetContainer, (QUnknownInterface**)&iface2 );
+			TQWidgetContainerInterfacePrivate *iface2 = 0;
+			iface->queryInterface( IID_TQWidgetContainer, (TQUnknownInterface**)&iface2 );
 			if ( iface2 ) {
-			    iface2->insertPage( parentClassName,
-						(TQWidget*)parent, v.toString(), -1, w );
+			    iface2->insertPage( tqparentClassName,
+						(TQWidget*)tqparent, v.toString(), -1, w );
 			    iface2->release();
 			}
 			iface->release();
 		    }
 		}
-#endif // QT_CONTAINER_CUSTOM_WIDGETS
+#endif // TQT_CONTAINER_CUSTOM_WIDGETS
 	    }
 	} else if ( n.tagName() == "item" ) {
 	    createItem( n, w );
@@ -1926,7 +1926,7 @@ TQObject *Resource::createObject( const TQDomElement &e, TQWidget *parent, TQLay
     if ( w->isWidgetType() )
 	widgets.insert( w->name(), w );
 
-    return w;
+    return TQT_TQOBJECT(w);
 }
 
 void Resource::createColumn( const TQDomElement &e, TQWidget *widget )
@@ -1934,7 +1934,7 @@ void Resource::createColumn( const TQDomElement &e, TQWidget *widget )
     if ( !widget )
 	return;
 
-    if ( ::qt_cast<TQListView*>(widget) && e.tagName() == "column" ) {
+    if ( ::tqqt_cast<TQListView*>(widget) && e.tagName() == "column" ) {
 	TQListView *lv = (TQListView*)widget;
 	TQDomElement n = e.firstChild().toElement();
 	TQPixmap pix;
@@ -1967,8 +1967,8 @@ void Resource::createColumn( const TQDomElement &e, TQWidget *widget )
 	if ( !resizable )
 	    lv->header()->setResizeEnabled( resizable, i );
     }
-#ifndef QT_NO_TABLE
-    else if ( ::qt_cast<TQTable*>(widget) ) {
+#ifndef TQT_NO_TABLE
+    else if ( ::tqqt_cast<TQTable*>(widget) ) {
 	TQTable *table = (TQTable*)widget;
 	bool isRow;
 	if ( ( isRow = e.tagName() == "row" ) )
@@ -1981,7 +1981,7 @@ void Resource::createColumn( const TQDomElement &e, TQWidget *widget )
 	bool hasPixmap = FALSE;
 	TQString txt;
 	TQString field;
-	TQMap<TQString, TQString> fieldMap = MetaDataBase::columnFields( table );
+	TQMap<TQString, TQString> fieldMap = MetaDataBase::columnFields( TQT_TQOBJECT(table) );
 	while ( !n.isNull() ) {
 	    if ( n.tagName() == "property" ) {
 		TQString attrib = n.attribute( "name" );
@@ -2006,7 +2006,7 @@ void Resource::createColumn( const TQDomElement &e, TQWidget *widget )
 	    h->setLabel( i, txt );
 	if ( !isRow && !field.isEmpty() )
 	    fieldMap.insert( txt, field );
-	MetaDataBase::setColumnFields( table, fieldMap );
+	MetaDataBase::setColumnFields( TQT_TQOBJECT(table), fieldMap );
     }
 #endif
 }
@@ -2032,17 +2032,17 @@ void Resource::loadItem( const TQDomElement &e, TQPixmap &pix, TQString &txt, bo
 
 void Resource::createItem( const TQDomElement &e, TQWidget *widget, TQListViewItem *i )
 {
-    if ( !widget || !WidgetFactory::hasItems( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( widget ) ), widget ) )
+    if ( !widget || !WidgetFactory::hasItems( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(widget) ) ), TQT_TQOBJECT(widget) ) )
 	return;
 
-    if ( ::qt_cast<TQListBox*>(widget) || ::qt_cast<TQComboBox*>(widget) ) {
+    if ( ::tqqt_cast<TQListBox*>(widget) || ::tqqt_cast<TQComboBox*>(widget) ) {
 	TQDomElement n = e.firstChild().toElement();
 	TQPixmap pix;
 	bool hasPixmap = FALSE;
 	TQString txt;
 	loadItem( n, pix, txt, hasPixmap );
 	TQListBox *lb = 0;
-	if ( ::qt_cast<TQListBox*>(widget) )
+	if ( ::tqqt_cast<TQListBox*>(widget) )
 	    lb = (TQListBox*)widget;
 	else
 	    lb = ( (TQComboBox*)widget)->listBox();
@@ -2051,7 +2051,7 @@ void Resource::createItem( const TQDomElement &e, TQWidget *widget, TQListViewIt
 	} else {
 	    new TQListBoxText( lb, txt );
 	}
-    } else if ( ::qt_cast<TQIconView*>(widget) ) {
+    } else if ( ::tqqt_cast<TQIconView*>(widget) ) {
 	TQDomElement n = e.firstChild().toElement();
 	TQPixmap pix;
 	bool hasPixmap = FALSE;
@@ -2062,7 +2062,7 @@ void Resource::createItem( const TQDomElement &e, TQWidget *widget, TQListViewIt
 	    new TQIconViewItem( iv, txt, pix );
 	else
 	    new TQIconViewItem( iv, txt );
-    } else if ( ::qt_cast<TQListView*>(widget) ) {
+    } else if ( ::tqqt_cast<TQListView*>(widget) ) {
 	TQDomElement n = e.firstChild().toElement();
 	TQPixmap pix;
 	TQValueList<TQPixmap> pixmaps;
@@ -2104,7 +2104,7 @@ void Resource::createItem( const TQDomElement &e, TQWidget *widget, TQListViewIt
     }
 }
 
-TQWidget *Resource::createSpacer( const TQDomElement &e, TQWidget *parent, TQLayout *layout, Qt::Orientation o )
+TQWidget *Resource::createSpacer( const TQDomElement &e, TQWidget *tqparent, TQLayout *tqlayout, Qt::Orientation o )
 {
     TQDomElement n = e.firstChild().toElement();
     int row = e.attribute( "row" ).toInt();
@@ -2117,23 +2117,23 @@ TQWidget *Resource::createSpacer( const TQDomElement &e, TQWidget *parent, TQLay
 	colspan = 1;
 
     Spacer *spacer = (Spacer*) WidgetFactory::create( WidgetDatabase::idFromClassName("Spacer"),
-						      parent, "spacer", FALSE);
+						      tqparent, "spacer", FALSE);
     spacer->setOrientation( o );
     spacer->setInteraciveMode( FALSE );
     while ( !n.isNull() ) {
 	if ( n.tagName() == "property" )
-	    setObjectProperty( spacer, n.attribute( "name" ), n.firstChild().toElement() );
+	    setObjectProperty( TQT_TQOBJECT(spacer), n.attribute( "name" ), n.firstChild().toElement() );
 	n = n.nextSibling().toElement();
     }
     spacer->setInteraciveMode( TRUE );
     if ( formwindow )
 	formwindow->insertWidget( spacer, pasting );
-    if ( layout ) {
-	if ( ::qt_cast<TQBoxLayout*>(layout) )
-	    ( (TQBoxLayout*)layout )->addWidget( spacer, 0, spacer->alignment() );
+    if ( tqlayout ) {
+	if ( ::tqqt_cast<TQBoxLayout*>(tqlayout) )
+	    ( (TQBoxLayout*)tqlayout )->addWidget( spacer, 0, spacer->tqalignment() );
 	else
-	    ( (QDesignerGridLayout*)layout )->addMultiCellWidget( spacer, row, row + rowspan - 1, col, col + colspan - 1,
-								  spacer->alignment() );
+	    ( (TQDesignerGridLayout*)tqlayout )->addMultiCellWidget( spacer, row, row + rowspan - 1, col, col + colspan - 1,
+								  spacer->tqalignment() );
     }
     return spacer;
 }
@@ -2143,9 +2143,9 @@ TQWidget *Resource::createSpacer( const TQDomElement &e, TQWidget *parent, TQLay
 */
 void Resource::setObjectProperty( TQObject* obj, const TQString &prop, const TQDomElement &e )
 {
-    const TQMetaProperty *p = obj->metaObject()->property( obj->metaObject()->findProperty( prop, TRUE ), TRUE );
+    const TQMetaProperty *p = obj->tqmetaObject()->property( obj->tqmetaObject()->tqfindProperty( prop, TRUE ), TRUE );
 
-    if ( !::qt_cast<TQLayout*>(obj)  ) {// no layouts in metadatabase... (RS)
+    if ( !::tqqt_cast<TQLayout*>(obj)  ) {// no tqlayouts in metadatabase... (RS)
 	if ( obj->inherits( "CustomWidget" ) ) {
 	    MetaDataBase::CustomWidget *cw = ( (CustomWidget*)obj )->customWidget();
 	    if ( cw && !cw->hasProperty( prop.latin1() ) && !p && prop != "toolTip" && prop != "whatsThis" )
@@ -2156,9 +2156,9 @@ void Resource::setObjectProperty( TQObject* obj, const TQString &prop, const TQD
 
     TQVariant defVarient;
     if ( e.tagName() == "font" ) {
-	TQFont f( qApp->font() );
-	if ( obj->isWidgetType() && ( (TQWidget*)obj )->parentWidget() )
-	    f = ( (TQWidget*)obj )->parentWidget()->font();
+	TQFont f( tqApp->font() );
+	if ( obj->isWidgetType() && ( (TQWidget*)obj )->tqparentWidget() )
+	    f = ( (TQWidget*)obj )->tqparentWidget()->font();
 	defVarient = TQVariant( f );
     }
 
@@ -2187,7 +2187,7 @@ void Resource::setObjectProperty( TQObject* obj, const TQString &prop, const TQD
     if ( !p ) {
 	MetaDataBase::setFakeProperty( obj, prop, v );
 	if ( obj->isWidgetType() ) {
-	    if ( prop == "database" && obj != toplevel ) {
+	    if ( prop == "database" && TQT_TQOBJECT(obj) != TQT_TQOBJECT(toplevel) ) {
 		TQStringList lst = MetaDataBase::fakeProperty( obj, "database" ).toStringList();
 		if ( lst.count() > 2 )
 		    dbControls.insert( obj->name(), lst[ 2 ] );
@@ -2241,32 +2241,32 @@ void Resource::setObjectProperty( TQObject* obj, const TQString &prop, const TQD
     }
     if ( prop == "icon" ) {
 	formwindow->setIcon( v.toPixmap() );
-	TQString pmk = MetaDataBase::pixmapKey( formwindow, v.toPixmap().serialNumber() );
-	MetaDataBase::setPixmapKey( formwindow,
+	TQString pmk = MetaDataBase::pixmapKey( TQT_TQOBJECT(formwindow), v.toPixmap().serialNumber() );
+	MetaDataBase::setPixmapKey( TQT_TQOBJECT(formwindow),
 				    formwindow->icon()->serialNumber(), pmk );
     }
 
     if ( prop == "geometry" ) {
-	if ( obj == toplevel ) {
+	if ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(toplevel) ) {
 	    hadGeometry = TRUE;
 	    toplevel->resize( v.toRect().size() );
 	    return;
-	} else if ( obj == formwindow->mainContainer() ) {
+	} else if ( TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(formwindow->mainContainer()) ) {
 	    hadGeometry = TRUE;
 	    formwindow->resize( v.toRect().size() );
 	    return;
 	}
     }
 
-    if ( ::qt_cast<TQLayout*>(obj) ) {
+    if ( ::tqqt_cast<TQLayout*>(obj) ) {
 	if ( prop == "spacing" ) {
-	    MetaDataBase::setSpacing( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( (TQLayout*)obj ) ), v.toInt() );
+	    MetaDataBase::setSpacing( TQT_TQOBJECT( WidgetFactory::containerOfWidget( WidgetFactory::tqlayoutParent( (TQLayout*)(obj) ) ) ), v.toInt() );
 	    return;
 	} else if ( prop == "margin" ) {
-	    MetaDataBase::setMargin( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( (TQLayout*)obj ) ), v.toInt() );
+	    MetaDataBase::setMargin( TQT_TQOBJECT( WidgetFactory::containerOfWidget( WidgetFactory::tqlayoutParent( (TQLayout*)(obj) ) ) ), v.toInt() );
 	    return;
 	} else if ( e.tagName() == "enum" &&  prop == "resizeMode" ) {
-	    MetaDataBase::setResizeMode( WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( (TQLayout*)obj ) ), v.toString() );
+	    MetaDataBase::setResizeMode( TQT_TQOBJECT( WidgetFactory::containerOfWidget( WidgetFactory::tqlayoutParent( (TQLayout*)(obj) ) ) ), v.toString() );
 	    return;
 	}
     }
@@ -2274,10 +2274,10 @@ void Resource::setObjectProperty( TQObject* obj, const TQString &prop, const TQD
     if ( prop == "name" ) {
 	if ( pasting ) {
 	    TQString s = v.toString();
-	    formwindow->unify( (TQWidget*)obj, s, TRUE );
+	    formwindow->unify( TQT_TQOBJECT(obj), s, TRUE );
 	    obj->setName( s );
 	    return;
-	} else if ( formwindow && obj == formwindow->mainContainer() ) {
+	} else if ( formwindow && TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(formwindow->mainContainer()) ) {
 	    formwindow->setName( v.toCString() );
 	}
     }
@@ -2335,9 +2335,9 @@ void Resource::saveImageData( const TQImage &img, TQTextStream &ts, int indent )
     TQByteArray bazip = ba;
     int i = 0;
     if (compress) {
-	bazip = qCompress( ba );
+	bazip = tqCompress( ba );
 	format += ".GZ";
-	// The first 4 bytes in qCompress() are the length of the unzipped
+	// The first 4 bytes in tqCompress() are the length of the unzipped
 	// format. The XPM.GZ format does not use these.
 	i = 4;
     }
@@ -2397,14 +2397,14 @@ static TQImage loadImageData( TQDomElement &n2 )
 	ulong len = n2.attribute( "length" ).toULong();
 	if ( len < data.length() * 5 )
 	    len = data.length() * 5;
-	// qUncompress() expects the first 4 bytes to be the expected length of
+	// tqUncompress() expects the first 4 bytes to be the expected length of
 	// the uncompressed data
 	ba[0] = ( len & 0xff000000 ) >> 24;
 	ba[1] = ( len & 0x00ff0000 ) >> 16;
 	ba[2] = ( len & 0x0000ff00 ) >> 8;
 	ba[3] = ( len & 0x000000ff );
-	TQByteArray baunzip = qUncompress( ba, baSize );
-	img.loadFromData( (const uchar*)baunzip.data(), baunzip.size(), format.left(format.find('.')) );
+	TQByteArray baunzip = tqUncompress( ba, baSize );
+	img.loadFromData( (const uchar*)baunzip.data(), baunzip.size(), format.left(format.tqfind('.')) );
     }  else {
 	img.loadFromData( (const uchar*)ba+lengthOffset, baSize-lengthOffset, format );
     }
@@ -2443,7 +2443,7 @@ TQImage Resource::loadFromCollection( const TQString &name )
 
 void Resource::saveConnections( TQTextStream &ts, int indent )
 {
-    TQValueList<MetaDataBase::Connection> connections = MetaDataBase::connections( formwindow );
+    TQValueList<MetaDataBase::Connection> connections = MetaDataBase::connections( TQT_TQOBJECT(formwindow) );
     if ( connections.isEmpty() )
 	return;
     ts << makeIndent( indent ) << "<connections>" << endl;
@@ -2451,13 +2451,13 @@ void Resource::saveConnections( TQTextStream &ts, int indent )
     TQValueList<MetaDataBase::Connection>::Iterator it = connections.begin();
     for ( ; it != connections.end(); ++it ) {
 	MetaDataBase::Connection conn = *it;
-	if ( ( knownNames.findIndex( TQString( conn.sender->name() ) ) == -1 &&
+	if ( ( knownNames.tqfindIndex( TQString( conn.sender->name() ) ) == -1 &&
 	       qstrcmp( conn.sender->name(), "this" ) != 0 ) ||
-	     ( knownNames.findIndex( TQString( conn.receiver->name() ) ) == -1 &&
+	     ( knownNames.tqfindIndex( TQString( conn.receiver->name() ) ) == -1 &&
 	       qstrcmp( conn.receiver->name(), "this" ) != 0 ) )
 	    continue;
-	if ( formwindow->isMainContainer( (TQWidget*)(*it).receiver ) &&
-	     !MetaDataBase::hasSlot( formwindow, MetaDataBase::normalizeFunction( (*it).slot ).latin1() ) )
+	if ( formwindow->isMainContainer( TQT_TQOBJECT((*it).receiver) ) &&
+	     !MetaDataBase::hasSlot( TQT_TQOBJECT(formwindow), MetaDataBase::normalizeFunction( (*it).slot ).latin1() ) )
 	    continue;
 
 	if ( conn.sender->inherits( "CustomWidget" ) ) {
@@ -2500,7 +2500,7 @@ void Resource::loadConnections( const TQDomElement &e )
 		    conn.sender = 0;
 		    TQString name = n2.firstChild().toText().data();
 		    if ( name == "this" || qstrcmp( toplevel->name(), name ) == 0 ) {
-			conn.sender = toplevel;
+			conn.sender = TQT_TQOBJECT(toplevel);
 		    } else {
 			if ( name == "this" )
 			    name = toplevel->name();
@@ -2520,7 +2520,7 @@ void Resource::loadConnections( const TQDomElement &e )
 		    conn.receiver = 0;
 		    TQString name = n2.firstChild().toText().data();
 		    if ( name == "this" || qstrcmp( toplevel->name(), name ) == 0 ) {
-			conn.receiver = toplevel;
+			conn.receiver = TQT_TQOBJECT(toplevel);
 		    } else {
 			TQObjectList *l = toplevel->queryList( 0, name, FALSE );
 			if ( l ) {
@@ -2538,14 +2538,14 @@ void Resource::loadConnections( const TQDomElement &e )
 		n2 = n2.nextSibling().toElement();
 	    }
 	    if ( formwindow ) {
-		if ( conn.sender == formwindow )
-		    conn.sender = formwindow->mainContainer();
-		if ( conn.receiver == formwindow )
-		    conn.receiver = formwindow->mainContainer();
+		if ( TQT_BASE_OBJECT(conn.sender) == TQT_BASE_OBJECT(formwindow) )
+		    conn.sender = TQT_TQOBJECT(formwindow->mainContainer());
+		if ( TQT_BASE_OBJECT(conn.receiver) == TQT_BASE_OBJECT(formwindow) )
+		    conn.receiver = TQT_TQOBJECT(formwindow->mainContainer());
 	    }
 	    if ( conn.sender && conn.receiver ) {
 		if ( lang == "C++" ) {
-		    MetaDataBase::addConnection( formwindow ? formwindow : toplevel,
+		    MetaDataBase::addConnection( TQT_TQOBJECT(formwindow ? formwindow : toplevel),
 						 conn.sender, conn.signal, conn.receiver, conn.slot );
 		}
 	    }
@@ -2562,11 +2562,11 @@ void Resource::loadConnections( const TQDomElement &e )
 	    if ( slot.returnType.isEmpty() )
 		slot.returnType = "void";
 	    slot.function = n.firstChild().toText().data();
-	    if ( !MetaDataBase::hasFunction( formwindow, slot.function, TRUE ) )
-		MetaDataBase::addFunction( formwindow, slot.function, slot.specifier,
+	    if ( !MetaDataBase::hasFunction( TQT_TQOBJECT(formwindow), slot.function, TRUE ) )
+		MetaDataBase::addFunction( TQT_TQOBJECT(formwindow), slot.function, slot.specifier,
 				       slot.access, "slot", slot.language, slot.returnType );
 	    else
-		MetaDataBase::changeFunctionAttributes( formwindow, slot.function, slot.function,
+		MetaDataBase::changeFunctionAttributes( TQT_TQOBJECT(formwindow), slot.function, slot.function,
 							slot.specifier, slot.access,
 							"slot", slot.language, slot.returnType );
 	}
@@ -2581,7 +2581,7 @@ void Resource::saveCustomWidgets( TQTextStream &ts, int indent )
 
     TQPtrList<MetaDataBase::CustomWidget> *lst = MetaDataBase::customWidgets();
     for ( MetaDataBase::CustomWidget *w = lst->first(); w; w = lst->next() ) {
-	if ( usedCustomWidgets.findIndex( w->className ) == -1 )
+	if ( usedCustomWidgets.tqfindIndex( w->className ) == -1 )
 	    continue;
 	ts << makeIndent( indent ) << "<customwidget>" << endl;
 	indent++;
@@ -2591,8 +2591,8 @@ void Resource::saveCustomWidgets( TQTextStream &ts, int indent )
 	   << "\">" << w->includeFile << "</header>" << endl;
 	ts << makeIndent( indent ) << "<sizehint>" << endl;
 	indent++;
-	ts << makeIndent( indent ) << "<width>" << w->sizeHint.width() << "</width>" << endl;
-	ts << makeIndent( indent ) << "<height>" << w->sizeHint.height() << "</height>" << endl;
+	ts << makeIndent( indent ) << "<width>" << w->tqsizeHint.width() << "</width>" << endl;
+	ts << makeIndent( indent ) << "<height>" << w->tqsizeHint.height() << "</height>" << endl;
 	indent--;
 	ts << makeIndent( indent ) << "</sizehint>" << endl;
 	ts << makeIndent( indent ) << "<container>" << (int)w->isContainer << "</container>" << endl;
@@ -2648,9 +2648,9 @@ void Resource::loadCustomWidgets( const TQDomElement &e, Resource *r )
 		    TQDomElement n3 = n2.firstChild().toElement();
 		    while ( !n3.isNull() ) {
 			if ( n3.tagName() == "width" )
-			    w->sizeHint.setWidth( n3.firstChild().toText().data().toInt() );
+			    w->tqsizeHint.setWidth( n3.firstChild().toText().data().toInt() );
 			else if ( n3.tagName() == "height" )
-			    w->sizeHint.setHeight( n3.firstChild().toText().data().toInt() );
+			    w->tqsizeHint.setHeight( n3.firstChild().toText().data().toInt() );
 			n3 = n3.nextSibling().toElement();
 		    }
 		} else if ( n2.tagName() == "sizepolicy" ) {
@@ -2716,7 +2716,7 @@ void Resource::saveTabOrder( TQTextStream &ts, int indent )
     indent++;
 
     for ( TQWidget *w = l.first(); w; w = l.next() ) {
-	if ( w->testWState( Qt::WState_ForceHide ) || knownNames.findIndex( w->name() ) == -1 )
+	if ( w->testWState( TQt::WState_ForceHide ) || knownNames.tqfindIndex( w->name() ) == -1 )
 	    continue;
 	ts << makeIndent( indent ) << "<tabstop>" << w->name() << "</tabstop>" << endl;
     }
@@ -2756,7 +2756,7 @@ void Resource::loadTabOrder( const TQDomElement &e )
 
 void Resource::saveMetaInfoBefore( TQTextStream &ts, int indent )
 {
-    MetaDataBase::MetaInfo info = MetaDataBase::metaInfo( formwindow );
+    MetaDataBase::MetaInfo info = MetaDataBase::metaInfo( TQT_TQOBJECT(formwindow) );
     TQString cn;
     if ( info.classNameChanged && !info.className.isEmpty() )
 	cn = info.className;
@@ -2771,9 +2771,9 @@ void Resource::saveMetaInfoBefore( TQTextStream &ts, int indent )
 
 void Resource::saveMetaInfoAfter( TQTextStream &ts, int indent )
 {
-    MetaDataBase::MetaInfo info = MetaDataBase::metaInfo( formwindow );
+    MetaDataBase::MetaInfo info = MetaDataBase::metaInfo( TQT_TQOBJECT(formwindow) );
     if ( !langIface || formwindow->project()->isCpp() ) {
-	TQValueList<MetaDataBase::Include> includes = MetaDataBase::includes( formwindow );
+	TQValueList<MetaDataBase::Include> includes = MetaDataBase::includes( TQT_TQOBJECT(formwindow) );
 	TQString extensionInclude;
 	bool needExtensionInclude = FALSE;
 	if ( langIface &&
@@ -2800,7 +2800,7 @@ void Resource::saveMetaInfoAfter( TQTextStream &ts, int indent )
 	    ts << makeIndent( indent ) << "</includes>" << endl;
 	}
 
-	TQStringList forwards = MetaDataBase::forwards( formwindow );
+	TQStringList forwards = MetaDataBase::forwards( TQT_TQOBJECT(formwindow) );
 	if ( !forwards.isEmpty() ) {
 	    ts << makeIndent( indent ) << "<forwards>" << endl;
 	    indent++;
@@ -2809,7 +2809,7 @@ void Resource::saveMetaInfoAfter( TQTextStream &ts, int indent )
 	    indent--;
 	    ts << makeIndent( indent ) << "</forwards>" << endl;
 	}
-	TQValueList<MetaDataBase::Variable> varLst = MetaDataBase::variables( formwindow );
+	TQValueList<MetaDataBase::Variable> varLst = MetaDataBase::variables( TQT_TQOBJECT(formwindow) );
 	if ( !varLst.isEmpty() ) {
 	    ts << makeIndent( indent ) << "<variables>" << endl;
 	    indent++;
@@ -2825,7 +2825,7 @@ void Resource::saveMetaInfoAfter( TQTextStream &ts, int indent )
 	    indent--;
 	    ts << makeIndent( indent ) << "</variables>" << endl;
 	}
-	TQStringList sigs = MetaDataBase::signalList( formwindow );
+	TQStringList sigs = MetaDataBase::signalList( TQT_TQOBJECT(formwindow) );
 	if ( !sigs.isEmpty() ) {
 	    ts << makeIndent( indent ) << "<signals>" << endl;
 	    indent++;
@@ -2835,7 +2835,7 @@ void Resource::saveMetaInfoAfter( TQTextStream &ts, int indent )
 	    ts << makeIndent( indent ) << "</signals>" << endl;
 	}
 
-	TQValueList<MetaDataBase::Function> slotList = MetaDataBase::slotList( formwindow );
+	TQValueList<MetaDataBase::Function> slotList = MetaDataBase::slotList( TQT_TQOBJECT(formwindow) );
 	if ( !slotList.isEmpty() ) {
 	    ts << makeIndent( indent ) << "<slots>" << endl;
 	    indent++;
@@ -2858,7 +2858,7 @@ void Resource::saveMetaInfoAfter( TQTextStream &ts, int indent )
 	    ts << makeIndent( indent ) << "</slots>" << endl;
 	}
 
-	TQValueList<MetaDataBase::Function> functionList = MetaDataBase::functionList( formwindow, TRUE );
+	TQValueList<MetaDataBase::Function> functionList = MetaDataBase::functionList( TQT_TQOBJECT(formwindow), TRUE );
 	if ( !functionList.isEmpty() ) {
 	    ts << makeIndent( indent ) << "<functions>" << endl;
 	    indent++;
@@ -2888,19 +2888,19 @@ void Resource::saveMetaInfoAfter( TQTextStream &ts, int indent )
 	ts << makeIndent( indent ) << "<pixmapinproject/>" << endl;
     else
 	ts << makeIndent( indent ) << "<pixmapfunction>" << formwindow->pixmapLoaderFunction() << "</pixmapfunction>" << endl;
-    if ( !( exportMacro = MetaDataBase::exportMacro( formwindow->mainContainer() ) ).isEmpty() )
+    if ( !( exportMacro = MetaDataBase::exportMacro( TQT_TQOBJECT(formwindow->mainContainer()) ) ).isEmpty() )
 	ts << makeIndent( indent ) << "<exportmacro>" << exportMacro << "</exportmacro>" << endl;
     if ( formwindow ) {
-	ts << makeIndent( indent ) << "<layoutdefaults spacing=\"" << formwindow->layoutDefaultSpacing()
-	   << "\" margin=\"" << formwindow->layoutDefaultMargin() << "\"/>" << endl;
+	ts << makeIndent( indent ) << "<tqlayoutdefaults spacing=\"" << formwindow->tqlayoutDefaultSpacing()
+	   << "\" margin=\"" << formwindow->tqlayoutDefaultMargin() << "\"/>" << endl;
 	if ( formwindow->hasLayoutFunctions() ) {
 	    TQString s = "";
 	    TQString m = "";
 	    if ( !formwindow->spacingFunction().isEmpty() )
-		s = TQString( " spacing=\"%1\"" ).arg( formwindow->spacingFunction() );
+		s = TQString( " spacing=\"%1\"" ).tqarg( formwindow->spacingFunction() );
 	    if ( !formwindow->marginFunction().isEmpty() )
-		m = TQString( " margin=\"%1\"" ).arg( formwindow->marginFunction() );
-	    ts << makeIndent( indent ) << "<layoutfunctions" << s << m << "/>" << endl;
+		m = TQString( " margin=\"%1\"" ).tqarg( formwindow->marginFunction() );
+	    ts << makeIndent( indent ) << "<tqlayoutfunctions" << s << m << "/>" << endl;
 	}
     }
 }
@@ -2938,16 +2938,17 @@ TQColorGroup Resource::loadColorGroup( const TQDomElement &e )
 
 void Resource::saveChildActions( TQAction *a, TQTextStream &ts, int indent )
 {
-    if ( !a->children() )
+    TQObjectList clo = a->childrenListObject();
+    if ( clo.isEmpty() )
 	return;
-    TQObjectListIt it( *a->children() );
+    TQObjectListIt it( clo );
     while ( it.current() ) {
 	TQObject *o = it.current();
 	++it;
-	if ( !::qt_cast<TQAction*>(o) )
+	if ( !::tqqt_cast<TQAction*>(o) )
 	    continue;
 	TQAction *ac = (TQAction*)o;
-	bool isGroup = ::qt_cast<TQActionGroup*>(ac);
+	bool isGroup = ::tqqt_cast<TQActionGroup*>(ac);
 	if ( isGroup )
 	    ts << makeIndent( indent ) << "<actiongroup>" << endl;
 	else
@@ -2976,7 +2977,7 @@ void Resource::saveActions( const TQPtrList<TQAction> &actions, TQTextStream &ts
     TQPtrListIterator<TQAction> it( actions );
     while ( it.current() ) {
 	TQAction *a = it.current();
-	bool isGroup = ::qt_cast<TQActionGroup*>(a);
+	bool isGroup = ::tqqt_cast<TQActionGroup*>(a);
 	if ( isGroup )
 	    ts << makeIndent( indent ) << "<actiongroup>" << endl;
 	else
@@ -2999,12 +3000,12 @@ void Resource::saveActions( const TQPtrList<TQAction> &actions, TQTextStream &ts
     ts << makeIndent( indent ) << "</actions>" << endl;
 }
 
-void Resource::loadChildAction( TQObject *parent, const TQDomElement &e )
+void Resource::loadChildAction( TQObject *tqparent, const TQDomElement &e )
 {
     TQDomElement n = e;
     TQAction *a = 0;
     if ( n.tagName() == "action" ) {
-	a = new QDesignerAction( parent );
+	a = new TQDesignerAction( tqparent );
 	MetaDataBase::addEntry( a );
 	TQDomElement n2 = n.firstChild().toElement();
 	bool hasMenuText = FALSE;
@@ -3021,10 +3022,10 @@ void Resource::loadChildAction( TQObject *parent, const TQDomElement &e )
 	    }
 	    n2 = n2.nextSibling().toElement();
 	}
-	if ( !::qt_cast<TQAction*>(parent) )
+	if ( !::tqqt_cast<TQAction*>(tqparent) )
 	    formwindow->actionList().append( a );
     } else if ( n.tagName() == "actiongroup" ) {
-	a = new QDesignerActionGroup( parent );
+	a = new TQDesignerActionGroup( tqparent );
 	MetaDataBase::addEntry( a );
 	TQDomElement n2 = n.firstChild().toElement();
 	bool hasMenuText = FALSE;
@@ -3044,7 +3045,7 @@ void Resource::loadChildAction( TQObject *parent, const TQDomElement &e )
 	    }
 	    n2 = n2.nextSibling().toElement();
 	}
-	if ( !::qt_cast<TQAction*>(parent) )
+	if ( !::tqqt_cast<TQAction*>(tqparent) )
 	    formwindow->actionList().append( a );
     }
 }
@@ -3054,9 +3055,9 @@ void Resource::loadActions( const TQDomElement &e )
     TQDomElement n = e.firstChild().toElement();
     while ( !n.isNull() ) {
 	if ( n.tagName() == "action" ) {
-	    loadChildAction( formwindow, n );
+	    loadChildAction( TQT_TQOBJECT(formwindow), n );
 	} else if ( n.tagName() == "actiongroup" ) {
-	    loadChildAction( formwindow, n );
+	    loadChildAction( TQT_TQOBJECT(formwindow), n );
 	}
 	n = n.nextSibling().toElement();
     }
@@ -3068,8 +3069,8 @@ void Resource::saveToolBars( TQMainWindow *mw, TQTextStream &ts, int indent )
     indent++;
 
     TQPtrList<TQToolBar> tbList;
-    for ( int i = 0; i <= (int)Qt::DockMinimized; ++i ) {
-	tbList = mw->toolBars( (Qt::Dock)i );
+    for ( int i = 0; i <= (int)TQt::DockMinimized; ++i ) {
+	tbList = mw->toolBars( (TQt::Dock)i );
 	if ( tbList.isEmpty() )
 	    continue;
 	for ( TQToolBar *tb = tbList.first(); tb; tb = tbList.next() ) {
@@ -3077,23 +3078,23 @@ void Resource::saveToolBars( TQMainWindow *mw, TQTextStream &ts, int indent )
 		continue;
 	    ts << makeIndent( indent ) << "<toolbar dock=\"" << i << "\">" << endl;
 	    indent++;
-	    saveObjectProperties( tb, ts, indent );
-	    TQPtrList<TQAction> actionList = ( (QDesignerToolBar*)tb )->insertedActions();
+	    saveObjectProperties( TQT_TQOBJECT(tb), ts, indent );
+	    TQPtrList<TQAction> actionList = ( (TQDesignerToolBar*)tb )->insertedActions();
 	    for ( TQAction *a = actionList.first(); a; a = actionList.next() ) {
-		if ( ::qt_cast<QSeparatorAction*>(a) ) {
+		if ( ::tqqt_cast<TQSeparatorAction*>(a) ) {
 		    ts << makeIndent( indent ) << "<separator/>" << endl;
 		} else {
-		    if ( ::qt_cast<QDesignerAction*>(a) && !( (QDesignerAction*)a )->supportsMenu() ) {
-			TQWidget *w = ( (QDesignerAction*)a )->widget();
+		    if ( ::tqqt_cast<TQDesignerAction*>(a) && !( (TQDesignerAction*)a )->supportsMenu() ) {
+			TQWidget *w = ( (TQDesignerAction*)a )->widget();
 			ts <<  makeIndent( indent ) << "<widget class=\""
-			   << WidgetFactory::classNameOf( w ) << "\">" << endl;
+			   << WidgetFactory::classNameOf( TQT_TQOBJECT(w) ) << "\">" << endl;
 			indent++;
-			const char *className = WidgetFactory::classNameOf( w );
+			const char *className = WidgetFactory::classNameOf( TQT_TQOBJECT(w) );
 			if ( w->isA( "CustomWidget" ) )
 			    usedCustomWidgets << TQString( className );
-			if ( WidgetFactory::hasItems( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( w ) ), w ) )
-			    saveItems( w, ts, indent );
-			saveObjectProperties( w, ts, indent );
+			if ( WidgetFactory::hasItems( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(w) ) ), TQT_TQOBJECT(w) ) )
+			    saveItems( TQT_TQOBJECT(w), ts, indent );
+			saveObjectProperties( TQT_TQOBJECT(w), ts, indent );
 			indent--;
 			ts << makeIndent( indent ) << "</widget>" << endl;
 		    } else {
@@ -3116,8 +3117,8 @@ void Resource::saveMenuBar( TQMainWindow *mw, TQTextStream &ts, int indent )
 	return;
     ts << makeIndent( indent ) << "<menubar>" << endl;
     indent++;
-    MetaDataBase::setPropertyChanged( mb, "name", TRUE ); // FIXME: remove
-    saveObjectProperties( mb, ts, indent );
+    MetaDataBase::setPropertyChanged( TQT_TQOBJECT(mb), "name", TRUE ); // FIXME: remove
+    saveObjectProperties( TQT_TQOBJECT(mb), ts, indent );
 
     for ( int i = 0; i < (int)mb->count(); ++i ) {
 	MenuBarEditorItem *m = mb->item( i );
@@ -3142,11 +3143,11 @@ void Resource::savePopupMenu( PopupMenuEditor *pm, TQMainWindow *mw, TQTextStrea
 {
     for ( PopupMenuEditorItem *i = pm->items()->first(); i; i = pm->items()->next() ) {
 	TQAction *a = i->action();
-	if ( ::qt_cast<QSeparatorAction*>(a) )
+	if ( ::tqqt_cast<TQSeparatorAction*>(a) )
 	    ts <<  makeIndent( indent ) << "<separator/>" << endl;
-	else if ( ::qt_cast<QDesignerAction*>(a) )
+	else if ( ::tqqt_cast<TQDesignerAction*>(a) )
 	    ts <<  makeIndent( indent ) << "<action name=\"" << a->name() << "\"/>" << endl;
-	else if  ( ::qt_cast<QDesignerActionGroup*>(a) )
+	else if  ( ::tqqt_cast<TQDesignerActionGroup*>(a) )
 	    ts <<  makeIndent( indent ) << "<actiongroup name=\"" << a->name() << "\"/>" << endl;
 	PopupMenuEditor *s =  i->subMenu();
 	if ( s && s->count() ) {
@@ -3167,11 +3168,11 @@ void Resource::loadToolBars( const TQDomElement &e )
 {
     TQDomElement n = e.firstChild().toElement();
     TQMainWindow *mw = ( (TQMainWindow*)formwindow->mainContainer() );
-    QDesignerToolBar *tb = 0;
+    TQDesignerToolBar *tb = 0;
     while ( !n.isNull() ) {
 	if ( n.tagName() == "toolbar" ) {
-	    Qt::Dock dock = (Qt::Dock)n.attribute( "dock" ).toInt();
-	    tb = new QDesignerToolBar( mw, dock );
+	    TQt::Dock dock = (TQt::Dock)n.attribute( "dock" ).toInt();
+	    tb = new TQDesignerToolBar( mw, dock );
 	    TQDomElement n2 = n.firstChild().toElement();
 	    while ( !n2.isNull() ) {
 		if ( n2.tagName() == "action" ) {
@@ -3181,17 +3182,17 @@ void Resource::loadToolBars( const TQDomElement &e )
 			tb->addAction( a );
 		    }
 		} else if ( n2.tagName() == "separator" ) {
-		    TQAction *a = new QSeparatorAction( 0 );
+		    TQAction *a = new TQSeparatorAction( 0 );
 		    a->addTo( tb );
 		    tb->addAction( a );
 		} else if ( n2.tagName() == "widget" ) {
 		    TQWidget *w = (TQWidget*)createObject( n2, tb );
-		    QDesignerAction *a = new QDesignerAction( w, tb );
+		    TQDesignerAction *a = new TQDesignerAction( w, TQT_TQOBJECT(tb) );
 		    a->addTo( tb );
 		    tb->addAction( a );
 		    tb->installEventFilters( w );
 		} else if ( n2.tagName() == "property" ) {
-		    setObjectProperty( tb, n2.attribute( "name" ), n2.firstChild().toElement() );
+		    setObjectProperty( TQT_TQOBJECT(tb), n2.attribute( "name" ), n2.firstChild().toElement() );
 		}
 		n2 = n2.nextSibling().toElement();
 	    }
@@ -3205,16 +3206,16 @@ void Resource::loadMenuBar( const TQDomElement &e )
     TQDomElement n = e.firstChild().toElement();
     TQMainWindow *mw = (TQMainWindow*)formwindow->mainContainer();
     MenuBarEditor *mb = new MenuBarEditor( formwindow, mw );
-    MetaDataBase::addEntry( mb );
+    MetaDataBase::addEntry( TQT_TQOBJECT(mb) );
     while ( !n.isNull() ) {
 	if ( n.tagName() == "item" ) {
 	    PopupMenuEditor * popup = new PopupMenuEditor( formwindow, mw );
 	    loadPopupMenu( popup, n );
 	    popup->setName( n.attribute( "name" ) );
 	    mb->insertItem( n.attribute( "text" ), popup );
-	    MetaDataBase::addEntry( popup );
+	    MetaDataBase::addEntry( TQT_TQOBJECT(popup) );
 	} else if ( n.tagName() == "property" ) {
-	    setObjectProperty( mb, n.attribute( "name" ), n.firstChild().toElement() );
+	    setObjectProperty( TQT_TQOBJECT(mb), n.attribute( "name" ), n.firstChild().toElement() );
 	} else if ( n.tagName() == "separator" ) {
 	    mb->insertSeparator();
 	}
@@ -3224,7 +3225,7 @@ void Resource::loadMenuBar( const TQDomElement &e )
 
 void Resource::loadPopupMenu( PopupMenuEditor *p, const TQDomElement &e )
 {
-    MetaDataBase::addEntry( p );
+    MetaDataBase::addEntry( TQT_TQOBJECT(p) );
     TQDomElement n = e.firstChild().toElement();
     TQAction *a = 0;
     while ( !n.isNull() ) {
@@ -3234,7 +3235,7 @@ void Resource::loadPopupMenu( PopupMenuEditor *p, const TQDomElement &e )
 		p->insert( a );
 	}
 	if ( n.tagName() == "item" ) {
-	    PopupMenuEditorItem *i = p->at( p->find( a ) );
+	    PopupMenuEditorItem *i = p->at( p->tqfind( a ) );
 	    if ( i ) {
 		TQString name = n.attribute( "name" );
 		formwindow->unify( i, name, TRUE );
@@ -3243,7 +3244,7 @@ void Resource::loadPopupMenu( PopupMenuEditor *p, const TQDomElement &e )
 		loadPopupMenu( i->subMenu(), n );
 	    }
 	} else if ( n.tagName() == "separator" ) {
-	    a = new QSeparatorAction( 0 );
+	    a = new TQSeparatorAction( 0 );
 	    p->insert( a );
 	}
 	n = n.nextSibling().toElement();
@@ -3265,7 +3266,7 @@ bool Resource::saveFormCode( FormFile *formfile, LanguageInterface * /*langIface
 void Resource::loadExtraSource( FormFile *formfile, const TQString &currFileName,
 				LanguageInterface *langIface, bool hasFunctions )
 {
-    TQString lang = "Qt Script";
+    TQString lang = "TQt Script";
     if ( MainWindow::self )
 	lang = MainWindow::self->currProject()->language();
     LanguageInterface *iface = langIface;
@@ -3309,7 +3310,7 @@ void Resource::loadExtraSource( FormFile *formfile, const TQString &currFileName
 					      (TQObject*)formfile,
 					      (*fit).name,
 					      (*fit).name,
-					      TQString::null );
+					      TQString() );
 	} else {
 	    TQString access = (*fit).access;
 	    if ( access.isEmpty() )
diff --git a/kdevdesigner/designer/resource.h b/kdevdesigner/designer/resource.h
index 4d448644..0617d977 100644
--- a/kdevdesigner/designer/resource.h
+++ b/kdevdesigner/designer/resource.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -44,7 +44,7 @@ class TQPalette;
 class FormWindow;
 class MainWindow;
 class TQDomElement;
-class QDesignerGridLayout;
+class TQDesignerGridLayout;
 class TQListViewItem;
 class TQMainWindow;
 struct LanguageInterface;
@@ -77,7 +77,7 @@ public:
 
     bool save( const TQString& filename, bool formCodeOnly = FALSE);
     bool save( TQIODevice* );
-    void paste( const TQString &cb, TQWidget *parent );
+    void paste( const TQString &cb, TQWidget *tqparent );
 
     static void saveImageData( const TQImage &img, TQTextStream &ts, int indent );
     static void loadCustomWidgets( const TQDomElement &e, Resource *r );
@@ -86,7 +86,7 @@ public:
     static bool saveFormCode( FormFile *formfile, LanguageInterface *langIface );
 
 private:
-    void saveObject( TQObject *obj, QDesignerGridLayout* grid, TQTextStream &ts, int indent );
+    void saveObject( TQObject *obj, TQDesignerGridLayout* grid, TQTextStream &ts, int indent );
     void saveChildrenOf( TQObject* obj, TQTextStream &ts, int indent );
     void saveObjectProperties( TQObject *w, TQTextStream &ts, int indent );
     void saveSetProperty( TQObject *w, const TQString &name, TQVariant::Type t, TQTextStream &ts, int indent );
@@ -111,8 +111,8 @@ private:
     void saveMenuBar( TQMainWindow *mw, TQTextStream &ts, int indent );
     void savePopupMenu( PopupMenuEditor *pm, TQMainWindow *mw, TQTextStream &ts, int indent );
 
-    TQObject *createObject( const TQDomElement &e, TQWidget *parent, TQLayout* layout = 0 );
-    TQWidget *createSpacer( const TQDomElement &e, TQWidget *parent, TQLayout *layout, Qt::Orientation o );
+    TQObject *createObject( const TQDomElement &e, TQWidget *tqparent, TQLayout* tqlayout = 0 );
+    TQWidget *createSpacer( const TQDomElement &e, TQWidget *tqparent, TQLayout *tqlayout, Qt::Orientation o );
     void createItem( const TQDomElement &e, TQWidget *widget, TQListViewItem *i = 0 );
     void createColumn( const TQDomElement &e, TQWidget *widget );
     void setObjectProperty( TQObject* widget, const TQString &prop, const TQDomElement &e);
@@ -125,7 +125,7 @@ private:
     void loadTabOrder( const TQDomElement &e );
     void loadItem( const TQDomElement &n, TQPixmap &pix, TQString &txt, bool &hasPixmap );
     void loadActions( const TQDomElement &n );
-    void loadChildAction( TQObject *parent, const TQDomElement &e );
+    void loadChildAction( TQObject *tqparent, const TQDomElement &e );
     void loadToolBars( const TQDomElement &n );
     void loadMenuBar( const TQDomElement &n );
     void loadPopupMenu( PopupMenuEditor *pm, const TQDomElement &e );
diff --git a/kdevdesigner/designer/richtextfontdialog.ui b/kdevdesigner/designer/richtextfontdialog.ui
index c55343ad..ae93f58c 100644
--- a/kdevdesigner/designer/richtextfontdialog.ui
+++ b/kdevdesigner/designer/richtextfontdialog.ui
@@ -25,7 +25,7 @@
 ** not clear to you.
 **
 *********************************************************************</comment>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>RichTextFontDialog</cstring>
     </property>
@@ -53,7 +53,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QLayoutWidget" row="0" column="0">
+        <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
                 <cstring>Layout6</cstring>
             </property>
@@ -67,7 +67,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QComboBox" row="0" column="1" rowspan="1" colspan="2">
+                <widget class="TQComboBox" row="0" column="1" rowspan="1" colspan="2">
                     <item>
                         <property name="text">
                             <string>default</string>
@@ -77,7 +77,7 @@
                         <cstring>fontCombo</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="0" column="0">
+                <widget class="TQLabel" row="0" column="0">
                     <property name="name">
                         <cstring>TextLabel1_2</cstring>
                     </property>
@@ -88,7 +88,7 @@
                         <cstring>fontCombo</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="1" column="0">
+                <widget class="TQLabel" row="1" column="0">
                     <property name="name">
                         <cstring>TextLabel2</cstring>
                     </property>
@@ -109,14 +109,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QLabel" row="2" column="0">
+                <widget class="TQLabel" row="2" column="0">
                     <property name="name">
                         <cstring>TextLabel1</cstring>
                     </property>
@@ -127,7 +127,7 @@
                         <cstring>colorButton</cstring>
                     </property>
                 </widget>
-                <widget class="QComboBox" row="1" column="1" rowspan="1" colspan="2">
+                <widget class="TQComboBox" row="1" column="1" rowspan="1" colspan="2">
                     <item>
                         <property name="text">
                             <string>0</string>
@@ -183,7 +183,7 @@
                         <enum>AtTop</enum>
                     </property>
                 </widget>
-                <widget class="QToolButton" row="2" column="1">
+                <widget class="TQToolButton" row="2" column="1">
                     <property name="name">
                         <cstring>colorButton</cstring>
                     </property>
@@ -195,7 +195,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>40</width>
                             <height>20</height>
@@ -227,7 +227,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
@@ -248,7 +248,7 @@
                 <enum>Horizontal</enum>
             </property>
         </widget>
-        <widget class="QLayoutWidget" row="3" column="0">
+        <widget class="TQLayoutWidget" row="3" column="0">
             <property name="name">
                 <cstring>Layout15</cstring>
             </property>
@@ -272,14 +272,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>okButton</cstring>
                     </property>
@@ -287,7 +287,7 @@
                         <string>&amp;OK</string>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>cancelButton</cstring>
                     </property>
@@ -334,14 +334,14 @@
     <variable>QColor color</variable>
     <variable>QString size</variable>
 </variables>
-<slots>
+<Q_SLOTS>
     <slot>init()</slot>
     <slot>selectColor()</slot>
     <slot>accept()</slot>
     <slot>reject()</slot>
-    <slot returnType="QString">getSize()</slot>
-    <slot returnType="QString">getColor()</slot>
-    <slot returnType="QString">getFont()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+    <slot returnType="TQString">getSize()</slot>
+    <slot returnType="TQString">getColor()</slot>
+    <slot returnType="TQString">getFont()</slot>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kdevdesigner/designer/richtextfontdialog.ui.h b/kdevdesigner/designer/richtextfontdialog.ui.h
index d270b7d9..263b5f90 100644
--- a/kdevdesigner/designer/richtextfontdialog.ui.h
+++ b/kdevdesigner/designer/richtextfontdialog.ui.h
@@ -1,7 +1,7 @@
 /****************************************************************************
 ** ui.h extension file, included from the uic-generated form implementation.
 **
-** If you wish to add, delete or rename slots use Qt Designer which will
+** If you wish to add, delete or rename slots use TQt Designer which will
 ** update this file, preserving your code. Create an init() slot in place of
 ** a constructor, and a destroy() slot in place of a destructor.
 *****************************************************************************/
@@ -11,12 +11,12 @@
 void RichTextFontDialog::init()
 {
     TQFontDatabase *db = new TQFontDatabase();
-    fontCombo->insertStringList( db->families() );
+    fontCombo->insertStringList( db->tqfamilies() );
 }
 
 void RichTextFontDialog::selectColor()
 {
-    color = QColorDialog::getColor( "", this );   
+    color = TQColorDialog::getColor( "", this );   
     if( color.isValid() )
 	colorButton->setPaletteBackgroundColor( color );
 }
diff --git a/kdevdesigner/designer/sizehandle.cpp b/kdevdesigner/designer/sizehandle.cpp
index eef86747..42b1f665 100644
--- a/kdevdesigner/designer/sizehandle.cpp
+++ b/kdevdesigner/designer/sizehandle.cpp
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -35,8 +35,8 @@
 #include <tqlabel.h>
 #include <klocale.h>
 
-SizeHandle::SizeHandle( FormWindow *parent, Direction d, WidgetSelection *s )
-    : TQWidget( parent )
+SizeHandle::SizeHandle( FormWindow *tqparent, Direction d, WidgetSelection *s )
+    : TQWidget( tqparent )
 {
     active = TRUE;
     setBackgroundMode( active ? PaletteText : PaletteDark );
@@ -44,7 +44,7 @@ SizeHandle::SizeHandle( FormWindow *parent, Direction d, WidgetSelection *s )
     widget = 0;
     dir =d ;
     setMouseTracking( FALSE );
-    formWindow = parent;
+    formWindow = tqparent;
     sel = s;
     updateCursor();
 }
@@ -98,7 +98,7 @@ void SizeHandle::setWidget( TQWidget *w )
 
 void SizeHandle::paintEvent( TQPaintEvent * )
 {
-    if ( ( (FormWindow*)parentWidget() )->currentWidget() != widget )
+    if ( ( (FormWindow*)tqparentWidget() )->currentWidget() != widget )
 	return;
     TQPainter p( this );
     p.setPen( blue );
@@ -107,7 +107,7 @@ void SizeHandle::paintEvent( TQPaintEvent * )
 
 void SizeHandle::mousePressEvent( TQMouseEvent *e )
 {
-    if ( !widget || e->button() != LeftButton || !active )
+    if ( !widget || e->button() != Qt::LeftButton || !active )
 	return;
     oldPressPos = e->pos();
     geom = origGeom = TQRect( widget->pos(), widget->size() );
@@ -115,13 +115,13 @@ void SizeHandle::mousePressEvent( TQMouseEvent *e )
 
 void SizeHandle::mouseMoveEvent( TQMouseEvent *e )
 {
-    if ( !widget || ( e->state() & LeftButton ) != LeftButton || !active )
+    if ( !widget || ( e->state() & Qt::LeftButton ) != Qt::LeftButton || !active )
 	return;
     TQPoint rp = mapFromGlobal( e->globalPos() );
     TQPoint d = oldPressPos - rp;
     oldPressPos = rp;
-    TQPoint checkPos = widget->parentWidget()->mapFromGlobal( e->globalPos() );
-    TQRect pr = widget->parentWidget()->rect();
+    TQPoint checkPos = widget->tqparentWidget()->mapFromGlobal( e->globalPos() );
+    TQRect pr = widget->tqparentWidget()->rect();
 
     // ##### move code around a bit to reduce duplicated code here
     switch ( dir ) {
@@ -213,7 +213,7 @@ void SizeHandle::mouseMoveEvent( TQMouseEvent *e )
     sel->updateGeometry();
     oldPressPos += ( p - pos() );
 
-    formWindow->sizePreview()->setText( i18n( "%1/%2" ).arg( widget->width() ).arg( widget->height() ) );
+    formWindow->sizePreview()->setText( i18n( "%1/%2" ).tqarg( widget->width() ).tqarg( widget->height() ) );
     formWindow->sizePreview()->adjustSize();
     TQRect lg( formWindow->mapFromGlobal( e->globalPos() ) + TQPoint( 16, 16 ),
 	      formWindow->sizePreview()->size() );
@@ -221,55 +221,55 @@ void SizeHandle::mouseMoveEvent( TQMouseEvent *e )
     formWindow->sizePreview()->setGeometry( lg );
     formWindow->sizePreview()->show();
     formWindow->sizePreview()->raise();
-    if ( WidgetFactory::layoutType( widget ) != WidgetFactory::NoLayout )
+    if ( WidgetFactory::tqlayoutType( widget ) != WidgetFactory::NoLayout )
 	formWindow->updateChildSelections( widget );
 }
 
 void SizeHandle::mouseReleaseEvent( TQMouseEvent *e )
 {
-    if ( e->button() != LeftButton || !active )
+    if ( e->button() != Qt::LeftButton || !active )
 	return;
 
     formWindow->sizePreview()->hide();
-    if ( geom != widget->geometry() )
+    if ( geom != widget->tqgeometry() )
 	formWindow->commandHistory()->addCommand( new ResizeCommand( i18n( "Resize" ),
 								     formWindow,
 								     widget, origGeom,
-								     widget->geometry() ) );
-    formWindow->emitUpdateProperties( widget );
+								     widget->tqgeometry() ) );
+    formWindow->emitUpdateProperties( TQT_TQOBJECT(widget) );
 }
 
 void SizeHandle::trySetGeometry( TQWidget *w, int x, int y, int width, int height )
 {
-    int minw = QMAX( w->minimumSizeHint().width(), w->minimumSize().width() );
-    minw = QMAX( minw, 2 * formWindow->grid().x() );
-    int minh = QMAX( w->minimumSizeHint().height(), w->minimumSize().height() );
-    minh = QMAX( minh, 2 * formWindow->grid().y() );
-    if ( QMAX( minw, width ) > w->maximumWidth() ||
-	 QMAX( minh, height ) > w->maximumHeight() )
+    int minw = TQMAX( w->tqminimumSizeHint().width(), w->tqminimumSize().width() );
+    minw = TQMAX( minw, 2 * formWindow->grid().x() );
+    int minh = TQMAX( w->tqminimumSizeHint().height(), w->tqminimumSize().height() );
+    minh = TQMAX( minh, 2 * formWindow->grid().y() );
+    if ( TQMAX( minw, width ) > w->maximumWidth() ||
+	 TQMAX( minh, height ) > w->maximumHeight() )
 	return;
     if ( width < minw && x != w->x() )
 	x -= minw - width;
     if ( height < minh && y != w->y() )
 	y -= minh - height;
-    w->setGeometry( x, y, QMAX( minw, width ), QMAX( minh, height ) );
+    w->setGeometry( x, y, TQMAX( minw, width ), TQMAX( minh, height ) );
 }
 
 void SizeHandle::tryResize( TQWidget *w, int width, int height )
 {
-    int minw = QMAX( w->minimumSizeHint().width(), w->minimumSize().width() );
-    minw = QMAX( minw, 16 );
-    int minh = QMAX( w->minimumSizeHint().height(), w->minimumSize().height() );
-    minh = QMAX( minh, 16 );
-    w->resize( QMAX( minw, width ), QMAX( minh, height ) );
+    int minw = TQMAX( w->tqminimumSizeHint().width(), w->tqminimumSize().width() );
+    minw = TQMAX( minw, 16 );
+    int minh = TQMAX( w->tqminimumSizeHint().height(), w->tqminimumSize().height() );
+    minh = TQMAX( minh, 16 );
+    w->resize( TQMAX( minw, width ), TQMAX( minh, height ) );
 }
 
 // ------------------------------------------------------------------------
 
-WidgetSelection::WidgetSelection( FormWindow *parent, TQPtrDict<WidgetSelection> *selDict )
+WidgetSelection::WidgetSelection( FormWindow *tqparent, TQPtrDict<WidgetSelection> *selDict )
     : selectionDict( selDict )
 {
-    formWindow = parent;
+    formWindow = tqparent;
     for ( int i = SizeHandle::LeftTop; i <= SizeHandle::Left; ++i ) {
 	handles.insert( i, new SizeHandle( formWindow, (SizeHandle::Direction)i, this ) );
     }
@@ -287,7 +287,7 @@ void WidgetSelection::setWidget( TQWidget *w, bool updateDict )
     }
 
     wid = w;
-    bool active = !wid->parentWidget() || WidgetFactory::layoutType( wid->parentWidget() ) == WidgetFactory::NoLayout;
+    bool active = !wid->tqparentWidget() || WidgetFactory::tqlayoutType( wid->tqparentWidget() ) == WidgetFactory::NoLayout;
     for ( int i = SizeHandle::LeftTop; i <= SizeHandle::Left; ++i ) {
 	SizeHandle *h = handles[ i ];
 	if ( h ) {
@@ -308,10 +308,10 @@ bool WidgetSelection::isUsed() const
 
 void WidgetSelection::updateGeometry()
 {
-    if ( !wid || !wid->parentWidget() )
+    if ( !wid || !wid->tqparentWidget() )
 	return;
 
-    TQPoint p = wid->parentWidget()->mapToGlobal( wid->pos() );
+    TQPoint p = wid->tqparentWidget()->mapToGlobal( wid->pos() );
     p = formWindow->mapFromGlobal( p );
     TQRect r( p, wid->size() );
 
diff --git a/kdevdesigner/designer/sizehandle.h b/kdevdesigner/designer/sizehandle.h
index 0e5f1a9e..ee089de3 100644
--- a/kdevdesigner/designer/sizehandle.h
+++ b/kdevdesigner/designer/sizehandle.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -36,14 +36,15 @@ class FormWindow;
 class WidgetSelection;
 class TQPaintEvent;
 
-class SizeHandle : public QWidget
+class SizeHandle : public TQWidget
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     enum Direction { LeftTop, Top, RightTop, Right, RightBottom, Bottom, LeftBottom, Left };
 
-    SizeHandle( FormWindow *parent, Direction d, WidgetSelection *s );
+    SizeHandle( FormWindow *tqparent, Direction d, WidgetSelection *s );
     void setWidget( TQWidget *w );
     void setActive( bool a );
     void updateCursor();
@@ -74,7 +75,7 @@ private:
 class WidgetSelection
 {
 public:
-    WidgetSelection( FormWindow *parent, TQPtrDict<WidgetSelection> *selDict );
+    WidgetSelection( FormWindow *tqparent, TQPtrDict<WidgetSelection> *selDict );
 
     void setWidget( TQWidget *w, bool updateDict = TRUE );
     bool isUsed() const;
diff --git a/kdevdesigner/designer/sourceeditor.cpp b/kdevdesigner/designer/sourceeditor.cpp
index f5915664..863abaab 100644
--- a/kdevdesigner/designer/sourceeditor.cpp
+++ b/kdevdesigner/designer/sourceeditor.cpp
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -40,14 +40,14 @@
 #include <tqtextstream.h>
 #include "kdevdesigner_part.h"
 
-SourceEditor::SourceEditor( TQWidget *parent, EditorInterface *iface, LanguageInterface *liface )
-    : TQVBox( parent, 0, WDestructiveClose ), iFace( iface ), lIface( liface ), obj( 0 ), pro( 0 )
+SourceEditor::SourceEditor( TQWidget *tqparent, EditorInterface *iface, LanguageInterface *liface )
+    : TQVBox( tqparent, 0, WDestructiveClose ), iFace( iface ), lIface( liface ), obj( 0 ), pro( 0 )
 {
     iFace->addRef();
     lIface->addRef();
     editor = iFace->editor( MainWindow::self->areEditorsReadOnly(),
 			    this, MainWindow::self->designerInterface() );
-    iFace->onBreakPointChange( MainWindow::self, TQT_SLOT( breakPointsChanged() ) );
+    iFace->onBreakPointChange( TQT_TQOBJECT(MainWindow::self), TQT_SLOT( breakPointsChanged() ) );
     resize( 600, 400 );
     setIcon( SmallIcon( "designer_filenew.png" , KDevDesignerPartFactory::instance()) );
 }
@@ -77,7 +77,7 @@ void SourceEditor::setObject( TQObject *o, Project *p )
 	formWindow()->formFile()->setCodeEdited( FALSE );
 	formWindow()->formFile()->setEditor( 0 );
     }
-    if ( ::qt_cast<FormWindow*>(o) )
+    if ( ::tqqt_cast<FormWindow*>(o) )
 	( (FormWindow*)o )->formFile()->setCodeEdited( TRUE );
     save();
     bool changed = FALSE;
@@ -104,7 +104,7 @@ void SourceEditor::setObject( TQObject *o, Project *p )
 	if ( formWindow()->isFake() )
 	    iFace->setContext( pro->objectForFakeFormFile( formWindow()->formFile() ) );
 	else
-	    iFace->setContext( formWindow()->mainContainer() );
+	    iFace->setContext( TQT_TQOBJECT(formWindow()->mainContainer()) );
     } else {
 	iFace->setContext( 0 );
     }
@@ -119,9 +119,9 @@ TQString SourceEditor::sourceOfObject( TQObject *o, const TQString &,
     TQString txt;
     if ( !o )
 	return txt;
-    if ( ::qt_cast<FormWindow*>(o) )
+    if ( ::tqqt_cast<FormWindow*>(o) )
 	txt = ( (FormWindow*)o )->formFile()->code();
-    else if ( ::qt_cast<SourceFile*>(o) )
+    else if ( ::tqqt_cast<SourceFile*>(o) )
 	txt = ( (SourceFile*)o )->text();
     return txt;
 }
@@ -133,7 +133,7 @@ void SourceEditor::setFunction( const TQString &func, const TQString &clss )
 
 void SourceEditor::setClass( const TQString &clss )
 {
-    iFace->scrollTo( clss, TQString::null );
+    iFace->scrollTo( clss, TQString() );
 }
 
 void SourceEditor::closeEvent( TQCloseEvent *e )
@@ -235,7 +235,7 @@ void SourceEditor::resetContext()
 	if ( formWindow()->isFake() )
 	    iFace->setContext( pro->objectForFakeFormFile( formWindow()->formFile() ) );
 	else
-	    iFace->setContext( formWindow()->mainContainer() );
+	    iFace->setContext( TQT_TQOBJECT(formWindow()->mainContainer()) );
     } else {
 	iFace->setContext( 0 );
     }
@@ -307,14 +307,14 @@ bool SourceEditor::saveAs()
 
 SourceFile *SourceEditor::sourceFile() const
 {
-    if ( !::qt_cast<SourceFile*>((TQObject *)obj) )
+    if ( !::tqqt_cast<SourceFile*>((TQObject *)obj) )
 	return 0;
     return (SourceFile*)(TQObject*)obj;
 }
 
 FormWindow *SourceEditor::formWindow() const
 {
-    if ( !::qt_cast<FormWindow*>((TQObject *)obj) )
+    if ( !::tqqt_cast<FormWindow*>((TQObject *)obj) )
 	return 0;
     return (FormWindow*)(TQObject*)obj;
 }
diff --git a/kdevdesigner/designer/sourceeditor.h b/kdevdesigner/designer/sourceeditor.h
index 3383da24..e8d4cfb8 100644
--- a/kdevdesigner/designer/sourceeditor.h
+++ b/kdevdesigner/designer/sourceeditor.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -37,18 +37,19 @@ struct LanguageInterface;
 class Project;
 class SourceFile;
 
-class SourceEditor : public QVBox
+class SourceEditor : public TQVBox
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    SourceEditor( TQWidget *parent, EditorInterface *iface, LanguageInterface *liface );
+    SourceEditor( TQWidget *tqparent, EditorInterface *iface, LanguageInterface *liface );
     ~SourceEditor();
 
     void setObject( TQObject *fw, Project *p );
     TQObject *object() const { return obj; }
     Project *project() const { return pro; }
-    void setFunction( const TQString &func, const TQString &clss = TQString::null );
+    void setFunction( const TQString &func, const TQString &clss = TQString() );
     void setClass( const TQString &clss );
     void save();
     bool saveAs();
diff --git a/kdevdesigner/designer/sourcefile.cpp b/kdevdesigner/designer/sourcefile.cpp
index 8e103e85..5b21afa5 100644
--- a/kdevdesigner/designer/sourcefile.cpp
+++ b/kdevdesigner/designer/sourcefile.cpp
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -122,7 +122,7 @@ bool SourceFile::saveAs( bool ignoreModified )
     TQString old = filename;
     TQString initFn = pro->makeAbsolute( filename );
     if ( ignoreModified ) {
-	TQString dir = TQStringList::split( ':', project()->iFace()->customSetting( "QTSCRIPT_PACKAGES" ) ).first();
+	TQString dir = TQStringList::split( ':', project()->iFace()->customSetting( "TQTSCRIPT_PACKAGES" ) ).first();
 	initFn = TQFileInfo( initFn ).fileName();
 	initFn.prepend( dir + "/" );
     }
@@ -138,12 +138,12 @@ bool SourceFile::saveAs( bool ignoreModified )
     pro->setModified( TRUE );
     timeStamp.setFileName( pro->makeAbsolute( filename ) );
     if ( ed )
-	ed->setCaption( i18n( "Edit %1" ).arg( filename ) );
+	ed->setCaption( i18n( "Edit %1" ).tqarg( filename ) );
     setModified( TRUE );
     if ( pro->isDummy() ) {
-	TQObject *o = ed->parent();
+	TQObject *o = ed->tqparent();
 	while ( o && !o->isA( "MainWindow" ) )
-	    o = o->parent();
+	    o = o->tqparent();
 	if ( o )
 	    ((MainWindow *)o)->addRecentlyOpenedFile( fn );
     }
@@ -187,10 +187,10 @@ TQString SourceFile::createUnnamedFileName( const TQString &extension )
 	extensionCounter = new TQMap<TQString, int>;
     int count = -1;
     TQMap<TQString, int>::Iterator it;
-    if ( ( it = extensionCounter->find( extension ) ) != extensionCounter->end() ) {
+    if ( ( it = extensionCounter->tqfind( extension ) ) != extensionCounter->end() ) {
 	count = *it;
 	++count;
-	extensionCounter->replace( extension, count );
+	extensionCounter->tqreplace( extension, count );
     } else {
 	count = 1;
 	extensionCounter->insert( extension, count );
@@ -220,7 +220,7 @@ bool SourceFile::closeEvent()
 	ed->save();
 
     switch ( TQMessageBox::warning( MainWindow::self, i18n( "Save Code" ),
-				   i18n( "Save changes to '%1'?" ).arg( filename ),
+				   i18n( "Save changes to '%1'?" ).tqarg( filename ),
 				   i18n( "&Yes" ), i18n( "&No" ), i18n( "&Cancel" ), 0, 2 ) ) {
     case 0: // save
 	if ( !save() )
@@ -263,9 +263,9 @@ void SourceFile::checkTimeStamp()
     if ( timeStamp.isUpToDate() )
 	return;
     timeStamp.update();
-    if ( TQMessageBox::information( MainWindow::self, i18n( "Qt Designer" ),
-				   i18n( "File '%1' has been changed outside Qt Designer.\n"
-				       "Do you want to reload it?" ).arg( filename ),
+    if ( TQMessageBox::information( MainWindow::self, i18n( "TQt Designer" ),
+				   i18n( "File '%1' has been changed outside TQt Designer.\n"
+				       "Do you want to reload it?" ).tqarg( filename ),
 				   i18n( "&Yes" ), i18n( "&No" ) ) == 0 ) {
 	load();
 	if ( ed )
@@ -279,7 +279,7 @@ bool SourceFile::checkFileName( bool allowBreak )
     if ( sf )
 	TQMessageBox::warning( MainWindow::self, i18n( "Invalid Filename" ),
 			      i18n( "The project already contains a source file with \n"
-				  "filename '%1'. Please choose a new filename." ).arg( filename ) );
+				  "filename '%1'. Please choose a new filename." ).tqarg( filename ) );
     while ( sf ) {
 	LanguageInterface *iface = MetaDataBase::languageInterface( pro->language() );
 	TQString filter;
diff --git a/kdevdesigner/designer/sourcefile.h b/kdevdesigner/designer/sourcefile.h
index 79083c83..139bbf22 100644
--- a/kdevdesigner/designer/sourcefile.h
+++ b/kdevdesigner/designer/sourcefile.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -34,9 +34,10 @@ struct DesignerSourceFile;
 class SourceEditor;
 class Project;
 
-class SourceFile : public QObject
+class SourceFile : public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     SourceFile( const TQString &fn, bool temp, Project *p );
diff --git a/kdevdesigner/designer/startdialog.ui b/kdevdesigner/designer/startdialog.ui
index 1301a20a..150989d0 100644
--- a/kdevdesigner/designer/startdialog.ui
+++ b/kdevdesigner/designer/startdialog.ui
@@ -25,7 +25,7 @@
 ** not clear to you.
 **
 *********************************************************************</comment>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>StartDialogBase</cstring>
     </property>
@@ -61,11 +61,11 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QTabWidget">
+        <widget class="TQTabWidget">
             <property name="name">
                 <cstring>tabWidget</cstring>
             </property>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>Widget8</cstring>
                 </property>
@@ -82,7 +82,7 @@
                     <property name="spacing">
                         <number>6</number>
                     </property>
-                    <widget class="QIconView" row="1" column="0" rowspan="1" colspan="3">
+                    <widget class="TQIconView" row="1" column="0" rowspan="1" colspan="3">
                         <property name="name">
                             <cstring>templateView</cstring>
                         </property>
@@ -98,7 +98,7 @@
                     </widget>
                 </grid>
             </widget>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>tab</cstring>
                 </property>
@@ -117,7 +117,7 @@
                     </property>
                 </hbox>
             </widget>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>Widget9</cstring>
                 </property>
@@ -134,7 +134,7 @@
                     <property name="spacing">
                         <number>6</number>
                     </property>
-                    <widget class="QIconView" row="0" column="0">
+                    <widget class="TQIconView" row="0" column="0">
                         <property name="name">
                             <cstring>recentView</cstring>
                         </property>
@@ -151,7 +151,7 @@
                             <bool>false</bool>
                         </property>
                     </widget>
-                    <widget class="QLabel" row="1" column="0">
+                    <widget class="TQLabel" row="1" column="0">
                         <property name="name">
                             <cstring>fileInfoLabel</cstring>
                         </property>
@@ -170,7 +170,7 @@
                 </grid>
             </widget>
         </widget>
-        <widget class="QCheckBox">
+        <widget class="TQCheckBox">
             <property name="name">
                 <cstring>checkShowInFuture</cstring>
             </property>
@@ -178,7 +178,7 @@
                 <string>&amp;Do not show this dialog in the future</string>
             </property>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>Layout1</cstring>
             </property>
@@ -192,7 +192,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonHelp</cstring>
                     </property>
@@ -216,14 +216,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>0</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonOk</cstring>
                     </property>
@@ -240,7 +240,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonCancel</cstring>
                     </property>
@@ -273,27 +273,27 @@
     </connection>
     <connection>
         <sender>templateView</sender>
-        <signal>doubleClicked(QIconViewItem*)</signal>
+        <signal>doubleClicked(TQIconViewItem*)</signal>
         <receiver>StartDialogBase</receiver>
         <slot>accept()</slot>
     </connection>
     <connection>
         <sender>templateView</sender>
-        <signal>returnPressed(QIconViewItem*)</signal>
+        <signal>returnPressed(TQIconViewItem*)</signal>
         <receiver>StartDialogBase</receiver>
         <slot>accept()</slot>
     </connection>
     <connection>
         <sender>recentView</sender>
-        <signal>doubleClicked(QIconViewItem*)</signal>
+        <signal>doubleClicked(TQIconViewItem*)</signal>
         <receiver>StartDialogBase</receiver>
         <slot>accept()</slot>
     </connection>
     <connection>
         <sender>recentView</sender>
-        <signal>onItem(QIconViewItem*)</signal>
+        <signal>onItem(TQIconViewItem*)</signal>
         <receiver>StartDialogBase</receiver>
-        <slot>recentItemChanged(QIconViewItem*)</slot>
+        <slot>recentItemChanged(TQIconViewItem*)</slot>
     </connection>
     <connection>
         <sender>recentView</sender>
@@ -303,22 +303,22 @@
     </connection>
     <connection>
         <sender>recentView</sender>
-        <signal>returnPressed(QIconViewItem*)</signal>
+        <signal>returnPressed(TQIconViewItem*)</signal>
         <receiver>StartDialogBase</receiver>
         <slot>accept()</slot>
     </connection>
     <connection>
         <sender>recentView</sender>
-        <signal>selectionChanged(QIconViewItem*)</signal>
+        <signal>selectionChanged(TQIconViewItem*)</signal>
         <receiver>StartDialogBase</receiver>
-        <slot>recentItemChanged(QIconViewItem*)</slot>
+        <slot>recentItemChanged(TQIconViewItem*)</slot>
     </connection>
 </connections>
-<slots>
-    <slot>recentItemChanged( QIconViewItem * )</slot>
+<Q_SLOTS>
+    <slot>recentItemChanged( TQIconViewItem * )</slot>
     <slot>clearFileInfo()</slot>
     <slot>accept()</slot>
     <slot>reject()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kdevdesigner/designer/startdialogimpl.cpp b/kdevdesigner/designer/startdialogimpl.cpp
index e5bf7752..a85310be 100644
--- a/kdevdesigner/designer/startdialogimpl.cpp
+++ b/kdevdesigner/designer/startdialogimpl.cpp
@@ -26,8 +26,8 @@
 
 #include <klocale.h>
 
-FileDialog::FileDialog( const TQString &dir, TQWidget *parent )
-    : TQFileDialog( dir, TQString::null, parent )
+FileDialog::FileDialog( const TQString &dir, TQWidget *tqparent )
+    : TQFileDialog( dir, TQString(), tqparent )
 {
 }
 
@@ -37,8 +37,8 @@ void FileDialog::accept()
 }
 
 
-StartDialog::StartDialog( TQWidget *parent, const TQString &templatePath )
-    : StartDialogBase( parent, 0 )
+StartDialog::StartDialog( TQWidget *tqparent, const TQString &templatePath )
+    : StartDialogBase( tqparent, 0 )
 {
     newForm = new NewForm( templateView, templatePath );
     recentFiles.clear();
@@ -108,7 +108,7 @@ void StartDialog::recentItemChanged( TQIconViewItem *item )
     }
     TQDateTime dt( f.lastModified() );
     TQString date( dt.toString( "MMMM dd hh:mm" ));
-    msg = TQString( "%1 (%2 %3)  %4" ).arg(msg).arg(s).arg(unit).arg(date);
+    msg = TQString( "%1 (%2 %3)  %4" ).tqarg(msg).tqarg(s).tqarg(unit).tqarg(date);
     fileInfoLabel->setText( msg );
 }
 
@@ -163,12 +163,12 @@ void StartDialog::initFileOpen()
     fd->setSizeGripEnabled ( FALSE );
     tabLayout->addWidget( fd );
 
-    QPluginManager<ImportFilterInterface> manager( IID_ImportFilter, TQApplication::libraryPaths(),
+    TQPluginManager<ImportFilterInterface> manager( IID_ImportFilter, TQApplication::libraryPaths(),
 						   MainWindow::self->pluginDirectory() );
     TQStringList filterlist;
     filterlist << i18n( "Designer Files (*.ui *.pro)" );
-    filterlist << i18n( "Qt User-Interface Files (*.ui)" );
-    filterlist << i18n( "QMAKE Project Files (*.pro)" );
+    filterlist << i18n( "TQt User-Interface Files (*.ui)" );
+    filterlist << i18n( "TQMAKE Project Files (*.pro)" );
 
     TQStringList list = manager.featureList();
     for ( TQStringList::Iterator it2 = list.begin(); it2 != list.end(); ++it2 )
diff --git a/kdevdesigner/designer/startdialogimpl.h b/kdevdesigner/designer/startdialogimpl.h
index e17592b3..2b5c1866 100644
--- a/kdevdesigner/designer/startdialogimpl.h
+++ b/kdevdesigner/designer/startdialogimpl.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -37,12 +37,13 @@
 #include "newformimpl.h"
 #include "startdialog.h"
 
-class FileDialog : public QFileDialog
+class FileDialog : public TQFileDialog
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    FileDialog( const TQString &dir, TQWidget *parent );
+    FileDialog( const TQString &dir, TQWidget *tqparent );
 
 protected slots:
     void accept();
@@ -55,9 +56,10 @@ signals:
 class StartDialog : public StartDialogBase
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    StartDialog( TQWidget *parent, const TQString &templatePath );
+    StartDialog( TQWidget *tqparent, const TQString &templatePath );
     void setRecentlyFiles( TQStringList& );
     void setRecentlyProjects( TQStringList& );
     bool showDialogInFuture() const { return showInFuture; }
diff --git a/kdevdesigner/designer/styledbutton.cpp b/kdevdesigner/designer/styledbutton.cpp
index 45c425b4..a217fbe0 100644
--- a/kdevdesigner/designer/styledbutton.cpp
+++ b/kdevdesigner/designer/styledbutton.cpp
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -38,10 +38,10 @@
 #include <tqdragobject.h>
 #include <tqstyle.h>
 
-StyledButton::StyledButton(TQWidget* parent, const char* name)
-    : TQButton( parent, name ), pix( 0 ), spix( 0 ), s( 0 ), formWindow( 0 ), mousePressed( FALSE )
+StyledButton::StyledButton(TQWidget* tqparent, const char* name)
+    : TQButton( tqparent, name ), pix( 0 ), spix( 0 ), s( 0 ), formWindow( 0 ), mousePressed( FALSE )
 {
-    setMinimumSize( minimumSizeHint() );
+    setMinimumSize( tqminimumSizeHint() );
     setAcceptDrops( TRUE );
 
     connect( this, TQT_SIGNAL(clicked()), TQT_SLOT(onEditor()));
@@ -49,12 +49,12 @@ StyledButton::StyledButton(TQWidget* parent, const char* name)
     setEditor( ColorEditor );
 }
 
-StyledButton::StyledButton( const TQBrush& b, TQWidget* parent, const char* name, WFlags f )
-    : TQButton( parent, name, f ), spix( 0 ), s( 0 ), formWindow( 0 )
+StyledButton::StyledButton( const TQBrush& b, TQWidget* tqparent, const char* name, WFlags f )
+    : TQButton( tqparent, name, f ), spix( 0 ), s( 0 ), formWindow( 0 )
 {
     col = b.color();
     pix = b.pixmap();
-    setMinimumSize( minimumSizeHint() );
+    setMinimumSize( tqminimumSizeHint() );
 }
 
 StyledButton::~StyledButton()
@@ -117,12 +117,12 @@ void StyledButton::setScale( bool on )
     scalePixmap();
 }
 
-TQSize StyledButton::sizeHint() const
+TQSize StyledButton::tqsizeHint() const
 {
     return TQSize( 50, 25 );
 }
 
-TQSize StyledButton::minimumSizeHint() const
+TQSize StyledButton::tqminimumSizeHint() const
 {
     return TQSize( 50, 25 );
 }
@@ -151,25 +151,25 @@ void StyledButton::resizeEvent( TQResizeEvent* e )
 
 void StyledButton::drawButton( TQPainter *paint )
 {
-    style().drawPrimitive(TQStyle::PE_ButtonBevel, paint, rect(), colorGroup(),
+    tqstyle().tqdrawPrimitive(TQStyle::PE_ButtonBevel, paint, rect(), tqcolorGroup(),
 			  isDown() ? TQStyle::Style_Sunken : TQStyle::Style_Raised);
     drawButtonLabel(paint);
 
     if (hasFocus())
-	style().drawPrimitive(TQStyle::PE_FocusRect, paint,
-			      style().subRect(TQStyle::SR_PushButtonFocusRect, this),
-			      colorGroup(), TQStyle::Style_Default);
+	tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, paint,
+			      tqstyle().subRect(TQStyle::SR_PushButtonFocusRect, this),
+			      tqcolorGroup(), TQStyle::Style_Default);
 }
 
 void StyledButton::drawButtonLabel( TQPainter *paint )
 {
     TQColor pen = isEnabled() ?
-		 hasFocus() ? palette().active().buttonText() : palette().inactive().buttonText()
-		 : palette().disabled().buttonText();
+		 hasFocus() ? tqpalette().active().buttonText() : tqpalette().inactive().buttonText()
+		 : tqpalette().disabled().buttonText();
     paint->setPen( pen );
 
     if(!isEnabled()) {
-	paint->setBrush( TQBrush( colorGroup().button() ) );
+	paint->setBrush( TQBrush( tqcolorGroup().button() ) );
     }
     else if ( edit == PixmapEditor && spix ) {
 	paint->setBrush( TQBrush( col, *spix ) );
@@ -184,7 +184,7 @@ void StyledButton::onEditor()
 {
     switch (edit) {
     case ColorEditor: {
-	TQColor c = QColorDialog::getColor( palette().active().background(), this );
+	TQColor c = TQColorDialog::getColor( tqpalette().active().background(), this );
 	if ( c.isValid() ) {
 	    setColor( c );
 	    emit changed();
@@ -216,7 +216,7 @@ void StyledButton::mousePressEvent(TQMouseEvent* e)
 void StyledButton::mouseMoveEvent(TQMouseEvent* e)
 {
     TQButton::mouseMoveEvent( e );
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
     if ( !mousePressed )
 	return;
     if ( ( pressPos - e->pos() ).manhattanLength() > TQApplication::startDragDistance() ) {
@@ -243,7 +243,7 @@ void StyledButton::mouseMoveEvent(TQMouseEvent* e)
 #endif
 }
 
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
 void StyledButton::dragEnterEvent( TQDragEnterEvent *e )
 {
     setFocus();
@@ -258,7 +258,7 @@ void StyledButton::dragEnterEvent( TQDragEnterEvent *e )
 void StyledButton::dragLeaveEvent( TQDragLeaveEvent * )
 {
     if ( hasFocus() )
-	parentWidget()->setFocus();
+	tqparentWidget()->setFocus();
 }
 
 void StyledButton::dragMoveEvent( TQDragMoveEvent *e )
@@ -292,4 +292,4 @@ void StyledButton::dropEvent( TQDropEvent *e )
 	e->ignore();
     }
 }
-#endif // QT_NO_DRAGANDDROP
+#endif // TQT_NO_DRAGANDDROP
diff --git a/kdevdesigner/designer/styledbutton.h b/kdevdesigner/designer/styledbutton.h
index ffed5917..90f35dfe 100644
--- a/kdevdesigner/designer/styledbutton.h
+++ b/kdevdesigner/designer/styledbutton.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -34,22 +34,23 @@ class TQColor;
 class TQBrush;
 class FormWindow;
 
-class StyledButton : public QButton
+class StyledButton : public TQButton
 {
     Q_OBJECT
+  TQ_OBJECT
 
-    Q_PROPERTY( TQColor color READ color WRITE setColor )
-    Q_PROPERTY( TQPixmap pixmap READ pixmap WRITE setPixmap )
-    Q_PROPERTY( EditorType editor READ editor WRITE setEditor )
-    Q_PROPERTY( bool scale READ scale WRITE setScale )
+    TQ_PROPERTY( TQColor color READ color WRITE setColor )
+    TQ_PROPERTY( TQPixmap pixmap READ pixmap WRITE setPixmap )
+    TQ_PROPERTY( EditorType editor READ editor WRITE setEditor )
+    TQ_PROPERTY( bool scale READ scale WRITE setScale )
 
     Q_ENUMS( EditorType )
 
 public:
     enum EditorType { ColorEditor, PixmapEditor };
 
-    StyledButton( TQWidget* parent = 0, const char* name = 0 );
-    StyledButton( const TQBrush& b, TQWidget* parent = 0, const char* name = 0, WFlags f = 0 );
+    StyledButton( TQWidget* tqparent = 0, const char* name = 0 );
+    StyledButton( const TQBrush& b, TQWidget* tqparent = 0, const char* name = 0, WFlags f = 0 );
     ~StyledButton();
 
     void setEditor( EditorType );
@@ -64,8 +65,8 @@ public:
     void setScale( bool );
     bool scale() const;
 
-    TQSize sizeHint() const;
-    TQSize minimumSizeHint() const;
+    TQSize tqsizeHint() const;
+    TQSize tqminimumSizeHint() const;
 
     void setFormWindow( FormWindow *fw ) { formWindow = fw; }
 
@@ -78,12 +79,12 @@ signals:
 protected:
     void mousePressEvent(TQMouseEvent*);
     void mouseMoveEvent(TQMouseEvent*);
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
     void dragEnterEvent ( TQDragEnterEvent * );
     void dragMoveEvent ( TQDragMoveEvent * );
     void dragLeaveEvent ( TQDragLeaveEvent * );
     void dropEvent ( TQDropEvent * );
-#endif // QT_NO_DRAGANDDROP
+#endif // TQT_NO_DRAGANDDROP
     void drawButton( TQPainter* );
     void drawButtonLabel( TQPainter* );
     void resizeEvent( TQResizeEvent* );
diff --git a/kdevdesigner/designer/syntaxhighlighter_html.cpp b/kdevdesigner/designer/syntaxhighlighter_html.cpp
index 76443305..baa6a9f5 100644
--- a/kdevdesigner/designer/syntaxhighlighter_html.cpp
+++ b/kdevdesigner/designer/syntaxhighlighter_html.cpp
@@ -2,15 +2,15 @@
 **
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -18,7 +18,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -32,27 +32,27 @@
 
 
 SyntaxHighlighter_HTML::SyntaxHighlighter_HTML()
-    : QTextPreProcessor(), lastFormat( 0 ), lastFormatId( -1 )
+    : TQTextPreProcessor(), lastFormat( 0 ), lastFormatId( -1 )
 {
-    TQFont f( qApp->font() );
+    TQFont f( tqApp->font() );
 
-    addFormat(Standard, new QTextFormat(f, qApp->palette().color(TQPalette::Active, TQColorGroup::Text)));
-    addFormat(Keyword, new QTextFormat(f, qApp->palette().color(TQPalette::Active, TQColorGroup::Dark)));
-    addFormat(Attribute, new QTextFormat(f, qApp->palette().color(TQPalette::Active, TQColorGroup::Link)));
-    addFormat(AttribValue, new QTextFormat(f, qApp->palette().color(TQPalette::Active, TQColorGroup::LinkVisited)));
+    addFormat(Standard, new TQTextFormat(f, tqApp->palette().color(TQPalette::Active, TQColorGroup::Text)));
+    addFormat(Keyword, new TQTextFormat(f, tqApp->palette().color(TQPalette::Active, TQColorGroup::Dark)));
+    addFormat(Attribute, new TQTextFormat(f, tqApp->palette().color(TQPalette::Active, TQColorGroup::Link)));
+    addFormat(AttribValue, new TQTextFormat(f, tqApp->palette().color(TQPalette::Active, TQColorGroup::LinkVisited)));
 }
 
 SyntaxHighlighter_HTML::~SyntaxHighlighter_HTML()
 {
 }
 
-void SyntaxHighlighter_HTML::process( QTextDocument *doc, QTextParagraph *string, int, bool invalidate )
+void SyntaxHighlighter_HTML::process( TQTextDocument *doc, TQTextParagraph *string, int, bool tqinvalidate )
 {
 
-    QTextFormat *formatStandard = format( Standard );
-    QTextFormat *formatKeyword = format( Keyword );
-    QTextFormat *formatAttribute = format( Attribute );
-    QTextFormat *formatAttribValue = format( AttribValue );
+    TQTextFormat *formatStandard = format( Standard );
+    TQTextFormat *formatKeyword = format( Keyword );
+    TQTextFormat *formatAttribute = format( Attribute );
+    TQTextFormat *formatAttribValue = format( AttribValue );
 
     const int StateStandard  = 0;
     const int StateTag       = 1;
@@ -131,9 +131,9 @@ void SyntaxHighlighter_HTML::process( QTextDocument *doc, QTextParagraph *string
     string->setEndState( state );
     string->setFirstPreProcess( FALSE );
 
-    if ( invalidate && string->next() &&
+    if ( tqinvalidate && string->next() &&
 	 !string->next()->firstPreProcess() && string->next()->endState() != -1 ) {
-	QTextParagraph *p = string->next();
+	TQTextParagraph *p = string->next();
 	while ( p ) {
 	    if ( p->endState() == -1 )
 		return;
@@ -143,18 +143,18 @@ void SyntaxHighlighter_HTML::process( QTextDocument *doc, QTextParagraph *string
     }
 }
 
-QTextFormat *SyntaxHighlighter_HTML::format( int id )
+TQTextFormat *SyntaxHighlighter_HTML::format( int id )
 {
     if ( lastFormatId == id  && lastFormat )
 	return lastFormat;
 
-    QTextFormat *f = formats[ id ];
+    TQTextFormat *f = formats[ id ];
     lastFormat = f ? f : formats[ 0 ];
     lastFormatId = id;
     return lastFormat;
 }
 
-void SyntaxHighlighter_HTML::addFormat( int id, QTextFormat *f )
+void SyntaxHighlighter_HTML::addFormat( int id, TQTextFormat *f )
 {
     formats.insert( id, f );
 }
diff --git a/kdevdesigner/designer/syntaxhighlighter_html.h b/kdevdesigner/designer/syntaxhighlighter_html.h
index 4a842ff5..607359f0 100644
--- a/kdevdesigner/designer/syntaxhighlighter_html.h
+++ b/kdevdesigner/designer/syntaxhighlighter_html.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -27,9 +27,9 @@
 #ifndef SYNTAXHIGHLIGHTER_HTML_H
 #define SYNTAXHIGHLIGHTER_HTML_H
 
-#include <./private/qrichtext_p.h>
+#include <./private/tqrichtext_p.h>
 
-class SyntaxHighlighter_HTML : public QTextPreProcessor
+class SyntaxHighlighter_HTML : public TQTextPreProcessor
 {
 public:
 
@@ -42,15 +42,15 @@ public:
 
     SyntaxHighlighter_HTML();
     virtual ~SyntaxHighlighter_HTML();
-    void process( QTextDocument *doc, QTextParagraph *string, int start, bool invalidate = TRUE );
-    QTextFormat *format( int id );
+    void process( TQTextDocument *doc, TQTextParagraph *string, int start, bool tqinvalidate = TRUE );
+    TQTextFormat *format( int id );
 
 private:
-    void addFormat( int id, QTextFormat *f );
+    void addFormat( int id, TQTextFormat *f );
 
-    QTextFormat *lastFormat;
+    TQTextFormat *lastFormat;
     int lastFormatId;
-    TQIntDict<QTextFormat> formats;
+    TQIntDict<TQTextFormat> formats;
 
 };
 
diff --git a/kdevdesigner/designer/tableeditor.ui b/kdevdesigner/designer/tableeditor.ui
index a6f10312..96a3df6e 100644
--- a/kdevdesigner/designer/tableeditor.ui
+++ b/kdevdesigner/designer/tableeditor.ui
@@ -25,7 +25,7 @@
 ** not clear to you.
 **
 *********************************************************************</comment>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>TableEditorBase</cstring>
     </property>
@@ -53,7 +53,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QTable" row="0" column="0">
+        <widget class="TQTable" row="0" column="0">
             <property name="name">
                 <cstring>table</cstring>
             </property>
@@ -67,7 +67,7 @@
                 <bool>true</bool>
             </property>
         </widget>
-        <widget class="QLayoutWidget" row="1" column="0" rowspan="1" colspan="2">
+        <widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>Layout11</cstring>
             </property>
@@ -81,7 +81,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonHelp</cstring>
                     </property>
@@ -102,14 +102,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonOk</cstring>
                     </property>
@@ -126,7 +126,7 @@
                         <string>Close the dialog and apply all the changes.</string>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonApply</cstring>
                     </property>
@@ -140,7 +140,7 @@
                         <string>Apply all changes.</string>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonCancel</cstring>
                     </property>
@@ -156,11 +156,11 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QTabWidget" row="0" column="1">
+        <widget class="TQTabWidget" row="0" column="1">
             <property name="name">
                 <cstring>TabWidget</cstring>
             </property>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>columns_tab</cstring>
                 </property>
@@ -187,14 +187,14 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
                             </size>
                         </property>
                     </spacer>
-                    <widget class="QListBox" row="0" column="0" rowspan="6" colspan="1">
+                    <widget class="TQListBox" row="0" column="0" rowspan="6" colspan="1">
                         <property name="name">
                             <cstring>listColumns</cstring>
                         </property>
@@ -209,14 +209,14 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
                             </size>
                         </property>
                     </spacer>
-                    <widget class="QPushButton" row="4" column="1">
+                    <widget class="TQPushButton" row="4" column="1">
                         <property name="name">
                             <cstring>buttonColumnUp</cstring>
                         </property>
@@ -233,7 +233,7 @@
                             <string>&lt;b&gt;Move the selected item up.&lt;/b&gt;&lt;p&gt;The top-most column will be the first column of the list.&lt;/p&gt;</string>
                         </property>
                     </widget>
-                    <widget class="QPushButton" row="5" column="1">
+                    <widget class="TQPushButton" row="5" column="1">
                         <property name="name">
                             <cstring>buttonColumnDown</cstring>
                         </property>
@@ -250,7 +250,7 @@
                             <string>&lt;b&gt;Move the selected item down.&lt;/b&gt;&lt;p&gt;The top-most column will be the first column of the list.&lt;/p&gt;</string>
                         </property>
                     </widget>
-                    <widget class="QPushButton" row="1" column="1">
+                    <widget class="TQPushButton" row="1" column="1">
                         <property name="name">
                             <cstring>buttonDeleteColumn</cstring>
                         </property>
@@ -258,7 +258,7 @@
                             <string>&amp;Delete Column</string>
                         </property>
                     </widget>
-                    <widget class="QPushButton" row="0" column="1">
+                    <widget class="TQPushButton" row="0" column="1">
                         <property name="name">
                             <cstring>buttonNewColumn</cstring>
                         </property>
@@ -266,7 +266,7 @@
                             <string>&amp;New Column</string>
                         </property>
                     </widget>
-                    <widget class="QLayoutWidget" row="2" column="1" rowspan="1" colspan="2">
+                    <widget class="TQLayoutWidget" row="2" column="1" rowspan="1" colspan="2">
                         <property name="name">
                             <cstring>Layout6</cstring>
                         </property>
@@ -280,7 +280,7 @@
                             <property name="spacing">
                                 <number>6</number>
                             </property>
-                            <widget class="QLabel" row="0" column="0">
+                            <widget class="TQLabel" row="0" column="0">
                                 <property name="name">
                                     <cstring>labelTable</cstring>
                                 </property>
@@ -288,7 +288,7 @@
                                     <string>Table:</string>
                                 </property>
                             </widget>
-                            <widget class="QLayoutWidget" row="3" column="1">
+                            <widget class="TQLayoutWidget" row="3" column="1">
                                 <property name="name">
                                     <cstring>Layout2</cstring>
                                 </property>
@@ -302,7 +302,7 @@
                                     <property name="spacing">
                                         <number>6</number>
                                     </property>
-                                    <widget class="QLabel">
+                                    <widget class="TQLabel">
                                         <property name="name">
                                             <cstring>labelColumnPixmap</cstring>
                                         </property>
@@ -310,11 +310,11 @@
                                             <string>Label4</string>
                                         </property>
                                     </widget>
-                                    <widget class="QPushButton">
+                                    <widget class="TQPushButton">
                                         <property name="name">
                                             <cstring>buttonDeleteColPixmap</cstring>
                                         </property>
-                                        <property name="maximumSize">
+                                        <property name="tqmaximumSize">
                                             <size>
                                                 <width>30</width>
                                                 <height>22</height>
@@ -333,11 +333,11 @@
                                             <string>&lt;b&gt;Delete the selected item's pixmap.&lt;/b&gt;&lt;p&gt;The pixmap in the current column of the selected item will be deleted.&lt;/p&gt;</string>
                                         </property>
                                     </widget>
-                                    <widget class="QPushButton">
+                                    <widget class="TQPushButton">
                                         <property name="name">
                                             <cstring>buttonChooseColPixmap</cstring>
                                         </property>
-                                        <property name="maximumSize">
+                                        <property name="tqmaximumSize">
                                             <size>
                                                 <width>30</width>
                                                 <height>22</height>
@@ -355,7 +355,7 @@
                                     </widget>
                                 </hbox>
                             </widget>
-                            <widget class="QLabel" row="2" column="0">
+                            <widget class="TQLabel" row="2" column="0">
                                 <property name="name">
                                     <cstring>TextLabel2</cstring>
                                 </property>
@@ -366,7 +366,7 @@
                                     <cstring>editColumnText</cstring>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="3" column="0">
+                            <widget class="TQLabel" row="3" column="0">
                                 <property name="name">
                                     <cstring>Label2</cstring>
                                 </property>
@@ -377,7 +377,7 @@
                                     <cstring>itemChoosePixmap</cstring>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="1" column="0">
+                            <widget class="TQLabel" row="1" column="0">
                                 <property name="name">
                                     <cstring>labelFields</cstring>
                                 </property>
@@ -393,7 +393,7 @@
                                     <cstring>editColumnText</cstring>
                                 </property>
                             </widget>
-                            <widget class="QComboBox" row="1" column="1">
+                            <widget class="TQComboBox" row="1" column="1">
                                 <property name="name">
                                     <cstring>comboFields</cstring>
                                 </property>
@@ -401,7 +401,7 @@
                                     <bool>true</bool>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="0" column="1">
+                            <widget class="TQLabel" row="0" column="1">
                                 <property name="name">
                                     <cstring>labelTableValue</cstring>
                                 </property>
@@ -413,7 +413,7 @@
                     </widget>
                 </grid>
             </widget>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>rows_tab</cstring>
                 </property>
@@ -440,14 +440,14 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
                             </size>
                         </property>
                     </spacer>
-                    <widget class="QPushButton" row="4" column="1">
+                    <widget class="TQPushButton" row="4" column="1">
                         <property name="name">
                             <cstring>buttonRowUp</cstring>
                         </property>
@@ -464,12 +464,12 @@
                             <string>&lt;b&gt;Move the selected item up.&lt;/b&gt;&lt;p&gt;The top-most column will be the first column of the list.&lt;/p&gt;</string>
                         </property>
                     </widget>
-                    <widget class="QListBox" row="0" column="0" rowspan="6" colspan="1">
+                    <widget class="TQListBox" row="0" column="0" rowspan="6" colspan="1">
                         <property name="name">
                             <cstring>listRows</cstring>
                         </property>
                     </widget>
-                    <widget class="QPushButton" row="5" column="1">
+                    <widget class="TQPushButton" row="5" column="1">
                         <property name="name">
                             <cstring>buttonRowDown</cstring>
                         </property>
@@ -496,14 +496,14 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
                             </size>
                         </property>
                     </spacer>
-                    <widget class="QPushButton" row="0" column="1">
+                    <widget class="TQPushButton" row="0" column="1">
                         <property name="name">
                             <cstring>buttonNewRow</cstring>
                         </property>
@@ -511,7 +511,7 @@
                             <string>&amp;New Row</string>
                         </property>
                     </widget>
-                    <widget class="QPushButton" row="1" column="1">
+                    <widget class="TQPushButton" row="1" column="1">
                         <property name="name">
                             <cstring>buttonDeleteRow</cstring>
                         </property>
@@ -519,7 +519,7 @@
                             <string>&amp;Delete Row</string>
                         </property>
                     </widget>
-                    <widget class="QLayoutWidget" row="2" column="1" rowspan="1" colspan="2">
+                    <widget class="TQLayoutWidget" row="2" column="1" rowspan="1" colspan="2">
                         <property name="name">
                             <cstring>Layout7_2</cstring>
                         </property>
@@ -533,7 +533,7 @@
                             <property name="spacing">
                                 <number>6</number>
                             </property>
-                            <widget class="QLabel" row="0" column="0">
+                            <widget class="TQLabel" row="0" column="0">
                                 <property name="name">
                                     <cstring>TextLabel2_3</cstring>
                                 </property>
@@ -544,7 +544,7 @@
                                     <cstring>editRowText</cstring>
                                 </property>
                             </widget>
-                            <widget class="QLabel" row="1" column="0">
+                            <widget class="TQLabel" row="1" column="0">
                                 <property name="name">
                                     <cstring>Label2_2</cstring>
                                 </property>
@@ -555,7 +555,7 @@
                                     <cstring>itemChoosePixmap</cstring>
                                 </property>
                             </widget>
-                            <widget class="QLayoutWidget" row="1" column="1">
+                            <widget class="TQLayoutWidget" row="1" column="1">
                                 <property name="name">
                                     <cstring>Layout2_2</cstring>
                                 </property>
@@ -569,7 +569,7 @@
                                     <property name="spacing">
                                         <number>6</number>
                                     </property>
-                                    <widget class="QLabel">
+                                    <widget class="TQLabel">
                                         <property name="name">
                                             <cstring>labelRowPixmap</cstring>
                                         </property>
@@ -577,11 +577,11 @@
                                             <string>Label4</string>
                                         </property>
                                     </widget>
-                                    <widget class="QPushButton">
+                                    <widget class="TQPushButton">
                                         <property name="name">
                                             <cstring>buttonDeleteRowPixmap</cstring>
                                         </property>
-                                        <property name="maximumSize">
+                                        <property name="tqmaximumSize">
                                             <size>
                                                 <width>30</width>
                                                 <height>22</height>
@@ -600,11 +600,11 @@
                                             <string>&lt;b&gt;Delete the selected item's pixmap.&lt;/b&gt;&lt;p&gt;The pixmap in the current column of the selected item will be deleted.&lt;/p&gt;</string>
                                         </property>
                                     </widget>
-                                    <widget class="QPushButton">
+                                    <widget class="TQPushButton">
                                         <property name="name">
                                             <cstring>buttonChooseRowPixmap</cstring>
                                         </property>
-                                        <property name="maximumSize">
+                                        <property name="tqmaximumSize">
                                             <size>
                                                 <width>30</width>
                                                 <height>22</height>
@@ -649,21 +649,21 @@
     </connection>
     <connection>
         <sender>listColumns</sender>
-        <signal>currentChanged(QListBoxItem*)</signal>
+        <signal>currentChanged(TQListBoxItem*)</signal>
         <receiver>TableEditorBase</receiver>
-        <slot>currentColumnChanged(QListBoxItem*)</slot>
+        <slot>currentColumnChanged(TQListBoxItem*)</slot>
     </connection>
     <connection>
         <sender>listColumns</sender>
-        <signal>selectionChanged(QListBoxItem*)</signal>
+        <signal>selectionChanged(TQListBoxItem*)</signal>
         <receiver>TableEditorBase</receiver>
-        <slot>currentColumnChanged(QListBoxItem*)</slot>
+        <slot>currentColumnChanged(TQListBoxItem*)</slot>
     </connection>
     <connection>
         <sender>editColumnText</sender>
-        <signal>textChanged(const QString&amp;)</signal>
+        <signal>textChanged(const TQString&amp;)</signal>
         <receiver>TableEditorBase</receiver>
-        <slot>columnTextChanged(const QString&amp;)</slot>
+        <slot>columnTextChanged(const TQString&amp;)</slot>
     </connection>
     <connection>
         <sender>buttonNewColumn</sender>
@@ -691,21 +691,21 @@
     </connection>
     <connection>
         <sender>comboFields</sender>
-        <signal>activated(const QString&amp;)</signal>
+        <signal>activated(const TQString&amp;)</signal>
         <receiver>TableEditorBase</receiver>
-        <slot>currentFieldChanged(const QString&amp;)</slot>
+        <slot>currentFieldChanged(const TQString&amp;)</slot>
     </connection>
     <connection>
         <sender>listRows</sender>
-        <signal>selectionChanged(QListBoxItem*)</signal>
+        <signal>selectionChanged(TQListBoxItem*)</signal>
         <receiver>TableEditorBase</receiver>
-        <slot>currentRowChanged(QListBoxItem*)</slot>
+        <slot>currentRowChanged(TQListBoxItem*)</slot>
     </connection>
     <connection>
         <sender>listRows</sender>
-        <signal>currentChanged(QListBoxItem*)</signal>
+        <signal>currentChanged(TQListBoxItem*)</signal>
         <receiver>TableEditorBase</receiver>
-        <slot>currentRowChanged(QListBoxItem*)</slot>
+        <slot>currentRowChanged(TQListBoxItem*)</slot>
     </connection>
     <connection>
         <sender>buttonNewRow</sender>
@@ -745,9 +745,9 @@
     </connection>
     <connection>
         <sender>editRowText</sender>
-        <signal>textChanged(const QString&amp;)</signal>
+        <signal>textChanged(const TQString&amp;)</signal>
         <receiver>TableEditorBase</receiver>
-        <slot>rowTextChanged(const QString&amp;)</slot>
+        <slot>rowTextChanged(const TQString&amp;)</slot>
     </connection>
     <connection>
         <sender>buttonCancel</sender>
@@ -794,18 +794,18 @@
     <tabstop>buttonHelp</tabstop>
 </tabstops>
 <includes>
-    <include location="global" impldecl="in implementation">qtable.h</include>
+    <include location="global" impldecl="in implementation">tqtable.h</include>
 </includes>
-<slots>
+<Q_SLOTS>
     <slot access="protected">init()</slot>
     <slot access="protected">destroy()</slot>
     <slot access="protected">applyClicked()</slot>
     <slot access="protected">chooseRowPixmapClicked()</slot>
-    <slot access="protected">columnTextChanged( const QString &amp; )</slot>
+    <slot access="protected">columnTextChanged( const TQString &amp; )</slot>
     <slot access="protected">columnUpClicked()</slot>
-    <slot access="protected">currentColumnChanged( QListBoxItem * )</slot>
-    <slot access="protected">currentFieldChanged( const QString &amp; )</slot>
-    <slot access="protected">currentRowChanged( QListBoxItem * )</slot>
+    <slot access="protected">currentColumnChanged( TQListBoxItem * )</slot>
+    <slot access="protected">currentFieldChanged( const TQString &amp; )</slot>
+    <slot access="protected">currentRowChanged( TQListBoxItem * )</slot>
     <slot access="protected">deleteColPixmapClicked()</slot>
     <slot access="protected">deleteColumnClicked()</slot>
     <slot access="protected">deleteRowClicked()</slot>
@@ -815,14 +815,14 @@
     <slot access="protected">chooseColPixmapClicked()</slot>
     <slot access="protected">okClicked()</slot>
     <slot access="protected">rowDownClicked()</slot>
-    <slot access="protected">rowTextChanged( const QString &amp; )</slot>
+    <slot access="protected">rowTextChanged( const TQString &amp; )</slot>
     <slot access="protected">rowUpClicked()</slot>
     <slot access="protected">columnDownClicked()</slot>
-</slots>
+</Q_SLOTS>
 <includes>
     <include location="local" impldecl="in implementation">myiconloader.h</include>
 </includes>
 <pixmapfunction>BarIcon2</pixmapfunction>
 
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kdevdesigner/designer/tableeditorimpl.cpp b/kdevdesigner/designer/tableeditorimpl.cpp
index d6ebba6c..b95f6bd2 100644
--- a/kdevdesigner/designer/tableeditorimpl.cpp
+++ b/kdevdesigner/designer/tableeditorimpl.cpp
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000-2001 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -25,7 +25,7 @@
 **********************************************************************/
 
 #include "tableeditorimpl.h"
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
 #include <tqtable.h>
 #endif
 #include "formwindow.h"
@@ -46,20 +46,20 @@
 
 #include <klocale.h>
 
-TableEditor::TableEditor( TQWidget* parent,  TQWidget *editWidget, FormWindow *fw, const char* name, bool modal, WFlags fl )
-    : TableEditorBase( parent, name, modal, fl ),
-#ifndef QT_NO_TABLE
+TableEditor::TableEditor( TQWidget* tqparent,  TQWidget *editWidget, FormWindow *fw, const char* name, bool modal, WFlags fl )
+    : TableEditorBase( tqparent, name, modal, fl ),
+#ifndef TQT_NO_TABLE
     editTable( (TQTable*)editWidget ),
 #endif
     formWindow( fw )
 {
     connect( buttonHelp, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) );
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
     labelColumnPixmap->setText( "" );
     labelRowPixmap->setText( "" );
 
-#ifndef QT_NO_SQL
-    if ( !::qt_cast<TQDataTable*>(editTable) )
+#ifndef TQT_NO_SQL
+    if ( !::tqqt_cast<TQDataTable*>(editTable) )
 #endif
     {
 	labelFields->hide();
@@ -67,8 +67,8 @@ TableEditor::TableEditor( TQWidget* parent,  TQWidget *editWidget, FormWindow *f
 	labelTable->hide();
 	labelTableValue->hide();
     }
-#ifndef QT_NO_SQL
-    if ( ::qt_cast<TQDataTable*>(editTable) ) {
+#ifndef TQT_NO_SQL
+    if ( ::tqqt_cast<TQDataTable*>(editTable) ) {
 	// ## why does this behave weird?
 	//	TabWidget->removePage( rows_tab );
 	//	rows_tab->hide();
@@ -76,8 +76,8 @@ TableEditor::TableEditor( TQWidget* parent,  TQWidget *editWidget, FormWindow *f
 	TabWidget->setTabEnabled( rows_tab, FALSE );
     }
 
-    if ( formWindow->project() && ::qt_cast<TQDataTable*>(editTable) ) {
-	TQStringList lst = MetaDataBase::fakeProperty( editTable, "database" ).toStringList();
+    if ( formWindow->project() && ::tqqt_cast<TQDataTable*>(editTable) ) {
+	TQStringList lst = MetaDataBase::fakeProperty( TQT_TQOBJECT(editTable), "database" ).toStringList();
 	if ( lst.count() == 2 && !lst[ 0 ].isEmpty() && !lst[ 1 ].isEmpty() ) {
 	    TQStringList fields;
 	    fields << "<no field>";
@@ -121,7 +121,7 @@ void TableEditor::columnTextChanged( const TQString &s )
     listColumns->blockSignals( TRUE );
     listColumns->changeItem( s, listColumns->currentItem() );
     listColumns->blockSignals( FALSE );
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
     if ( table->horizontalHeader()->iconSet( listColumns->currentItem() ) )
 	table->horizontalHeader()->setLabel( listColumns->currentItem(),
 					     *table->horizontalHeader()->iconSet( listColumns->currentItem() ), s );
@@ -158,13 +158,13 @@ void TableEditor::currentColumnChanged( TQListBoxItem *i )
 	labelColumnPixmap->setText( "" );
     editColumnText->blockSignals( FALSE );
 
-#ifndef QT_NO_SQL
-    if ( ::qt_cast<TQDataTable*>(editTable) ) {
-	TQString s = *fieldMap.find( listColumns->index( i ) );
+#ifndef TQT_NO_SQL
+    if ( ::tqqt_cast<TQDataTable*>(editTable) ) {
+	TQString s = *fieldMap.tqfind( listColumns->index( i ) );
 	if ( s.isEmpty() )
 	    comboFields->setCurrentItem( 0 );
-	else if ( comboFields->listBox()->findItem( s ) )
-	    comboFields->setCurrentItem( comboFields->listBox()->index( comboFields->listBox()->findItem( s ) ) );
+	else if ( comboFields->listBox()->tqfindItem( s ) )
+	    comboFields->setCurrentItem( comboFields->listBox()->index( comboFields->listBox()->tqfindItem( s ) ) );
 	else
 	    comboFields->lineEdit()->setText( s );
     }
@@ -201,7 +201,7 @@ void TableEditor::deleteColumnClicked()
 {
     if ( listColumns->currentItem() == -1 )
 	return;
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
     table->setNumCols( table->numCols() - 1 );
     delete listColumns->item( listColumns->currentItem() );
     readColumns();
@@ -216,7 +216,7 @@ void TableEditor::deleteRowClicked()
 {
     if ( listRows->currentItem() == -1 )
 	return;
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
     table->setNumRows( table->numRows() - 1 );
     delete listRows->item( listRows->currentItem() );
     readRows();
@@ -229,22 +229,22 @@ void TableEditor::deleteRowClicked()
 
 void TableEditor::newColumnClicked()
 {
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
     table->setNumCols( table->numCols() + 1 );
     TQMap<TQString, bool> m;
     for ( int i = 0; i < table->numCols() - 1; ++i )
 	m.insert( table->horizontalHeader()->label( i ), TRUE );
     int n = table->numCols() - 1;
     TQString t = TQString::number( n );
-    while ( m.find( t ) != m.end() )
+    while ( m.tqfind( t ) != m.end() )
 	t = TQString::number( ++n );
     table->horizontalHeader()->setLabel( table->numCols() - 1, t );
     listColumns->insertItem( t );
     TQListBoxItem *item = listColumns->item( listColumns->count() - 1 );
     listColumns->setCurrentItem( item );
     listColumns->setSelected( item, TRUE );
-#ifndef QT_NO_SQL
-    if ( ::qt_cast<TQDataTable*>(editTable) ) {
+#ifndef TQT_NO_SQL
+    if ( ::tqqt_cast<TQDataTable*>(editTable) ) {
 	comboFields->setFocus();
     } else
 #endif
@@ -257,14 +257,14 @@ void TableEditor::newColumnClicked()
 
 void TableEditor::newRowClicked()
 {
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
     table->setNumRows( table->numRows() + 1 );
     TQMap<TQString, bool> m;
     for ( int i = 0; i < table->numRows() - 1; ++i )
 	m.insert( table->verticalHeader()->label( i ), TRUE );
     int n = table->numRows() - 1;
     TQString t = TQString::number( n );
-    while ( m.find( t ) != m.end() )
+    while ( m.tqfind( t ) != m.end() )
 	t = TQString::number( ++n );
     table->verticalHeader()->setLabel( table->numRows() - 1, t );
     listRows->insertItem( t );
@@ -298,7 +298,7 @@ void TableEditor::rowTextChanged( const TQString &s )
 {
     if ( listRows->currentItem() == -1 )
 	return;
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
     listRows->changeItem( s, listRows->currentItem() );
     if ( table->verticalHeader()->iconSet( listRows->currentItem() ) )
 	table->verticalHeader()->setLabel( listRows->currentItem(),
@@ -327,13 +327,13 @@ void TableEditor::applyClicked()
     TQValueList<PopulateTableCommand::Column> cols;
 
     int i = 0;
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
     for ( i = 0; i < table->horizontalHeader()->count(); ++i ) {
 	PopulateTableCommand::Column col;
 	col.text = table->horizontalHeader()->label( i );
 	if ( table->horizontalHeader()->iconSet( i ) )
 	    col.pix = table->horizontalHeader()->iconSet( i )->pixmap();
-	col.field = *fieldMap.find( i );
+	col.field = *fieldMap.tqfind( i );
 	cols.append( col );
     }
     for ( i = 0; i < table->verticalHeader()->count(); ++i ) {
@@ -343,7 +343,7 @@ void TableEditor::applyClicked()
 	    row.pix = table->verticalHeader()->iconSet( i )->pixmap();
 	rows.append( row );
     }
-    PopulateTableCommand *cmd = new PopulateTableCommand( i18n( "Edit the Rows and Columns of '%1' " ).arg( editTable->name() ),
+    PopulateTableCommand *cmd = new PopulateTableCommand( i18n( "Edit the Rows and Columns of '%1' " ).tqarg( editTable->name() ),
 							  formWindow, editTable, rows, cols );
     cmd->execute();
     formWindow->commandHistory()->addCommand( cmd );
@@ -363,7 +363,7 @@ void TableEditor::chooseRowPixmapClicked()
     if ( pix.isNull() )
 	return;
 
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
     table->verticalHeader()->setLabel( listRows->currentItem(), pix, table->verticalHeader()->label( listRows->currentItem() ) );
     listRows->changeItem( pix, listRows->currentText(), listRows->currentItem() );
 #endif
@@ -373,7 +373,7 @@ void TableEditor::deleteRowPixmapClicked()
 {
     if ( listRows->currentItem() == -1 )
 	return;
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
     table->verticalHeader()->setLabel( listRows->currentItem(), TQPixmap(), table->verticalHeader()->label( listRows->currentItem() ) );
     listRows->changeItem( listRows->currentText(), listRows->currentItem() );
 #endif
@@ -391,7 +391,7 @@ void TableEditor::chooseColPixmapClicked()
 
     if ( pix.isNull() )
 	return;
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
     table->horizontalHeader()->setLabel( listColumns->currentItem(), pix, table->horizontalHeader()->label( listColumns->currentItem() ) );
     listColumns->changeItem( pix, listColumns->currentText(), listColumns->currentItem() );
 #endif
@@ -401,7 +401,7 @@ void TableEditor::deleteColPixmapClicked()
 {
     if ( listColumns->currentItem() == -1 )
 	return;
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
     table->horizontalHeader()->setLabel( listColumns->currentItem(), TQPixmap(), table->horizontalHeader()->label( listColumns->currentItem() ) );
     listColumns->changeItem( listColumns->currentText(), listColumns->currentItem() );
 #endif
@@ -409,10 +409,10 @@ void TableEditor::deleteColPixmapClicked()
 
 void TableEditor::readFromTable()
 {
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
     TQHeader *cols = editTable->horizontalHeader();
     table->setNumCols( cols->count() );
-    TQMap<TQString, TQString> columnFields = MetaDataBase::columnFields( editTable );
+    TQMap<TQString, TQString> columnFields = MetaDataBase::columnFields( TQT_TQOBJECT(editTable) );
     for ( int i = 0; i < cols->count(); ++i ) {
 	if ( editTable->horizontalHeader()->iconSet( i ) ) {
 	    table->horizontalHeader()->setLabel( i, *editTable->horizontalHeader()->iconSet( i ),
@@ -423,7 +423,7 @@ void TableEditor::readFromTable()
 	    table->horizontalHeader()->setLabel( i, editTable->horizontalHeader()->label( i ) );
 	    listColumns->insertItem( editTable->horizontalHeader()->label( i ) );
 	}
-	TQString cf = *columnFields.find( editTable->horizontalHeader()->label( i ) );
+	TQString cf = *columnFields.tqfind( editTable->horizontalHeader()->label( i ) );
 	fieldMap.insert( i, cf );
     }
 
@@ -456,7 +456,7 @@ void TableEditor::readFromTable()
 void TableEditor::readColumns()
 {
     int j = 0;
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
     for ( TQListBoxItem *i = listColumns->firstItem(); i; i = i->next(), ++j ) {
 	if ( i->pixmap() )
 	    table->horizontalHeader()->setLabel( j, *i->pixmap(), i->text() );
@@ -469,7 +469,7 @@ void TableEditor::readColumns()
 void TableEditor::readRows()
 {
     int j = 0;
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
     for ( TQListBoxItem *i = listRows->firstItem(); i; i = i->next(), ++j ) {
 	if ( i->pixmap() )
 	    table->verticalHeader()->setLabel( j, *i->pixmap(), i->text() );
diff --git a/kdevdesigner/designer/tableeditorimpl.h b/kdevdesigner/designer/tableeditorimpl.h
index c3d9990a..b437f4ce 100644
--- a/kdevdesigner/designer/tableeditorimpl.h
+++ b/kdevdesigner/designer/tableeditorimpl.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -37,9 +37,10 @@ class FormWindow;
 class TableEditor : public TableEditorBase
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    TableEditor( TQWidget* parent = 0, TQWidget *editWidget = 0, FormWindow *fw = 0,
+    TableEditor( TQWidget* tqparent = 0, TQWidget *editWidget = 0, FormWindow *fw = 0,
 		 const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
     ~TableEditor();
 
diff --git a/kdevdesigner/designer/timestamp.cpp b/kdevdesigner/designer/timestamp.cpp
index 703b4e58..eb80c1cd 100644
--- a/kdevdesigner/designer/timestamp.cpp
+++ b/kdevdesigner/designer/timestamp.cpp
@@ -1,15 +1,15 @@
  /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -30,8 +30,8 @@
 
 class TQTimer;
 
-TimeStamp::TimeStamp( TQObject *parent, const TQString &f )
-    : TQObject( parent ), filename( f ), autoCheck( FALSE )
+TimeStamp::TimeStamp( TQObject *tqparent, const TQString &f )
+    : TQObject( tqparent ), filename( f ), autoCheck( FALSE )
 {
     timer = new TQTimer( this );
     connect( timer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( autoCheckTimeStamp() ) );
diff --git a/kdevdesigner/designer/timestamp.h b/kdevdesigner/designer/timestamp.h
index 849a76f8..2c41b62a 100644
--- a/kdevdesigner/designer/timestamp.h
+++ b/kdevdesigner/designer/timestamp.h
@@ -1,15 +1,15 @@
  /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -31,12 +31,13 @@
 #include <tqdatetime.h>
 #include <tqtimer.h>
 
-class TimeStamp : public QObject
+class TimeStamp : public TQObject
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    TimeStamp( TQObject *parent, const TQString &f );
+    TimeStamp( TQObject *tqparent, const TQString &f );
 
     void setFileName( const TQString &f );
     TQString fileName() const;
diff --git a/kdevdesigner/designer/variabledialog.ui b/kdevdesigner/designer/variabledialog.ui
index a38954af..ec75c8d5 100644
--- a/kdevdesigner/designer/variabledialog.ui
+++ b/kdevdesigner/designer/variabledialog.ui
@@ -25,7 +25,7 @@
 ** not clear to you.
 **
 *********************************************************************</comment>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>VariableDialogBase</cstring>
     </property>
@@ -50,7 +50,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QListView" row="0" column="0" rowspan="1" colspan="4">
+        <widget class="TQListView" row="0" column="0" rowspan="1" colspan="4">
             <column>
                 <property name="text">
                     <string>Variable</string>
@@ -89,7 +89,7 @@
                 <enum>LastColumn</enum>
             </property>
         </widget>
-        <widget class="QPushButton" row="1" column="3">
+        <widget class="TQPushButton" row="1" column="3">
             <property name="name">
                 <cstring>deleteButton</cstring>
             </property>
@@ -97,7 +97,7 @@
                 <string>&amp;Delete</string>
             </property>
         </widget>
-        <widget class="QGroupBox" row="2" column="0" rowspan="1" colspan="4">
+        <widget class="TQGroupBox" row="2" column="0" rowspan="1" colspan="4">
             <property name="name">
                 <cstring>propBox</cstring>
             </property>
@@ -114,7 +114,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QLabel" row="1" column="0">
+                <widget class="TQLabel" row="1" column="0">
                     <property name="name">
                         <cstring>TextLabel2</cstring>
                     </property>
@@ -125,7 +125,7 @@
                         <cstring>accessCombo</cstring>
                     </property>
                 </widget>
-                <widget class="QLabel" row="0" column="0">
+                <widget class="TQLabel" row="0" column="0">
                     <property name="name">
                         <cstring>TextLabel1</cstring>
                     </property>
@@ -141,7 +141,7 @@
                         <cstring>varName</cstring>
                     </property>
                 </widget>
-                <widget class="QComboBox" row="1" column="1">
+                <widget class="TQComboBox" row="1" column="1">
                     <item>
                         <property name="text">
                             <string>public</string>
@@ -163,7 +163,7 @@
                 </widget>
             </grid>
         </widget>
-        <widget class="QPushButton" row="1" column="2">
+        <widget class="TQPushButton" row="1" column="2">
             <property name="name">
                 <cstring>addButton</cstring>
             </property>
@@ -181,14 +181,14 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>0</width>
                     <height>21</height>
                 </size>
             </property>
         </spacer>
-        <widget class="QPushButton" row="3" column="3">
+        <widget class="TQPushButton" row="3" column="3">
             <property name="name">
                 <cstring>cancelButton</cstring>
             </property>
@@ -196,7 +196,7 @@
                 <string>&amp;Cancel</string>
             </property>
         </widget>
-        <widget class="QPushButton" row="3" column="1" rowspan="1" colspan="2">
+        <widget class="TQPushButton" row="3" column="1" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>okButton</cstring>
             </property>
@@ -214,7 +214,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>0</width>
                     <height>21</height>
@@ -262,15 +262,15 @@
     </connection>
     <connection>
         <sender>varView</sender>
-        <signal>currentChanged(QListViewItem*)</signal>
+        <signal>currentChanged(TQListViewItem*)</signal>
         <receiver>VariableDialogBase</receiver>
-        <slot>currentItemChanged(QListViewItem*)</slot>
+        <slot>currentItemChanged(TQListViewItem*)</slot>
     </connection>
     <connection>
         <sender>varView</sender>
-        <signal>selectionChanged(QListViewItem*)</signal>
+        <signal>selectionChanged(TQListViewItem*)</signal>
         <receiver>VariableDialogBase</receiver>
-        <slot>currentItemChanged(QListViewItem*)</slot>
+        <slot>currentItemChanged(TQListViewItem*)</slot>
     </connection>
 </connections>
 <tabstops>
@@ -282,13 +282,13 @@
     <tabstop>okButton</tabstop>
     <tabstop>cancelButton</tabstop>
 </tabstops>
-<slots>
+<Q_SLOTS>
     <slot>addVariable()</slot>
     <slot>deleteVariable()</slot>
     <slot>accessChanged()</slot>
     <slot>nameChanged()</slot>
     <slot>okClicked()</slot>
-    <slot>currentItemChanged( QListViewItem * i )</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+    <slot>currentItemChanged( TQListViewItem * i )</slot>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kdevdesigner/designer/variabledialogimpl.cpp b/kdevdesigner/designer/variabledialogimpl.cpp
index 19af5e6c..bd0ef745 100644
--- a/kdevdesigner/designer/variabledialogimpl.cpp
+++ b/kdevdesigner/designer/variabledialogimpl.cpp
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000-2001 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -40,11 +40,11 @@
 #include <klocale.h>
 
 
-VariableDialog::VariableDialog( FormWindow *fw, TQWidget *parent )
-    : VariableDialogBase( parent ), formWindow( fw )
+VariableDialog::VariableDialog( FormWindow *fw, TQWidget *tqparent )
+    : VariableDialogBase( tqparent ), formWindow( fw )
 {
     varView->setSorting( -1 );
-    TQValueList<MetaDataBase::Variable> varLst = MetaDataBase::variables( formWindow );
+    TQValueList<MetaDataBase::Variable> varLst = MetaDataBase::variables( TQT_TQOBJECT(formWindow) );
     TQValueList<MetaDataBase::Variable>::Iterator it = varLst.begin();
     for ( ; it != varLst.end(); ++it ) {
 	TQListViewItem *i = new TQListViewItem( varView );
@@ -64,7 +64,7 @@ VariableDialog::~VariableDialog()
 
 void VariableDialog::setCurrentItem( TQString text )
 {
-    TQListViewItem *i = varView->findItem( text, 0 );
+    TQListViewItem *i = varView->tqfindItem( text, 0 );
     if ( i )
 	varView->setCurrentItem( i );
 }
diff --git a/kdevdesigner/designer/variabledialogimpl.h b/kdevdesigner/designer/variabledialogimpl.h
index 5b2775e1..88cb439e 100644
--- a/kdevdesigner/designer/variabledialogimpl.h
+++ b/kdevdesigner/designer/variabledialogimpl.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000-2001 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -35,8 +35,9 @@ class TQListView;
 class VariableDialog : public VariableDialogBase
 {
     Q_OBJECT
+  TQ_OBJECT
 public:
-    VariableDialog( FormWindow *fw, TQWidget* parent = 0 );
+    VariableDialog( FormWindow *fw, TQWidget* tqparent = 0 );
     ~VariableDialog();
 
     void setCurrentItem( TQString text );
diff --git a/kdevdesigner/designer/widgetaction.cpp b/kdevdesigner/designer/widgetaction.cpp
index 7568a98c..9547b049 100644
--- a/kdevdesigner/designer/widgetaction.cpp
+++ b/kdevdesigner/designer/widgetaction.cpp
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -35,7 +35,7 @@ static TQStyle *windowsStyle = 0;
 
 void WidgetAction::addedTo( TQWidget *w, TQWidget *container )
 {
-    if ( ::qt_cast<TQToolButton*>(w) && ::qt_cast<TQScrollView*>(container->parent()->parent()) ) {
+    if ( ::tqqt_cast<TQToolButton*>(w) && ::tqqt_cast<TQScrollView*>(container->tqparent()->tqparent()) ) {
 	if ( !windowsStyle )
 	    windowsStyle = TQStyleFactory::create( "windows" );
 	w->setStyle( windowsStyle );
diff --git a/kdevdesigner/designer/widgetaction.h b/kdevdesigner/designer/widgetaction.h
index fa3971c3..78c0270e 100644
--- a/kdevdesigner/designer/widgetaction.h
+++ b/kdevdesigner/designer/widgetaction.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -29,25 +29,26 @@
 
 #include <tqaction.h>
 
-class WidgetAction : public QAction
+class WidgetAction : public TQAction
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    WidgetAction( const TQString &grp, TQObject* parent,
+    WidgetAction( const TQString &grp, TQObject* tqparent,
 		  const char* name = 0, bool toggle = FALSE  )
-	: TQAction( parent, name, toggle ) { init( grp ); }
+	: TQAction( tqparent, name, toggle ) { init( grp ); }
     WidgetAction( const TQString &grp, const TQString& text,
 		  const TQIconSet& icon, const TQString& menuText, TQKeySequence accel,
-		  TQObject* parent, const char* name = 0, bool toggle = FALSE )
-	: TQAction( text, icon, menuText, accel, parent, name, toggle ) { init( grp ); }
+		  TQObject* tqparent, const char* name = 0, bool toggle = FALSE )
+	: TQAction( text, icon, menuText, accel, tqparent, name, toggle ) { init( grp ); }
     WidgetAction( const TQString &grp, const TQString& text,
-		  const TQString& menuText, TQKeySequence accel, TQObject* parent,
+		  const TQString& menuText, TQKeySequence accel, TQObject* tqparent,
 		  const char* name = 0, bool toggle = FALSE )
-	: TQAction( text, menuText, accel, parent, name, toggle ) { init( grp ); }
+	: TQAction( text, menuText, accel, tqparent, name, toggle ) { init( grp ); }
     ~WidgetAction();
 
-#if !defined(Q_NO_USING_KEYWORD)
+#if !defined(TQ_NO_USING_KEYWORD)
     using TQAction::addedTo;
 #endif
     void addedTo( TQWidget *, TQWidget * );
diff --git a/kdevdesigner/designer/widgetfactory.cpp b/kdevdesigner/designer/widgetfactory.cpp
index a38e75af..43081cdd 100644
--- a/kdevdesigner/designer/widgetfactory.cpp
+++ b/kdevdesigner/designer/widgetfactory.cpp
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -31,14 +31,14 @@
 #include "mainwindow.h"
 #include "formwindow.h"
 #include "propertyeditor.h"
-#include "layout.h"
+#include "tqlayout.h"
 #include "listboxeditorimpl.h"
 #include "listvieweditorimpl.h"
 #include "iconvieweditorimpl.h"
 #include "formwindow.h"
 #include "multilineeditorimpl.h"
 #include "../interfaces/widgetinterface.h"
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
 #include "tableeditorimpl.h"
 #endif
 #include "project.h"
@@ -54,10 +54,10 @@
 #include <tqpixmap.h>
 #include <tqgroupbox.h>
 #include <tqiconview.h>
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
 #include <tqtable.h>
 #endif
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 #include <tqdatatable.h>
 #endif
 #include <tqdatetimeedit.h>
@@ -92,7 +92,7 @@
 #include <tqsplitter.h>
 #include <tqtoolbox.h>
 #include <tqsizegrip.h>
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 #include "database.h"
 #endif
 
@@ -107,15 +107,15 @@ FormWindow *find_formwindow( TQWidget *w )
     if ( !w )
 	return 0;
     for (;;) {
-	if ( ::qt_cast<FormWindow*>(w) )
+	if ( ::tqqt_cast<FormWindow*>(w) )
 	    return (FormWindow*)w;
-	if ( !w->parentWidget() )
+	if ( !w->tqparentWidget() )
 	    return 0;
-	w = w->parentWidget();
+	w = w->tqparentWidget();
     }
 }
 
-void QLayoutWidget::paintEvent( TQPaintEvent* )
+void TQLayoutWidget::paintEvent( TQPaintEvent* )
 {
     TQPainter p ( this );
     p.setPen( red );
@@ -123,54 +123,54 @@ void QLayoutWidget::paintEvent( TQPaintEvent* )
 }
 
 
-QDesignerTabWidget::QDesignerTabWidget( TQWidget *parent, const char *name )
-    : TQTabWidget( parent, name ), dropIndicator( 0 ), dragPage( 0 ), mousePressed( FALSE )
+TQDesignerTabWidget::TQDesignerTabWidget( TQWidget *tqparent, const char *name )
+    : TQTabWidget( tqparent, name ), dropIndicator( 0 ), dragPage( 0 ), mousePressed( FALSE )
 {
     tabBar()->setAcceptDrops( TRUE );
     tabBar()->installEventFilter( this );
 }
 
-int QDesignerTabWidget::currentPage() const
+int TQDesignerTabWidget::currentPage() const
 {
     return tabBar()->currentTab();
 }
 
-void QDesignerTabWidget::setCurrentPage( int i )
+void TQDesignerTabWidget::setCurrentPage( int i )
 {
     tabBar()->setCurrentTab( i );
 }
 
-TQString QDesignerTabWidget::pageTitle() const
+TQString TQDesignerTabWidget::pageTitle() const
 {
     return ((TQTabWidget*)this)->tabLabel( TQTabWidget::currentPage() );
 }
 
-void QDesignerTabWidget::setPageTitle( const TQString& title )
+void TQDesignerTabWidget::setPageTitle( const TQString& title )
 {
     changeTab( TQTabWidget::currentPage(), title );
 }
 
-void QDesignerTabWidget::setPageName( const TQCString& name )
+void TQDesignerTabWidget::setPageName( const TQCString& name )
 {
     if ( TQTabWidget::currentPage() )
 	TQTabWidget::currentPage()->setName( name );
 }
 
-TQCString QDesignerTabWidget::pageName() const
+TQCString TQDesignerTabWidget::pageName() const
 {
     if ( !TQTabWidget::currentPage() )
 	return 0;
     return TQTabWidget::currentPage()->name();
 }
 
-int QDesignerTabWidget::count() const
+int TQDesignerTabWidget::count() const
 {
     return tabBar()->count();
 }
 
-bool QDesignerTabWidget::eventFilter( TQObject *o, TQEvent *e )
+bool TQDesignerTabWidget::eventFilter( TQObject *o, TQEvent *e )
 {
-    if ( o != tabBar() ) return FALSE;
+    if ( TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(tabBar()) ) return FALSE;
 
     switch ( e->type() ) {
     case TQEvent::MouseButtonPress: {
@@ -218,7 +218,7 @@ bool QDesignerTabWidget::eventFilter( TQObject *o, TQEvent *e )
 	int index = 0;
 	TQRect rect;
 	for ( ; index < tabBar()->count(); index++ ) {
-	    if ( tabBar()->tabAt( index )->rect().contains( de->pos() ) ) {
+	    if ( tabBar()->tabAt( index )->rect().tqcontains( de->pos() ) ) {
 		rect = tabBar()->tabAt( index )->rect();
 		break;
 	    }
@@ -227,7 +227,7 @@ bool QDesignerTabWidget::eventFilter( TQObject *o, TQEvent *e )
 	if ( index == tabBar()->count() -1 ) {
 	    TQRect rect2 = rect;
 	    rect2.setLeft( rect2.left() + rect2.width() / 2 );
-	    if ( rect2.contains( de->pos() ) )
+	    if ( rect2.tqcontains( de->pos() ) )
 		index++;
 	}
 
@@ -255,20 +255,20 @@ bool QDesignerTabWidget::eventFilter( TQObject *o, TQEvent *e )
 
 		int newIndex = 0;
 		for ( ; newIndex < tabBar()->count(); newIndex++ ) {
-		    if ( tabBar()->tabAt( newIndex )->rect().contains( de->pos() ) )
+		    if ( tabBar()->tabAt( newIndex )->rect().tqcontains( de->pos() ) )
 			break;
 		}
 
 		if ( newIndex == tabBar()->count() -1 ) {
 		    TQRect rect2 = tabBar()->tabAt( newIndex )->rect();
 		    rect2.setLeft( rect2.left() + rect2.width() / 2 );
-		    if ( rect2.contains( de->pos() ) )
+		    if ( rect2.tqcontains( de->pos() ) )
 			newIndex++;
 		}
 
 		int oldIndex = 0;
 		for ( ; oldIndex < tabBar()->count(); oldIndex++ ) {
-		    if ( tabBar()->tabAt( oldIndex )->rect().contains( pressPoint ) )
+		    if ( tabBar()->tabAt( oldIndex )->rect().tqcontains( pressPoint ) )
 			break;
 		}
 
@@ -290,23 +290,23 @@ bool QDesignerTabWidget::eventFilter( TQObject *o, TQEvent *e )
 }
 
 
-QDesignerWidgetStack::QDesignerWidgetStack( TQWidget *parent, const char *name )
-    : TQWidgetStack( parent, name )
+TQDesignerWidgetStack::TQDesignerWidgetStack( TQWidget *tqparent, const char *name )
+    : TQWidgetStack( tqparent, name )
 {
-    prev = new TQToolButton( Qt::LeftArrow, this, "designer_wizardstack_button" );
+    prev = new TQToolButton( TQt::LeftArrow, this, "designer_wizardstack_button" );
     prev->setAutoRaise( TRUE );
     prev->setAutoRepeat( TRUE );
-    prev->setSizePolicy( TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored ) );
-    next = new TQToolButton( Qt::RightArrow, this, "designer_wizardstack_button" );
+    prev->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored ) );
+    next = new TQToolButton( TQt::RightArrow, this, "designer_wizardstack_button" );
     next->setAutoRaise( TRUE );
     next->setAutoRepeat( TRUE );
-    next->setSizePolicy( TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored ) );
+    next->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored ) );
     connect( prev, TQT_SIGNAL( clicked() ), this, TQT_SLOT( prevPage() ) );
     connect( next, TQT_SIGNAL( clicked() ), this, TQT_SLOT( nextPage() ) );
     updateButtons();
 }
 
-void QDesignerWidgetStack::updateButtons()
+void TQDesignerWidgetStack::updateButtons()
 {
     prev->setGeometry( width() - 31, 1, 15, 15 );
     next->setGeometry( width() - 16, 1, 15, 15 );
@@ -316,23 +316,23 @@ void QDesignerWidgetStack::updateButtons()
     next->raise();
 }
 
-void QDesignerWidgetStack::prevPage()
+void TQDesignerWidgetStack::prevPage()
 {
     setCurrentPage( currentPage() - 1 );
 }
 
-void QDesignerWidgetStack::nextPage()
+void TQDesignerWidgetStack::nextPage()
 {
     setCurrentPage( currentPage() + 1 );
 }
 
-int QDesignerWidgetStack::currentPage() const
+int TQDesignerWidgetStack::currentPage() const
 {
-    QDesignerWidgetStack* that = (QDesignerWidgetStack*) this;
-    return that->pages.find( visibleWidget() );
+    TQDesignerWidgetStack* that = (TQDesignerWidgetStack*) this;
+    return that->pages.tqfind( visibleWidget() );
 }
 
-void QDesignerWidgetStack::setCurrentPage( int i )
+void TQDesignerWidgetStack::setCurrentPage( int i )
 {
     // help next/prev page commands
     if ( i < 0 )
@@ -346,34 +346,34 @@ void QDesignerWidgetStack::setCurrentPage( int i )
     updateButtons();
 }
 
-TQCString QDesignerWidgetStack::pageName() const
+TQCString TQDesignerWidgetStack::pageName() const
 {
     if ( !visibleWidget() )
 	return 0;
     return visibleWidget()->name();
 }
 
-void QDesignerWidgetStack::setPageName( const TQCString& name )
+void TQDesignerWidgetStack::setPageName( const TQCString& name )
 {
     if ( visibleWidget() )
 	visibleWidget()->setName( name );
 }
 
-int QDesignerWidgetStack::count() const
+int TQDesignerWidgetStack::count() const
 {
     return pages.count();
 }
 
-TQWidget* QDesignerWidgetStack::page( int i ) const
+TQWidget* TQDesignerWidgetStack::page( int i ) const
 {
     if ( i < 0 || i >= count() )
 	return 0;
-    QDesignerWidgetStack* that = (QDesignerWidgetStack*) this;
+    TQDesignerWidgetStack* that = (TQDesignerWidgetStack*) this;
     return that->pages.at( i );
 }
 
 
-int QDesignerWidgetStack::insertPage( TQWidget *p, int i )
+int TQDesignerWidgetStack::insertPage( TQWidget *p, int i )
 {
     if ( i < 0 )
 	pages.append( p );
@@ -384,12 +384,12 @@ int QDesignerWidgetStack::insertPage( TQWidget *p, int i )
     raiseWidget( p );
     TQApplication::sendPostedEvents();
     updateButtons();
-    return pages.find( p );
+    return pages.tqfind( p );
 }
 
-int QDesignerWidgetStack::removePage( TQWidget *p )
+int TQDesignerWidgetStack::removePage( TQWidget *p )
 {
-    int i = pages.find( p );
+    int i = pages.tqfind( p );
     pages.remove( p );
     removeWidget( p );
     setCurrentPage( 0 );
@@ -398,7 +398,7 @@ int QDesignerWidgetStack::removePage( TQWidget *p )
 }
 
 
-int QDesignerWizard::currentPageNum() const
+int TQDesignerWizard::currentPageNum() const
 {
     for ( int i = 0; i < pageCount(); ++i ) {
 	if ( page( i ) == currentPage() )
@@ -411,7 +411,7 @@ int QDesignerWizard::currentPageNum() const
 
 
 
-void QDesignerWizard::setCurrentPage( int i )
+void TQDesignerWizard::setCurrentPage( int i )
 {
     if ( i < currentPageNum() ) {
 	while ( i < currentPageNum() ) {
@@ -429,30 +429,30 @@ void QDesignerWizard::setCurrentPage( int i )
     }
 }
 
-TQString QDesignerWizard::pageTitle() const
+TQString TQDesignerWizard::pageTitle() const
 {
     return title( currentPage() );
 }
 
-void QDesignerWizard::setPageTitle( const TQString& title )
+void TQDesignerWizard::setPageTitle( const TQString& title )
 {
     setTitle( currentPage(), title );
 }
 
-void QDesignerWizard::setPageName( const TQCString& name )
+void TQDesignerWizard::setPageName( const TQCString& name )
 {
     if ( TQWizard::currentPage() )
 	TQWizard::currentPage()->setName( name );
 }
 
-TQCString QDesignerWizard::pageName() const
+TQCString TQDesignerWizard::pageName() const
 {
     if ( !TQWizard::currentPage() )
 	return 0;
     return TQWizard::currentPage()->name();
 }
 
-int QDesignerWizard::pageNum( TQWidget *p )
+int TQDesignerWizard::pageNum( TQWidget *p )
 {
     for ( int i = 0; i < pageCount(); ++i ) {
 	if ( page( i ) == p )
@@ -461,23 +461,23 @@ int QDesignerWizard::pageNum( TQWidget *p )
     return -1;
 }
 
-void QDesignerWizard::addPage( TQWidget *p, const TQString &t )
+void TQDesignerWizard::addPage( TQWidget *p, const TQString &t )
 {
     TQWizard::addPage( p, t );
-    if ( removedPages.find( p ) )
+    if ( removedPages.tqfind( p ) )
 	removedPages.remove( p );
 }
 
-void QDesignerWizard::removePage( TQWidget *p )
+void TQDesignerWizard::removePage( TQWidget *p )
 {
     TQWizard::removePage( p );
     removedPages.insert( p, p );
 }
 
-void QDesignerWizard::insertPage( TQWidget *p, const TQString &t, int index )
+void TQDesignerWizard::insertPage( TQWidget *p, const TQString &t, int index )
 {
     TQWizard::insertPage( p, t, index );
-    if ( removedPages.find( p ) )
+    if ( removedPages.tqfind( p ) )
 	removedPages.remove( p );
 }
 
@@ -486,10 +486,10 @@ TQMap< int, TQStringList > *changedProperties = 0;
 
 /*!
   \class WidgetFactory widgetfactory.h
-  \brief Set of static functions for creating widgets, layouts and do other stuff
+  \brief Set of static functions for creating widgets, tqlayouts and do other stuff
 
   The widget factory offers functions to create widgets, create and
-  delete layouts find out other details - all based on the
+  delete tqlayouts find out other details - all based on the
   WidgetDatabase's data. So the functions that use ids use the same
   ids as in the WidgetDatabase.
 */
@@ -498,16 +498,16 @@ TQMap< int, TQStringList > *changedProperties = 0;
 void WidgetFactory::saveDefaultProperties( TQObject *w, int id )
 {
     TQMap< TQString, TQVariant> propMap;
-    TQStrList lst = w->metaObject()->propertyNames( TRUE );
+    TQStrList lst = w->tqmetaObject()->propertyNames( TRUE );
     for ( uint i = 0; i < lst.count(); ++i ) {
 	TQVariant var = w->property( lst.at( i ) );
 	if ( !var.isValid() && qstrcmp( "pixmap", lst.at( i ) ) == 0 )
 	    var = TQVariant( TQPixmap() );
 	else if ( !var.isValid() && qstrcmp( "iconSet", lst.at( i ) ) == 0 )
 	    var = TQVariant( TQIconSet() );
-	propMap.replace( lst.at( i ), var );
+	propMap.tqreplace( lst.at( i ), var );
     }
-    defaultProperties->replace( id, propMap );
+    defaultProperties->tqreplace( id, propMap );
 }
 
 void WidgetFactory::saveChangedProperties( TQObject *w, int id )
@@ -517,12 +517,12 @@ void WidgetFactory::saveChangedProperties( TQObject *w, int id )
 }
 
 /*!  Creates a widget of the type which is registered as \a id as
-  child of \a parent. The \a name is optional. If \a init is TRUE, the
+  child of \a tqparent. The \a name is optional. If \a init is TRUE, the
   widget is initialized with some defaults, else the plain widget is
   created.
 */
 
-TQWidget *WidgetFactory::create( int id, TQWidget *parent, const char *name, bool init, const TQRect *r, Qt::Orientation orient )
+TQWidget *WidgetFactory::create( int id, TQWidget *tqparent, const char *name, bool init, const TQRect *r, Qt::Orientation orient )
 {
     TQString n = WidgetDatabase::className( id );
     if ( n.isEmpty() )
@@ -536,97 +536,97 @@ TQWidget *WidgetFactory::create( int id, TQWidget *parent, const char *name, boo
     TQWidget *w = 0;
     TQString str = WidgetDatabase::createWidgetName( id );
     const char *s = str.latin1();
-    w = createWidget( n, parent, name ? name : s, init, r, orient );
-    if ( ::qt_cast<TQScrollView*>(w) )
+    w = createWidget( n, tqparent, name ? name : s, init, r, orient );
+    if ( ::tqqt_cast<TQScrollView*>(w) )
 	( (TQScrollView*)w )->disableSizeHintCaching();
     if ( !w && WidgetDatabase::isCustomWidget( id ) )
-	w = createCustomWidget( parent, name ? name : s, MetaDataBase::customWidget( id ) );
+	w = createCustomWidget( tqparent, name ? name : s, MetaDataBase::customWidget( id ) );
     if ( !w )
 	return 0;
-    MetaDataBase::addEntry( w );
+    MetaDataBase::addEntry( TQT_TQOBJECT(w) );
 
-    if ( !defaultProperties->contains( id ) )
-	saveDefaultProperties( w, id );
-    if ( !changedProperties->contains( id ) )
-	saveChangedProperties( w, id );
+    if ( !defaultProperties->tqcontains( id ) )
+	saveDefaultProperties( TQT_TQOBJECT(w), id );
+    if ( !changedProperties->tqcontains( id ) )
+	saveChangedProperties( TQT_TQOBJECT(w), id );
 
     return w;
 }
 
-/*!  Creates a layout on the widget \a widget of the type \a type
+/*!  Creates a tqlayout on the widget \a widget of the type \a type
   which can be \c HBox, \c VBox or \c Grid.
 */
 
-TQLayout *WidgetFactory::createLayout( TQWidget *widget, TQLayout *layout, LayoutType type )
+TQLayout *WidgetFactory::createLayout( TQWidget *widget, TQLayout *tqlayout, LayoutType type )
 {
     int spacing = MainWindow::self->currentLayoutDefaultSpacing();
     int margin = 0;
 
-    int metaspacing = MetaDataBase::spacing( widget );
-    int metamargin = MetaDataBase::margin( widget );
+    int metaspacing = MetaDataBase::spacing( TQT_TQOBJECT(widget) );
+    int metamargin = MetaDataBase::margin( TQT_TQOBJECT(widget) );
 
-    if ( ::qt_cast<QLayoutWidget*>(widget) &&
-	 ( WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( widget ) ) ) ||
-	   widget && ::qt_cast<FormWindow*>(widget->parentWidget()) ) )
+    if ( ::tqqt_cast<TQLayoutWidget*>(widget) &&
+	 ( WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(widget) ) ) ) ||
+	   widget && ::tqqt_cast<FormWindow*>(widget->tqparentWidget()) ) )
 	margin = MainWindow::self->currentLayoutDefaultMargin();
 
-    if ( !layout && ::qt_cast<TQTabWidget*>(widget) )
+    if ( !tqlayout && ::tqqt_cast<TQTabWidget*>(widget) )
 	widget = ((TQTabWidget*)widget)->currentPage();
 
-    if ( !layout && ::qt_cast<TQWizard*>(widget) )
+    if ( !tqlayout && ::tqqt_cast<TQWizard*>(widget) )
 	widget = ((TQWizard*)widget)->currentPage();
 
-    if ( !layout && ::qt_cast<TQMainWindow*>(widget) )
+    if ( !tqlayout && ::tqqt_cast<TQMainWindow*>(widget) )
 	widget = ((TQMainWindow*)widget)->centralWidget();
 
-    if ( !layout && ::qt_cast<TQWidgetStack*>(widget) )
+    if ( !tqlayout && ::tqqt_cast<TQWidgetStack*>(widget) )
 	widget = ((TQWidgetStack*)widget)->visibleWidget();
 
-    if ( !layout && ::qt_cast<TQToolBox*>(widget) )
+    if ( !tqlayout && ::tqqt_cast<TQToolBox*>(widget) )
 	widget = ((TQToolBox*)widget)->currentItem();
 
-    MetaDataBase::addEntry( widget );
+    MetaDataBase::addEntry( TQT_TQOBJECT(widget) );
 
     TQLayout *l = 0;
     int align = 0;
-    if ( !layout && ::qt_cast<TQGroupBox*>(widget) ) {
+    if ( !tqlayout && ::tqqt_cast<TQGroupBox*>(widget) ) {
 	TQGroupBox *gb = (TQGroupBox*)widget;
 	gb->setColumnLayout( 0, Qt::Vertical );
-	layout = gb->layout();
-	layout->setMargin( 0 );
-	layout->setSpacing( 0 );
+	tqlayout = gb->tqlayout();
+	tqlayout->setMargin( 0 );
+	tqlayout->setSpacing( 0 );
 	switch ( type ) {
 	case HBox:
-	    l = new TQHBoxLayout( layout );
+	    l = new TQHBoxLayout( tqlayout );
 	    break;
 	case VBox:
-	    l = new TQVBoxLayout( layout );
+	    l = new TQVBoxLayout( tqlayout );
 	    break;
 	case Grid:
-	    l = new QDesignerGridLayout( layout );
+	    l = new TQDesignerGridLayout( tqlayout );
 	    break;
 	default:
 	    return 0;
 	}
-	align = Qt::AlignTop;
-	MetaDataBase::setMargin( gb, metamargin );
-	MetaDataBase::setSpacing( gb, metaspacing );
+	align = TQt::AlignTop;
+	MetaDataBase::setMargin( TQT_TQOBJECT(gb), metamargin );
+	MetaDataBase::setSpacing( TQT_TQOBJECT(gb), metaspacing );
     } else {
-	if ( layout ) {
+	if ( tqlayout ) {
 	    switch ( type ) {
 	    case HBox:
-		l = new TQHBoxLayout( layout );
+		l = new TQHBoxLayout( tqlayout );
 		break;
 	    case VBox:
-		l = new TQVBoxLayout( layout );
+		l = new TQVBoxLayout( tqlayout );
 		break;
 	    case Grid:
-		l = new QDesignerGridLayout( layout );
+		l = new TQDesignerGridLayout( tqlayout );
 		break;
 	    default:
 		return 0;
 	    }
-	    MetaDataBase::addEntry( l );
+	    MetaDataBase::addEntry( TQT_TQOBJECT(l) );
 	    l->setSpacing( spacing );
 	    l->setMargin( margin );
 	} else {
@@ -638,23 +638,23 @@ TQLayout *WidgetFactory::createLayout( TQWidget *widget, TQLayout *layout, Layou
 		l = new TQVBoxLayout( widget );
 		break;
 	    case Grid:
-		l = new QDesignerGridLayout( widget );
+		l = new TQDesignerGridLayout( widget );
 		break;
 	    default:
 		return 0;
 	    }
-	    MetaDataBase::addEntry( l );
+	    MetaDataBase::addEntry( TQT_TQOBJECT(l) );
 	    if ( widget ) {
-		MetaDataBase::setMargin( widget, metamargin );
-		MetaDataBase::setSpacing( widget, metaspacing );
+		MetaDataBase::setMargin( TQT_TQOBJECT(widget), metamargin );
+		MetaDataBase::setSpacing( TQT_TQOBJECT(widget), metaspacing );
 	    } else {
 		l->setMargin( margin );
 		l->setSpacing( spacing );
 	    }
 	}
     }
-    l->setAlignment( align );
-    MetaDataBase::addEntry( l );
+    l->tqsetAlignment( align );
+    MetaDataBase::addEntry( TQT_TQOBJECT(l) );
     return l;
 }
 
@@ -663,44 +663,44 @@ void WidgetFactory::deleteLayout( TQWidget *widget )
     if ( !widget )
 	return;
 
-    if ( ::qt_cast<TQTabWidget*>(widget) )
+    if ( ::tqqt_cast<TQTabWidget*>(widget) )
 	widget = ((TQTabWidget*)widget)->currentPage();
-    if ( ::qt_cast<TQWizard*>(widget) )
+    if ( ::tqqt_cast<TQWizard*>(widget) )
 	widget = ((TQWizard*)widget)->currentPage();
-    if ( ::qt_cast<TQMainWindow*>(widget) )
+    if ( ::tqqt_cast<TQMainWindow*>(widget) )
 	widget = ((TQMainWindow*)widget)->centralWidget();
-    if ( ::qt_cast<TQWidgetStack*>(widget) )
+    if ( ::tqqt_cast<TQWidgetStack*>(widget) )
 	widget = ((TQWidgetStack*)widget)->visibleWidget();
-    if ( ::qt_cast<TQToolBox*>(widget) )
+    if ( ::tqqt_cast<TQToolBox*>(widget) )
 	widget = ((TQToolBox*)widget)->currentItem();
-    delete widget->layout();
+    delete widget->tqlayout();
 }
 
 /*!  Factory functions for creating a widget of the type \a className
-  as child of \a parent with the name \a name.
+  as child of \a tqparent with the name \a name.
 
   If \a init is TRUE, some initial default properties are set. This
   has to be in sync with the initChangedProperties() function!
 */
 
-TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *parent, const char *name, bool init,
+TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqparent, const char *name, bool init,
 				      const TQRect *r, Qt::Orientation orient )
 {
     if ( className == TQPUSHBUTTON_OBJECT_NAME_STRING ) {
 	TQPushButton *b = 0;
 	if ( init ) {
-	    b = new QDesignerPushButton( parent, name );
-	    b->setText( TQString::fromLatin1( name ) );
+	    b = new TQDesignerPushButton( tqparent, name );
+	    b->setText( TQString::tqfromLatin1( name ) );
 	} else {
-	    b = new QDesignerPushButton( parent, name );
+	    b = new TQDesignerPushButton( tqparent, name );
 	}
 	TQWidget *w = find_formwindow( b );
-	b->setAutoDefault( w && ::qt_cast<TQDialog*>(((FormWindow*)w)->mainContainer()) );
+	b->setAutoDefault( w && ::tqqt_cast<TQDialog*>(((FormWindow*)w)->mainContainer()) );
 	return b;
     } else if ( className == TQTOOLBUTTON_OBJECT_NAME_STRING ) {
 	if ( init ) {
-	    QDesignerToolButton *tb = new QDesignerToolButton( parent, name );
-	    if ( ::qt_cast<TQToolBox*>(widgetOfContainer(parent))) {
+	    TQDesignerToolButton *tb = new TQDesignerToolButton( tqparent, name );
+	    if ( ::tqqt_cast<TQToolBox*>(widgetOfContainer(tqparent))) {
 		tb->setUsesTextLabel(TRUE);
 		tb->setTextLabel("...");
 		tb->setAutoRaise(TRUE);
@@ -710,32 +710,32 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare
 	    }
 	    return tb;
 	}
-	return new QDesignerToolButton( parent, name );
+	return new TQDesignerToolButton( tqparent, name );
     } else if ( className == TQCHECKBOX_OBJECT_NAME_STRING ) {
 	if ( init ) {
-	    QDesignerCheckBox *cb = new QDesignerCheckBox( parent, name );
-	    cb->setText( TQString::fromLatin1( name ) );
+	    TQDesignerCheckBox *cb = new TQDesignerCheckBox( tqparent, name );
+	    cb->setText( TQString::tqfromLatin1( name ) );
 	    return cb;
 	}
-	return new QDesignerCheckBox( parent, name );
+	return new TQDesignerCheckBox( tqparent, name );
     } else if ( className == TQRADIOBUTTON_OBJECT_NAME_STRING ) {
 	if ( init ) {
-	    QDesignerRadioButton *rb = new QDesignerRadioButton( parent, name );
-	    rb->setText( TQString::fromLatin1( name ) );
+	    TQDesignerRadioButton *rb = new TQDesignerRadioButton( tqparent, name );
+	    rb->setText( TQString::tqfromLatin1( name ) );
 	    return rb;
 	}
-	return new QDesignerRadioButton( parent, name );
+	return new TQDesignerRadioButton( tqparent, name );
     } else if ( className == TQGROUPBOX_OBJECT_NAME_STRING ) {
 	if ( init )
-	    return new TQGroupBox( TQString::fromLatin1( name ), parent, name );
-	return new TQGroupBox( parent, name );
+	    return new TQGroupBox( TQString::tqfromLatin1( name ), tqparent, name );
+	return new TQGroupBox( tqparent, name );
     } else if ( className == TQBUTTONGROUP_OBJECT_NAME_STRING ) {
 	if ( init )
-	    return new TQButtonGroup( TQString::fromLatin1( name ), parent, name );
-	return new TQButtonGroup( parent, name );
+	    return new TQButtonGroup( TQString::tqfromLatin1( name ), tqparent, name );
+	return new TQButtonGroup( tqparent, name );
     } else if ( className == TQICONVIEW_OBJECT_NAME_STRING ) {
-#if !defined(QT_NO_ICONVIEW)
-	TQIconView* iv = new TQIconView( parent, name );
+#if !defined(TQT_NO_ICONVIEW)
+	TQIconView* iv = new TQIconView( tqparent, name );
 	if ( init )
 	    (void) new TQIconViewItem( iv, i18n( "New Item" ) );
 	return iv;
@@ -743,33 +743,33 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare
 	return 0;
 #endif
     } else if ( className == TQTABLE_OBJECT_NAME_STRING ) {
-#if !defined(QT_NO_TABLE)
+#if !defined(TQT_NO_TABLE)
 	if ( init )
-	    return new TQTable( 3, 3, parent, name );
-	return new TQTable( parent, name );
+	    return new TQTable( 3, 3, tqparent, name );
+	return new TQTable( tqparent, name );
 #else
 	return 0;
 #endif
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     } else if ( className == TQDATATABLE_OBJECT_NAME_STRING ) {
-	return new TQDataTable( parent, name );
-#endif //QT_NO_SQL
+	return new TQDataTable( tqparent, name );
+#endif //TQT_NO_SQL
     } else if ( className == TQDATEEDIT_OBJECT_NAME_STRING ) {
-	return new QDateEdit( parent, name );
+	return new TQDateEdit( tqparent, name );
     } else if ( className == TQTIMEEDIT_OBJECT_NAME_STRING ) {
-	return new QTimeEdit( parent, name );
+	return new TQTimeEdit( tqparent, name );
     } else if ( className == TQDATETIMEEDIT_OBJECT_NAME_STRING ) {
-	return new QDateTimeEdit( parent, name );
+	return new TQDateTimeEdit( tqparent, name );
     }
     else if ( className == TQLISTBOX_OBJECT_NAME_STRING ) {
-	TQListBox* lb = new TQListBox( parent, name );
+	TQListBox* lb = new TQListBox( tqparent, name );
 	if ( init ) {
 	    lb->insertItem( i18n( "New Item" ) );
 	    lb->setCurrentItem( 0 );
 	}
 	return lb;
     } else if ( className == TQLISTVIEW_OBJECT_NAME_STRING ) {
-	TQListView *lv = new TQListView( parent, name );
+	TQListView *lv = new TQListView( tqparent, name );
 	lv->setSorting( -1 );
 	if ( init ) {
 	    lv->addColumn( i18n( "Column 1" ) );
@@ -777,109 +777,109 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare
 	}
 	return lv;
     } else if ( className == TQLINEEDIT_OBJECT_NAME_STRING )
-	return new TQLineEdit( parent, name );
+	return new TQLineEdit( tqparent, name );
     else if ( className == TQSPINBOX_OBJECT_NAME_STRING )
-	return new TQSpinBox( parent, name );
+	return new TQSpinBox( tqparent, name );
     else if ( className == TQSPLITTER_OBJECT_NAME_STRING )
-	return new TQSplitter( parent, name );
+	return new TQSplitter( tqparent, name );
     else if ( className == TQMULTILINEEDIT_OBJECT_NAME_STRING )
-	return new TQMultiLineEdit( parent, name );
+	return new TQMultiLineEdit( tqparent, name );
     else if ( className == TQTEXTEDIT_OBJECT_NAME_STRING )
-	return new TQTextEdit( parent, name );
+	return new TQTextEdit( tqparent, name );
     else if ( className == TQLABEL_OBJECT_NAME_STRING  || className == "TextLabel" ) {
-	QDesignerLabel *l = new QDesignerLabel( parent, name );
+	TQDesignerLabel *l = new TQDesignerLabel( tqparent, name );
 	if ( init ) {
-	    l->setText( TQString::fromLatin1( name ) );
-	    MetaDataBase::addEntry( l );
-	    MetaDataBase::setPropertyChanged( l, "text", TRUE );
+	    l->setText( TQString::tqfromLatin1( name ) );
+	    MetaDataBase::addEntry( TQT_TQOBJECT(l) );
+	    MetaDataBase::setPropertyChanged( TQT_TQOBJECT(l), "text", TRUE );
 	}
 	return l;
     } else if ( className == "PixmapLabel" ) {
-	QDesignerLabel *l = new QDesignerLabel( parent, name );
+	TQDesignerLabel *l = new TQDesignerLabel( tqparent, name );
 	if ( init ) {
 	    l->setPixmap( BarIcon( "designer_qtlogo.png", KDevDesignerPartFactory::instance() ) );
 	    l->setScaledContents( TRUE );
-	    MetaDataBase::addEntry( l );
-	    MetaDataBase::setPropertyChanged( l, "pixmap", TRUE );
-	    MetaDataBase::setPropertyChanged( l, "scaledContents", TRUE );
+	    MetaDataBase::addEntry( TQT_TQOBJECT(l) );
+	    MetaDataBase::setPropertyChanged( TQT_TQOBJECT(l), "pixmap", TRUE );
+	    MetaDataBase::setPropertyChanged( TQT_TQOBJECT(l), "scaledContents", TRUE );
 	}
 	return l;
     } else if ( className == TQLAYOUTWIDGET_OBJECT_NAME_STRING )
-	return new QLayoutWidget( parent, name );
+	return new TQLayoutWidget( tqparent, name );
     else if ( className == TQTABWIDGET_OBJECT_NAME_STRING ) {
-	TQTabWidget *tw = new QDesignerTabWidget( parent, name );
+	TQTabWidget *tw = new TQDesignerTabWidget( tqparent, name );
 	if ( init ) {
-	    FormWindow *fw = find_formwindow( parent );
-	    TQWidget *w = fw ? new QDesignerWidget( fw, tw, "tab" ) : new TQWidget( tw, "tab" );
+	    FormWindow *fw = find_formwindow( tqparent );
+	    TQWidget *w = fw ? new TQDesignerWidget( fw, tw, "tab" ) : new TQWidget( tw, "tab" );
 	    tw->addTab( w, i18n("Tab 1") );
-	    MetaDataBase::addEntry( w );
-	    w = fw ? new QDesignerWidget( fw, tw, "tab" ) : new TQWidget( tw, "tab" );
+	    MetaDataBase::addEntry( TQT_TQOBJECT(w) );
+	    w = fw ? new TQDesignerWidget( fw, tw, "tab" ) : new TQWidget( tw, "tab" );
 	    tw->addTab( w, i18n("Tab 2") );
-	    MetaDataBase::addEntry( tw );
-	    MetaDataBase::addEntry( w );
+	    MetaDataBase::addEntry( TQT_TQOBJECT(tw) );
+	    MetaDataBase::addEntry( TQT_TQOBJECT(w) );
 	}
 	return tw;
     } else if ( className == TQWIDGETSTACK_OBJECT_NAME_STRING ) {
-	QDesignerWidgetStack *ws = new QDesignerWidgetStack( parent, name );
+	TQDesignerWidgetStack *ws = new TQDesignerWidgetStack( tqparent, name );
 	if ( init ) {
-	    FormWindow *fw = find_formwindow( parent );
-	    TQWidget *w = fw ? new QDesignerWidget( fw, ws, "WStackPage" ) : new TQWidget( ws, "WStackPage" );
+	    FormWindow *fw = find_formwindow( tqparent );
+	    TQWidget *w = fw ? new TQDesignerWidget( fw, ws, "WStackPage" ) : new TQWidget( ws, "WStackPage" );
 	    ws->insertPage( w );
-	    MetaDataBase::addEntry( w );
-	    MetaDataBase::addEntry( ws );
+	    MetaDataBase::addEntry( TQT_TQOBJECT(w) );
+	    MetaDataBase::addEntry( TQT_TQOBJECT(ws) );
 	}
 	return ws;
     } else if ( className == TQCOMBOBOX_OBJECT_NAME_STRING ) {
-	return new TQComboBox( FALSE, parent, name );
+	return new TQComboBox( FALSE, tqparent, name );
     } else if ( className == TQWIDGET_OBJECT_NAME_STRING ) {
-	if ( parent &&
-	     ( ::qt_cast<FormWindow*>(parent) ||
-	       ::qt_cast<TQWizard*>(parent) ||
-	       ::qt_cast<TQTabWidget*>(parent) ||
-	       ::qt_cast<TQWidgetStack*>(parent) ||
-	       ::qt_cast<TQToolBox*>(parent) ||
-	       ::qt_cast<TQMainWindow*>(parent) ) ) {
-	    FormWindow *fw = find_formwindow( parent );
+	if ( tqparent &&
+	     ( ::tqqt_cast<FormWindow*>(tqparent) ||
+	       ::tqqt_cast<TQWizard*>(tqparent) ||
+	       ::tqqt_cast<TQTabWidget*>(tqparent) ||
+	       ::tqqt_cast<TQWidgetStack*>(tqparent) ||
+	       ::tqqt_cast<TQToolBox*>(tqparent) ||
+	       ::tqqt_cast<TQMainWindow*>(tqparent) ) ) {
+	    FormWindow *fw = find_formwindow( tqparent );
 	    if ( fw ) {
-		QDesignerWidget *dw = new QDesignerWidget( fw, parent, name );
-		MetaDataBase::addEntry( dw );
+		TQDesignerWidget *dw = new TQDesignerWidget( fw, tqparent, name );
+		MetaDataBase::addEntry( TQT_TQOBJECT(dw) );
 		return dw;
 	    }
 	}
-	return new TQWidget( parent, name );
+	return new TQWidget( tqparent, name );
     } else if ( className == TQDIALOG_OBJECT_NAME_STRING ) {
 	TQDialog *dia = 0;
-	if ( ::qt_cast<FormWindow*>(parent) )
-	    dia = new QDesignerDialog( (FormWindow*)parent, parent, name );
+	if ( ::tqqt_cast<FormWindow*>(tqparent) )
+	    dia = new TQDesignerDialog( (FormWindow*)tqparent, tqparent, name );
 	else
-	    dia = new TQDialog( parent, name );
-#if defined(QT_NON_COMMERCIAL)
-	if ( ::qt_cast<MainWindow*>(parent) )
+	    dia = new TQDialog( tqparent, name );
+#if defined(TQT_NON_COMMERCIAL)
+	if ( ::tqqt_cast<MainWindow*>(tqparent) )
 #else
-	if ( parent )
+	if ( tqparent )
 #endif
-	    dia->reparent( parent, TQPoint( 0, 0 ), TRUE );
+	    dia->reparent( tqparent, TQPoint( 0, 0 ), TRUE );
 	return dia;
     } else if ( className == TQWIZARD_OBJECT_NAME_STRING ) {
-	TQWizard *wiz = new QDesignerWizard( parent, name );
-#if defined(QT_NON_COMMERCIAL)
-	if ( ::qt_cast<MainWindow*>(parent) )
+	TQWizard *wiz = new TQDesignerWizard( tqparent, name );
+#if defined(TQT_NON_COMMERCIAL)
+	if ( ::tqqt_cast<MainWindow*>(tqparent) )
 #else
-	if ( parent )
+	if ( tqparent )
 #endif
-	    wiz->reparent( parent, TQPoint( 0, 0 ), TRUE );
-	if ( init && ::qt_cast<FormWindow*>(parent) ) {
-	    QDesignerWidget *dw = new QDesignerWidget( (FormWindow*)parent, wiz, "WizardPage" );
-	    MetaDataBase::addEntry( dw );
+	    wiz->reparent( tqparent, TQPoint( 0, 0 ), TRUE );
+	if ( init && ::tqqt_cast<FormWindow*>(tqparent) ) {
+	    TQDesignerWidget *dw = new TQDesignerWidget( (FormWindow*)tqparent, wiz, "WizardPage" );
+	    MetaDataBase::addEntry( TQT_TQOBJECT(dw) );
 	    wiz->addPage( dw, i18n( "Page" ) );
 	    TQTimer::singleShot( 0, wiz, TQT_SLOT( next() ) );
 	}
 	return wiz;
     } else if ( className == "Spacer" ) {
-	Spacer *s = new Spacer( parent, name );
-	MetaDataBase::addEntry( s );
-	MetaDataBase::setPropertyChanged( s, "orientation", TRUE );
-	MetaDataBase::setPropertyChanged( s, "sizeType", TRUE );
+	Spacer *s = new Spacer( tqparent, name );
+	MetaDataBase::addEntry( TQT_TQOBJECT(s) );
+	MetaDataBase::setPropertyChanged( TQT_TQOBJECT(s), "orientation", TRUE );
+	MetaDataBase::setPropertyChanged( TQT_TQOBJECT(s), "sizeType", TRUE );
 	if ( !r )
 	    return s;
 	if ( !r->isValid() || r->width() < 2 && r->height() < 2 )
@@ -890,49 +890,49 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare
 	    s->setOrientation( Qt::Horizontal );
 	return s;
     } else if ( className == TQLCDNUMBER_OBJECT_NAME_STRING )
-	return new TQLCDNumber( parent, name );
+	return new TQLCDNumber( tqparent, name );
     else if ( className == TQPROGRESSBAR_OBJECT_NAME_STRING )
-	return new TQProgressBar( parent, name );
+	return new TQProgressBar( tqparent, name );
     else if ( className == TQTEXTVIEW_OBJECT_NAME_STRING )
-	return new TQTextView( parent, name );
+	return new TQTextView( tqparent, name );
     else if ( className == TQTEXTBROWSER_OBJECT_NAME_STRING )
-	return new TQTextBrowser( parent, name );
+	return new TQTextBrowser( tqparent, name );
     else if ( className == TQDIAL_OBJECT_NAME_STRING )
-	return new TQDial( parent, name );
+	return new TQDial( tqparent, name );
     else if ( className == TQSLIDER_OBJECT_NAME_STRING ) {
-	TQSlider *s = new TQSlider( parent, name );
+	TQSlider *s = new TQSlider( tqparent, name );
 	if ( !r )
 	    return s;
 	if ( !r->isValid() || r->width() < 2 && r->height() < 2 )
 	    s->setOrientation( orient );
 	else if ( r->width() > r->height() )
 	    s->setOrientation( Qt::Horizontal );
-	MetaDataBase::addEntry( s );
-	MetaDataBase::setPropertyChanged( s, "orientation", TRUE );
+	MetaDataBase::addEntry( TQT_TQOBJECT(s) );
+	MetaDataBase::setPropertyChanged( TQT_TQOBJECT(s), "orientation", TRUE );
 	return s;
     } else if ( className == TQSCROLLBAR_OBJECT_NAME_STRING ) {
-	TQScrollBar *s = new TQScrollBar( parent, name );
+	TQScrollBar *s = new TQScrollBar( tqparent, name );
 	if ( !r )
 	    return s;
 	if ( !r->isValid() || r->width() < 2 && r->height() < 2 )
 	    s->setOrientation( orient );
 	else if ( r->width() > r->height() )
 	    s->setOrientation( Qt::Horizontal );
-	MetaDataBase::addEntry( s );
-	MetaDataBase::setPropertyChanged( s, "orientation", TRUE );
+	MetaDataBase::addEntry( TQT_TQOBJECT(s) );
+	MetaDataBase::setPropertyChanged( TQT_TQOBJECT(s), "orientation", TRUE );
 	return s;
     } else if ( className == TQFRAME_OBJECT_NAME_STRING ) {
 	if ( !init )
-	    return new TQFrame( parent, name );
-	TQFrame *f = new TQFrame( parent, name );
+	    return new TQFrame( tqparent, name );
+	TQFrame *f = new TQFrame( tqparent, name );
 	f->setFrameStyle( TQFrame::StyledPanel | TQFrame::Raised );
 	return f;
     } else if ( className == "Line" ) {
-	Line *l = new Line( parent, name );
-	MetaDataBase::addEntry( l );
-	MetaDataBase::setPropertyChanged( l, "orientation", TRUE );
-	MetaDataBase::setPropertyChanged( l, "frameShadow", TRUE );
-	MetaDataBase::setPropertyChanged( l, "frameShape", TRUE );
+	Line *l = new Line( tqparent, name );
+	MetaDataBase::addEntry( TQT_TQOBJECT(l) );
+	MetaDataBase::setPropertyChanged( TQT_TQOBJECT(l), "orientation", TRUE );
+	MetaDataBase::setPropertyChanged( TQT_TQOBJECT(l), "frameShadow", TRUE );
+	MetaDataBase::setPropertyChanged( TQT_TQOBJECT(l), "frameShape", TRUE );
 	if ( !r )
 	    return l;
 	if ( !r->isValid() || r->width() < 2 && r->height() < 2 )
@@ -941,40 +941,40 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare
 	    l->setOrientation( Qt::Vertical );
 	return l;
     } else if ( className == TQMAINWINDOW_OBJECT_NAME_STRING ) {
-	TQMainWindow *mw = new TQMainWindow( parent, name, 0 );
-	mw->setDockEnabled( Qt::DockMinimized, FALSE );
-	QDesignerWidget *dw = new QDesignerWidget( (FormWindow*)parent, mw, "central widget" );
+	TQMainWindow *mw = new TQMainWindow( tqparent, name, 0 );
+	mw->setDockEnabled( TQt::DockMinimized, FALSE );
+	TQDesignerWidget *dw = new TQDesignerWidget( (FormWindow*)tqparent, mw, "central widget" );
 	mw->setDockMenuEnabled( FALSE );
-	MetaDataBase::addEntry( dw );
+	MetaDataBase::addEntry( TQT_TQOBJECT(dw) );
 	mw->setCentralWidget( dw );
 	(void)mw->statusBar();
 	dw->show();
 	return mw;
     } else if ( className == TQTOOLBOX_OBJECT_NAME_STRING ) {
 	if ( !init )
-	    return new QDesignerToolBox( parent, name );
-	TQToolBox *tb = new QDesignerToolBox( parent, name );
-	FormWindow *fw = find_formwindow( parent );
-	TQWidget *w = fw ? new QDesignerWidget( fw, tb, "page1" ) :
+	    return new TQDesignerToolBox( tqparent, name );
+	TQToolBox *tb = new TQDesignerToolBox( tqparent, name );
+	FormWindow *fw = find_formwindow( tqparent );
+	TQWidget *w = fw ? new TQDesignerWidget( fw, tb, "page1" ) :
 		     new TQWidget( tb, "page1" );
 	tb->addItem( w, i18n("Page 1") );
-	MetaDataBase::addEntry( w );
-	w = fw ? new QDesignerWidget( fw, tb, "page2" ) : new TQWidget( tb, "page2" );
+	MetaDataBase::addEntry( TQT_TQOBJECT(w) );
+	w = fw ? new TQDesignerWidget( fw, tb, "page2" ) : new TQWidget( tb, "page2" );
 	tb->addItem( w, i18n("Page 2") );
-	MetaDataBase::addEntry( tb );
-	MetaDataBase::addEntry( w );
+	MetaDataBase::addEntry( TQT_TQOBJECT(tb) );
+	MetaDataBase::addEntry( TQT_TQOBJECT(w) );
 	return tb;
     }
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     else if ( className == TQDATABROWSER_OBJECT_NAME_STRING ) {
-	TQWidget *w = new QDesignerDataBrowser( parent, name );
-	if ( parent )
-	    w->reparent( parent, TQPoint( 0, 0 ), TRUE );
+	TQWidget *w = new TQDesignerDataBrowser( tqparent, name );
+	if ( tqparent )
+	    w->reparent( tqparent, TQPoint( 0, 0 ), TRUE );
 	return w;
     } else if ( className == TQDATAVIEW_OBJECT_NAME_STRING ) {
-	TQWidget *w = new QDesignerDataView( parent, name );
-	if ( parent )
-	    w->reparent( parent, TQPoint( 0, 0 ), TRUE );
+	TQWidget *w = new TQDesignerDataView( tqparent, name );
+	if ( tqparent )
+	    w->reparent( tqparent, TQPoint( 0, 0 ), TRUE );
 	return w;
     }
 #endif
@@ -984,63 +984,63 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare
     if ( !iface )
 	return 0;
 
-    TQWidget *w = iface->create( className, parent, name );
-#ifdef QT_CONTAINER_CUSTOM_WIDGETS
+    TQWidget *w = iface->create( className, tqparent, name );
+#ifdef TQT_CONTAINER_CUSTOM_WIDGETS
     if ( init && WidgetDatabase::isCustomPluginWidget( WidgetDatabase::idFromClassName( className ) ) ) {
-	QWidgetContainerInterfacePrivate *iface2 = 0;
-	iface->queryInterface( IID_QWidgetContainer, (QUnknownInterface**)&iface2 );
+	TQWidgetContainerInterfacePrivate *iface2 = 0;
+	iface->queryInterface( IID_TQWidgetContainer, (TQUnknownInterface**)&iface2 );
 	if ( iface2 ) {
 	    iface2->addPage( className, w, "Page", -1 );
 	    iface2->release();
 	}
     }
-#endif // QT_CONTAINER_CUSTOM_WIDGETS
+#endif // TQT_CONTAINER_CUSTOM_WIDGETS
     iface->release();
     return w;
 }
 
 
 
-/*!  Find out which type the layout of the widget is. Returns \c HBox,
-  \c VBox, \c Grid or \c NoLayout.  \a layout points to this
-  TQWidget::layout() of \a w or to 0 after the function call.
+/*!  Find out which type the tqlayout of the widget is. Returns \c HBox,
+  \c VBox, \c Grid or \c NoLayout.  \a tqlayout points to this
+  TQWidget::tqlayout() of \a w or to 0 after the function call.
 */
 
-WidgetFactory::LayoutType WidgetFactory::layoutType( TQWidget *w, TQLayout *&layout )
+WidgetFactory::LayoutType WidgetFactory::tqlayoutType( TQWidget *w, TQLayout *&tqlayout )
 {
-    layout = 0;
+    tqlayout = 0;
 
-    if ( ::qt_cast<TQTabWidget*>(w) )
+    if ( ::tqqt_cast<TQTabWidget*>(w) )
 	w = ((TQTabWidget*)w)->currentPage();
-    if ( ::qt_cast<TQWizard*>(w) )
+    if ( ::tqqt_cast<TQWizard*>(w) )
 	w = ((TQWizard*)w)->currentPage();
-    if ( ::qt_cast<TQMainWindow*>(w) )
+    if ( ::tqqt_cast<TQMainWindow*>(w) )
 	w = ((TQMainWindow*)w)->centralWidget();
-    if ( ::qt_cast<TQWidgetStack*>(w) )
+    if ( ::tqqt_cast<TQWidgetStack*>(w) )
 	w = ((TQWidgetStack*)w)->visibleWidget();
-    if ( ::qt_cast<TQToolBox*>(w) )
+    if ( ::tqqt_cast<TQToolBox*>(w) )
 	w = ((TQToolBox*)w)->currentItem();
 
-    if ( ::qt_cast<TQSplitter*>(w) )
-	return ( (TQSplitter*)w )->orientation() == Horizontal ? HBox : VBox;
+    if ( ::tqqt_cast<TQSplitter*>(w) )
+	return ( (TQSplitter*)w )->orientation() ==Qt::Horizontal ? HBox : VBox;
 
-    if ( !w || !w->layout() )
+    if ( !w || !w->tqlayout() )
 	return NoLayout;
-    TQLayout *lay = w->layout();
+    TQLayout *lay = w->tqlayout();
 
-    if ( ::qt_cast<TQGroupBox*>(w) ) {
-	TQObjectList *l = lay->queryList( TQLAYOUT_OBJECT_NAME_STRING );
+    if ( ::tqqt_cast<TQGroupBox*>(w) ) {
+	TQObjectList *l = TQT_TQOBJECT(lay)->queryList( TQLAYOUT_OBJECT_NAME_STRING );
 	if ( l && l->first() )
 	    lay = (TQLayout*)l->first();
 	delete l;
     }
-    layout = lay;
+    tqlayout = lay;
 
-    if ( ::qt_cast<TQHBoxLayout*>(lay) )
+    if ( ::tqqt_cast<TQHBoxLayout*>(lay) )
 	return HBox;
-    else if ( ::qt_cast<TQVBoxLayout*>(lay) )
+    else if ( ::tqqt_cast<TQVBoxLayout*>(lay) )
 	return VBox;
-    else if ( ::qt_cast<TQGridLayout*>(lay) )
+    else if ( ::tqqt_cast<TQGridLayout*>(lay) )
 	return Grid;
     return NoLayout;
 }
@@ -1048,13 +1048,13 @@ WidgetFactory::LayoutType WidgetFactory::layoutType( TQWidget *w, TQLayout *&lay
 /*!
   \overload
 */
-WidgetFactory::LayoutType WidgetFactory::layoutType( TQLayout *layout )
+WidgetFactory::LayoutType WidgetFactory::tqlayoutType( TQLayout *tqlayout )
 {
-    if ( ::qt_cast<TQHBoxLayout*>(layout) )
+    if ( ::tqqt_cast<TQHBoxLayout*>(tqlayout) )
 	return HBox;
-    else if ( ::qt_cast<TQVBoxLayout*>(layout) )
+    else if ( ::tqqt_cast<TQVBoxLayout*>(tqlayout) )
 	return VBox;
-    else if ( ::qt_cast<TQGridLayout*>(layout) )
+    else if ( ::tqqt_cast<TQGridLayout*>(tqlayout) )
 	return Grid;
     return NoLayout;
 }
@@ -1062,25 +1062,25 @@ WidgetFactory::LayoutType WidgetFactory::layoutType( TQLayout *layout )
 /*!
   \overload
 */
-WidgetFactory::LayoutType WidgetFactory::layoutType( TQWidget *w )
+WidgetFactory::LayoutType WidgetFactory::tqlayoutType( TQWidget *w )
 {
     TQLayout *l = 0;
-    return layoutType( w, l );
+    return tqlayoutType( w, l );
 }
 
 
-TQWidget *WidgetFactory::layoutParent( TQLayout *layout )
+TQWidget *WidgetFactory::tqlayoutParent( TQLayout *tqlayout )
 {
-    TQObject *o = layout;
+    TQObject *o = TQT_TQOBJECT(tqlayout);
     while ( o ) {
 	if ( o->isWidgetType() )
 	    return (TQWidget*)o;
-	o = o->parent();
+	o = o->tqparent();
     }
     return 0;
 }
 
-/*!  Returns the widget into which children should be inserted when \a
+/*!  Returns the widget into which tqchildren should be inserted when \a
   w is a container known to the designer.
 
   Usually that is \a w itself, sometimes it is different (e.g. a
@@ -1093,25 +1093,25 @@ TQWidget* WidgetFactory::containerOfWidget( TQWidget *w )
 {
     if ( !w )
 	return w;
-    if ( ::qt_cast<TQTabWidget*>(w) )
+    if ( ::tqqt_cast<TQTabWidget*>(w) )
 	return ((TQTabWidget*)w)->currentPage();
-    if ( ::qt_cast<TQWizard*>(w) )
+    if ( ::tqqt_cast<TQWizard*>(w) )
 	return ((TQWizard*)w)->currentPage();
-    if ( ::qt_cast<TQWidgetStack*>(w) )
+    if ( ::tqqt_cast<TQWidgetStack*>(w) )
 	return ((TQWidgetStack*)w)->visibleWidget();
-    if ( ::qt_cast<TQToolBox*>(w) )
+    if ( ::tqqt_cast<TQToolBox*>(w) )
 	return ((TQToolBox*)w)->currentItem();
-    if ( ::qt_cast<TQMainWindow*>(w) )
+    if ( ::tqqt_cast<TQMainWindow*>(w) )
 	return ((TQMainWindow*)w)->centralWidget();
-#ifdef QT_CONTAINER_CUSTOM_WIDGETS
+#ifdef TQT_CONTAINER_CUSTOM_WIDGETS
     if ( !WidgetDatabase::isCustomPluginWidget( WidgetDatabase::idFromClassName( classNameOf( w ) ) ) )
 	return w;
     WidgetInterface *iface = 0;
     widgetManager()->queryInterface( classNameOf( w ), &iface );
     if ( !iface )
 	return w;
-    QWidgetContainerInterfacePrivate *iface2 = 0;
-    iface->queryInterface( IID_QWidgetContainer, (QUnknownInterface**)&iface2 );
+    TQWidgetContainerInterfacePrivate *iface2 = 0;
+    iface->queryInterface( IID_TQWidgetContainer, (TQUnknownInterface**)&iface2 );
     if ( !iface2 )
 	return w;
     TQWidget *c = iface2->containerOfWidget( w->className(), w );
@@ -1119,32 +1119,32 @@ TQWidget* WidgetFactory::containerOfWidget( TQWidget *w )
     iface->release();
     if ( c )
 	return c;
-#endif // QT_CONTAINER_CUSTOM_WIDGETS
+#endif // TQT_CONTAINER_CUSTOM_WIDGETS
     return w;
 }
 
 /*!  Returns the actual designer widget of the container \a w. This is
-  normally \a w itself, but might be a parent or grand parent of \a w
+  normally \a w itself, but might be a tqparent or grand tqparent of \a w
   (e.g. when working with a tabwidget and \a w is the container which
-  contains and layouts childs, but the actual widget known to the
-  designer is the tabwidget which is the parent of \a w. So this
+  contains and tqlayouts childs, but the actual widget known to the
+  designer is the tabwidget which is the tqparent of \a w. So this
   function returns the tabwidget then.)
 */
 
 TQWidget* WidgetFactory::widgetOfContainer( TQWidget *w )
 {
-    if ( w && ::qt_cast<TQWidgetStack*>(w->parentWidget()) )
-	w = w->parentWidget();
-    if ( w->parentWidget() && w->parentWidget()->parentWidget() &&
-	 w->parentWidget()->parentWidget()->parentWidget() &&
-	 ::qt_cast<TQToolBox*>(w->parentWidget()->parentWidget()->parentWidget()) )
-	return w->parentWidget()->parentWidget()->parentWidget();
+    if ( w && ::tqqt_cast<TQWidgetStack*>(w->tqparentWidget()) )
+	w = w->tqparentWidget();
+    if ( w->tqparentWidget() && w->tqparentWidget()->tqparentWidget() &&
+	 w->tqparentWidget()->tqparentWidget()->tqparentWidget() &&
+	 ::tqqt_cast<TQToolBox*>(w->tqparentWidget()->tqparentWidget()->tqparentWidget()) )
+	return w->tqparentWidget()->tqparentWidget()->tqparentWidget();
     while ( w ) {
-	int id = WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( w ) );
+	int id = WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(w) ) );
 	if ( WidgetDatabase::isContainer( id ) ||
-	     w && ::qt_cast<FormWindow*>(w->parentWidget()) )
+	     w && ::tqqt_cast<FormWindow*>(w->tqparentWidget()) )
 	    return w;
-	w = w->parentWidget();
+	w = w->tqparentWidget();
     }
     return w;
 }
@@ -1165,38 +1165,38 @@ bool WidgetFactory::isPassiveInteractor( TQObject* o )
     if ( TQApplication::activePopupWidget() ) // if a popup is open, we have to make sure that this one is closed, else X might do funny things
 	return ( lastWasAPassiveInteractor = TRUE );
 
-    if ( ::qt_cast<TQTabBar*>(o) )
+    if ( ::tqqt_cast<TQTabBar*>(o) )
 	return ( lastWasAPassiveInteractor = TRUE );
-    else if ( ::qt_cast<TQSizeGrip*>(o) )
+    else if ( ::tqqt_cast<TQSizeGrip*>(o) )
 	return ( lastWasAPassiveInteractor = TRUE );
-    else if ( ::qt_cast<TQButton*>(o) &&
-	      ( ::qt_cast<TQTabBar*>(o->parent()) || ::qt_cast<TQToolBox*>(o->parent()) ) )
+    else if ( ::tqqt_cast<TQButton*>(o) &&
+	      ( ::tqqt_cast<TQTabBar*>(o->tqparent()) || ::tqqt_cast<TQToolBox*>(o->tqparent()) ) )
 	return ( lastWasAPassiveInteractor = TRUE );
-    else if ( ::qt_cast<TQPushButton*>(o) && ::qt_cast<TQWizard*>(o->parent()) )
+    else if ( ::tqqt_cast<TQPushButton*>(o) && ::tqqt_cast<TQWizard*>(o->tqparent()) )
 	return ( lastWasAPassiveInteractor = TRUE );
-    else if ( ::qt_cast<TQMenuBar*>(o) && ::qt_cast<TQMainWindow*>(o->parent()) )
+    else if ( ::tqqt_cast<TQMenuBar*>(o) && ::tqqt_cast<TQMainWindow*>(o->tqparent()) )
 	return ( lastWasAPassiveInteractor = TRUE );
-//    else if ( ::qt_cast<QDockWindowHandle*>(o) )
-    else if ( o->inherits( "QDockWindowHandle" ) )
+//    else if ( ::tqqt_cast<TQDockWindowHandle*>(o) )
+    else if ( o->inherits( TQDOCKWINDOWHANDLE_OBJECT_NAME_STRING ) )
 	return ( lastWasAPassiveInteractor = TRUE );
-//    else if ( ::qt_cast<QHideDock*>(o) )
-    else if ( o->inherits( "QHideDock" ) )
+//    else if ( ::tqqt_cast<TQHideDock*>(o) )
+    else if ( o->inherits( TQHIDEDOCK_OBJECT_NAME_STRING ) )
 	return ( lastWasAPassiveInteractor = TRUE );
     else if ( qstrcmp( o->name(), "designer_wizardstack_button" ) == 0 )
 	return ( lastWasAPassiveInteractor = TRUE );
-#ifdef QT_CONTAINER_CUSTOM_WIDGETS
+#ifdef TQT_CONTAINER_CUSTOM_WIDGETS
     if ( !o->isWidgetType() )
 	return ( lastWasAPassiveInteractor = FALSE );
     WidgetInterface *iface = 0;
     TQWidget *w = (TQWidget*)o;
-    while ( !iface && w && !::qt_cast<FormWindow*>(w) ) {
+    while ( !iface && w && !::tqqt_cast<FormWindow*>(w) ) {
 	widgetManager()->queryInterface( classNameOf( w ), &iface );
-	w = w->parentWidget();
+	w = w->tqparentWidget();
     }
     if ( !iface )
 	return ( lastWasAPassiveInteractor = FALSE );
-    QWidgetContainerInterfacePrivate *iface2 = 0;
-    iface->queryInterface( IID_QWidgetContainer, (QUnknownInterface**)&iface2 );
+    TQWidgetContainerInterfacePrivate *iface2 = 0;
+    iface->queryInterface( IID_TQWidgetContainer, (TQUnknownInterface**)&iface2 );
     if ( !iface2 )
 	return ( lastWasAPassiveInteractor = FALSE );
     TQWidget *fw = MainWindow::self->isAFormWindowChild( (TQWidget*)o );
@@ -1208,7 +1208,7 @@ bool WidgetFactory::isPassiveInteractor( TQObject* o )
     lastWasAPassiveInteractor = iface2->isPassiveInteractor( dw->className(), (TQWidget*)o );
     iface2->release();
     iface->release();
-#endif // QT_CONTAINER_CUSTOM_WIDGETS
+#endif // TQT_CONTAINER_CUSTOM_WIDGETS
     return lastWasAPassiveInteractor;
 }
 
@@ -1222,78 +1222,78 @@ const char* WidgetFactory::classNameOf( TQObject* o )
 	return o->className();
     if (WidgetDatabase::isCustomPluginWidget(WidgetDatabase::idFromClassName(o->className())))
         return o->className();
-    else if ( ::qt_cast<QDesignerTabWidget*>(o) )
-	return "TQTabWidget";
-    else if ( ::qt_cast<QDesignerWidgetStack*>(o) )
-	return "TQWidgetStack";
-    else if ( ::qt_cast<TQWidgetStack*>(o) )
-	return "QWeDoNotWantToBreakTabWidget";
-    else if ( ::qt_cast<QDesignerDialog*>(o) )
-	return "TQDialog";
-    else if ( ::qt_cast<QDesignerWidget*>(o) )
-	return "TQWidget";
+    else if ( ::tqqt_cast<TQDesignerTabWidget*>(o) )
+	return TQTABWIDGET_OBJECT_NAME_STRING;
+    else if ( ::tqqt_cast<TQDesignerWidgetStack*>(o) )
+	return TQWIDGETSTACK_OBJECT_NAME_STRING;
+    else if ( ::tqqt_cast<TQWidgetStack*>(o) )
+	return "TQWeDoNotWantToBreakTabWidget";
+    else if ( ::tqqt_cast<TQDesignerDialog*>(o) )
+	return TQDIALOG_OBJECT_NAME_STRING;
+    else if ( ::tqqt_cast<TQDesignerWidget*>(o) )
+	return TQWIDGET_OBJECT_NAME_STRING;
     else if ( o->inherits( "CustomWidget" ) )
 	return ( (CustomWidget*)o )->realClassName().latin1();
-    else if ( ::qt_cast<QDesignerLabel*>(o) )
-	return "TQLabel";
-    else if ( ::qt_cast<QDesignerWizard*>(o) )
-	return "TQWizard";
-    else if ( ::qt_cast<QDesignerPushButton*>(o) )
-	return "TQPushButton";
-    else if ( ::qt_cast<QDesignerToolButton*>(o) )
-	return "TQToolButton";
-    else if ( ::qt_cast<QDesignerRadioButton*>(o) )
-	return "TQRadioButton";
-    else if ( ::qt_cast<QDesignerCheckBox*>(o) )
-	return "TQCheckBox";
-    else if ( ::qt_cast<MenuBarEditor*>(o) )
-	return "TQMenuBar";
-    else if ( ::qt_cast<QDesignerToolBar*>(o) )
-	return "TQToolBar";
-    else if ( ::qt_cast<QDesignerAction*>(o) )
-	return "TQAction";
-    else if ( ::qt_cast<QDesignerActionGroup*>(o) )
-	return "TQActionGroup";
-    else if ( ::qt_cast<PopupMenuEditor*>(o) )
-	return "TQPopupMenu";
-    else if ( ::qt_cast<QDesignerToolBox*>(o) )
-	return "TQToolBox";
-#ifndef QT_NO_SQL
-    else if ( ::qt_cast<QDesignerDataBrowser*>(o) )
-	return "TQDataBrowser";
-    else if ( ::qt_cast<QDesignerDataView*>(o) )
-	return "TQDataView";
+    else if ( ::tqqt_cast<TQDesignerLabel*>(o) )
+	return TQLABEL_OBJECT_NAME_STRING;
+    else if ( ::tqqt_cast<TQDesignerWizard*>(o) )
+	return TQWIZARD_OBJECT_NAME_STRING;
+    else if ( ::tqqt_cast<TQDesignerPushButton*>(o) )
+	return TQPUSHBUTTON_OBJECT_NAME_STRING;
+    else if ( ::tqqt_cast<TQDesignerToolButton*>(o) )
+	return TQTOOLBUTTON_OBJECT_NAME_STRING;
+    else if ( ::tqqt_cast<TQDesignerRadioButton*>(o) )
+	return TQRADIOBUTTON_OBJECT_NAME_STRING;
+    else if ( ::tqqt_cast<TQDesignerCheckBox*>(o) )
+	return TQCHECKBOX_OBJECT_NAME_STRING;
+    else if ( ::tqqt_cast<MenuBarEditor*>(o) )
+	return TQMENUBAR_OBJECT_NAME_STRING;
+    else if ( ::tqqt_cast<TQDesignerToolBar*>(o) )
+	return TQTOOLBAR_OBJECT_NAME_STRING;
+    else if ( ::tqqt_cast<TQDesignerAction*>(o) )
+	return TQACTION_OBJECT_NAME_STRING;
+    else if ( ::tqqt_cast<TQDesignerActionGroup*>(o) )
+	return TQACTIONGROUP_OBJECT_NAME_STRING;
+    else if ( ::tqqt_cast<PopupMenuEditor*>(o) )
+	return TQPOPUPMENU_OBJECT_NAME_STRING;
+    else if ( ::tqqt_cast<TQDesignerToolBox*>(o) )
+	return TQTOOLBOX_OBJECT_NAME_STRING;
+#ifndef TQT_NO_SQL
+    else if ( ::tqqt_cast<TQDesignerDataBrowser*>(o) )
+	return TQDATABROWSER_OBJECT_NAME_STRING;
+    else if ( ::tqqt_cast<TQDesignerDataView*>(o) )
+	return TQDATAVIEW_OBJECT_NAME_STRING;
 #endif
     return o->className();
 }
 
 TQString WidgetFactory::defaultSignal( TQObject *w )
 {
-    if ( ::qt_cast<TQRadioButton*>(w) || ::qt_cast<TQCheckBox*>(w) )
+    if ( ::tqqt_cast<TQRadioButton*>(w) || ::tqqt_cast<TQCheckBox*>(w) )
 	return "toggled";
-    else if ( ::qt_cast<TQButton*>(w) || ::qt_cast<TQButtonGroup*>(w) )
+    else if ( ::tqqt_cast<TQButton*>(w) || ::tqqt_cast<TQButtonGroup*>(w) )
 	return "clicked";
-    else if ( ::qt_cast<TQTextBrowser*>(w) )
+    else if ( ::tqqt_cast<TQTextBrowser*>(w) )
 	return "linkClicked";
-    else if ( ::qt_cast<TQLineEdit*>(w) || ::qt_cast<TQTextEdit*>(w) )
+    else if ( ::tqqt_cast<TQLineEdit*>(w) || ::tqqt_cast<TQTextEdit*>(w) )
 	return "textChanged";
-    else if ( ::qt_cast<TQListView*>(w) || ::qt_cast<TQIconView*>(w) ||
-	      ::qt_cast<TQListBox*>(w) || ::qt_cast<TQTable*>(w) )
+    else if ( ::tqqt_cast<TQListView*>(w) || ::tqqt_cast<TQIconView*>(w) ||
+	      ::tqqt_cast<TQListBox*>(w) || ::tqqt_cast<TQTable*>(w) )
 	return "selectionChanged";
-    else if ( ::qt_cast<TQTabWidget*>(w) )
+    else if ( ::tqqt_cast<TQTabWidget*>(w) )
 	return "selected";
-    else if ( ::qt_cast<TQToolBox*>(w) )
+    else if ( ::tqqt_cast<TQToolBox*>(w) )
 	return "currentChanged";
-    else if ( ::qt_cast<TQWidgetStack*>(w) )
+    else if ( ::tqqt_cast<TQWidgetStack*>(w) )
 	return "aboutToShow";
-    else if ( ::qt_cast<TQSpinBox*>(w) || ::qt_cast<TQSlider*>(w) ||
-	      ::qt_cast<TQScrollBar*>(w) || ::qt_cast<QDateEdit*>(w) ||
-	      ::qt_cast<QTimeEdit*>(w) || ::qt_cast<QDateTimeEdit*>(w) ||
-	      ::qt_cast<TQDial*>(w) )
+    else if ( ::tqqt_cast<TQSpinBox*>(w) || ::tqqt_cast<TQSlider*>(w) ||
+	      ::tqqt_cast<TQScrollBar*>(w) || ::tqqt_cast<TQDateEdit*>(w) ||
+	      ::tqqt_cast<TQTimeEdit*>(w) || ::tqqt_cast<TQDateTimeEdit*>(w) ||
+	      ::tqqt_cast<TQDial*>(w) )
 	return "valueChanged";
-    else if ( ::qt_cast<TQComboBox*>(w) )
+    else if ( ::tqqt_cast<TQComboBox*>(w) )
 	return "activated";
-    return TQString::null;
+    return TQString();
 }
 
 /*!  As some properties are set by default when creating a widget this
@@ -1307,14 +1307,14 @@ void WidgetFactory::initChangedProperties( TQObject *o )
 	 MainWindow::self->currProject()->fakeFormFileFor( o ) )
 	return;
     MetaDataBase::setPropertyChanged( o, "name", TRUE );
-    if ( !::qt_cast<QDesignerToolBar*>(o) && !::qt_cast<MenuBarEditor*>(o) )
+    if ( !::tqqt_cast<TQDesignerToolBar*>(o) && !::tqqt_cast<MenuBarEditor*>(o) )
 	MetaDataBase::setPropertyChanged( o, "geometry", TRUE );
 
-    if ( ::qt_cast<TQPushButton*>(o) ||
-	 ::qt_cast<TQRadioButton*>(o) ||
-	 ::qt_cast<TQCheckBox*>(o) ||
-	 ::qt_cast<TQToolButton*>(o) ) {
-	if (::qt_cast<TQToolButton*>(o) && ::qt_cast<TQToolBox*>(widgetOfContainer((TQWidget*)o->parent()))) {
+    if ( ::tqqt_cast<TQPushButton*>(o) ||
+	 ::tqqt_cast<TQRadioButton*>(o) ||
+	 ::tqqt_cast<TQCheckBox*>(o) ||
+	 ::tqqt_cast<TQToolButton*>(o) ) {
+	if (::tqqt_cast<TQToolButton*>(o) && ::tqqt_cast<TQToolBox*>(widgetOfContainer((TQWidget*)o->tqparent()))) {
 	    MetaDataBase::setPropertyChanged( o, "usesTextLabel", TRUE );
 	    MetaDataBase::setPropertyChanged( o, "textLabel", TRUE );
 	    MetaDataBase::setPropertyChanged( o, "autoRaise", TRUE );
@@ -1323,29 +1323,29 @@ void WidgetFactory::initChangedProperties( TQObject *o )
 	    MetaDataBase::setPropertyChanged( o, "text", TRUE );
 	}
     }
-    else if ( ::qt_cast<TQGroupBox*>(o) )
+    else if ( ::tqqt_cast<TQGroupBox*>(o) )
 	MetaDataBase::setPropertyChanged( o, "title", TRUE );
     else if ( o->isA( TQFRAME_OBJECT_NAME_STRING ) ) {
 	MetaDataBase::setPropertyChanged( o, "frameShadow", TRUE );
 	MetaDataBase::setPropertyChanged( o, "frameShape", TRUE );
-    } else if ( ::qt_cast<TQTabWidget*>(o) || ::qt_cast<TQWizard*>(o) ) {
+    } else if ( ::tqqt_cast<TQTabWidget*>(o) || ::tqqt_cast<TQWizard*>(o) ) {
 	MetaDataBase::setPropertyChanged( o, "pageTitle", TRUE );
 	MetaDataBase::setPropertyChanged( o, "pageName", TRUE );
 	MetaDataBase::setPropertyChanged( o, "currentPage", TRUE );
-    } else if ( ::qt_cast<TQWidgetStack*>(o) ) {
+    } else if ( ::tqqt_cast<TQWidgetStack*>(o) ) {
 	MetaDataBase::setPropertyChanged( o, "currentPage", TRUE );
 	MetaDataBase::setPropertyChanged( o, "pageName", TRUE );
-    } else if ( ::qt_cast<TQToolBox*>(o) ) {
+    } else if ( ::tqqt_cast<TQToolBox*>(o) ) {
 	MetaDataBase::setPropertyChanged( o, "currentIndex", TRUE );
 	MetaDataBase::setPropertyChanged( o, "itemName", TRUE );
 	MetaDataBase::setPropertyChanged( o, "itemLabel", TRUE );
 	MetaDataBase::setPropertyChanged( o, "itemIconSet", TRUE );
 	MetaDataBase::setPropertyChanged( o, "itemToolTip", TRUE );
 	MetaDataBase::setPropertyChanged( o, "itemBackgroundMode", TRUE );
-#ifndef QT_NO_TABLE
-    } else if ( ::qt_cast<TQTable*>(o) ) {
-#  ifndef QT_NO_SQL
-        if (!::qt_cast<TQDataTable*>(o) )
+#ifndef TQT_NO_TABLE
+    } else if ( ::tqqt_cast<TQTable*>(o) ) {
+#  ifndef TQT_NO_SQL
+        if (!::tqqt_cast<TQDataTable*>(o) )
 #  endif
         {
             MetaDataBase::setPropertyChanged( o, "numRows", TRUE );
@@ -1357,11 +1357,11 @@ void WidgetFactory::initChangedProperties( TQObject *o )
             }
         }
 #endif
-    } else if ( ::qt_cast<TQSplitter*>(o)  ) {
+    } else if ( ::tqqt_cast<TQSplitter*>(o)  ) {
 	MetaDataBase::setPropertyChanged( o, "orientation", TRUE );
-    } else if ( ::qt_cast<QDesignerToolBar*>(o)  ) {
+    } else if ( ::tqqt_cast<TQDesignerToolBar*>(o)  ) {
 	MetaDataBase::setPropertyChanged( o, "label", TRUE );
-    } else if ( ::qt_cast<MenuBarEditor*>(o)  ) {
+    } else if ( ::tqqt_cast<MenuBarEditor*>(o)  ) {
 	MetaDataBase::setPropertyChanged( o, "itemName", TRUE );
 	MetaDataBase::setPropertyChanged( o, "itemNumber", TRUE );
 	MetaDataBase::setPropertyChanged( o, "itemText", TRUE );
@@ -1372,17 +1372,17 @@ bool WidgetFactory::hasSpecialEditor( int id, TQObject *editorWidget )
 {
     TQString className = WidgetDatabase::className( id );
 
-    if ( className.contains( "ListBox" ) )
+    if ( className.tqcontains( "ListBox" ) )
 	return TRUE;
-    if ( className.contains( "ComboBox" ) )
+    if ( className.tqcontains( "ComboBox" ) )
 	return TRUE;
-    if ( className.contains( "ListView" ) )
+    if ( className.tqcontains( "ListView" ) )
 	return TRUE;
-    if ( className.contains( "IconView" ) )
+    if ( className.tqcontains( "IconView" ) )
 	return TRUE;
     if ( className == TQTEXTEDIT_OBJECT_NAME_STRING || className == TQMULTILINEEDIT_OBJECT_NAME_STRING )
 	return TRUE;
-    if ( ::qt_cast<TQTable*>(editorWidget) != 0 )
+    if ( ::tqqt_cast<TQTable*>(editorWidget) != 0 )
 	return TRUE;
 
     return FALSE;
@@ -1392,66 +1392,66 @@ bool WidgetFactory::hasItems( int id, TQObject *editorWidget )
 {
     TQString className = WidgetDatabase::className( id );
 
-    if ( className.contains( "ListBox" ) || className.contains( "ListView" ) ||
-	 className.contains( "IconView" )  || className.contains( "ComboBox" ) ||
-	 ::qt_cast<TQTable*>(editorWidget) != 0 )
+    if ( className.tqcontains( "ListBox" ) || className.tqcontains( "ListView" ) ||
+	 className.tqcontains( "IconView" )  || className.tqcontains( "ComboBox" ) ||
+	 ::tqqt_cast<TQTable*>(editorWidget) != 0 )
 	return TRUE;
 
     return FALSE;
 }
 
-void WidgetFactory::editWidget( int id, TQWidget *parent, TQWidget *editWidget, FormWindow *fw )
+void WidgetFactory::editWidget( int id, TQWidget *tqparent, TQWidget *editWidget, FormWindow *fw )
 {
     TQString className = WidgetDatabase::className( id );
 
-    if ( className.contains( "ListBox" ) ) {
-	if ( !::qt_cast<TQListBox*>(editWidget) )
+    if ( className.tqcontains( "ListBox" ) ) {
+	if ( !::tqqt_cast<TQListBox*>(editWidget) )
 	    return;
-	ListBoxEditor *e = new ListBoxEditor( parent, editWidget, fw );
+	ListBoxEditor *e = new ListBoxEditor( tqparent, editWidget, fw );
 	e->exec();
 	delete e;
 	return;
     }
 
-    if ( className.contains( "ComboBox" ) ) {
-	if ( !::qt_cast<TQComboBox*>(editWidget) )
+    if ( className.tqcontains( "ComboBox" ) ) {
+	if ( !::tqqt_cast<TQComboBox*>(editWidget) )
 	    return;
 	TQComboBox *cb = (TQComboBox*)editWidget;
-	ListBoxEditor *e = new ListBoxEditor( parent, cb->listBox(), fw );
+	ListBoxEditor *e = new ListBoxEditor( tqparent, cb->listBox(), fw );
 	e->exec();
 	delete e;
 	cb->update();
 	return;
     }
 
-    if ( className.contains( "ListView" ) ) {
-	if ( !::qt_cast<TQListView*>(editWidget) )
+    if ( className.tqcontains( "ListView" ) ) {
+	if ( !::tqqt_cast<TQListView*>(editWidget) )
 	    return;
 	TQListView *lv = (TQListView*)editWidget;
-	ListViewEditor *e = new ListViewEditor( parent, lv, fw );
+	ListViewEditor *e = new ListViewEditor( tqparent, lv, fw );
 	e->exec();
 	delete e;
 	return;
     }
 
-    if ( className.contains( "IconView" ) ) {
-	if ( !::qt_cast<TQIconView*>(editWidget) )
+    if ( className.tqcontains( "IconView" ) ) {
+	if ( !::tqqt_cast<TQIconView*>(editWidget) )
 	    return;
-	IconViewEditor *e = new IconViewEditor( parent, editWidget, fw );
+	IconViewEditor *e = new IconViewEditor( tqparent, editWidget, fw );
 	e->exec();
 	delete e;
 	return;
     }
 
     if ( className == TQMULTILINEEDIT_OBJECT_NAME_STRING || className == TQTEXTEDIT_OBJECT_NAME_STRING ) {
-	MultiLineEditor *e = new MultiLineEditor( FALSE, TRUE, parent, editWidget, fw );
+	MultiLineEditor *e = new MultiLineEditor( FALSE, TRUE, tqparent, editWidget, fw );
 	e->exec();
 	delete e;
 	return;
     }
-#ifndef QT_NO_TABLE
-    if (::qt_cast<TQTable*>(editWidget) != 0) {
-	TableEditor *e = new TableEditor( parent, editWidget, fw );
+#ifndef TQT_NO_TABLE
+    if (::tqqt_cast<TQTable*>(editWidget) != 0) {
+	TableEditor *e = new TableEditor( tqparent, editWidget, fw );
 	e->exec();
 	delete e;
 	return;
@@ -1463,14 +1463,14 @@ bool WidgetFactory::canResetProperty( TQObject *w, const TQString &propName )
 {
     if ( propName == "name" || propName == "geometry" )
 	return FALSE;
-    TQStringList l = *changedProperties->find( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( w ) ) );
-    return l.findIndex( propName ) == -1;
+    TQStringList l = *changedProperties->tqfind( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( w ) ) );
+    return l.tqfindIndex( propName ) == -1;
 }
 
 bool WidgetFactory::resetProperty( TQObject *w, const TQString &propName )
 {
-    const TQMetaProperty *p = w->metaObject()->property( w->metaObject()->
-							findProperty( propName, TRUE ), TRUE );
+    const TQMetaProperty *p = w->tqmetaObject()->property( w->tqmetaObject()->
+							tqfindProperty( propName, TRUE ), TRUE );
     if (!p )
 	return FALSE;
     return p->reset( w );
@@ -1479,27 +1479,27 @@ bool WidgetFactory::resetProperty( TQObject *w, const TQString &propName )
 TQVariant WidgetFactory::defaultValue( TQObject *w, const TQString &propName )
 {
     if ( propName == "wordwrap" ) {
-	int v = defaultValue( w, "alignment" ).toInt();
+	int v = defaultValue( w, "tqalignment" ).toInt();
 	return TQVariant( ( v & WordBreak ) == WordBreak, 0 );
     } else if ( propName == "toolTip" || propName == "whatsThis" ) {
-	return TQVariant( TQString::fromLatin1( "" ) );
+	return TQVariant( TQString::tqfromLatin1( "" ) );
     } else if ( w->inherits( "CustomWidget" ) ) {
 	return TQVariant();
     } else if ( propName == "frameworkCode" ) {
 	return TQVariant( TRUE, 0 );
-    } else if ( propName == "layoutMargin" || propName == "layoutSpacing" ) {
+    } else if ( propName == "tqlayoutMargin" || propName == "tqlayoutSpacing" ) {
 	return TQVariant( -1 );
     }
 
-    return *( *defaultProperties->find( WidgetDatabase::idFromClassName( classNameOf( w ) ) ) ).find( propName );
+    return *( *defaultProperties->tqfind( WidgetDatabase::idFromClassName( classNameOf( w ) ) ) ).tqfind( propName );
 }
 
 TQString WidgetFactory::defaultCurrentItem( TQObject *w, const TQString &propName )
 {
-    const TQMetaProperty *p = w->metaObject()->
-			     property( w->metaObject()->findProperty( propName, TRUE ), TRUE );
+    const TQMetaProperty *p = w->tqmetaObject()->
+			     property( w->tqmetaObject()->tqfindProperty( propName, TRUE ), TRUE );
     if ( !p ) {
-	int v = defaultValue( w, "alignment" ).toInt();
+	int v = defaultValue( w, "tqalignment" ).toInt();
 	if ( propName == "hAlign" ) {
 	    if ( ( v & AlignAuto ) == AlignAuto )
 		return "AlignAuto";
@@ -1521,35 +1521,35 @@ TQString WidgetFactory::defaultCurrentItem( TQObject *w, const TQString &propNam
 	} else if ( propName == "resizeMode" ) {
 	    return "Auto";
 	}
-	return TQString::null;
+	return TQString();
 
     }
     return p->valueToKey( defaultValue( w, propName ).toInt() );
 }
 
-TQWidget *WidgetFactory::createCustomWidget( TQWidget *parent, const char *name, MetaDataBase::CustomWidget *w )
+TQWidget *WidgetFactory::createCustomWidget( TQWidget *tqparent, const char *name, MetaDataBase::CustomWidget *w )
 {
     if ( !w )
 	return 0;
-    return new CustomWidget( parent, name, w );
+    return new CustomWidget( tqparent, name, w );
 }
 
 TQVariant WidgetFactory::property( TQObject *w, const char *name )
 {
-    int id = w->metaObject()->findProperty( name, TRUE );
-    const TQMetaProperty* p = w->metaObject()->property( id, TRUE );
+    int id = w->tqmetaObject()->tqfindProperty( name, TRUE );
+    const TQMetaProperty* p = w->tqmetaObject()->property( id, TRUE );
     if ( !p || !p->isValid() )
 	return MetaDataBase::fakeProperty( w, name );
     return w->property( name );
 }
 
-void QDesignerLabel::updateBuddy()
+void TQDesignerLabel::updateBuddy()
 {
 
     if ( myBuddy.isEmpty() )
 	return;
 
-    TQObjectList *l = topLevelWidget()->queryList( TQWIDGET_OBJECT_NAME_STRING, myBuddy, FALSE, TRUE );
+    TQObjectList *l = tqtopLevelWidget()->queryList( TQWIDGET_OBJECT_NAME_STRING, myBuddy, FALSE, TRUE );
     if ( !l || !l->first() ) {
 	delete l;
 	return;
@@ -1560,7 +1560,7 @@ void QDesignerLabel::updateBuddy()
 }
 
 
-void QDesignerWidget::resizeEvent( TQResizeEvent* e)
+void TQDesignerWidget::resizeEvent( TQResizeEvent* e)
 {
     if ( need_frame ) {
 	TQPainter p(this);
@@ -1569,7 +1569,7 @@ void QDesignerWidget::resizeEvent( TQResizeEvent* e)
     }
 }
 
-void QDesignerWidget::paintEvent( TQPaintEvent *e )
+void TQDesignerWidget::paintEvent( TQPaintEvent *e )
 {
     if ( need_frame ) {
 	TQPainter p(this);
@@ -1579,17 +1579,17 @@ void QDesignerWidget::paintEvent( TQPaintEvent *e )
     formwindow->paintGrid( this, e );
 }
 
-void QDesignerDialog::paintEvent( TQPaintEvent *e )
+void TQDesignerDialog::paintEvent( TQPaintEvent *e )
 {
     formwindow->paintGrid( this, e );
 }
 
-TQSizePolicy QLayoutWidget::sizePolicy() const
+TQSizePolicy TQLayoutWidget::sizePolicy() const
 {
     return sp;
 }
 
-bool QLayoutWidget::event( TQEvent *e )
+bool TQLayoutWidget::event( TQEvent *e )
 {
     if ( e && ( e->type() == TQEvent::ChildInserted ||
 		e->type() == TQEvent::ChildRemoved ||
@@ -1600,14 +1600,14 @@ bool QLayoutWidget::event( TQEvent *e )
 }
 
 /*
-  This function must be called on QLayoutWidget creation and whenever
-  the QLayoutWidget's parent layout changes (e.g., from a QHBoxLayout
-  to a TQVBoxLayout), because of the (illogical) way layouting works.
+  This function must be called on TQLayoutWidget creation and whenever
+  the TQLayoutWidget's tqparent tqlayout changes (e.g., from a TQHBoxLayout
+  to a TQVBoxLayout), because of the (illogical) way tqlayouting works.
 */
-void QLayoutWidget::updateSizePolicy()
+void TQLayoutWidget::updateSizePolicy()
 {
-    if ( !children() || children()->count() == 0 ) {
-	sp = TQWidget::sizePolicy();
+    if ( childrenListObject().isEmpty() || childrenListObject().count() == 0 ) {
+	sp = TQWidget::tqsizePolicy();
 	return;
     }
 
@@ -1624,24 +1624,24 @@ void QLayoutWidget::updateSizePolicy()
     int ht = (int) TQSizePolicy::Preferred;
     int vt = (int) TQSizePolicy::Preferred;
 
-    if ( layout() ) {
+    if ( tqlayout() ) {
 	/*
-	  parentLayout is set to the parent layout if there is one and if it is
-	  top level, in which case layouting is illogical.
+	  tqparentLayout is set to the tqparent tqlayout if there is one and if it is
+	  top level, in which case tqlayouting is illogical.
 	*/
-	TQLayout *parentLayout = 0;
-	if ( parent() && parent()->isWidgetType() ) {
-	    parentLayout = ((TQWidget *)parent())->layout();
-	    if ( parentLayout &&
-		 ::qt_cast<QLayoutWidget*>(parentLayout->mainWidget()) )
-		parentLayout = 0;
+	TQLayout *tqparentLayout = 0;
+	if ( tqparent() && tqparent()->isWidgetType() ) {
+	    tqparentLayout = ((TQWidget *)tqparent())->tqlayout();
+	    if ( tqparentLayout &&
+		 ::tqqt_cast<TQLayoutWidget*>(tqparentLayout->mainWidget()) )
+		tqparentLayout = 0;
 	}
 
-	TQObjectListIt it( *children() );
+	TQObjectListIt it( childrenListObject() );
 	TQObject *o;
 
-	if ( ::qt_cast<TQVBoxLayout*>(layout()) ) {
-	    if ( ::qt_cast<TQHBoxLayout*>(parentLayout) )
+	if ( ::tqqt_cast<TQVBoxLayout*>(tqlayout()) ) {
+	    if ( ::tqqt_cast<TQHBoxLayout*>(tqparentLayout) )
 		vt = TQSizePolicy::Minimum;
 	    else
 		vt = TQSizePolicy::Fixed;
@@ -1652,17 +1652,17 @@ void QLayoutWidget::updateSizePolicy()
 		    continue;
 		TQWidget *w = (TQWidget*)o;
 
-		if ( !w->sizePolicy().mayGrowHorizontally() )
+		if ( !w->tqsizePolicy().mayGrowHorizontally() )
 		    ht &= ~TQSizePolicy::Minimum;
-		if ( !w->sizePolicy().mayShrinkHorizontally() )
+		if ( !w->tqsizePolicy().mayShrinkHorizontally() )
 		    ht &= ~TQSizePolicy::Maximum;
-		if ( w->sizePolicy().mayGrowVertically() )
+		if ( w->tqsizePolicy().mayGrowVertically() )
 		    vt |= TQSizePolicy::Minimum;
-		if ( w->sizePolicy().mayShrinkVertically() )
+		if ( w->tqsizePolicy().mayShrinkVertically() )
 		    vt |= TQSizePolicy::Maximum;
 	    }
-	} else if ( ::qt_cast<TQHBoxLayout*>(layout()) ) {
-	    if ( ::qt_cast<TQVBoxLayout*>(parentLayout) )
+	} else if ( ::tqqt_cast<TQHBoxLayout*>(tqlayout()) ) {
+	    if ( ::tqqt_cast<TQVBoxLayout*>(tqparentLayout) )
 		ht = TQSizePolicy::Minimum;
 	    else
 		ht = TQSizePolicy::Fixed;
@@ -1673,22 +1673,22 @@ void QLayoutWidget::updateSizePolicy()
 		    continue;
 		TQWidget *w = (TQWidget*)o;
 
-		if ( w->sizePolicy().mayGrowHorizontally() )
+		if ( w->tqsizePolicy().mayGrowHorizontally() )
 		    ht |= TQSizePolicy::Minimum;
-		if ( w->sizePolicy().mayShrinkHorizontally() )
+		if ( w->tqsizePolicy().mayShrinkHorizontally() )
 		    ht |= TQSizePolicy::Maximum;
-		if ( !w->sizePolicy().mayGrowVertically() )
+		if ( !w->tqsizePolicy().mayGrowVertically() )
 		    vt &= ~TQSizePolicy::Minimum;
-		if ( !w->sizePolicy().mayShrinkVertically() )
+		if ( !w->tqsizePolicy().mayShrinkVertically() )
 		    vt &= ~TQSizePolicy::Maximum;
 	    }
-	} else if ( ::qt_cast<TQGridLayout*>(layout()) ) {
+	} else if ( ::tqqt_cast<TQGridLayout*>(tqlayout()) ) {
 	    ht = TQSizePolicy::Fixed;
 	    vt = TQSizePolicy::Fixed;
-	    if ( parentLayout ) {
-		if ( ::qt_cast<TQVBoxLayout*>(parentLayout) )
+	    if ( tqparentLayout ) {
+		if ( ::tqqt_cast<TQVBoxLayout*>(tqparentLayout) )
 		    ht = TQSizePolicy::Minimum;
-		else if ( ::qt_cast<TQHBoxLayout*>(parentLayout) )
+		else if ( ::tqqt_cast<TQHBoxLayout*>(tqparentLayout) )
 		    vt = TQSizePolicy::Minimum;
 	    }
 
@@ -1698,22 +1698,30 @@ void QLayoutWidget::updateSizePolicy()
 		    continue;
 		TQWidget *w = (TQWidget*)o;
 
-		if ( w->sizePolicy().mayGrowHorizontally() )
+		if ( w->tqsizePolicy().mayGrowHorizontally() )
 		    ht |= TQSizePolicy::Minimum;
-		if ( w->sizePolicy().mayShrinkHorizontally() )
+		if ( w->tqsizePolicy().mayShrinkHorizontally() )
 		    ht |= TQSizePolicy::Maximum;
-		if ( w->sizePolicy().mayGrowVertically() )
+		if ( w->tqsizePolicy().mayGrowVertically() )
 		    vt |= TQSizePolicy::Minimum;
-		if ( w->sizePolicy().mayShrinkVertically() )
+		if ( w->tqsizePolicy().mayShrinkVertically() )
 		    vt |= TQSizePolicy::Maximum;
 	    }
 	}
-	if ( layout()->expanding() & TQSizePolicy::Horizontally )
+#ifdef USE_QT4
+	if ( tqlayout()->expandingDirections() & TQSizePolicy::Horizontally )
+#else // USE_QT4
+	if ( tqlayout()->expanding() & TQSizePolicy::Horizontally )
+#endif // USE_QT4
 	    ht = TQSizePolicy::Expanding;
-	if ( layout()->expanding() & TQSizePolicy::Vertically )
+#ifdef USE_QT4
+	if ( tqlayout()->expandingDirections() & TQSizePolicy::Vertically )
+#else // USE_QT4
+	if ( tqlayout()->expanding() & TQSizePolicy::Vertically )
+#endif // USE_QT4
 	    vt = TQSizePolicy::Expanding;
 
-	layout()->invalidate();
+	tqlayout()->tqinvalidate();
     }
 
     sp = TQSizePolicy( (TQSizePolicy::SizeType) ht, (TQSizePolicy::SizeType) vt );
@@ -1722,13 +1730,13 @@ void QLayoutWidget::updateSizePolicy()
 
 void CustomWidget::paintEvent( TQPaintEvent *e )
 {
-    if ( ::qt_cast<FormWindow*>(parentWidget()) ) {
-	( (FormWindow*)parentWidget() )->paintGrid( this, e );
+    if ( ::tqqt_cast<FormWindow*>(tqparentWidget()) ) {
+	( (FormWindow*)tqparentWidget() )->paintGrid( this, e );
     } else {
 	TQPainter p( this );
-	p.fillRect( rect(), colorGroup().dark() );
-	p.setPen( colorGroup().light() );
-	p.drawText( 2, 2, width() - 4, height() - 4, Qt::AlignAuto | Qt::AlignTop, cusw->className );
+	p.fillRect( rect(), tqcolorGroup().dark() );
+	p.setPen( tqcolorGroup().light() );
+	p.drawText( 2, 2, width() - 4, height() - 4, TQt::AlignAuto | TQt::AlignTop, cusw->className );
 	p.drawPixmap( ( width() - cusw->pixmap->width() ) / 2,
 		      ( height() - cusw->pixmap->height() ) / 2,
 		      *cusw->pixmap );
@@ -1740,48 +1748,48 @@ CustomWidgetFactory::CustomWidgetFactory()
 {
 }
 
-TQWidget *CustomWidgetFactory::createWidget( const TQString &className, TQWidget *parent, const char *name ) const
+TQWidget *CustomWidgetFactory::createWidget( const TQString &className, TQWidget *tqparent, const char *name ) const
 {
     MetaDataBase::CustomWidget *w = MetaDataBase::customWidget( WidgetDatabase::idFromClassName( className ) );
     if ( !w )
 	return 0;
-    return WidgetFactory::createCustomWidget( parent, name, w );
+    return WidgetFactory::createCustomWidget( tqparent, name, w );
 }
 
 
-QDesignerToolBox::QDesignerToolBox( TQWidget *parent, const char *name )
-    : TQToolBox( parent, name )
+TQDesignerToolBox::TQDesignerToolBox( TQWidget *tqparent, const char *name )
+    : TQToolBox( tqparent, name )
 {
 }
 
-TQString QDesignerToolBox::itemLabel() const
+TQString TQDesignerToolBox::itemLabel() const
 {
     return TQToolBox::itemLabel( currentIndex() );
 }
 
-void QDesignerToolBox::setItemLabel( const TQString &l )
+void TQDesignerToolBox::setItemLabel( const TQString &l )
 {
     TQToolBox::setItemLabel( currentIndex(), l );
 }
 
-TQCString QDesignerToolBox::itemName() const
+TQCString TQDesignerToolBox::itemName() const
 {
     return currentItem() ? currentItem()->name() : 0;
 }
 
-void QDesignerToolBox::setItemName( const TQCString &n )
+void TQDesignerToolBox::setItemName( const TQCString &n )
 {
     if (currentItem())
 	currentItem()->setName( n );
 }
 
 
-Qt::BackgroundMode QDesignerToolBox::itemBackgroundMode() const
+TQt::BackgroundMode TQDesignerToolBox::itemBackgroundMode() const
 {
     return (item(0) ? item(0)->backgroundMode() : PaletteBackground);
 }
 
-void QDesignerToolBox::setItemBackgroundMode( BackgroundMode bmode )
+void TQDesignerToolBox::setItemBackgroundMode( BackgroundMode bmode )
 {
     for (int i = 0; i < count(); ++i) {
 	TQWidget *w = item(i);
@@ -1790,7 +1798,7 @@ void QDesignerToolBox::setItemBackgroundMode( BackgroundMode bmode )
     }
 }
 
-void QDesignerToolBox::itemInserted( int index )
+void TQDesignerToolBox::itemInserted( int index )
 {
     if (count() > 1)
 	item(index)->setBackgroundMode(item(index>0?0:1)->backgroundMode());
diff --git a/kdevdesigner/designer/widgetfactory.h b/kdevdesigner/designer/widgetfactory.h
index d3d315fc..17f5133b 100644
--- a/kdevdesigner/designer/widgetfactory.h
+++ b/kdevdesigner/designer/widgetfactory.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -56,15 +56,15 @@ class TQWidget;
 class TQLayout;
 class FormWindow;
 
-class CustomWidgetFactory : public QWidgetFactory
+class CustomWidgetFactory : public TQWidgetFactory
 {
 public:
     CustomWidgetFactory();
-    TQWidget *createWidget( const TQString &className, TQWidget *parent, const char *name ) const;
+    TQWidget *createWidget( const TQString &className, TQWidget *tqparent, const char *name ) const;
 
 };
 
-class WidgetFactory : public Qt
+class WidgetFactory : public TQt
 {
     friend class CustomWidgetFactory;
 
@@ -76,15 +76,15 @@ public:
 	NoLayout
     };
 
-    static TQWidget *create( int id, TQWidget *parent, const char *name = 0, bool init = TRUE,
+    static TQWidget *create( int id, TQWidget *tqparent, const char *name = 0, bool init = TRUE,
 			    const TQRect *rect = 0, Qt::Orientation orient = Qt::Horizontal );
-    static TQLayout *createLayout( TQWidget *widget, TQLayout* layout, LayoutType type );
+    static TQLayout *createLayout( TQWidget *widget, TQLayout* tqlayout, LayoutType type );
     static void deleteLayout( TQWidget *widget );
 
-    static LayoutType layoutType( TQWidget *w );
-    static LayoutType layoutType( TQWidget *w, TQLayout *&layout );
-    static LayoutType layoutType( TQLayout *layout );
-    static TQWidget *layoutParent( TQLayout *layout );
+    static LayoutType tqlayoutType( TQWidget *w );
+    static LayoutType tqlayoutType( TQWidget *w, TQLayout *&tqlayout );
+    static LayoutType tqlayoutType( TQLayout *tqlayout );
+    static TQWidget *tqlayoutParent( TQLayout *tqlayout );
 
     static TQWidget* containerOfWidget( TQWidget *w );
     static TQWidget* widgetOfContainer( TQWidget *w );
@@ -96,7 +96,7 @@ public:
 
     static bool hasSpecialEditor( int id, TQObject *editorWidget );
     static bool hasItems( int id, TQObject *editorWidget );
-    static void editWidget( int id, TQWidget *parent, TQWidget *editWidget, FormWindow *fw );
+    static void editWidget( int id, TQWidget *tqparent, TQWidget *editWidget, FormWindow *fw );
 
     static bool canResetProperty( TQObject *w, const TQString &propName );
     static bool resetProperty( TQObject *w, const TQString &propName );
@@ -110,23 +110,24 @@ public:
     static TQString defaultSignal( TQObject *w );
 
 private:
-    static TQWidget *createWidget( const TQString &className, TQWidget *parent, const char *name, bool init,
+    static TQWidget *createWidget( const TQString &className, TQWidget *tqparent, const char *name, bool init,
 				  const TQRect *r = 0, Qt::Orientation orient = Qt::Horizontal );
-    static TQWidget *createCustomWidget( TQWidget *parent, const char *name, MetaDataBase::CustomWidget *w );
+    static TQWidget *createCustomWidget( TQWidget *tqparent, const char *name, MetaDataBase::CustomWidget *w );
 
     static TQGuardedPtr<TQObject> *lastPassiveInteractor;
     static bool lastWasAPassiveInteractor;
 };
 
 
-class QDesignerTabWidget : public QTabWidget
+class TQDesignerTabWidget : public TQTabWidget
 {
     Q_OBJECT
-    Q_PROPERTY( int currentPage READ currentPage WRITE setCurrentPage STORED false DESIGNABLE true )
-    Q_PROPERTY( TQString pageTitle READ pageTitle WRITE setPageTitle STORED false DESIGNABLE true )
-    Q_PROPERTY( TQCString pageName READ pageName WRITE setPageName STORED false DESIGNABLE true )
+  TQ_OBJECT
+    TQ_PROPERTY( int currentPage READ currentPage WRITE setCurrentPage STORED false DESIGNABLE true )
+    TQ_PROPERTY( TQString pageTitle READ pageTitle WRITE setPageTitle STORED false DESIGNABLE true )
+    TQ_PROPERTY( TQCString pageName READ pageName WRITE setPageName STORED false DESIGNABLE true )
 public:
-    QDesignerTabWidget( TQWidget *parent, const char *name );
+    TQDesignerTabWidget( TQWidget *tqparent, const char *name );
 
     int currentPage() const;
     void setCurrentPage( int i );
@@ -148,13 +149,14 @@ private:
      bool mousePressed;
 };
 
-class QDesignerWidgetStack : public QWidgetStack
+class TQDesignerWidgetStack : public TQWidgetStack
 {
     Q_OBJECT
-    Q_PROPERTY( int currentPage READ currentPage WRITE setCurrentPage STORED false DESIGNABLE true )
-    Q_PROPERTY( TQCString pageName READ pageName WRITE setPageName STORED false DESIGNABLE true )
+  TQ_OBJECT
+    TQ_PROPERTY( int currentPage READ currentPage WRITE setCurrentPage STORED false DESIGNABLE true )
+    TQ_PROPERTY( TQCString pageName READ pageName WRITE setPageName STORED false DESIGNABLE true )
 public:
-    QDesignerWidgetStack( TQWidget *parent, const char *name );
+    TQDesignerWidgetStack( TQWidget *tqparent, const char *name );
 
     int currentPage() const;
     void setCurrentPage( int i );
@@ -191,17 +193,18 @@ private:
 
 };
 
-class QDesignerWizard : public QWizard
+class TQDesignerWizard : public TQWizard
 {
     Q_OBJECT
-    Q_PROPERTY( int currentPage READ currentPageNum WRITE setCurrentPage STORED false DESIGNABLE true )
-    Q_PROPERTY( TQString pageTitle READ pageTitle WRITE setPageTitle STORED false DESIGNABLE true )
-    Q_PROPERTY( TQCString pageName READ pageName WRITE setPageName STORED false DESIGNABLE true )
-    Q_OVERRIDE( bool modal READ isModal WRITE setModal )
+  TQ_OBJECT
+    TQ_PROPERTY( int currentPage READ currentPageNum WRITE setCurrentPage STORED false DESIGNABLE true )
+    TQ_PROPERTY( TQString pageTitle READ pageTitle WRITE setPageTitle STORED false DESIGNABLE true )
+    TQ_PROPERTY( TQCString pageName READ pageName WRITE setPageName STORED false DESIGNABLE true )
+    TQ_OVERRIDE( bool modal READ isModal WRITE setModal )
 
 public:
-    QDesignerWizard( TQWidget *parent, const char *name ) 
-        : TQWizard( parent, name ), modal(FALSE) {}
+    TQDesignerWizard( TQWidget *tqparent, const char *name ) 
+        : TQWizard( tqparent, name ), modal(FALSE) {}
 
     int currentPageNum() const;
     void setCurrentPage( int i );
@@ -213,7 +216,7 @@ public:
     void addPage( TQWidget *p, const TQString & );
     void removePage( TQWidget *p );
     void insertPage( TQWidget *p, const TQString &t, int index );
-    bool isPageRemoved( TQWidget *p ) { return (removedPages.find( p ) != 0); }
+    bool isPageRemoved( TQWidget *p ) { return (removedPages.tqfind( p ) != 0); }
 
     bool isModal() const { return modal; }
     void setModal(bool b) { modal = b; }
@@ -224,7 +227,7 @@ private:
     struct Page
     {
 	Page( TQWidget *a, const TQString &b ) : p( a ), t( b ) {}
-	Page() : p( 0 ), t( TQString::null ) {}
+	Page() : p( 0 ), t( TQString() ) {}
 	TQWidget *p;
 	TQString t;
     };
@@ -233,12 +236,13 @@ private:
 
 };
 
-class QLayoutWidget : public QWidget
+class TQLayoutWidget : public TQWidget
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    QLayoutWidget( TQWidget *parent, const char *name ) : TQWidget( parent, name ), sp( TQWidget::sizePolicy() ) {}
+    TQLayoutWidget( TQWidget *tqparent, const char *name ) : TQWidget( tqparent, name ), sp( sizePolicy() ) {}
 
     TQSizePolicy sizePolicy() const;
     void updateSizePolicy();
@@ -251,24 +255,25 @@ protected:
 };
 
 
-class CustomWidget : public QWidget
+class CustomWidget : public TQWidget
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    CustomWidget( TQWidget *parent, const char *name, MetaDataBase::CustomWidget *cw )
-	: TQWidget( parent, name ), cusw( cw ) {
-	    alwaysExpand = parentWidget() && parentWidget()->inherits( "FormWindow" );
-	    setSizePolicy( cw->sizePolicy );
+    CustomWidget( TQWidget *tqparent, const char *name, MetaDataBase::CustomWidget *cw )
+	: TQWidget( tqparent, name ), cusw( cw ) {
+	    alwaysExpand = tqparentWidget() && tqparentWidget()->inherits( "FormWindow" );
+	    tqsetSizePolicy( cw->sizePolicy );
 	    if ( !alwaysExpand )
 		setBackgroundMode( PaletteDark );
     }
 
-    TQSize sizeHint() const {
-	TQSize sh = cusw->sizeHint;
+    TQSize tqsizeHint() const {
+	TQSize sh = cusw->tqsizeHint;
 	if ( sh.isValid() )
 	    return sh;
-	return TQWidget::sizeHint();
+	return TQWidget::tqsizeHint();
     }
 
     TQString realClassName() { return cusw->className; }
@@ -283,41 +288,43 @@ protected:
 };
 
 
-class Line : public QFrame
+class Line : public TQFrame
 {
     Q_OBJECT
+  TQ_OBJECT
 
-    Q_PROPERTY( Orientation orientation READ orientation WRITE setOrientation )
-    Q_OVERRIDE( int frameWidth DESIGNABLE false )
-    Q_OVERRIDE( Shape frameShape DESIGNABLE false )
-    Q_OVERRIDE( TQRect frameRect DESIGNABLE false )
-    Q_OVERRIDE( TQRect contentsRect DESIGNABLE false )
+    TQ_PROPERTY( Qt::Orientation orientation READ orientation WRITE setOrientation )
+    TQ_OVERRIDE( int frameWidth DESIGNABLE false )
+    TQ_OVERRIDE( Shape frameShape DESIGNABLE false )
+    TQ_OVERRIDE( TQRect frameRect DESIGNABLE false )
+    TQ_OVERRIDE( TQRect contentsRect DESIGNABLE false )
 public:
-    Line( TQWidget *parent, const char *name )
-	: TQFrame( parent, name, WMouseNoMask ) {
+    Line( TQWidget *tqparent, const char *name )
+	: TQFrame( tqparent, name, WMouseNoMask ) {
 	    setFrameStyle( HLine | Sunken );
     }
 
-    void setOrientation( Orientation orient ) {
-	if ( orient == Horizontal )
+    void setOrientation( Qt::Orientation orient ) {
+	if ( orient ==Qt::Horizontal )
 	    setFrameShape( HLine );
 	else
 	    setFrameShape( VLine );
     }
-    Orientation orientation() const {
-	return frameShape() == HLine ? Horizontal : Vertical;
+    Qt::Orientation orientation() const {
+	return frameShape() == HLine ?Qt::Horizontal :Qt::Vertical;
     }
 };
 
-class QDesignerLabel : public QLabel
+class TQDesignerLabel : public TQLabel
 {
     Q_OBJECT
+  TQ_OBJECT
 
-    Q_PROPERTY( TQCString buddy READ buddyWidget WRITE setBuddyWidget )
+    TQ_PROPERTY( TQCString buddy READ buddyWidget WRITE setBuddyWidget )
 
 public:
-    QDesignerLabel( TQWidget *parent = 0, const char *name = 0 )
-	: TQLabel( parent, name ) { myBuddy = 0; }
+    TQDesignerLabel( TQWidget *tqparent = 0, const char *name = 0 )
+	: TQLabel( tqparent, name ) { myBuddy = 0; }
 
     void setBuddyWidget( const TQCString &b ) {
 	myBuddy = b;
@@ -341,14 +348,15 @@ private:
 
 };
 
-class QDesignerWidget : public QWidget
+class TQDesignerWidget : public TQWidget
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    QDesignerWidget( FormWindow *fw, TQWidget *parent, const char *name )
-	: TQWidget( parent, name, WResizeNoErase ), formwindow( fw ) {
-	    need_frame = parent && parent->inherits("QDesignerWidgetStack" );
+    TQDesignerWidget( FormWindow *fw, TQWidget *tqparent, const char *name )
+	: TQWidget( tqparent, name, WResizeNoErase ), formwindow( fw ) {
+	    need_frame = tqparent && tqparent->inherits("TQDesignerWidgetStack" );
     }
 
 protected:
@@ -361,14 +369,15 @@ private:
 
 };
 
-class QDesignerDialog : public QDialog
+class TQDesignerDialog : public TQDialog
 {
     Q_OBJECT
-    Q_OVERRIDE( bool modal READ isModal WRITE setModal )
+  TQ_OBJECT
+    TQ_OVERRIDE( bool modal READ isModal WRITE setModal )
 
 public:
-    QDesignerDialog( FormWindow *fw, TQWidget *parent, const char *name )
-	: TQDialog( parent, name, FALSE, WResizeNoErase ), formwindow( fw ), modal(FALSE) {}
+    TQDesignerDialog( FormWindow *fw, TQWidget *tqparent, const char *name )
+	: TQDialog( tqparent, name, FALSE, WResizeNoErase ), formwindow( fw ), modal(FALSE) {}
 
     bool isModal() const { return modal; }
     void setModal(bool b) { modal = b; }
@@ -382,110 +391,115 @@ private:
 
 };
 
-class QDesignerToolButton : public QToolButton
+class TQDesignerToolButton : public TQToolButton
 {
     Q_OBJECT
-    Q_PROPERTY( int buttonGroupId READ buttonGroupId WRITE setButtonGroupId )
+  TQ_OBJECT
+    TQ_PROPERTY( int buttonGroupId READ buttonGroupId WRITE setButtonGroupId )
 
 public:
-    QDesignerToolButton( TQWidget *parent, const char *name )
-	: TQToolButton( parent, name ) {}
+    TQDesignerToolButton( TQWidget *tqparent, const char *name )
+	: TQToolButton( tqparent, name ) {}
 
     bool isInButtonGroup() const {
-	return parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING );
+	return tqparentWidget() && tqparentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING );
     }
     int buttonGroupId() const {
-	return parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ? ( (TQButtonGroup*)parentWidget() )->id( (TQButton*)this ) : -1;
+	return tqparentWidget() && tqparentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ? ( (TQButtonGroup*)tqparentWidget() )->id( (TQButton*)this ) : -1;
     }
     void setButtonGroupId( int id ) {
-	if ( parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ) {
-	    ( (TQButtonGroup*)parentWidget() )->remove( this );
-	    ( (TQButtonGroup*)parentWidget() )->insert( this, id );
+	if ( tqparentWidget() && tqparentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ) {
+	    ( (TQButtonGroup*)tqparentWidget() )->remove( this );
+	    ( (TQButtonGroup*)tqparentWidget() )->insert( this, id );
 	}
     }
 };
 
-class QDesignerRadioButton : public QRadioButton
+class TQDesignerRadioButton : public TQRadioButton
 {
     Q_OBJECT
-    Q_PROPERTY( int buttonGroupId READ buttonGroupId WRITE setButtonGroupId )
+  TQ_OBJECT
+    TQ_PROPERTY( int buttonGroupId READ buttonGroupId WRITE setButtonGroupId )
 
 public:
-    QDesignerRadioButton( TQWidget *parent, const char *name )
-	: TQRadioButton( parent, name ) {}
+    TQDesignerRadioButton( TQWidget *tqparent, const char *name )
+	: TQRadioButton( tqparent, name ) {}
 
     bool isInButtonGroup() const {
-	return parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING );
+	return tqparentWidget() && tqparentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING );
     }
     int buttonGroupId() const {
-	return parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ? ( (TQButtonGroup*)parentWidget() )->id( (TQButton*)this ) : -1;
+	return tqparentWidget() && tqparentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ? ( (TQButtonGroup*)tqparentWidget() )->id( (TQButton*)this ) : -1;
     }
     void setButtonGroupId( int id ) {
-	if ( parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ) {
-	    ( (TQButtonGroup*)parentWidget() )->remove( this );
-	    ( (TQButtonGroup*)parentWidget() )->insert( this, id );
+	if ( tqparentWidget() && tqparentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ) {
+	    ( (TQButtonGroup*)tqparentWidget() )->remove( this );
+	    ( (TQButtonGroup*)tqparentWidget() )->insert( this, id );
 	}
     }
 
 };
 
-class QDesignerPushButton : public QPushButton
+class TQDesignerPushButton : public TQPushButton
 {
     Q_OBJECT
-    Q_PROPERTY( int buttonGroupId READ buttonGroupId WRITE setButtonGroupId )
+  TQ_OBJECT
+    TQ_PROPERTY( int buttonGroupId READ buttonGroupId WRITE setButtonGroupId )
 
 public:
-    QDesignerPushButton( TQWidget *parent, const char *name )
-	: TQPushButton( parent, name ) {}
+    TQDesignerPushButton( TQWidget *tqparent, const char *name )
+	: TQPushButton( tqparent, name ) {}
 
     bool isInButtonGroup() const {
-	return parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING );
+	return tqparentWidget() && tqparentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING );
     }
     int buttonGroupId() const {
-	return parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ? ( (TQButtonGroup*)parentWidget() )->id( (TQButton*)this ) : -1;
+	return tqparentWidget() && tqparentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ? ( (TQButtonGroup*)tqparentWidget() )->id( (TQButton*)this ) : -1;
     }
     void setButtonGroupId( int id ) {
-	if ( parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ) {
-	    ( (TQButtonGroup*)parentWidget() )->remove( this );
-	    ( (TQButtonGroup*)parentWidget() )->insert( this, id );
+	if ( tqparentWidget() && tqparentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ) {
+	    ( (TQButtonGroup*)tqparentWidget() )->remove( this );
+	    ( (TQButtonGroup*)tqparentWidget() )->insert( this, id );
 	}
     }
 
 };
 
-class QDesignerCheckBox : public QCheckBox
+class TQDesignerCheckBox : public TQCheckBox
 {
     Q_OBJECT
-    Q_PROPERTY( int buttonGroupId READ buttonGroupId WRITE setButtonGroupId )
+  TQ_OBJECT
+    TQ_PROPERTY( int buttonGroupId READ buttonGroupId WRITE setButtonGroupId )
 
 public:
-    QDesignerCheckBox( TQWidget *parent, const char *name )
-	: TQCheckBox( parent, name ) {}
+    TQDesignerCheckBox( TQWidget *tqparent, const char *name )
+	: TQCheckBox( tqparent, name ) {}
 
     bool isInButtonGroup() const {
-	return parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING );
+	return tqparentWidget() && tqparentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING );
     }
     int buttonGroupId() const {
-	return parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ? ( (TQButtonGroup*)parentWidget() )->id( (TQButton*)this ) : -1;
+	return tqparentWidget() && tqparentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ? ( (TQButtonGroup*)tqparentWidget() )->id( (TQButton*)this ) : -1;
     }
     void setButtonGroupId( int id ) {
-	if ( parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ) {
-	    ( (TQButtonGroup*)parentWidget() )->remove( this );
-	    ( (TQButtonGroup*)parentWidget() )->insert( this, id );
+	if ( tqparentWidget() && tqparentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ) {
+	    ( (TQButtonGroup*)tqparentWidget() )->remove( this );
+	    ( (TQButtonGroup*)tqparentWidget() )->insert( this, id );
 	}
     }
 
 };
 
-class QDesignerToolBox : public QToolBox
+class TQDesignerToolBox : public TQToolBox
 {
     Q_OBJECT
-    Q_PROPERTY( TQString itemLabel READ itemLabel WRITE setItemLabel STORED false DESIGNABLE true )
-    Q_PROPERTY( TQCString itemName READ itemName WRITE setItemName STORED false DESIGNABLE true )
-    Q_PROPERTY( BackgroundMode itemBackgroundMode READ itemBackgroundMode WRITE setItemBackgroundMode STORED false DESIGNABLE true )
+  TQ_OBJECT
+    TQ_PROPERTY( TQString itemLabel READ itemLabel WRITE setItemLabel STORED false DESIGNABLE true )
+    TQ_PROPERTY( TQCString itemName READ itemName WRITE setItemName STORED false DESIGNABLE true )
+    TQ_PROPERTY( BackgroundMode itemBackgroundMode READ itemBackgroundMode WRITE setItemBackgroundMode STORED false DESIGNABLE true )
 
 public:
-    QDesignerToolBox( TQWidget *parent, const char *name );
+    TQDesignerToolBox( TQWidget *tqparent, const char *name );
 
     TQString itemLabel() const;
     void setItemLabel( const TQString &l );
diff --git a/kdevdesigner/designer/wizardeditor.ui b/kdevdesigner/designer/wizardeditor.ui
index 45450be2..745115ca 100644
--- a/kdevdesigner/designer/wizardeditor.ui
+++ b/kdevdesigner/designer/wizardeditor.ui
@@ -25,7 +25,7 @@
 ** not clear to you.
 **
 *********************************************************************</comment>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>WizardEditorBase</cstring>
     </property>
@@ -50,7 +50,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>Layout19</cstring>
             </property>
@@ -64,7 +64,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
                         <cstring>Layout14</cstring>
                     </property>
@@ -78,7 +78,7 @@
                         <property name="spacing">
                             <number>2</number>
                         </property>
-                        <widget class="QLabel">
+                        <widget class="TQLabel">
                             <property name="name">
                                 <cstring>pagesLabel</cstring>
                             </property>
@@ -86,14 +86,14 @@
                                 <string>Wizard pages:</string>
                             </property>
                         </widget>
-                        <widget class="QListBox">
+                        <widget class="TQListBox">
                             <property name="name">
                                 <cstring>listBox</cstring>
                             </property>
                         </widget>
                     </vbox>
                 </widget>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
                         <cstring>Layout18</cstring>
                     </property>
@@ -107,7 +107,7 @@
                         <property name="spacing">
                             <number>6</number>
                         </property>
-                        <widget class="QPushButton">
+                        <widget class="TQPushButton">
                             <property name="name">
                                 <cstring>buttonAdd</cstring>
                             </property>
@@ -115,7 +115,7 @@
                                 <string>A&amp;dd</string>
                             </property>
                         </widget>
-                        <widget class="QPushButton">
+                        <widget class="TQPushButton">
                             <property name="name">
                                 <cstring>buttonRemove</cstring>
                             </property>
@@ -133,14 +133,14 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
                                 </size>
                             </property>
                         </spacer>
-                        <widget class="QPushButton">
+                        <widget class="TQPushButton">
                             <property name="name">
                                 <cstring>buttonUp</cstring>
                             </property>
@@ -151,7 +151,7 @@
                                 <pixmap>"designer_s_up.png"</pixmap>
                             </property>
                         </widget>
-                        <widget class="QPushButton">
+                        <widget class="TQPushButton">
                             <property name="name">
                                 <cstring>buttonDown</cstring>
                             </property>
@@ -166,7 +166,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>Layout1</cstring>
             </property>
@@ -180,7 +180,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonHelp</cstring>
                     </property>
@@ -201,14 +201,14 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonOk</cstring>
                     </property>
@@ -225,7 +225,7 @@
                         <string>Close the dialog and apply all the changes.</string>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonApply</cstring>
                     </property>
@@ -239,7 +239,7 @@
                         <string>Apply all changes.</string>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonCancel</cstring>
                     </property>
@@ -319,7 +319,7 @@
         <slot>cancelClicked()</slot>
     </connection>
 </connections>
-<slots>
+<Q_SLOTS>
     <slot access="protected">init()</slot>
     <slot access="protected">destroy()</slot>
     <slot access="protected">addClicked()</slot>
@@ -332,11 +332,11 @@
     <slot access="protected">okClicked()</slot>
     <slot access="protected">removeClicked()</slot>
     <slot access="protected">upClicked()</slot>
-</slots>
+</Q_SLOTS>
 <includes>
     <include location="local" impldecl="in implementation">myiconloader.h</include>
 </includes>
 <pixmapfunction>BarIcon2</pixmapfunction>
 
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kdevdesigner/designer/wizardeditorimpl.cpp b/kdevdesigner/designer/wizardeditorimpl.cpp
index 21e20c63..587f46d3 100644
--- a/kdevdesigner/designer/wizardeditorimpl.cpp
+++ b/kdevdesigner/designer/wizardeditorimpl.cpp
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -38,8 +38,8 @@
 
 #include <klocale.h>
 
-WizardEditor::WizardEditor( TQWidget *parent, TQWizard *w, FormWindow *fw )
-    : WizardEditorBase( parent, 0 ), formwindow( fw ), wizard( w ), draggedItem( 0 )
+WizardEditor::WizardEditor( TQWidget *tqparent, TQWizard *w, FormWindow *fw )
+    : WizardEditorBase( tqparent, 0 ), formwindow( fw ), wizard( w ), draggedItem( 0 )
 {
     connect( buttonHelp, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) );
     fillListBox();
@@ -130,7 +130,7 @@ void WizardEditor::addClicked()
     listBox->insertItem( i18n( "Page" ), index );
 
     // schedule add command
-    AddWizardPageCommand *cmd = new AddWizardPageCommand( i18n( "Add Page to %1" ).arg( wizard->name() ),
+    AddWizardPageCommand *cmd = new AddWizardPageCommand( i18n( "Add Page to %1" ).tqarg( wizard->name() ),
 							  formwindow, wizard, "Page", index, FALSE);
     commands.append( cmd );
 
@@ -149,7 +149,7 @@ void WizardEditor::removeClicked()
 
     // schedule remove command
     DeleteWizardPageCommand *cmd = new DeleteWizardPageCommand( i18n( "Delete Page %1 of %2" )
-								.arg( listBox->text( index ) ).arg( wizard->name() ),
+								.tqarg( listBox->text( index ) ).tqarg( wizard->name() ),
 								formwindow, wizard, index, FALSE );
     commands.append( cmd );
 
@@ -169,8 +169,8 @@ void WizardEditor::upClicked()
     listBox->setCurrentItem( index2 );
 
     // schedule swap command
-    SwapWizardPagesCommand *cmd = new SwapWizardPagesCommand( i18n( "Swap Pages %1 and %2 of %3" ).arg( index1 ).arg( index2 )
-							     .arg( wizard->name() ), formwindow, wizard, index1, index2);
+    SwapWizardPagesCommand *cmd = new SwapWizardPagesCommand( i18n( "Swap Pages %1 and %2 of %3" ).tqarg( index1 ).tqarg( index2 )
+							     .tqarg( wizard->name() ), formwindow, wizard, index1, index2);
     commands.append( cmd );
 
     // update buttons
@@ -189,7 +189,7 @@ void WizardEditor::downClicked()
     listBox->setCurrentItem( index2 );
 
     // schedule swap command
-    SwapWizardPagesCommand *cmd = new SwapWizardPagesCommand( i18n( "Swap Pages %1 and %2 of %3" ).arg( index1 ).arg( index2 ).arg( wizard->name() ), formwindow, wizard, index2, index1);
+    SwapWizardPagesCommand *cmd = new SwapWizardPagesCommand( i18n( "Swap Pages %1 and %2 of %3" ).tqarg( index1 ).tqarg( index2 ).tqarg( wizard->name() ), formwindow, wizard, index2, index1);
     commands.append( cmd );
 
     // update buttons
@@ -215,9 +215,9 @@ void WizardEditor::itemHighlighted( int )
 void WizardEditor::itemSelected( int index )
 {
     if ( index < 0 ) return;
-    // Called when Qt::Key_Enter was pressed.
+    // Called when TQt::Key_Enter was pressed.
     // ListBoxRename has renamed the list item, so we only need to rename the page to the same name.
-    TQString pn( i18n( "Rename page %1 of %2" ).arg( wizard->title( wizard->page( index ) ) ).arg( wizard->name() ) );
+    TQString pn( i18n( "Rename page %1 of %2" ).tqarg( wizard->title( wizard->page( index ) ) ).tqarg( wizard->name() ) );
 	RenameWizardPageCommand *cmd = new RenameWizardPageCommand( pn, formwindow, wizard, index, listBox->text( index ) );
 	commands.append( cmd );
 }
@@ -248,6 +248,6 @@ void WizardEditor::itemDropped( TQListBoxItem * i )
     int droppedItem = listBox->index( i );
 
     //qDebug( "Moving page %d -> %d", draggedItem, droppedItem );
-    MoveWizardPageCommand *cmd = new MoveWizardPageCommand( i18n( "Move Page %1 to %2 in %3" ).arg( draggedItem ).arg( droppedItem ).arg( wizard->name() ), formwindow, wizard, draggedItem, droppedItem );
+    MoveWizardPageCommand *cmd = new MoveWizardPageCommand( i18n( "Move Page %1 to %2 in %3" ).tqarg( draggedItem ).tqarg( droppedItem ).tqarg( wizard->name() ), formwindow, wizard, draggedItem, droppedItem );
     commands.append( cmd );
 }
diff --git a/kdevdesigner/designer/wizardeditorimpl.h b/kdevdesigner/designer/wizardeditorimpl.h
index 9e2eff4d..94a9e900 100644
--- a/kdevdesigner/designer/wizardeditorimpl.h
+++ b/kdevdesigner/designer/wizardeditorimpl.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -38,9 +38,10 @@ class FormWindow;
 class WizardEditor : public WizardEditorBase
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    WizardEditor( TQWidget *parent, TQWizard *wizard, FormWindow *fw );
+    WizardEditor( TQWidget *tqparent, TQWizard *wizard, FormWindow *fw );
     ~WizardEditor();
 
 protected slots:
diff --git a/kdevdesigner/designer/workspace.cpp b/kdevdesigner/designer/workspace.cpp
index 9977c2ab..fe62a4ec 100644
--- a/kdevdesigner/designer/workspace.cpp
+++ b/kdevdesigner/designer/workspace.cpp
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -53,8 +53,8 @@
 
 #include <klocale.h>
 
-WorkspaceItem::WorkspaceItem( TQListView *parent, Project* p )
-    : TQListViewItem( parent )
+WorkspaceItem::WorkspaceItem( TQListView *tqparent, Project* p )
+    : TQListViewItem( tqparent )
 {
     init();
     project = p;
@@ -63,8 +63,8 @@ WorkspaceItem::WorkspaceItem( TQListView *parent, Project* p )
     setExpandable( FALSE );
 }
 
-WorkspaceItem::WorkspaceItem( TQListViewItem *parent, SourceFile* sf )
-    : TQListViewItem( parent )
+WorkspaceItem::WorkspaceItem( TQListViewItem *tqparent, SourceFile* sf )
+    : TQListViewItem( tqparent )
 {
     init();
     sourceFile = sf;
@@ -72,8 +72,8 @@ WorkspaceItem::WorkspaceItem( TQListViewItem *parent, SourceFile* sf )
     setPixmap( 0, SmallIcon( "designer_filenew.png" , KDevDesignerPartFactory::instance()) );
 }
 
-WorkspaceItem::WorkspaceItem( TQListViewItem *parent, TQObject *o, Project *p )
-    : TQListViewItem( parent )
+WorkspaceItem::WorkspaceItem( TQListViewItem *tqparent, TQObject *o, Project *p )
+    : TQListViewItem( tqparent )
 {
     init();
     object = o;
@@ -84,8 +84,8 @@ WorkspaceItem::WorkspaceItem( TQListViewItem *parent, TQObject *o, Project *p )
 		      listView(), TQT_SLOT( update() ) );
 }
 
-WorkspaceItem::WorkspaceItem( TQListViewItem *parent, FormFile* ff, Type type )
-    : TQListViewItem( parent )
+WorkspaceItem::WorkspaceItem( TQListViewItem *tqparent, FormFile* ff, Type type )
+    : TQListViewItem( tqparent )
 {
     init();
     formFile = ff;
@@ -115,16 +115,16 @@ void WorkspaceItem::paintCell( TQPainter *p, const TQColorGroup &cg, int column,
 {
     TQColorGroup g( cg );
     g.setColor( TQColorGroup::Base, backgroundColor() );
-    g.setColor( TQColorGroup::Foreground, Qt::black );
+    g.setColor( TQColorGroup::Foreground, TQt::black );
 
     if ( type() == FormSourceType &&
 	 ( !formFile->hasFormCode() || ( formFile->codeFileState() == FormFile::Deleted && formFile->formWindow() ) ) &&
-	 parent() && parent()->parent() && ( (WorkspaceItem*)parent()->parent() )->project &&
-	 ( (WorkspaceItem*)parent()->parent() )->project->isCpp() ) {
-	g.setColor( TQColorGroup::Text, listView()->palette().disabled().color( TQColorGroup::Text) );
-	g.setColor( TQColorGroup::HighlightedText, listView()->palette().disabled().color( TQColorGroup::Text) );
+	 tqparent() && tqparent()->tqparent() && ( (WorkspaceItem*)tqparent()->tqparent() )->project &&
+	 ( (WorkspaceItem*)tqparent()->tqparent() )->project->isCpp() ) {
+	g.setColor( TQColorGroup::Text, listView()->tqpalette().disabled().color( TQColorGroup::Text) );
+	g.setColor( TQColorGroup::HighlightedText, listView()->tqpalette().disabled().color( TQColorGroup::Text) );
     } else {
-	g.setColor( TQColorGroup::Text, Qt::black );
+	g.setColor( TQColorGroup::Text, TQt::black );
     }
     p->save();
 
@@ -177,7 +177,7 @@ TQString WorkspaceItem::text( int column ) const
 	return project->qualifiedName( object );
     }
 
-    return TQString::null; // shut up compiler
+    return TQString(); // shut up compiler
 }
 
 void WorkspaceItem::fillCompletionList( TQStringList& completion )
@@ -252,8 +252,8 @@ TQString WorkspaceItem::key( int column, bool ) const
 TQColor WorkspaceItem::backgroundColor()
 {
     bool b = useOddColor;
-    if ( t == FormSourceType && parent() )
-	b = ( ( WorkspaceItem*)parent() )->useOddColor;
+    if ( t == FormSourceType && tqparent() )
+	b = ( ( WorkspaceItem*)tqparent() )->useOddColor;
     return b ? *backColor2 : *backColor1;
 }
 
@@ -270,8 +270,8 @@ void WorkspaceItem::setAutoOpen( bool b )
     autoOpen = b;
 }
 
-Workspace::Workspace( TQWidget *parent, MainWindow *mw )
-    : TQListView( parent, 0, WStyle_Customize | WStyle_NormalBorder | WStyle_Title |
+Workspace::Workspace( TQWidget *tqparent, MainWindow *mw )
+    : TQListView( tqparent, 0, WStyle_Customize | WStyle_NormalBorder | WStyle_Title |
 		 WStyle_Tool | WStyle_MinMax | WStyle_SysMenu ), mainWindow( mw ),
 	project( 0 ), completionDirty( FALSE )
 {
@@ -284,7 +284,7 @@ Workspace::Workspace( TQWidget *parent, MainWindow *mw )
     header()->hide();
     setSorting( 0 );
     setResizePolicy( TQScrollView::Manual );
-#ifndef Q_WS_MAC
+#ifndef TQ_WS_MAC
     TQPalette p( palette() );
     p.setColor( TQColorGroup::Base, TQColor( *backColor2 ) );
     (void)*selectedBack; // hack
@@ -419,9 +419,9 @@ void Workspace::update( FormFile* ff )
 {
     TQListViewItem* i = findItem( ff );
     if ( i ) {
-	i->repaint();
+	i->tqrepaint();
 	if ( (i = i->firstChild()) )
-	    i->repaint();
+	    i->tqrepaint();
     }
 }
 
@@ -499,7 +499,7 @@ void Workspace::closeAutoOpenItems()
     TQListViewItemIterator it( this );
     for ( ; it.current(); ++it ) {
 	WorkspaceItem* i = (WorkspaceItem*) it.current();
-	WorkspaceItem* ip = (WorkspaceItem*) i->parent();
+	WorkspaceItem* ip = (WorkspaceItem*) i->tqparent();
 	if ( i->type() == WorkspaceItem::FormSourceType ) {
 	    if ( !i->isSelected() && !ip->isSelected()
 		 && ip->isAutoOpen() ) {
@@ -523,7 +523,7 @@ void Workspace::itemDoubleClicked( TQListViewItem *i )
 
 void Workspace::itemClicked( int button, TQListViewItem *i, const TQPoint& )
 {
-    if ( !i || button != LeftButton )
+    if ( !i || button != Qt::LeftButton )
 	return;
 
     closeAutoOpenItems();
@@ -640,7 +640,7 @@ void Workspace::rmbClicked( TQListViewItem *i, const TQPoint& pos )
     case OPEN_SOURCE:
     case OPEN_FORM:
     case OPEN_FORM_SOURCE:
-	itemClicked( LeftButton, i, pos );
+	itemClicked( Qt::LeftButton, i, pos );
 	break;
     }
 }
@@ -648,12 +648,12 @@ void Workspace::rmbClicked( TQListViewItem *i, const TQPoint& pos )
 bool Workspace::eventFilter( TQObject *o, TQEvent * e )
 {
     // Reggie, on what type of events do we have to execute updateBufferEdit()
-    if ( o ==bufferEdit && e->type() != TQEvent::ChildRemoved )
+    if ( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(bufferEdit) && e->type() != TQEvent::ChildRemoved )
 	updateBufferEdit();
     return TQListView::eventFilter( o, e );
 }
 
-void Workspace::setBufferEdit( QCompletionEdit *edit )
+void Workspace::setBufferEdit( TQCompletionEdit *edit )
 {
     bufferEdit = edit;
     connect( bufferEdit, TQT_SIGNAL( chosen( const TQString & ) ),
@@ -681,7 +681,7 @@ void Workspace::bufferChosen( const TQString &buffer )
     if ( bufferEdit )
 	bufferEdit->setText( "" );
 
-    if ( MainWindow::self->projectFileNames().contains( buffer ) ) {
+    if ( MainWindow::self->projectFileNames().tqcontains( buffer ) ) {
 	MainWindow::self->setCurrentProjectByFilename( buffer );
 	return;
     }
@@ -689,7 +689,7 @@ void Workspace::bufferChosen( const TQString &buffer )
     TQListViewItemIterator it( this );
     while ( it.current() ) {
 	if ( ( (WorkspaceItem*)it.current())->checkCompletion( buffer ) ) {
-	    itemClicked( LeftButton, it.current(), TQPoint() );
+	    itemClicked( Qt::LeftButton, it.current(), TQPoint() );
 	    break;
 	}
 	++it;
diff --git a/kdevdesigner/designer/workspace.h b/kdevdesigner/designer/workspace.h
index 344046f6..b32cd16a 100644
--- a/kdevdesigner/designer/workspace.h
+++ b/kdevdesigner/designer/workspace.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -39,18 +39,18 @@ class MainWindow;
 class Project;
 class SourceFile;
 class FormFile;
-class QCompletionEdit;
+class TQCompletionEdit;
 class SourceEditor;
 
-class WorkspaceItem : public QListViewItem
+class WorkspaceItem : public TQListViewItem
 {
 public:
     enum Type { ProjectType, FormFileType, FormSourceType, SourceFileType, ObjectType };
 
-    WorkspaceItem( TQListView *parent, Project* p );
-    WorkspaceItem( TQListViewItem *parent, SourceFile* sf );
-    WorkspaceItem( TQListViewItem *parent, FormFile* ff, Type t = FormFileType );
-    WorkspaceItem( TQListViewItem *parent, TQObject *o, Project *p );
+    WorkspaceItem( TQListView *tqparent, Project* p );
+    WorkspaceItem( TQListViewItem *tqparent, SourceFile* sf );
+    WorkspaceItem( TQListViewItem *tqparent, FormFile* ff, Type t = FormFileType );
+    WorkspaceItem( TQListViewItem *tqparent, TQObject *o, Project *p );
 
     void paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int align );
 
@@ -84,12 +84,13 @@ private:
     Type t;
 };
 
-class Workspace : public QListView
+class Workspace : public TQListView
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    Workspace( TQWidget *parent , MainWindow *mw );
+    Workspace( TQWidget *tqparent , MainWindow *mw );
 
     void setCurrentProject( Project *pro );
 
@@ -97,7 +98,7 @@ public:
     void contentsDragEnterEvent( TQDragEnterEvent *e );
     void contentsDragMoveEvent( TQDragMoveEvent *e );
 
-    void setBufferEdit( QCompletionEdit *edit );
+    void setBufferEdit( TQCompletionEdit *edit );
 
 public slots:
 
@@ -140,7 +141,7 @@ private:
     MainWindow *mainWindow;
     Project *project;
     WorkspaceItem *projectItem;
-    QCompletionEdit *bufferEdit;
+    TQCompletionEdit *bufferEdit;
     bool blockNewForms;
     void updateBufferEdit();
     bool completionDirty;
author	tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>	2011-06-14 16:45:05 +0000
committer	tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>	2011-06-14 16:45:05 +0000
commit	48d4a26399959121f33d2bc3bfe51c7827b654fc (patch)
tree	5ae5e6e00d3ba330b7b8be9bc097154b6bc739e8 /kdevdesigner/designer
parent	7e701ace6592d09e1f2c0cf28c7d6d872d78f4f5 (diff)
download	tdevelop-48d4a26399959121f33d2bc3bfe51c7827b654fc.tar.gz tdevelop-48d4a26399959121f33d2bc3bfe51c7827b654fc.zip