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

This reverts commit b6ba5d642f3fc7d320e3d6f4650eb259a3a52b04.

107 files changed, 912 insertions, 912 deletions

diff --git a/kdevdesigner/designer/about.ui b/kdevdesigner/designer/about.ui
index 48d53486..7034bca4 100644
--- a/kdevdesigner/designer/about.ui
+++ b/kdevdesigner/designer/about.ui
@@ -66,7 +66,7 @@
             <property name="scaledContents">
                 <bool>false</bool>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>AlignCenter</set>
             </property>
             <property name="hAlign" stdset="0">
@@ -79,7 +79,7 @@
             <property name="text">
                 <string>Version 3.2</string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>AlignCenter</set>
             </property>
             <property name="hAlign" stdset="0">
@@ -92,7 +92,7 @@
             <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">
@@ -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,7 +129,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
@@ -160,7 +160,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -191,7 +191,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/actiondnd.cpp b/kdevdesigner/designer/actiondnd.cpp
index a4988bda..9eb97cbd 100644
--- a/kdevdesigner/designer/actiondnd.cpp
+++ b/kdevdesigner/designer/actiondnd.cpp
@@ -38,7 +38,7 @@
 #include <tqbitmap.h>
 #include <tqdragobject.h>
 #include <tqinputdialog.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqmainwindow.h>
 #include <tqmenudata.h>
 #include <tqmessagebox.h>
@@ -140,7 +140,7 @@ QDesignerToolBarSeparator::QDesignerToolBarSeparator(Qt::Orientation o , TQToolB
     setOrientation( o );
     setBackgroundMode( parent->backgroundMode() );
     setBackgroundOrigin( ParentOrigin );
-    setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ) );
+    tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ) );
 }
 
 void QDesignerToolBarSeparator::setOrientation( Qt::Orientation o )
@@ -153,9 +153,9 @@ void QDesignerToolBarSeparator::styleChange( TQStyle& )
     setOrientation( orient );
 }
 
-TQSize QDesignerToolBarSeparator::sizeHint() const
+TQSize QDesignerToolBarSeparator::tqsizeHint() const
 {
-    int extent = tqstyle().pixelMetric( TQStyle::PM_DockWindowSeparatorExtent,
+    int extent = tqstyle().tqpixelMetric( TQStyle::PM_DockWindowSeparatorExtent,
 				      this );
     if ( orient ==Qt::Horizontal )
 	return TQSize( extent, 0 );
@@ -172,7 +172,7 @@ void QDesignerToolBarSeparator::paintEvent( TQPaintEvent * )
 	flags |= TQStyle::Style_Horizontal;
 
     tqstyle().tqdrawPrimitive( TQStyle::PE_DockWindowSeparator, &p, rect(),
-			   colorGroup(), flags );
+			   tqcolorGroup(), flags );
 }
 
 
@@ -349,7 +349,7 @@ void QDesignerToolBar::contextMenuEvent( TQContextMenuEvent *e )
     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();
@@ -409,7 +409,7 @@ void QDesignerToolBar::buttonContextMenuEvent( TQContextMenuEvent *e, TQObject *
 	int index = actionList.find( 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();
@@ -429,7 +429,7 @@ 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();
@@ -464,7 +464,7 @@ void QDesignerToolBar::removeWidget( TQWidget *w )
     int index = actionList.find( 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();
@@ -487,7 +487,7 @@ void QDesignerToolBar::buttonMouseMoveEvent( TQMouseEvent *e, TQObject *o )
     int index = actionList.find( 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();
@@ -504,7 +504,7 @@ void QDesignerToolBar::buttonMouseMoveEvent( TQMouseEvent *e, TQObject *o )
     }
     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();
@@ -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();
@@ -699,7 +699,7 @@ void QDesignerToolBar::doInsertWidget( const TQPoint &p )
     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();
diff --git a/kdevdesigner/designer/actiondnd.h b/kdevdesigner/designer/actiondnd.h
index 0050ace8..5e830949 100644
--- a/kdevdesigner/designer/actiondnd.h
+++ b/kdevdesigner/designer/actiondnd.h
@@ -160,7 +160,7 @@ class QDesignerToolBarSeparator : public TQWidget
 public:
     QDesignerToolBarSeparator( Qt::Orientation, TQToolBar *parent, const char* name=0 );
 
-    TQSize sizeHint() const;
+    TQSize tqsizeHint() const;
     Qt::Orientation orientation() const { return orient; }
 public slots:
    void setOrientation( Qt::Orientation );
diff --git a/kdevdesigner/designer/actioneditor.ui b/kdevdesigner/designer/actioneditor.ui
index c2c5988c..38d1f966 100644
--- a/kdevdesigner/designer/actioneditor.ui
+++ b/kdevdesigner/designer/actioneditor.ui
@@ -127,7 +127,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/command.cpp b/kdevdesigner/designer/command.cpp
index 50c604bd..60a14cdf 100644
--- a/kdevdesigner/designer/command.cpp
+++ b/kdevdesigner/designer/command.cpp
@@ -43,11 +43,11 @@
 #include <tqwidget.h>
 #include <tqmetaobject.h>
 #include <tqapplication.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqmessagebox.h>
 #include <tqlistbox.h>
 #include <tqiconview.h>
-#include <textedit.h>
+#include <tqtextedit.h>
 #include <tqptrstack.h>
 #include <tqheader.h>
 #include <tqsplitter.h>
@@ -261,19 +261,19 @@ 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();
@@ -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() ) {
+	TQObjectList *tqchildren = w->queryList( TQWIDGET_OBJECT_NAME_STRING );
+	for ( TQWidget *c = (TQWidget *)tqchildren->first(); c; c = (TQWidget *)tqchildren->next() ) {
 	    if ( copyOfWidgets.find( c ) == -1 && formWindow()->widgets()->find( c ) ) {
 		widgets.insert(widgets.at() + 1, c);
 		widgets.prev();
 		copyOfWidgets.append(c);
 	    }
 	}
-	delete children;
+	delete tqchildren;
     }
 }
 
@@ -490,7 +490,7 @@ 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()->findProperty( propName, TRUE ), TRUE );
     if ( !p ) {
 	if ( propName == "toolTip" || propName == "whatsThis" )
 	    return TRUE;
@@ -563,26 +563,26 @@ void SetPropertyCommand::setProperty( const TQVariant &v, const TQString &curren
     if ( select )
 	editor->propertyList()->setCurrentProperty( propName );
     const TQMetaProperty *p =
-	widget->metaObject()->property( widget->metaObject()->findProperty( propName, TRUE ), TRUE );
+	widget->tqmetaObject()->property( widget->tqmetaObject()->findProperty( 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()->findProperty( "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()->findProperty( "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 ) );
+	    widget->setProperty( "tqalignment", TQVariant( align ) );
 	} else if ( propName == "layoutSpacing" ) {
 	    TQVariant val = v;
 	    if ( val.toString() == "default" )
@@ -674,21 +674,21 @@ void SetPropertyCommand::setProperty( const TQVariant &v, const TQString &curren
 LayoutHorizontalCommand::LayoutHorizontalCommand( const TQString &n, FormWindow *fw,
 						  TQWidget *parent, TQWidget *layoutBase,
 						  const TQWidgetList &wl )
-    : Command( n, fw ), layout( wl, parent, fw, layoutBase )
+    : Command( n, fw ), tqlayout( wl, parent, fw, layoutBase )
 {
 }
 
 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();
 }
 
@@ -697,21 +697,21 @@ void LayoutHorizontalCommand::unexecute()
 LayoutHorizontalSplitCommand::LayoutHorizontalSplitCommand( const TQString &n, FormWindow *fw,
 							    TQWidget *parent, TQWidget *layoutBase,
 							    const TQWidgetList &wl )
-    : Command( n, fw ), layout( wl, parent, fw, layoutBase, TRUE, TRUE )
+    : Command( n, fw ), tqlayout( wl, parent, fw, layoutBase, 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();
 }
 
@@ -720,21 +720,21 @@ void LayoutHorizontalSplitCommand::unexecute()
 LayoutVerticalCommand::LayoutVerticalCommand( const TQString &n, FormWindow *fw,
 					      TQWidget *parent, TQWidget *layoutBase,
 					      const TQWidgetList &wl )
-    : Command( n, fw ), layout( wl, parent, fw, layoutBase )
+    : Command( n, fw ), tqlayout( wl, parent, fw, layoutBase )
 {
 }
 
 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();
 }
 
@@ -743,21 +743,21 @@ void LayoutVerticalCommand::unexecute()
 LayoutVerticalSplitCommand::LayoutVerticalSplitCommand( const TQString &n, FormWindow *fw,
 							TQWidget *parent, TQWidget *layoutBase,
 							const TQWidgetList &wl )
-    : Command( n, fw ), layout( wl, parent, fw, layoutBase, TRUE, TRUE )
+    : Command( n, fw ), tqlayout( wl, parent, fw, layoutBase, 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();
 }
 
@@ -766,21 +766,21 @@ void LayoutVerticalSplitCommand::unexecute()
 LayoutGridCommand::LayoutGridCommand( const TQString &n, FormWindow *fw,
 				      TQWidget *parent, TQWidget *layoutBase,
 				      const TQWidgetList &wl, int xres, int yres )
-    : Command( n, fw ), layout( wl, parent, fw, layoutBase, TQSize( TQMAX(5,xres), TQMAX(5,yres) ) )
+    : Command( n, fw ), tqlayout( wl, parent, fw, layoutBase, 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();
 }
 
@@ -793,21 +793,21 @@ BreakLayoutCommand::BreakLayoutCommand( const TQString &n, FormWindow *fw,
     WidgetFactory::LayoutType lay = WidgetFactory::layoutType( layoutBase );
     spacing = MetaDataBase::spacing( TQT_TQOBJECT(layoutBase) );
     margin = MetaDataBase::margin( TQT_TQOBJECT(layoutBase) );
-    layout = 0;
+    tqlayout = 0;
     if ( lay == WidgetFactory::HBox )
-	layout = new HorizontalLayout( wl, layoutBase, fw, layoutBase, FALSE, ::tqqt_cast<TQSplitter*>(layoutBase) != 0 );
+	tqlayout = new HorizontalLayout( wl, layoutBase, fw, layoutBase, FALSE, ::tqqt_cast<TQSplitter*>(layoutBase) != 0 );
     else if ( lay == WidgetFactory::VBox )
-	layout = new VerticalLayout( wl, layoutBase, fw, layoutBase, FALSE, ::tqqt_cast<TQSplitter*>(layoutBase) != 0 );
+	tqlayout = new VerticalLayout( wl, layoutBase, fw, layoutBase, FALSE, ::tqqt_cast<TQSplitter*>(layoutBase) != 0 );
     else if ( lay == WidgetFactory::Grid )
-	layout = new GridLayout( wl, layoutBase, fw, layoutBase, TQSize( TQMAX( 5, fw->grid().x()), TQMAX( 5, fw->grid().y()) ), FALSE );
+	tqlayout = new GridLayout( wl, layoutBase, fw, layoutBase, 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( TQMAX( 16, w->width() ), TQMAX( 16, w->height() ) );
@@ -815,10 +815,10 @@ void BreakLayoutCommand::execute()
 
 void BreakLayoutCommand::unexecute()
 {
-    if ( !layout )
+    if ( !tqlayout )
 	return;
     formWindow()->clearSelection( FALSE );
-    layout->doLayout();
+    tqlayout->doLayout();
     formWindow()->mainWindow()->objectHierarchy()->rebuild();
     MetaDataBase::setSpacing( TQT_TQOBJECT(WidgetFactory::containerOfWidget( lb )), spacing );
     MetaDataBase::setMargin( TQT_TQOBJECT(WidgetFactory::containerOfWidget( lb )), margin );
@@ -2390,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' )
diff --git a/kdevdesigner/designer/command.h b/kdevdesigner/designer/command.h
index b2c2d161..909c8ea4 100644
--- a/kdevdesigner/designer/command.h
+++ b/kdevdesigner/designer/command.h
@@ -208,7 +208,7 @@ public:
 
 private:
     TQWidget *widget;
-    TQRect geometry;
+    TQRect tqgeometry;
 
 };
 
@@ -290,7 +290,7 @@ public:
     Type type() const { return LayoutHorizontal; }
 
 private:
-   HorizontalLayout layout;
+   HorizontalLayout tqlayout;
 
 };
 
@@ -306,7 +306,7 @@ public:
     Type type() const { return LayoutHorizontalSplitter; }
 
 private:
-   HorizontalLayout layout;
+   HorizontalLayout tqlayout;
 
 };
 
@@ -322,7 +322,7 @@ public:
     Type type() const { return LayoutVertical; }
 
 private:
-   VerticalLayout layout;
+   VerticalLayout tqlayout;
 
 };
 
@@ -338,7 +338,7 @@ public:
     Type type() const { return LayoutVerticalSplitter; }
 
 private:
-   VerticalLayout layout;
+   VerticalLayout tqlayout;
 
 };
 
@@ -354,7 +354,7 @@ public:
     Type type() const { return LayoutGrid; }
 
 private:
-    GridLayout layout;
+    GridLayout tqlayout;
 
 };
 
@@ -369,7 +369,7 @@ public:
     Type type() const { return BreakLayout; }
 
 private:
-    Layout *layout;
+    Layout *tqlayout;
     int spacing;
     int margin;
     TQWidget *lb;
diff --git a/kdevdesigner/designer/configtoolboxdialog.ui b/kdevdesigner/designer/configtoolboxdialog.ui
index 226cdd35..05a1e52f 100644
--- a/kdevdesigner/designer/configtoolboxdialog.ui
+++ b/kdevdesigner/designer/configtoolboxdialog.ui
@@ -62,7 +62,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>342</width>
                             <height>0</height>
@@ -119,7 +119,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>111</width>
                             <height>0</height>
@@ -215,7 +215,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>41</width>
                             <height>0</height>
diff --git a/kdevdesigner/designer/configtoolboxdialog.ui.h b/kdevdesigner/designer/configtoolboxdialog.ui.h
index 7dcd6530..711c51e6 100644
--- a/kdevdesigner/designer/configtoolboxdialog.ui.h
+++ b/kdevdesigner/designer/configtoolboxdialog.ui.h
@@ -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,7 +96,7 @@ 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();
@@ -106,7 +106,7 @@ void ConfigToolboxDialog::addTool()
 		}
 	    }
 	} 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 51995633..cfc590a5 100644
--- a/kdevdesigner/designer/connectiondialog.ui
+++ b/kdevdesigner/designer/connectiondialog.ui
@@ -114,7 +114,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/connectiondialog.ui.h b/kdevdesigner/designer/connectiondialog.ui.h
index 25a5d5f2..4969c8fd 100644
--- a/kdevdesigner/designer/connectiondialog.ui.h
+++ b/kdevdesigner/designer/connectiondialog.ui.h
@@ -175,7 +175,7 @@ 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() );
diff --git a/kdevdesigner/designer/connectionitems.cpp b/kdevdesigner/designer/connectionitems.cpp
index 12b03a1d..d43bb874 100644
--- a/kdevdesigner/designer/connectionitems.cpp
+++ b/kdevdesigner/designer/connectionitems.cpp
@@ -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 );
 }
 
@@ -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)" );
@@ -441,15 +441,15 @@ 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 TQMetaData* md = lastReceiver->metaObject()->slot( i, TRUE );
-	if ( ( (lastReceiver->metaObject()->slot( i, TRUE )->tqt_mo_access == TQMetaData::Public) ||
+	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->metaObject()->slot(i, TRUE)->tqt_mo_access ==
+		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 ) )
diff --git a/kdevdesigner/designer/connectionitems.h b/kdevdesigner/designer/connectionitems.h
index 76c57065..4087c59f 100644
--- a/kdevdesigner/designer/connectionitems.h
+++ b/kdevdesigner/designer/connectionitems.h
@@ -183,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] != '<' &&
@@ -191,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/createtemplate.ui b/kdevdesigner/designer/createtemplate.ui
index e03340b1..60f6a3b6 100644
--- a/kdevdesigner/designer/createtemplate.ui
+++ b/kdevdesigner/designer/createtemplate.ui
@@ -110,7 +110,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -165,7 +165,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/customwidgeteditor.ui b/kdevdesigner/designer/customwidgeteditor.ui
index 85e09c9b..7ba5dd29 100644
--- a/kdevdesigner/designer/customwidgeteditor.ui
+++ b/kdevdesigner/designer/customwidgeteditor.ui
@@ -127,7 +127,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -160,7 +160,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
@@ -246,7 +246,7 @@
                                 <property name="name">
                                     <cstring>buttonChoosePixmap</cstring>
                                 </property>
-                                <property name="maximumSize">
+                                <property name="tqmaximumSize">
                                     <size>
                                         <width>30</width>
                                         <height>22</height>
@@ -293,7 +293,7 @@
                                 <property name="name">
                                     <cstring>buttonChooseHeader</cstring>
                                 </property>
-                                <property name="maximumSize">
+                                <property name="tqmaximumSize">
                                     <size>
                                         <width>30</width>
                                         <height>22</height>
@@ -527,7 +527,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
@@ -546,7 +546,7 @@
                         </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>
@@ -600,7 +600,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>20</height>
@@ -814,7 +814,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>20</height>
@@ -900,7 +900,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/customwidgeteditorimpl.cpp b/kdevdesigner/designer/customwidgeteditorimpl.cpp
index b94b0a03..d2d0f5b5 100644
--- a/kdevdesigner/designer/customwidgeteditorimpl.cpp
+++ b/kdevdesigner/designer/customwidgeteditorimpl.cpp
@@ -48,9 +48,9 @@
 #include <tqapplication.h>
 #include <tqlistview.h>
 #include <tqfile.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqdom.h>
-#include <textcodec.h>
+#include <tqtextcodec.h>
 #include <tqcheckbox.h>
 
 #include <klocale.h>
@@ -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();
 }
 
@@ -397,7 +397,7 @@ 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 );
 	    tqApp->processEvents();
@@ -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;
@@ -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/dbconnectioneditor.ui b/kdevdesigner/designer/dbconnectioneditor.ui
index 40ef0a9b..abf8beed 100644
--- a/kdevdesigner/designer/dbconnectioneditor.ui
+++ b/kdevdesigner/designer/dbconnectioneditor.ui
@@ -79,7 +79,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
@@ -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 eea4bb3e..3cfd1fdc 100644
--- a/kdevdesigner/designer/dbconnectionimpl.cpp
+++ b/kdevdesigner/designer/dbconnectionimpl.cpp
@@ -32,7 +32,7 @@
 #include <tqcombobox.h>
 #include <tqspinbox.h>
 #include <klineedit.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqsqldatabase.h>
 
 DatabaseConnectionEditor::DatabaseConnectionEditor( DatabaseConnection* connection, TQWidget* parent,
diff --git a/kdevdesigner/designer/dbconnections.ui b/kdevdesigner/designer/dbconnections.ui
index 64cc65c1..e373b2be 100644
--- a/kdevdesigner/designer/dbconnections.ui
+++ b/kdevdesigner/designer/dbconnections.ui
@@ -109,7 +109,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -142,7 +142,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
@@ -176,7 +176,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -209,7 +209,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -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 a9403a69..b5b4409f 100644
--- a/kdevdesigner/designer/dbconnectionsimpl.cpp
+++ b/kdevdesigner/designer/dbconnectionsimpl.cpp
@@ -27,7 +27,7 @@
 #include "dbconnectionsimpl.h"
 #include <tqptrlist.h>
 #include <tqgroupbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include "project.h"
 #include <tqlistbox.h>
 #include <tqcombobox.h>
diff --git a/kdevdesigner/designer/designer_pch.h b/kdevdesigner/designer/designer_pch.h
index 5171ca63..fa840181 100644
--- a/kdevdesigner/designer/designer_pch.h
+++ b/kdevdesigner/designer/designer_pch.h
@@ -16,7 +16,7 @@
 #include <tqdialog.h>
 #include <tqheader.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlineedit.h>
 #include <tqlistbox.h>
 #include <tqlistview.h>
diff --git a/kdevdesigner/designer/designerapp.cpp b/kdevdesigner/designer/designerapp.cpp
index 22d1e531..ebe10a70 100644
--- a/kdevdesigner/designer/designerapp.cpp
+++ b/kdevdesigner/designer/designerapp.cpp
@@ -48,7 +48,7 @@ void set_splash_status( const TQString &txt )
     if ( !splash )
 	return;
     TQString splashText = "Licensed to "
-			 + TQString::fromLatin1( TQT_PRODUCT_LICENSEE ) + "\n"
+			 + TQString::tqfromLatin1( TQT_PRODUCT_LICENSEE ) + "\n"
 			 + txt;
     splash->message( splashText, TQt::AlignRight|TQt::AlignTop );
 }
diff --git a/kdevdesigner/designer/designerappiface.cpp b/kdevdesigner/designer/designerappiface.cpp
index 767ecf3a..cfafb4e9 100644
--- a/kdevdesigner/designer/designerappiface.cpp
+++ b/kdevdesigner/designer/designerappiface.cpp
@@ -37,7 +37,7 @@
 #include "../shared/widgetdatabase.h"
 #include <tqvariant.h>
 #include <tqlistview.h>
-#include <textedit.h>
+#include <tqtextedit.h>
 #include <tqstatusbar.h>
 #include "pixmapcollection.h"
 #include "hierarchyview.h"
@@ -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()->findProperty( 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()->findProperty( prop, TRUE );
+    const TQMetaProperty* p = o->tqmetaObject()->property( id, TRUE );
     if ( p && p->isValid() )
 	return o->property( prop );
     return MetaDataBase::fakeProperty( o, prop );
diff --git a/kdevdesigner/designer/editfunctions.ui b/kdevdesigner/designer/editfunctions.ui
index c3483b1d..1119282a 100644
--- a/kdevdesigner/designer/editfunctions.ui
+++ b/kdevdesigner/designer/editfunctions.ui
@@ -189,7 +189,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -283,7 +283,7 @@
                                     <property name="text">
                                         <string>&amp;Function:</string>
                                     </property>
-                                    <property name="alignment">
+                                    <property name="tqalignment">
                                         <set>AlignVCenter|AlignRight</set>
                                     </property>
                                     <property name="buddy" stdset="0">
@@ -316,7 +316,7 @@
                                     <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,7 +354,7 @@
                             <property name="sizeType">
                                 <enum>Fixed</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>16</height>
@@ -379,7 +379,7 @@
                                     <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">
@@ -432,7 +432,7 @@
                                     <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">
@@ -480,7 +480,7 @@
                                     <property name="text">
                                         <string>&amp;Type:</string>
                                     </property>
-                                    <property name="alignment">
+                                    <property name="tqalignment">
                                         <set>AlignVCenter|AlignRight</set>
                                     </property>
                                     <property name="buddy" stdset="0">
@@ -518,7 +518,7 @@
                                     <property name="sizeType">
                                         <enum>Expanding</enum>
                                     </property>
-                                    <property name="sizeHint">
+                                    <property name="tqsizeHint">
                                         <size>
                                             <width>20</width>
                                             <height>20</height>
@@ -566,7 +566,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/editfunctionsimpl.cpp b/kdevdesigner/designer/editfunctionsimpl.cpp
index ca757b6a..b28ff0ad 100644
--- a/kdevdesigner/designer/editfunctionsimpl.cpp
+++ b/kdevdesigner/designer/editfunctionsimpl.cpp
@@ -41,7 +41,7 @@
 #include <tqcombobox.h>
 #include <tqstrlist.h>
 #include <tqmessagebox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqgroupbox.h>
 #include <tqheader.h>
@@ -132,7 +132,7 @@ EditFunctions::EditFunctions( TQWidget *parent, FormWindow *fw, bool justSlots )
 void EditFunctions::okClicked()
 {
     TQValueList<MetaDataBase::Function> functionList = MetaDataBase::functionList( TQT_TQOBJECT(formWindow) );
-    TQString n = i18n( "Add/Remove functions of '%1'" ).arg( formWindow->name() );
+    TQString n = i18n( "Add/Remove functions of '%1'" ).tqarg( formWindow->name() );
     TQPtrList<Command> commands;
     TQValueList<MetaDataBase::Function>::Iterator fit;
     if ( !functionList.isEmpty() ) {
diff --git a/kdevdesigner/designer/filechooser.cpp b/kdevdesigner/designer/filechooser.cpp
index 9f4a9401..961cfee0 100644
--- a/kdevdesigner/designer/filechooser.cpp
+++ b/kdevdesigner/designer/filechooser.cpp
@@ -28,25 +28,25 @@
 #include <tqlineedit.h>
 #include <tqpushbutton.h>
 #include <tqfiledialog.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <kfiledialog.h>
 
 FileChooser::FileChooser( TQWidget *parent, const char *name )
     : TQWidget( parent, 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() ) );
diff --git a/kdevdesigner/designer/finddialog.ui b/kdevdesigner/designer/finddialog.ui
index 9b16cd8c..f806a3aa 100644
--- a/kdevdesigner/designer/finddialog.ui
+++ b/kdevdesigner/designer/finddialog.ui
@@ -117,7 +117,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/formfile.cpp b/kdevdesigner/designer/formfile.cpp
index 325862aa..93486243 100644
--- a/kdevdesigner/designer/formfile.cpp
+++ b/kdevdesigner/designer/formfile.cpp
@@ -77,7 +77,7 @@ 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()
@@ -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() ) );
 		}
 	    }
 	}
@@ -215,7 +215,7 @@ bool FormFile::save( bool withMsgBox, bool ignoreModified )
 		    f2.writeBlock( data );
 		} 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() ) );
 		}
 	    }
 	}
@@ -227,7 +227,7 @@ bool FormFile::save( bool withMsgBox, bool ignoreModified )
 	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();
@@ -263,7 +263,7 @@ bool FormFile::saveAs( bool ignoreModified )
 	fn = KFileDialog::getSaveFileName( f,
 					   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;
@@ -294,7 +294,7 @@ bool FormFile::saveAs( bool ignoreModified )
     pro->setModified( TRUE );
     timeStamp.setFileName( pro->makeAbsolute( codeFile() ) );
     if ( ed && TQT_TQOBJECT(formWindow()) )
-	ed->setCaption( i18n( "Edit %1" ).arg( formWindow()->name() ) );
+	ed->setCaption( i18n( "Edit %1" ).tqarg( formWindow()->name() ) );
     setModified( TRUE );
     if ( pro->isDummy() )
 	fw->mainWindow()->addRecentlyOpenedFile( fn );
@@ -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() )
@@ -653,7 +653,7 @@ void FormFile::checkTimeStamp()
     if ( codeEdited ) {
 	if ( TQMessageBox::information( MainWindow::self, i18n( "TQt Designer" ),
 				       i18n( "File '%1' has been changed outside TQt Designer.\n"
-					   "Do you want to reload it?" ).arg( timeStamp.fileName() ),
+					   "Do you want to reload it?" ).tqarg( timeStamp.fileName() ),
 				       i18n( "&Yes" ), i18n( "&No" ) ) == 0 ) {
 	    TQFile f( timeStamp.fileName() );
 	    if ( f.open( IO_ReadOnly ) ) {
@@ -854,7 +854,7 @@ 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() ) {
@@ -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 f6d71a26..097beff4 100644
--- a/kdevdesigner/designer/formfile.h
+++ b/kdevdesigner/designer/formfile.h
@@ -116,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/formwindow.cpp b/kdevdesigner/designer/formwindow.cpp
index 05636e38..fbd7e1ad 100644
--- a/kdevdesigner/designer/formwindow.cpp
+++ b/kdevdesigner/designer/formwindow.cpp
@@ -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"
@@ -55,11 +55,11 @@
 #include <tqobjectlist.h>
 #include <tqtimer.h>
 #include <tqapplication.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqspinbox.h>
 #include <tqstatusbar.h>
 #include <tqapplication.h>
-#include <palette.h>
+#include <tqpalette.h>
 #include <tqmessagebox.h>
 #include <tqpopupmenu.h>
 #include <tqsizegrip.h>
@@ -108,7 +108,7 @@ static void restoreCursors( TQWidget *start, FormWindow *fw )
     }
 }
 
-#if defined(TQ_WS_WIN32) // #### needed for the workaround for repaint problem on windows
+#if defined(TQ_WS_WIN32) // #### needed for the workaround for tqrepaint problem on windows
 #include <tqt_windows.h>
 static void flickerfree_update( TQWidget *w )
 {
@@ -260,7 +260,7 @@ void FormWindow::paintGrid( TQWidget *w, TQPaintEvent *e )
     grid_name.sprintf("FormWindowGrid_%d_%d", mainWindow()->grid().x(), mainWindow()->grid().y());
     if( !TQPixmapCache::find( grid_name, grid ) ) {
 	grid = TQPixmap( 350 + ( 350 % mainWindow()->grid().x() ), 350 + ( 350 % mainWindow()->grid().y() ) );
-	grid.fill( colorGroup().color( TQColorGroup::Foreground ) );
+	grid.fill( tqcolorGroup().color( TQColorGroup::Foreground ) );
 	TQBitmap mask( grid.width(), grid.height() );
 	mask.fill( color0 );
 	TQPainter p( &mask );
@@ -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 );
@@ -383,13 +383,13 @@ void FormWindow::insertWidget()
 			    "properties as well as signals and slots to integrate custom widgets into "
 			    "<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();
@@ -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() );
 	}
     }
 
@@ -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();
     }
@@ -510,13 +510,13 @@ void FormWindow::insertWidget( TQWidget *w, bool checkName )
 			    "properties as well as signals and slots to integrate custom widgets into "
 			    "<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 );
@@ -577,7 +577,7 @@ void FormWindow::handleMousePress( TQMouseEvent *e, TQWidget *w )
     switch ( currTool ) {
     case POINTER_TOOL:
 	if ( !isMainContainer( TQT_TQOBJECT(w) ) && qstrcmp( w->name(), "central widget" ) != 0 ) { // press on a child widget
-	    // if the clicked widget is not in a layout, raise it
+	    // if the clicked widget is not in a tqlayout, raise it
 	    if ( !w->parentWidget() || WidgetFactory::layoutType( w->parentWidget() ) == WidgetFactory::NoLayout )
 		w->raise();
 	    if ( ( e->state() & ControlButton ) ) { // with control pressed, always start rubber band selection
@@ -592,7 +592,7 @@ void FormWindow::handleMousePress( TQMouseEvent *e, TQWidget *w )
 		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
+		    // only if widget has a tqlayout (it is a tqlayout meta widget or a laid out container!), unselect its childs
 		    if ( WidgetFactory::layoutType( w ) != WidgetFactory::NoLayout ) {
 			TQObjectList *l = w->queryList( TQWIDGET_OBJECT_NAME_STRING );
 			setPropertyShowingBlocked( TRUE );
@@ -622,7 +622,7 @@ void FormWindow::handleMousePress( TQMouseEvent *e, TQWidget *w )
 		    ( WidgetFactory::layoutType( w->parentWidget()) != WidgetFactory::NoLayout || !insertedWidgets.find(w) ) )
 		w = w->parentWidget();
 
-	    if ( e->button() == Qt::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() );
@@ -660,9 +660,9 @@ void FormWindow::handleMousePress( TQMouseEvent *e, TQWidget *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() );
@@ -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,7 +837,7 @@ 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 );
@@ -871,7 +871,7 @@ void FormWindow::handleMouseMove( TQMouseEvent *e, TQWidget *w )
 	if ( newendWidget &&
 	     ( isMainContainer( TQT_TQOBJECT(newendWidget) ) || insertedWidgets.find( 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() );
 	tqApp->processEvents();
@@ -899,10 +899,10 @@ void FormWindow::handleMouseMove( TQMouseEvent *e, TQWidget *w )
 	else if ( insertedWidgets.find( 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() );
 	tqApp->processEvents();
 	if ( drawRecRect && oldendWidget )
@@ -958,15 +958,15 @@ void FormWindow::handleMouseRelease( TQMouseEvent *e, TQWidget *w )
 		if ( wa == it.key()->parentWidget() )
 		    goto make_move_command;
 
-		// break layout if necessary
+		// break tqlayout if necessary
 		if ( WidgetFactory::layoutType( 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
@@ -1044,7 +1044,7 @@ 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() ),
+		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(),
@@ -1067,11 +1067,11 @@ void FormWindow::handleMouseRelease( TQMouseEvent *e, TQWidget *w )
 	    if ( WidgetFactory::layoutType( 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 );
@@ -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() ) ) );
@@ -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 );
@@ -1518,9 +1518,9 @@ void FormWindow::editAdjustSize()
     for ( TQWidget* w = widgets.first(); w; w = widgets.next() ) {
 	if ( w->parentWidget() && WidgetFactory::layoutType( w->parentWidget() ) != 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 ) );
     }
@@ -1759,7 +1759,7 @@ void FormWindow::currentToolChanged()
 	    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( TQT_TQOBJECT(mainContainer()) );
@@ -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 TQt 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"
@@ -1910,11 +1910,11 @@ 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()->findProperty( "text", TRUE ), TRUE );
 		const TQMetaProperty* title =
-		    w->metaObject()->property( w->metaObject()->findProperty( "title", TRUE ), TRUE );
+		    w->tqmetaObject()->property( w->tqmetaObject()->findProperty( "title", TRUE ), TRUE );
 		const TQMetaProperty* pageTitle =
-		    w->metaObject()->property( w->metaObject()->findProperty( "pageTitle", TRUE ), TRUE );
+		    w->tqmetaObject()->property( w->tqmetaObject()->findProperty( "pageTitle", TRUE ), TRUE );
 		if ( text )
 		    find_accel( w->property( "text" ).toString(), accels, w );
 		if ( title )
@@ -1935,7 +1935,7 @@ 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(), 2 ) ) {
 	    case 0: // select
@@ -2581,7 +2581,7 @@ void FormWindow::setMainContainer( TQWidget *w )
     delete mContainer;
     mContainer = w;
     insertedWidgets.insert( mContainer, mContainer );
-    delete layout();
+    delete tqlayout();
     TQHBoxLayout *l = new TQHBoxLayout( this );
     l->addWidget( w );
     if ( resetPropertyWidget ) {
diff --git a/kdevdesigner/designer/gotolinedialog.ui b/kdevdesigner/designer/gotolinedialog.ui
index 99df35d2..28c1005e 100644
--- a/kdevdesigner/designer/gotolinedialog.ui
+++ b/kdevdesigner/designer/gotolinedialog.ui
@@ -101,7 +101,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 @@
             <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/hierarchyview.cpp b/kdevdesigner/designer/hierarchyview.cpp
index 2f2d97b4..c91f5333 100644
--- a/kdevdesigner/designer/hierarchyview.cpp
+++ b/kdevdesigner/designer/hierarchyview.cpp
@@ -46,7 +46,7 @@
 #include "kdevdesigner_part.h"
 #include <klocale.h>
 
-#include <palette.h>
+#include <tqpalette.h>
 #include <tqobjectlist.h>
 #include <tqheader.h>
 #include <tqpopupmenu.h>
@@ -654,7 +654,7 @@ void HierarchyList::removeTabPage()
 	    QDesignerTabWidget *dtw = (QDesignerTabWidget*)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();
@@ -665,7 +665,7 @@ void HierarchyList::removeTabPage()
 	    QDesignerWizard *dw = (QDesignerWizard*)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 );
@@ -1102,11 +1102,11 @@ void FormDefinitionView::showRMBMenu( TQListViewItem *i, const TQPoint &pos )
 	    if ( i->rtti() == HierarchyItem::Definition )
 		i = i->parent();
 	    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();
@@ -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();
diff --git a/kdevdesigner/designer/iconvieweditor.ui b/kdevdesigner/designer/iconvieweditor.ui
index 8711bd6b..369fdb67 100644
--- a/kdevdesigner/designer/iconvieweditor.ui
+++ b/kdevdesigner/designer/iconvieweditor.ui
@@ -130,7 +130,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
@@ -179,7 +179,7 @@
                             <property name="name">
                                 <cstring>itemText</cstring>
                             </property>
-                            <property name="minimumSize">
+                            <property name="tqminimumSize">
                                 <size>
                                     <width>0</width>
                                     <height>0</height>
@@ -229,7 +229,7 @@
                                     <property name="name">
                                         <cstring>itemDeletePixmap</cstring>
                                     </property>
-                                    <property name="maximumSize">
+                                    <property name="tqmaximumSize">
                                         <size>
                                             <width>30</width>
                                             <height>22</height>
@@ -252,7 +252,7 @@
                                     <property name="name">
                                         <cstring>itemChoosePixmap</cstring>
                                     </property>
-                                    <property name="maximumSize">
+                                    <property name="tqmaximumSize">
                                         <size>
                                             <width>30</width>
                                             <height>22</height>
@@ -309,7 +309,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/iconvieweditorimpl.cpp b/kdevdesigner/designer/iconvieweditorimpl.cpp
index a5781e89..07db9813 100644
--- a/kdevdesigner/designer/iconvieweditorimpl.cpp
+++ b/kdevdesigner/designer/iconvieweditorimpl.cpp
@@ -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/kdevdesigner_part.cpp b/kdevdesigner/designer/kdevdesigner_part.cpp
index 65724614..bb0f2955 100644
--- a/kdevdesigner/designer/kdevdesigner_part.cpp
+++ b/kdevdesigner/designer/kdevdesigner_part.cpp
@@ -30,7 +30,7 @@
 #include <kiconloader.h>
 
 #include <tqfile.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqtoolbar.h>
 #include <tqmenubar.h>
 #include <tqptrlist.h>
@@ -146,9 +146,9 @@ void KDevDesignerPart::setupActions( )
 
     action = new KAction(i18n("Adjust &Size"), createPartIconSet("designer_adjustsize.png"), CTRL + Key_J, this, TQT_SLOT(layoutAdjustSize()), actionCollection(), "layout_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(layoutHLayout()), actionCollection(), "layout_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(layoutVLayout()), actionCollection(), "layout_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");
     stateSync(action, m_widget->actionEditGridLayout);
@@ -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 4a98f1a7..5d402856 100644
--- a/kdevdesigner/designer/kdevdesigner_part.h
+++ b/kdevdesigner/designer/kdevdesigner_part.h
@@ -61,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();
diff --git a/kdevdesigner/designer/layout.cpp b/kdevdesigner/designer/layout.cpp
index 89dfe821..f908dd4b 100644
--- a/kdevdesigner/designer/layout.cpp
+++ b/kdevdesigner/designer/layout.cpp
@@ -25,11 +25,11 @@
 **********************************************************************/
 
 #include "formwindow.h"
-#include "layout.h"
+#include "tqlayout.h"
 #include <widgetdatabase.h>
 #include "widgetfactory.h"
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqevent.h>
 #include <tqpainter.h>
 #include <tqpen.h>
@@ -44,7 +44,7 @@ bool operator<( const TQGuardedPtr<TQWidget> &p1, const TQGuardedPtr<TQWidget> &
 }
 
 /*!
-  \class Layout layout.h
+  \class Layout tqlayout.h
   \brief Baseclass for layouting widgets in the Designer
 
   Classes derived from this abstract base class are used for layouting
@@ -67,7 +67,7 @@ Layout::Layout( const TQWidgetList &wl, TQWidget *p, FormWindow *fw, TQWidget *l
     widgets.setAutoDelete( FALSE );
     layoutBase = lb;
     if ( !doSetup && layoutBase )
-	oldGeometry = layoutBase->geometry();
+	oldGeometry = layoutBase->tqgeometry();
 }
 
 /*!  The widget list we got in the constructor might contain too much
@@ -85,7 +85,7 @@ 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
+    // tqlayout widgets which have the same parent, we first do some
     // sorting which means create a list for each parent containing
     // its child here. After that we keep working on the list of
     // childs which has the most entries.
@@ -120,7 +120,7 @@ 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 ||
@@ -133,11 +133,11 @@ 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
+    // 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
@@ -149,7 +149,7 @@ void Layout::setup()
 	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();
     }
 }
@@ -182,7 +182,7 @@ bool Layout::prepareLayout( bool &needMove, bool &needReparent )
     return TRUE;
 }
 
-void Layout::finishLayout( bool needMove, TQLayout *layout )
+void Layout::finishLayout( bool needMove, TQLayout *tqlayout )
 {
     if ( needMove )
 	layoutBase->move( startPoint );
@@ -193,7 +193,7 @@ void Layout::finishLayout( bool needMove, TQLayout *layout )
 	layoutBase->setGeometry( oldGeometry );
     oldGeometry = g;
     layoutBase->show();
-    layout->activate();
+    tqlayout->activate();
     formWindow->insertWidget( layoutBase );
     formWindow->selectWidget( TQT_TQOBJECT(layoutBase) );
     TQString n = layoutBase->name();
@@ -236,7 +236,7 @@ void Layout::breakLayout()
     if ( !widgets.isEmpty() ) {
 	TQWidget *w;
 	for ( w = widgets.first(); w; w = widgets.next() )
-	    rects.insert( w, w->geometry() );
+	    rects.insert( w, w->tqgeometry() );
     }
     WidgetFactory::deleteLayout( layoutBase );
     bool needReparent = qstrcmp( layoutBase->className(), TQLAYOUTWIDGET_OBJECT_NAME_STRING ) == 0 ||
@@ -311,16 +311,16 @@ void HorizontalLayout::doLayout()
     if ( !prepareLayout( needMove, needReparent ) )
 	return;
 
-    TQHBoxLayout *layout = (TQHBoxLayout*)WidgetFactory::createLayout( layoutBase, 0, WidgetFactory::HBox );
+    TQHBoxLayout *tqlayout = (TQHBoxLayout*)WidgetFactory::createLayout( layoutBase, 0, WidgetFactory::HBox );
 
     for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) {
 	if ( needReparent && TQT_BASE_OBJECT(w->parent()) != TQT_BASE_OBJECT(layoutBase) )
 	    w->reparent( layoutBase, 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 );
+		tqlayout->addWidget( w );
 	    if ( ::tqqt_cast<TQLayoutWidget*>(w) )
 		( (TQLayoutWidget*)w )->updateSizePolicy();
 	}
@@ -330,7 +330,7 @@ void HorizontalLayout::doLayout()
     if ( ::tqqt_cast<TQSplitter*>(layoutBase) )
 	( (TQSplitter*)layoutBase )->setOrientation( Qt::Horizontal );
 
-    finishLayout( needMove, layout );
+    finishLayout( needMove, tqlayout );
 }
 
 
@@ -375,16 +375,16 @@ void VerticalLayout::doLayout()
     if ( !prepareLayout( needMove, needReparent ) )
 	return;
 
-    TQVBoxLayout *layout = (TQVBoxLayout*)WidgetFactory::createLayout( layoutBase, 0, WidgetFactory::VBox );
+    TQVBoxLayout *tqlayout = (TQVBoxLayout*)WidgetFactory::createLayout( layoutBase, 0, WidgetFactory::VBox );
 
     for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) {
 	if ( needReparent && TQT_BASE_OBJECT(w->parent()) != TQT_BASE_OBJECT(layoutBase) )
 	    w->reparent( layoutBase, 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 );
+		tqlayout->addWidget( w );
 	    if ( ::tqqt_cast<TQLayoutWidget*>(w) )
 		( (TQLayoutWidget*)w )->updateSizePolicy();
 	}
@@ -394,7 +394,7 @@ void VerticalLayout::doLayout()
     if ( ::tqqt_cast<TQSplitter*>(layoutBase) )
 	( (TQSplitter*)layoutBase )->setOrientation( Qt::Vertical );
 
-    finishLayout( needMove, layout );
+    finishLayout( needMove, tqlayout );
 }
 
 
@@ -747,7 +747,7 @@ void GridLayout::doLayout()
     if ( !prepareLayout( needMove, needReparent ) )
 	return;
 
-    QDesignerGridLayout *layout = (QDesignerGridLayout*)WidgetFactory::createLayout( layoutBase, 0, WidgetFactory::Grid );
+    QDesignerGridLayout *tqlayout = (QDesignerGridLayout*)WidgetFactory::createLayout( layoutBase, 0, WidgetFactory::Grid );
 
     if ( !grid )
 	buildGrid();
@@ -759,18 +759,18 @@ void GridLayout::doLayout()
 	    if ( needReparent && TQT_BASE_OBJECT(w->parent()) != TQT_BASE_OBJECT(layoutBase) )
 		w->reparent( layoutBase, 0, TQPoint( 0, 0 ), FALSE );
 	    if ( rs * cs == 1 ) {
-		layout->addWidget( w, r, c, ::tqqt_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, ::tqqt_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 ( ::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() )
@@ -936,25 +936,25 @@ void Spacer::setSizeType( SizeType t )
 	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 ==Qt::Vertical )
-	return (SizeType)sizePolicy().verData();
-    return (SizeType)sizePolicy().horData();
+	return (SizeType)tqsizePolicy().verData();
+    return (SizeType)tqsizePolicy().horData();
 }
 
-int Spacer::alignment() const
+int Spacer::tqalignment() const
 {
     if ( orient ==Qt::Vertical )
 	return AlignHCenter;
     return AlignVCenter;
 }
 
-TQSize Spacer::minimumSize() const
+TQSize Spacer::tqminimumSize() const
 {
     TQSize s = TQSize( 20,20 );
     if ( sizeType() == Expanding )
@@ -965,7 +965,7 @@ TQSize Spacer::minimumSize() const
     return s;
 }
 
-TQSize Spacer::sizeHint() const
+TQSize Spacer::tqsizeHint() const
 {
     return sh;
 }
@@ -975,7 +975,7 @@ void Spacer::setSizeHint( const TQSize &s )
 {
     sh = s;
     if ( !parentWidget() || WidgetFactory::layoutType( parentWidget() ) == WidgetFactory::NoLayout )
-	resize( sizeHint() );
+	resize( tqsizeHint() );
     updateGeometry();
 }
 
diff --git a/kdevdesigner/designer/layout.h b/kdevdesigner/designer/layout.h
index c42fb373..d71368ab 100644
--- a/kdevdesigner/designer/layout.h
+++ b/kdevdesigner/designer/layout.h
@@ -31,7 +31,7 @@
 #include <tqmap.h>
 #include <tqguardedptr.h>
 #include <tqobject.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqmap.h>
 #include <tqwidgetlist.h>
 
@@ -51,7 +51,7 @@ public:
     virtual void undoLayout();
     virtual void breakLayout();
     virtual bool prepareLayout( bool &needMove, bool &needReparent );
-    virtual void finishLayout( bool needMove, TQLayout *layout );
+    virtual void finishLayout( bool needMove, TQLayout *tqlayout );
 
 protected:
     TQWidgetList widgets;
@@ -125,8 +125,8 @@ class Spacer : public TQWidget
     TQ_PROPERTY( Qt::Orientation orientation READ orientation WRITE setOrientation )
     Q_ENUMS( SizeType )
     TQ_PROPERTY( SizeType sizeType READ sizeType WRITE setSizeType )
-    TQ_PROPERTY( TQSize sizeHint READ sizeHint WRITE setSizeHint DESIGNABLE true STORED true )
-    TQ_OVERRIDE( TQRect geometry DESIGNABLE false )
+    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,
@@ -142,11 +142,11 @@ public:
 
     Spacer( TQWidget *parent, 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;
+    int tqalignment() const;
     Qt::Orientation orientation() const;
     void setOrientation( Qt::Orientation o );
     void setInteraciveMode( bool b ) { interactive = b; };
diff --git a/kdevdesigner/designer/listboxdnd.cpp b/kdevdesigner/designer/listboxdnd.cpp
index 54498478..920559c5 100644
--- a/kdevdesigner/designer/listboxdnd.cpp
+++ b/kdevdesigner/designer/listboxdnd.cpp
@@ -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;
@@ -240,7 +240,7 @@ bool ListBoxItemDrag::canDecode( TQDragMoveEvent * event )
 
 bool ListBoxItemDrag::decode( TQDropEvent * event, TQListBox * parent, TQListBoxItem * after )
 {
-    TQByteArray data = event->encodedData( "qt/listboxitem" );
+    TQByteArray data = event->tqencodedData( "qt/listboxitem" );
 
     if ( data.size() ) {
 	event->accept();
diff --git a/kdevdesigner/designer/listboxeditor.ui b/kdevdesigner/designer/listboxeditor.ui
index df584ddf..2827c93d 100644
--- a/kdevdesigner/designer/listboxeditor.ui
+++ b/kdevdesigner/designer/listboxeditor.ui
@@ -91,7 +91,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -196,7 +196,7 @@
                     <property name="name">
                         <cstring>itemDeletePixmap</cstring>
                     </property>
-                    <property name="maximumSize">
+                    <property name="tqmaximumSize">
                         <size>
                             <width>30</width>
                             <height>22</height>
@@ -219,7 +219,7 @@
                     <property name="name">
                         <cstring>itemChoosePixmap</cstring>
                     </property>
-                    <property name="maximumSize">
+                    <property name="tqmaximumSize">
                         <size>
                             <width>30</width>
                             <height>22</height>
@@ -250,7 +250,7 @@
                     <property name="name">
                         <cstring>itemText</cstring>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>0</width>
                             <height>0</height>
@@ -303,7 +303,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/listboxeditorimpl.cpp b/kdevdesigner/designer/listboxeditorimpl.cpp
index db3ddcc8..98c5c835 100644
--- a/kdevdesigner/designer/listboxeditorimpl.cpp
+++ b/kdevdesigner/designer/listboxeditorimpl.cpp
@@ -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/listboxrename.cpp b/kdevdesigner/designer/listboxrename.cpp
index 0a32d292..53f0deea 100644
--- a/kdevdesigner/designer/listboxrename.cpp
+++ b/kdevdesigner/designer/listboxrename.cpp
@@ -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/listeditor.ui b/kdevdesigner/designer/listeditor.ui
index c477ff1a..30b766a0 100644
--- a/kdevdesigner/designer/listeditor.ui
+++ b/kdevdesigner/designer/listeditor.ui
@@ -114,7 +114,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/listviewdnd.cpp b/kdevdesigner/designer/listviewdnd.cpp
index 32dcc6d5..953551df 100644
--- a/kdevdesigner/designer/listviewdnd.cpp
+++ b/kdevdesigner/designer/listviewdnd.cpp
@@ -142,12 +142,12 @@ 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();
@@ -157,7 +157,7 @@ int ListViewDnd::buildFlatList( ListViewItemList & list )
 		}
 	    }
 	} 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() );
@@ -217,7 +217,7 @@ TQListViewItem * ListViewDnd::itemAt( TQPoint pos )
     while ( result && !result->isVisible() && result->parent() )
 	result = result->parent();
 
-    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
@@ -284,7 +284,7 @@ bool ListViewItemDrag::canDecode( TQDragMoveEvent * event )
 
 bool ListViewItemDrag::decode( TQDropEvent * event, TQListView * parent, TQListViewItem * insertPoint, DropRelation dr )
 {
-    TQByteArray data = event->encodedData( "qt/listviewitem" );
+    TQByteArray data = event->tqencodedData( "qt/listviewitem" );
     TQListViewItem* itemParent = insertPoint ? insertPoint->parent() : 0;
 
     // Change from sibling (default) to child creation
diff --git a/kdevdesigner/designer/listvieweditor.ui b/kdevdesigner/designer/listvieweditor.ui
index 8a0abe14..e2f3447f 100644
--- a/kdevdesigner/designer/listvieweditor.ui
+++ b/kdevdesigner/designer/listvieweditor.ui
@@ -142,7 +142,7 @@
                                 <property name="name">
                                     <cstring>itemText</cstring>
                                 </property>
-                                <property name="minimumSize">
+                                <property name="tqminimumSize">
                                     <size>
                                         <width>0</width>
                                         <height>0</height>
@@ -203,7 +203,7 @@
                                         <property name="name">
                                             <cstring>itemDeletePixmap</cstring>
                                         </property>
-                                        <property name="maximumSize">
+                                        <property name="tqmaximumSize">
                                             <size>
                                                 <width>30</width>
                                                 <height>22</height>
@@ -226,7 +226,7 @@
                                         <property name="name">
                                             <cstring>itemChoosePixmap</cstring>
                                         </property>
-                                        <property name="maximumSize">
+                                        <property name="tqmaximumSize">
                                             <size>
                                                 <width>30</width>
                                                 <height>22</height>
@@ -292,7 +292,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
@@ -426,7 +426,7 @@
                                 <property name="name">
                                     <cstring>colDeletePixmap</cstring>
                                 </property>
-                                <property name="maximumSize">
+                                <property name="tqmaximumSize">
                                     <size>
                                         <width>30</width>
                                         <height>22</height>
@@ -449,7 +449,7 @@
                                 <property name="name">
                                     <cstring>colChoosePixmap</cstring>
                                 </property>
-                                <property name="maximumSize">
+                                <property name="tqmaximumSize">
                                     <size>
                                         <width>30</width>
                                         <height>22</height>
@@ -480,7 +480,7 @@
                                 <property name="name">
                                     <cstring>colText</cstring>
                                 </property>
-                                <property name="minimumSize">
+                                <property name="tqminimumSize">
                                     <size>
                                         <width>0</width>
                                         <height>0</height>
@@ -597,7 +597,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
@@ -642,7 +642,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/listvieweditorimpl.cpp b/kdevdesigner/designer/listvieweditorimpl.cpp
index bd6c0e64..9e6c54ed 100644
--- a/kdevdesigner/designer/listvieweditorimpl.cpp
+++ b/kdevdesigner/designer/listvieweditorimpl.cpp
@@ -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 );
diff --git a/kdevdesigner/designer/mainwindow.cpp b/kdevdesigner/designer/mainwindow.cpp
index cc56386a..dbc2b932 100644
--- a/kdevdesigner/designer/mainwindow.cpp
+++ b/kdevdesigner/designer/mainwindow.cpp
@@ -92,7 +92,7 @@
 #include <tqpixmap.h>
 #include <tqworkspace.h>
 #include <tqfiledialog.h>
-#include <clipboard.h>
+#include <tqclipboard.h>
 #include <tqmessagebox.h>
 #include <tqbuffer.h>
 #include <tqdir.h>
@@ -113,7 +113,7 @@
 #include <tqaccel.h>
 #include <tqtooltip.h>
 #include <tqsizegrip.h>
-#include <textview.h>
+#include <tqtextview.h>
 #include <tqassistantclient.h>
 #include <stdlib.h>
 
@@ -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()
@@ -735,14 +735,14 @@ void MainWindow::previewForm( const TQString & style )
 
 void MainWindow::helpContents()
 {
-    TQWidget *focusWidget = tqApp->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->parentWidget();
     }
 
     TQString source = "designer-manual.html";
@@ -767,7 +767,7 @@ 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" ) {
@@ -783,7 +783,7 @@ void MainWindow::helpContents()
 		    source = propertyDocumentation[ "TQObject/name" ];
 	    } else {
 		while ( mo && !propertyDocumentation.contains( ( s = TQString( mo->className() ) + "/" + cp ) ) )
-		    mo = mo->superClass();
+		    mo = mo->tqsuperClass();
 		if ( mo )
 		    source = "p:" + propertyDocumentation[s];
 	    }
@@ -794,7 +794,7 @@ void MainWindow::helpContents()
 	    if ( classname.lower() == "spacer" )
 		source = "qspaceritem.html#details";
 	    else if ( classname == TQLAYOUTWIDGET_OBJECT_NAME_STRING )
-		source = "layout.html";
+		source = "tqlayout.html";
 	    else
 		source = TQString( WidgetFactory::classNameOf( propertyEditor->widget() ) ).lower() + ".html#details";
 	}
@@ -822,7 +822,7 @@ void MainWindow::helpAbout()
 	dlg.aboutLicense->setText( iface->aboutText() );
     }
     dlg.aboutVersion->setText(TQString("Version ") + TQString(TQT_VERSION_STR));
-    dlg.resize( dlg.width(), dlg.layout()->heightForWidth(dlg.width()) );
+    dlg.resize( dlg.width(), dlg.tqlayout()->heightForWidth(dlg.width()) );
     dlg.exec();
 }
 
@@ -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>"
@@ -1484,11 +1484,11 @@ void MainWindow::updateUndoRedo( bool undoAvailable, bool redoAvailable,
     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" ) );
 
@@ -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()->findProperty( "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()->findProperty( "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()->findProperty( "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()->findProperty( "pixmap", TRUE ), TRUE );
     if ( pixmap && qstrcmp( pixmap->type(), TQPIXMAP_OBJECT_NAME_STRING) != 0 )
 	pixmap = 0;
 
@@ -1721,7 +1721,7 @@ void MainWindow::handleRMBProperties( int id, TQMap<TQString, int> &props, TQWid
 	bool ok = FALSE;
 	bool oldDoWrap = FALSE;
 	if ( ::tqqt_cast<TQLabel*>(w) ) {
-	    int align = w->property( "alignment" ).toInt();
+	    int align = w->property( "tqalignment" ).toInt();
 	    if ( align & WordBreak )
 		oldDoWrap = TRUE;
 	}
@@ -1737,7 +1737,7 @@ void MainWindow::handleRMBProperties( int id, TQMap<TQString, int> &props, TQWid
 	}
 	if ( ok ) {
 	    if ( oldDoWrap != doWrap ) {
-		TQString pn( i18n( "Set 'wordwrap' of '%1'" ).arg( w->name() ) );
+		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(), TQString() );
@@ -1746,7 +1746,7 @@ void MainWindow::handleRMBProperties( int id, TQMap<TQString, int> &props, TQWid
 		MetaDataBase::setPropertyChanged( TQT_TQOBJECT(w), "wordwrap", TRUE );
 	    }
 
-	    TQString pn( i18n( "Set the 'text' of '%1'" ).arg( w->name() ) );
+	    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(), TQString() );
@@ -1759,7 +1759,7 @@ void MainWindow::handleRMBProperties( int id, TQMap<TQString, int> &props, TQWid
 	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() ) );
+	    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(), TQString() );
@@ -1772,7 +1772,7 @@ void MainWindow::handleRMBProperties( int id, TQMap<TQString, int> &props, TQWid
 	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() ) );
+	    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" ),
@@ -1785,7 +1785,7 @@ void MainWindow::handleRMBProperties( int id, TQMap<TQString, int> &props, TQWid
 	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() ) );
+	    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(), TQString() );
@@ -1802,7 +1802,7 @@ void MainWindow::handleRMBSpecialCommands( int id, TQMap<TQString, int> &command
 	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();
@@ -1811,7 +1811,7 @@ void MainWindow::handleRMBSpecialCommands( int id, TQMap<TQString, int> &command
 		QDesignerTabWidget *dtw = (QDesignerTabWidget*)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();
@@ -1821,7 +1821,7 @@ void MainWindow::handleRMBSpecialCommands( int id, TQMap<TQString, int> &command
 	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 );
@@ -1841,7 +1841,7 @@ void MainWindow::handleRMBSpecialCommands( int id, TQMap<TQString, int> &command
 	QDesignerWidgetStack *ws = (QDesignerWidgetStack*)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,14 +1849,14 @@ 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(), TQT_TQOBJECT(w), propertyEditor,
 					"currentPage", currentPage,
@@ -1866,7 +1866,7 @@ void MainWindow::handleRMBSpecialCommands( int id, TQMap<TQString, int> &command
 	    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(), TQT_TQOBJECT(w), propertyEditor,
 					"currentPage", currentPage,
@@ -1881,7 +1881,7 @@ void MainWindow::handleRMBSpecialCommands( int id, TQMap<TQString, int> &command
 				      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();
@@ -1892,7 +1892,7 @@ void MainWindow::handleRMBSpecialCommands( int id, TQMap<TQString, int> &command
 		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 );
@@ -1942,7 +1942,7 @@ void MainWindow::handleRMBSpecialCommands( int id, TQMap<TQString, int> &command
 	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();
@@ -1951,7 +1951,7 @@ void MainWindow::handleRMBSpecialCommands( int id, TQMap<TQString, int> &command
 		QDesignerWizard *dw = (QDesignerWizard*)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 );
@@ -1968,7 +1968,7 @@ void MainWindow::handleRMBSpecialCommands( int id, TQMap<TQString, int> &command
 	    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 );
@@ -1980,13 +1980,13 @@ void MainWindow::handleRMBSpecialCommands( int id, TQMap<TQString, int> &command
 	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();
@@ -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 ) );
@@ -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();
@@ -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();
@@ -2610,20 +2610,20 @@ bool MainWindow::openEditor( TQWidget *w, FormWindow *f )
     }
     if ( WidgetFactory::hasSpecialEditor( WidgetDatabase::
 					  idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(w) ) ), TQT_TQOBJECT(w) ) ) {
-	statusMessage( i18n( "Edit %1..." ).arg( w->className() ) );
+	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()->findProperty( "text", TRUE ), TRUE );
+    const TQMetaProperty* title = w->tqmetaObject()->property( w->tqmetaObject()->findProperty( "title", TRUE ), TRUE );
     if ( text && text->designable(w) ) {
 	bool ok = FALSE;
 	bool oldDoWrap = FALSE;
 	if ( ::tqqt_cast<TQLabel*>(w) ) {
-	    int align = w->property( "alignment" ).toInt();
+	    int align = w->property( "tqalignment" ).toInt();
 	    if ( align & WordBreak )
 		oldDoWrap = TRUE;
 	}
@@ -2640,7 +2640,7 @@ bool MainWindow::openEditor( TQWidget *w, FormWindow *f )
 	}
 	if ( ok ) {
 	    if ( oldDoWrap != doWrap ) {
-		TQString pn( i18n( "Set 'wordwrap' of '%1'" ).arg( w->name() ) );
+		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(), TQString() );
@@ -2649,7 +2649,7 @@ bool MainWindow::openEditor( TQWidget *w, FormWindow *f )
 		MetaDataBase::setPropertyChanged( TQT_TQOBJECT(w), "wordwrap", TRUE );
 	    }
 
-	    TQString pn( i18n( "Set the 'text' of '%1'" ).arg( w->name() ) );
+	    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(), TQString() );
@@ -2664,7 +2664,7 @@ bool MainWindow::openEditor( TQWidget *w, FormWindow *f )
 	TQString text;
 	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() ) );
+	    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(), TQString() );
@@ -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 TQt Designer, "
-			    "and provide a pixmap which will be used to represent the widget on the form.</p>").arg( w->className ) );
+			    "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 );
@@ -2856,7 +2856,7 @@ void MainWindow::checkTempFiles()
 void MainWindow::showDialogHelp()
 {
     TQWidget *w = (TQWidget*)sender();
-    w = w->topLevelWidget();
+    w = w->tqtopLevelWidget();
 
     TQString link = documentationPath() + "/designer-manual-13.html#";
 
@@ -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 TQt configurations." ).arg( lang ) );
+				      "Note: Plugins are not available in static TQt configurations." ).tqarg( lang ) );
 	return;
     }
 
diff --git a/kdevdesigner/designer/mainwindowactions.cpp b/kdevdesigner/designer/mainwindowactions.cpp
index 72f2469b..e7ba30f3 100644
--- a/kdevdesigner/designer/mainwindowactions.cpp
+++ b/kdevdesigner/designer/mainwindowactions.cpp
@@ -44,12 +44,12 @@
 #include <tqmessagebox.h>
 #include <tqstatusbar.h>
 #include <tqlistbox.h>
-#include <clipboard.h>
+#include <tqclipboard.h>
 #include <tqcombobox.h>
 #include <tqspinbox.h>
 #include <tqinputdialog.h>
 #include <tqdatetimeedit.h>
-#include <textedit.h>
+#include <tqtextedit.h>
 
 #include "defs.h"
 #include "project.h"
@@ -225,7 +225,7 @@ void MainWindow::setupEditActions()
 
 /*    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 );
@@ -330,14 +330,14 @@ void MainWindow::setupLayoutActions()
     connect( actionEditAdjustSize, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editAdjustSize() ) );
     actionEditAdjustSize->setEnabled( FALSE );
 
-    actionEditHLayout = new DesignerAction( i18n( "Lay OutQt::Horizontally" ), createIconSet("designer_edithlayout.png"),
+    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 OutQt::Horizontally" ) );
     connect( actionEditHLayout, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editLayoutHorizontal() ) );
     actionEditHLayout->setEnabled( FALSE );
 
-    actionEditVLayout = new DesignerAction( i18n( "Lay OutQt::Vertically" ), createIconSet("designer_editvlayout.png"),
+    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 OutQt::Vertically" ) );
@@ -367,7 +367,7 @@ void MainWindow::setupLayoutActions()
 
     actionEditBreakLayout = new DesignerAction( i18n( "Break Layout" ), createIconSet("designer_editbreaklayout.png"),
 					 i18n( "&Break Layout" ), CTRL + Key_B, TQT_TQOBJECT(this), 0 );
-    actionEditBreakLayout->setStatusTip(i18n("Breaks the selected layout") );
+    actionEditBreakLayout->setStatusTip(i18n("Breaks the selected tqlayout") );
     actionEditBreakLayout->setWhatsThis( whatsThisFrom( "Layout|Break Layout" ) );
     connect( actionEditBreakLayout, TQT_SIGNAL( activated() ), TQT_TQOBJECT(this), TQT_SLOT( editBreakLayout() ) );
     actionEditBreakLayout->setEnabled( FALSE );
@@ -376,23 +376,23 @@ void MainWindow::setupLayoutActions()
     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("")) );
+    TQWhatsThis::add( layoutToolBar, i18n( "<b>The Layout toolbar</b>%1" ).tqarg(i18n(toolbarHelp).tqarg("")) );
     actionEditAdjustSize->addTo( layoutToolBar );
     layoutToolBar->addSeparator();
     actionEditHLayout->addTo( layoutToolBar );
@@ -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 );
@@ -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" )
@@ -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 );
@@ -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, TQT_TQOBJECT(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) ) );
@@ -965,7 +965,7 @@ void MainWindow::setupWindowActions()
 	j++;
 	TQString itemText;
 	if ( j < 10 )
-	    itemText = TQString("&%1 ").arg( j );
+	    itemText = TQString("&%1 ").tqarg( j );
 	if ( ::tqqt_cast<FormWindow*>(w) )
 	    itemText += w->name();
 	else
@@ -1015,7 +1015,7 @@ void MainWindow::setupHelpActions()
 
 /*    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 );*/
 
@@ -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();
@@ -1166,7 +1166,7 @@ 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() ) {
@@ -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();
@@ -1338,10 +1338,10 @@ FormWindow *MainWindow::openFormWindow( const TQString &filename, bool validFile
     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();
@@ -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;
 }
 
@@ -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;
@@ -1567,7 +1567,7 @@ void MainWindow::editPaste()
     } 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." ) );
     }
@@ -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 TQt configurations." ).arg( lang ) );
+				      "Note: Plugins are not available in static TQt configurations." ).tqarg( lang ) );
 	return 0;
     }
 
@@ -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 TQt configurations." ).arg( lang ) );
+				      "Note: Plugins are not available in static TQt configurations." ).tqarg( lang ) );
 	return 0;
     }
 
@@ -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;
 	}
 
diff --git a/kdevdesigner/designer/menubareditor.cpp b/kdevdesigner/designer/menubareditor.cpp
index 550c9b60..498c6827 100644
--- a/kdevdesigner/designer/menubareditor.cpp
+++ b/kdevdesigner/designer/menubareditor.cpp
@@ -74,7 +74,7 @@ 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() )
@@ -502,7 +502,7 @@ void MenuBarEditor::deleteItem( int index )
     }
 }
 
-TQSize MenuBarEditor::sizeHint() const
+TQSize MenuBarEditor::tqsizeHint() const
 {
     return TQSize( parentWidget()->width(), heightForWidth( parentWidget()->width() ) );
 }
@@ -576,7 +576,7 @@ bool MenuBarEditor::eventFilter( TQObject * o, TQEvent * e )
 	lineEdit->hide();
 	update();
     } else if ( e->type() == TQEvent::LayoutHint ) {
-	resize( sizeHint() );
+	resize( tqsizeHint() );
      }
     return TQMenuBar::eventFilter( o, e );
 }
@@ -586,7 +586,7 @@ void MenuBarEditor::paintEvent( TQPaintEvent * )
     TQPainter p( this );
     TQRect r = rect();
     tqstyle().tqdrawPrimitive( TQStyle::PE_PanelMenuBar, &p,
-			   r, colorGroup() );
+			   r, tqcolorGroup() );
     drawItems( p );
 }
 
@@ -817,7 +817,7 @@ void MenuBarEditor::keyPressEvent( TQKeyEvent * e )
 
 void MenuBarEditor::focusOutEvent( TQFocusEvent * e )
 {
-    TQWidget * fw = tqApp->focusWidget();
+    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 ) {
diff --git a/kdevdesigner/designer/menubareditor.h b/kdevdesigner/designer/menubareditor.h
index ec933d0b..0725fd5f 100644
--- a/kdevdesigner/designer/menubareditor.h
+++ b/kdevdesigner/designer/menubareditor.h
@@ -120,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 fec4a368..5f8ce367 100644
--- a/kdevdesigner/designer/metadatabase.cpp
+++ b/kdevdesigner/designer/metadatabase.cpp
@@ -42,7 +42,7 @@
 
 #include <tqapplication.h>
 #include <tqobject.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqptrdict.h>
 #include <tqobjectlist.h>
 #include <tqstrlist.h>
@@ -54,7 +54,7 @@
 #include <tqdatetime.h>
 #include <tqfile.h>
 #include <tqfileinfo.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 
 #include <stdlib.h>
 
@@ -167,14 +167,14 @@ void MetaDataBase::setPropertyChanged( TQObject *o, const TQString &property, bo
     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 );
@@ -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::layoutType( (TQWidget*)o, tqlayout );
+    if ( tqlayout ) {
 	int spadef = 6;
 	if ( MainWindow::self->formWindow() )
 	    spadef = MainWindow::self->formWindow()->layoutDefaultSpacing();
 	if ( spacing == -1 )
-	    layout->setSpacing( spadef );
+	    tqlayout->setSpacing( spadef );
 	else
-	    layout->setSpacing( spacing );
+	    tqlayout->setSpacing( spacing );
     }
 }
 
@@ -346,8 +346,8 @@ void MetaDataBase::setMargin( TQObject *o, int margin )
     }
 
     r->margin = margin;
-    TQLayout * layout = 0;
-    WidgetFactory::layoutType( (TQWidget*)o, layout );
+    TQLayout * tqlayout = 0;
+    WidgetFactory::layoutType( (TQWidget*)o, tqlayout );
 
     bool isInnerLayout = TRUE;
 
@@ -358,18 +358,18 @@ void MetaDataBase::setMargin( TQObject *o, int margin )
 	isInnerLayout = FALSE;
 
 
-    if ( layout ) {
+    if ( tqlayout ) {
 	int mardef = 11;
 	if ( MainWindow::self->formWindow() )
 	    mardef = MainWindow::self->formWindow()->layoutDefaultMargin();
 	if ( margin == -1 ) {
 	    if ( isInnerLayout )
-		layout->setMargin( 1 );
+		tqlayout->setMargin( 1 );
 	    else
-		layout->setMargin( TQMAX( 1, mardef ) );
+		tqlayout->setMargin( TQMAX( 1, mardef ) );
 	}
 	else
-	    layout->setMargin( TQMAX( 1, margin ) );
+	    tqlayout->setMargin( TQMAX( 1, margin ) );
     }
 }
 
@@ -648,12 +648,12 @@ void MetaDataBase::doConnections( TQObject *o )
 	    delete l;
 	}
 	TQString s = "2""%1";
-	s = s.arg( conn.signal.data() );
+	s = s.tqarg( conn.signal.data() );
 	TQString s2 = "1""%1";
-	s2 = s2.arg( conn.slot.data() );
+	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 ||
@@ -675,13 +675,13 @@ bool MetaDataBase::hasSlot( TQObject *o, const TQCString &slot, bool onlyCustom
     }
 
     if ( !onlyCustom ) {
-	TQStrList slotList = o->metaObject()->slotNames( TRUE );
+	TQStrList slotList = o->tqmetaObject()->slotNames( TRUE );
 	if ( slotList.find( slot ) != -1 )
 	    return TRUE;
 
 	if ( ::tqqt_cast<FormWindow*>(o) ) {
 	    o = TQT_TQOBJECT(( (FormWindow*)o )->mainContainer());
-	    slotList = o->metaObject()->slotNames( TRUE );
+	    slotList = o->tqmetaObject()->slotNames( TRUE );
 	    if ( slotList.find( slot ) != -1 )
 		return TRUE;
 	}
@@ -905,13 +905,13 @@ bool MetaDataBase::hasFunction( TQObject *o, const TQCString &function, bool onl
     }
 
     if ( !onlyCustom ) {
-	TQStrList functionList = o->metaObject()->slotNames( TRUE );
+	TQStrList functionList = o->tqmetaObject()->slotNames( TRUE );
 	if ( functionList.find( function ) != -1 )
 	    return TRUE;
 
 	if ( ::tqqt_cast<FormWindow*>(o) ) {
 	    o = TQT_TQOBJECT(( (FormWindow*)o )->mainContainer());
-	    functionList = o->metaObject()->slotNames( TRUE );
+	    functionList = o->tqmetaObject()->slotNames( TRUE );
 	    if ( functionList.find( function ) != -1 )
 		return TRUE;
 	}
@@ -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
@@ -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,7 +1354,7 @@ MetaDataBase::CustomWidget &MetaDataBase::CustomWidget::operator=( const CustomW
 
 bool MetaDataBase::CustomWidget::hasSignal( const TQCString &signal ) const
 {
-    TQStrList sigList = TQWidget::staticMetaObject()->signalNames( TRUE );
+    TQStrList sigList = TQWidget::tqstaticMetaObject()->signalNames( TRUE );
     if ( sigList.find( signal ) != -1 )
 	return TRUE;
     for ( TQValueList<TQCString>::ConstIterator it = lstSignals.begin(); it != lstSignals.end(); ++it ) {
@@ -1366,7 +1366,7 @@ bool MetaDataBase::CustomWidget::hasSignal( const TQCString &signal ) const
 
 bool MetaDataBase::CustomWidget::hasSlot( const TQCString &slot ) const
 {
-    TQStrList slotList = TQWidget::staticMetaObject()->slotNames( TRUE );
+    TQStrList slotList = TQWidget::tqstaticMetaObject()->slotNames( TRUE );
     if ( slotList.find( normalizeFunction( slot ) ) != -1 )
 	return TRUE;
 
@@ -1379,7 +1379,7 @@ bool MetaDataBase::CustomWidget::hasSlot( const TQCString &slot ) const
 
 bool MetaDataBase::CustomWidget::hasProperty( const TQCString &prop ) const
 {
-    TQStrList propList = TQWidget::staticMetaObject()->propertyNames( TRUE );
+    TQStrList propList = TQWidget::tqstaticMetaObject()->propertyNames( TRUE );
     if ( propList.find( prop ) != -1 )
 	return TRUE;
 
diff --git a/kdevdesigner/designer/metadatabase.h b/kdevdesigner/designer/metadatabase.h
index 352e10d7..9b00deb9 100644
--- a/kdevdesigner/designer/metadatabase.h
+++ b/kdevdesigner/designer/metadatabase.h
@@ -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 f0ff2129..1fe1ea63 100644
--- a/kdevdesigner/designer/multilineeditor.ui
+++ b/kdevdesigner/designer/multilineeditor.ui
@@ -124,7 +124,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/multilineeditorimpl.cpp b/kdevdesigner/designer/multilineeditorimpl.cpp
index ef1926f3..166ab877 100644
--- a/kdevdesigner/designer/multilineeditorimpl.cpp
+++ b/kdevdesigner/designer/multilineeditorimpl.cpp
@@ -35,10 +35,10 @@
 #include <kiconloader.h>
 #include "kdevdesigner_part.h"
 
-#include <textedit.h>
+#include <tqtextedit.h>
 #include <tqrichtext_p.h>
 #include <tqpushbutton.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqtoolbutton.h>
 #include <tqapplication.h>
 #include <tqaction.h>
@@ -231,8 +231,8 @@ MultiLineEditor::MultiLineEditor( bool call_static, bool richtextMode, TQWidget
 	    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()->findProperty( "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() );
@@ -276,13 +276,13 @@ 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,
@@ -325,7 +325,7 @@ void MultiLineEditor::insertTags( const TQString &tag )
     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 );
diff --git a/kdevdesigner/designer/multilineeditorimpl.h b/kdevdesigner/designer/multilineeditorimpl.h
index 36697cd7..4756f37c 100644
--- a/kdevdesigner/designer/multilineeditorimpl.h
+++ b/kdevdesigner/designer/multilineeditorimpl.h
@@ -28,7 +28,7 @@
 #define MULTILINEEDITORIMPL_H
 
 #include <tqaction.h>
-#include <textedit.h>
+#include <tqtextedit.h>
 #include <tqrichtext_p.h>
 #include "multilineeditor.h"
 
diff --git a/kdevdesigner/designer/newform.ui b/kdevdesigner/designer/newform.ui
index 81cb4fa5..3fcbd914 100644
--- a/kdevdesigner/designer/newform.ui
+++ b/kdevdesigner/designer/newform.ui
@@ -91,7 +91,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -177,7 +177,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/newformimpl.cpp b/kdevdesigner/designer/newformimpl.cpp
index 2d631833..6026a9bd 100644
--- a/kdevdesigner/designer/newformimpl.cpp
+++ b/kdevdesigner/designer/newformimpl.cpp
@@ -158,7 +158,7 @@ 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;
 	}
@@ -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()) );
diff --git a/kdevdesigner/designer/outputwindow.cpp b/kdevdesigner/designer/outputwindow.cpp
index f69125bd..33113ef5 100644
--- a/kdevdesigner/designer/outputwindow.cpp
+++ b/kdevdesigner/designer/outputwindow.cpp
@@ -30,7 +30,7 @@
 #include "mainwindow.h"
 
 #include <tqlistview.h>
-#include <textedit.h>
+#include <tqtextedit.h>
 #include <tqapplication.h>
 #include <tqheader.h>
 #include <stdlib.h>
@@ -196,7 +196,7 @@ ErrorItem::ErrorItem( TQListView *parent, TQListViewItem *after, const TQString
 }
 
 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 ? TQt::red : TQt::darkYellow );
@@ -205,5 +205,5 @@ void ErrorItem::paintCell( TQPainter *p, const TQColorGroup & cg,
 	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 a3276da6..04ebc065 100644
--- a/kdevdesigner/designer/outputwindow.h
+++ b/kdevdesigner/designer/outputwindow.h
@@ -45,9 +45,9 @@ public:
 	       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(); }
diff --git a/kdevdesigner/designer/paletteeditor.ui b/kdevdesigner/designer/paletteeditor.ui
index 32b14b54..79e04792 100644
--- a/kdevdesigner/designer/paletteeditor.ui
+++ b/kdevdesigner/designer/paletteeditor.ui
@@ -69,7 +69,7 @@
             <property name="title">
                 <string>Build Palette</string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>AlignAuto</set>
             </property>
             <hbox>
@@ -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">
@@ -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,7 +208,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -343,7 +343,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/paletteeditoradvanced.ui b/kdevdesigner/designer/paletteeditoradvanced.ui
index 579f0e68..a8ba6c03 100644
--- a/kdevdesigner/designer/paletteeditoradvanced.ui
+++ b/kdevdesigner/designer/paletteeditoradvanced.ui
@@ -266,7 +266,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
@@ -323,7 +323,7 @@
                                     <vsizetype>1</vsizetype>
                                 </sizepolicy>
                             </property>
-                            <property name="minimumSize">
+                            <property name="tqminimumSize">
                                 <size>
                                     <width>0</width>
                                     <height>0</height>
@@ -473,7 +473,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
@@ -490,7 +490,7 @@
                                     <vsizetype>1</vsizetype>
                                 </sizepolicy>
                             </property>
-                            <property name="minimumSize">
+                            <property name="tqminimumSize">
                                 <size>
                                     <width>0</width>
                                     <height>0</height>
@@ -565,7 +565,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/paletteeditoradvancedimpl.cpp b/kdevdesigner/designer/paletteeditoradvancedimpl.cpp
index 903c1a4f..e8c780fc 100644
--- a/kdevdesigner/designer/paletteeditoradvancedimpl.cpp
+++ b/kdevdesigner/designer/paletteeditoradvancedimpl.cpp
@@ -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;
     }
 
diff --git a/kdevdesigner/designer/pixmapchooser.cpp b/kdevdesigner/designer/pixmapchooser.cpp
index 976343bd..1da0557b 100644
--- a/kdevdesigner/designer/pixmapchooser.cpp
+++ b/kdevdesigner/designer/pixmapchooser.cpp
@@ -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 );
 }
 
@@ -98,7 +98,7 @@ static void buildImageFormatList( TQString &filter, TQString &all )
 	else
 	    outputExtension = "jpg;*.jpeg";
 	filter += TQString(tqApp->translate( "qChoosePixmap", "%1-Pixmaps (%2)\n" )).
-		  arg( outputFormat ).arg( "*." + outputExtension);
+		  tqarg( outputFormat ).tqarg( "*." + outputExtension);
 	all += "*." + outputExtension + ";";
     }
     filter.prepend( all + tqApp->translate( "qChoosePixmap", ")\n" ) );
diff --git a/kdevdesigner/designer/pixmapcollection.cpp b/kdevdesigner/designer/pixmapcollection.cpp
index 936dbc4d..880423a3 100644
--- a/kdevdesigner/designer/pixmapcollection.cpp
+++ b/kdevdesigner/designer/pixmapcollection.cpp
@@ -30,7 +30,7 @@
 #include <tqmime.h>
 #include <tqdir.h>
 #include <tqfileinfo.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqimage.h>
 
 PixmapCollection::PixmapCollection( Project *pro )
diff --git a/kdevdesigner/designer/pixmapcollectioneditor.ui b/kdevdesigner/designer/pixmapcollectioneditor.ui
index 30f74183..a6ed1bd6 100644
--- a/kdevdesigner/designer/pixmapcollectioneditor.ui
+++ b/kdevdesigner/designer/pixmapcollectioneditor.ui
@@ -101,7 +101,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/pixmapfunction.ui b/kdevdesigner/designer/pixmapfunction.ui
index 760abe56..e5f13817 100644
--- a/kdevdesigner/designer/pixmapfunction.ui
+++ b/kdevdesigner/designer/pixmapfunction.ui
@@ -877,7 +877,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
@@ -919,7 +919,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/popupmenueditor.cpp b/kdevdesigner/designer/popupmenueditor.cpp
index ea4ffec7..7770dcda 100644
--- a/kdevdesigner/designer/popupmenueditor.cpp
+++ b/kdevdesigner/designer/popupmenueditor.cpp
@@ -80,7 +80,7 @@ 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() )
@@ -170,7 +170,7 @@ PopupMenuEditorItem::ItemType PopupMenuEditorItem::type() const
 void PopupMenuEditorItem::setVisible( bool enable )
 {
     if ( a )
-	a->setVisible( enable );
+	a->tqsetVisible( enable );
 }
 
 bool PopupMenuEditorItem::isVisible() const
@@ -730,7 +730,7 @@ void PopupMenuEditor::paintEvent( TQPaintEvent * )
 		 rect().width() - borderSize * 2, rect().height() - borderSize * 2 );
     reg -= mid;
     p.setClipRegion( reg );
-    tqstyle().tqdrawPrimitive( TQStyle::PE_PanelPopup, &p, rect(), colorGroup() );
+    tqstyle().tqdrawPrimitive( TQStyle::PE_PanelPopup, &p, rect(), tqcolorGroup() );
     p.restore();
     drawItems( &p );
 }
@@ -1011,7 +1011,7 @@ void PopupMenuEditor::focusInEvent( TQFocusEvent * )
 
 void PopupMenuEditor::focusOutEvent( TQFocusEvent * )
 {
-    TQWidget * fw = tqApp->focusWidget();
+    TQWidget * fw = tqApp->tqfocusWidget();
     if ( !fw || ( !::tqqt_cast<PopupMenuEditor*>(fw) && fw != lineEdit ) ) {
 	hideSubMenu();
 	if ( fw && ::tqqt_cast<MenuBarEditor*>(fw) )
@@ -1031,12 +1031,12 @@ 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() ) {
 	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;
     }
 
@@ -1044,7 +1044,7 @@ void PopupMenuEditor::drawItem( TQPainter * p, PopupMenuEditorItem * i,
     if ( a->isToggleAction() && a->isOn() ) {
 	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,
@@ -1066,7 +1066,7 @@ void PopupMenuEditor::drawItem( TQPainter * p, PopupMenuEditorItem * i,
     if ( i->count() ) // Item has submenu
 	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 );
 
diff --git a/kdevdesigner/designer/preferences.ui b/kdevdesigner/designer/preferences.ui
index 363164ed..a4335bc7 100644
--- a/kdevdesigner/designer/preferences.ui
+++ b/kdevdesigner/designer/preferences.ui
@@ -95,7 +95,7 @@
                             </widget>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>layout3</cstring>
+                                    <cstring>tqlayout3</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -156,7 +156,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
@@ -519,7 +519,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/previewframe.cpp b/kdevdesigner/designer/previewframe.cpp
index c26d51fc..c63e994f 100644
--- a/kdevdesigner/designer/previewframe.cpp
+++ b/kdevdesigner/designer/previewframe.cpp
@@ -37,7 +37,7 @@ PreviewFrame::PreviewFrame( TQWidget *parent, const char *name )
     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/previewwidget.ui b/kdevdesigner/designer/previewwidget.ui
index 3b792253..0cc680c8 100644
--- a/kdevdesigner/designer/previewwidget.ui
+++ b/kdevdesigner/designer/previewwidget.ui
@@ -259,7 +259,7 @@
                             <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/project.cpp b/kdevdesigner/designer/project.cpp
index a250c1f8..1410361d 100644
--- a/kdevdesigner/designer/project.cpp
+++ b/kdevdesigner/designer/project.cpp
@@ -37,11 +37,11 @@
 #include "outputwindow.h"
 
 #include <tqfile.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqurl.h>
 #include <tqobjectlist.h>
 #include <tqfeatures.h>
-#include <textcodec.h>
+#include <tqtextcodec.h>
 #include <tqdom.h>
 #include <tqmessagebox.h>
 #include <tqapplication.h>
diff --git a/kdevdesigner/designer/projectsettings.ui b/kdevdesigner/designer/projectsettings.ui
index 4ac40534..486ce960 100644
--- a/kdevdesigner/designer/projectsettings.ui
+++ b/kdevdesigner/designer/projectsettings.ui
@@ -161,7 +161,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>21</width>
                                 <height>71</height>
@@ -206,7 +206,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/projectsettingsimpl.cpp b/kdevdesigner/designer/projectsettingsimpl.cpp
index 9a043e65..5cea9192 100644
--- a/kdevdesigner/designer/projectsettingsimpl.cpp
+++ b/kdevdesigner/designer/projectsettingsimpl.cpp
@@ -38,7 +38,7 @@
 #include <klocale.h>
 #include <klineedit.h>
 
-#include <textedit.h>
+#include <tqtextedit.h>
 #include <tqcheckbox.h>
 #include <tqfiledialog.h>
 #include <tqcombobox.h>
diff --git a/kdevdesigner/designer/propertyeditor.cpp b/kdevdesigner/designer/propertyeditor.cpp
index a37679d4..01a2bb9f 100644
--- a/kdevdesigner/designer/propertyeditor.cpp
+++ b/kdevdesigner/designer/propertyeditor.cpp
@@ -50,7 +50,7 @@
 #include "kdevdesigner_part.h"
 
 #include <tqpainter.h>
-#include <palette.h>
+#include <tqpalette.h>
 #include <tqapplication.h>
 #include <tqheader.h>
 #include <tqlineedit.h>
@@ -68,7 +68,7 @@
 #include <tqcolor.h>
 #include <tqcolordialog.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqsizepolicy.h>
 #include <tqbitmap.h>
 #include <tqtooltip.h>
@@ -86,7 +86,7 @@
 #include <tqmultilineedit.h> // FIXME: obsolete
 #include <tqsplitter.h>
 #include <tqdatatable.h>
-#include <textview.h>
+#include <tqtextview.h>
 
 #include <limits.h>
 
@@ -119,7 +119,7 @@ static TQStringList getFontList()
 	fontDataBase = new TQFontDatabase;
 	qAddPostRoutine( cleanupFontDatabase );
     }
-    return fontDataBase->families();
+    return fontDataBase->tqfamilies();
 }
 
 
@@ -329,9 +329,9 @@ void PropertyItem::setOpen( bool b )
     open = b;
 
     if ( !open ) {
-	children.setAutoDelete( TRUE );
-	children.clear();
-	children.setAutoDelete( FALSE );
+	tqchildren.setAutoDelete( TRUE );
+	tqchildren.clear();
+	tqchildren.setAutoDelete( FALSE );
 	tqApp->processEvents();
 	listview->updateEditorSize();
 	return;
@@ -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 );
     }
@@ -413,8 +413,8 @@ void PropertyItem::createResetButton()
     resetButton = new TQPushButton( hbox );
     setupStyle( resetButton );
     resetButton->setPixmap( DesignerResetPix );
-    resetButton->setFixedWidth( resetButton->sizeHint().width() );
-    hbox->layout()->setAlignment( TQt::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(TQ_WS_WIN)
 	listview->repaintContents( FALSE );
 #endif
-	r = listview->itemRect( this );
+	r = listview->tqitemRect( this );
     }
     r.setX( listview->header()->sectionPos( 1 ) );
     r.setWidth( listview->header()->sectionSize( 1 ) - 1 );
@@ -455,7 +455,7 @@ 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() );
+    resetButton->parentWidget()->resize( resetButton->tqsizeHint().width() + 10, r.height() );
     listview->moveChild( resetButton->parentWidget(), r.x() + r.width() - 8, r.y() );
     resetButton->setFixedHeight( TQMAX( 0, r.height() - 3 ) );
 }
@@ -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
@@ -553,10 +553,10 @@ TQString PropertyItem::currentItemFromObject() const
 
 void PropertyItem::setFocus( TQWidget *w )
 {
-    if ( !tqApp->focusWidget() ||
+    if ( !tqApp->tqfocusWidget() ||
 	 listview->propertyEditor()->formWindow() &&
-	 ( !MainWindow::self->isAFormWindowChild( TQT_TQOBJECT(tqApp->focusWidget()) ) &&
-	   !tqApp->focusWidget()->inherits( "Editor" ) ) )
+	 ( !MainWindow::self->isAFormWindowChild( TQT_TQOBJECT(tqApp->tqfocusWidget()) ) &&
+	   !tqApp->tqfocusWidget()->inherits( "Editor" ) ) )
 	w->setFocus();
 }
 
@@ -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();
@@ -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()
@@ -2311,7 +2311,7 @@ void PropertyPaletteItem::getPalette()
 	w = ( (TQScrollView*)w )->viewport();
     TQPalette pal = PaletteEditor::getPalette( &ok, val.toPalette(),
 #if defined(TQT_NON_COMMERCIAL)
-					      w->backgroundMode(), listview->topLevelWidget(),
+					      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 );
@@ -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 );
@@ -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,7 +2692,7 @@ void EnumBox::paintEvent( TQPaintEvent * )
 		&g.brush( TQColorGroup::Button ) );
 	return;
     }
-    tqstyle().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 :
@@ -2700,7 +2700,7 @@ void EnumBox::paintEvent( TQPaintEvent * )
 
     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*)parent())->mapToGlobal( tqgeometry().bottomLeft() ) );
     pop->setMinimumWidth( width() );
     emit aboutToShowPopup();
     pop->show();
@@ -2744,13 +2744,13 @@ void EnumBox::mousePressEvent( TQMouseEvent *e )
 
     TQRect arrowRect = tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, this,
 						      TQStyle::SC_ComboBoxArrow);
-    arrowRect = TQStyle::visualRect(arrowRect, this);
+    arrowRect = TQStyle::tqvisualRect(arrowRect, this);
 
     arrowRect.setHeight( TQMAX(  height() - (2 * arrowRect.y()), arrowRect.height() ) );
 
     if ( arrowRect.contains( 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 );
 }
 
 
@@ -3040,7 +3040,7 @@ void PropertyList::setupProperties()
     if ( !editor->widget() )
 	return;
     bool allProperties = !::tqqt_cast<Spacer*>(editor->widget());
-    TQStrList lst = editor->widget()->metaObject()->propertyNames( allProperties );
+    TQStrList lst = editor->widget()->tqmetaObject()->propertyNames( allProperties );
     PropertyItem *item = 0;
     TQMap<TQString, bool> unique;
     TQObject *w = editor->widget();
@@ -3051,11 +3051,11 @@ void PropertyList::setupProperties()
 	WidgetFactory::layoutType( ( (TQWidget*)w )->parentWidget() ) != 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()->findProperty( it.current(), allProperties), allProperties );
 	if ( !p )
 	    continue;
-	if ( unique.contains( TQString::fromLatin1( it.current() ) ) )
+	if ( unique.contains( TQString::tqfromLatin1( it.current() ) ) )
 	    continue;
 	if ( ::tqqt_cast<QDesignerToolBar*>(editor->widget()) ||
 	     ::tqqt_cast<MenuBarEditor*>(editor->widget()) ) {
@@ -3071,12 +3071,12 @@ 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( TQT_TQOBJECT(editor->widget()) ) ) {
 	    if ( qstrcmp( p->name(), "geometry" ) == 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;
@@ -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 )
@@ -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() ),
@@ -3500,7 +3500,7 @@ void PropertyList::layoutInitValue( 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() ),
@@ -3692,25 +3692,25 @@ 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()->findProperty( 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()->findProperty( "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()->findProperty( "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
@@ -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(),
@@ -3864,7 +3864,7 @@ TQString PropertyList::whatsThisText( TQListViewItem *i )
     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;
@@ -3873,10 +3873,10 @@ TQString PropertyList::whatsThisText( TQListViewItem *i )
 	if ( ( it = propertyDocs.find( 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()
@@ -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();
@@ -4274,21 +4274,21 @@ TQString PropertyEditor::classOfCurrentProperty() const
 	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 )
 	    return mo->className();
-	mo = mo->superClass();
+	mo = mo->tqsuperClass();
     }
     return TQString();
 }
 
-TQMetaObject* PropertyEditor::metaObjectOfCurrentProperty() const
+TQMetaObject* PropertyEditor::tqmetaObjectOfCurrentProperty() const
 {
     if ( !wid )
 	return 0;
-    return wid->metaObject();
+    return wid->tqmetaObject();
 }
 
 void PropertyEditor::resetFocus()
diff --git a/kdevdesigner/designer/propertyeditor.h b/kdevdesigner/designer/propertyeditor.h
index c3d842aa..1b0fcc85 100644
--- a/kdevdesigner/designer/propertyeditor.h
+++ b/kdevdesigner/designer/propertyeditor.h
@@ -35,7 +35,7 @@
 #include <tqtabwidget.h>
 #include <tqmodules.h>
 #include <tqptrlist.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqcheckbox.h>
 #include <tqcombobox.h>
 #include "hierarchyview.h"
@@ -129,7 +129,7 @@ private:
     bool open, changed;
     PropertyItem *property;
     TQString propertyName;
-    TQPtrList<PropertyItem> children;
+    TQPtrList<PropertyItem> tqchildren;
     TQColor backColor;
     TQPushButton *resetButton;
 
@@ -376,7 +376,7 @@ class PropertyColorItem : public TQObject,
 
 public:
     PropertyColorItem( PropertyList *l, PropertyItem *after, PropertyItem *prop,
-		       const TQString &propName, bool children );
+		       const TQString &propName, bool tqchildren );
     ~PropertyColorItem();
 
     virtual void createChildren();
@@ -789,7 +789,7 @@ public:
 
     TQString currentProperty() const;
     TQString classOfCurrentProperty() const;
-    TQMetaObject* metaObjectOfCurrentProperty() const;
+    TQMetaObject* tqmetaObjectOfCurrentProperty() const;
 
     void resetFocus();
 
diff --git a/kdevdesigner/designer/propertyobject.cpp b/kdevdesigner/designer/propertyobject.cpp
index 1bd1883f..39d23b48 100644
--- a/kdevdesigner/designer/propertyobject.cpp
+++ b/kdevdesigner/designer/propertyobject.cpp
@@ -39,11 +39,11 @@ PropertyObject::PropertyObject( const TQWidgetList &objs )
     v.setAutoDelete( TRUE );
 
     for ( TQObject *o = TQT_TQOBJECT(objects.first()); o; o = TQT_TQOBJECT(objects.next()) ) {
-	const TQMetaObject *m = o->metaObject();
+	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 );
     }
diff --git a/kdevdesigner/designer/propertyobject.h b/kdevdesigner/designer/propertyobject.h
index 2590399a..4cfb54fd 100644
--- a/kdevdesigner/designer/propertyobject.h
+++ b/kdevdesigner/designer/propertyobject.h
@@ -8,7 +8,7 @@
 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 ed0c986e..7407370c 100644
--- a/kdevdesigner/designer/qcompletionedit.cpp
+++ b/kdevdesigner/designer/qcompletionedit.cpp
@@ -88,8 +88,8 @@ void QCompletionEdit::placeListBox()
 	return;
     }
 
-    popup->resize( TQMAX( 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() )
diff --git a/kdevdesigner/designer/replacedialog.ui b/kdevdesigner/designer/replacedialog.ui
index 27d01a58..635b2315 100644
--- a/kdevdesigner/designer/replacedialog.ui
+++ b/kdevdesigner/designer/replacedialog.ui
@@ -144,7 +144,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/resource.cpp b/kdevdesigner/designer/resource.cpp
index 12b4e490..0d83cb1e 100644
--- a/kdevdesigner/designer/resource.cpp
+++ b/kdevdesigner/designer/resource.cpp
@@ -54,7 +54,7 @@
 #include <tqheader.h>
 #include <tqiconview.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlistbox.h>
 #include <tqlistview.h>
 #include <tqmenudata.h>
@@ -69,8 +69,8 @@
 #endif
 #include <tqtabwidget.h>
 #include <tqtabwidget.h>
-#include <textcodec.h>
-#include <textstream.h>
+#include <tqtextcodec.h>
+#include <tqtextstream.h>
 #include <tqtooltip.h>
 #include <tqwhatsthis.h>
 #include <tqwidget.h>
@@ -225,7 +225,7 @@ static TQString platformNeutralKeySequence(const TQKeySequence &ks)
 	    // represent, but is clearly impossible to trigger...
 	    p = TQChar(basekey & 0xffff);
 	} else if ( basekey >= TQt::Key_F1 && basekey <= TQt::Key_F35 ) {
-	    p = TQAccel::tr( "F%1" ).arg(basekey - TQt::Key_F1 + 1);
+	    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 {
@@ -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 )
@@ -622,13 +622,13 @@ bool Resource::load( FormFile *ff, TQIODevice* dev, Project *defProject )
 
     if ( formwindow ) {
 	formwindow->killAccels( TQT_TQOBJECT(formwindow) );
-	if ( formwindow->layout() )
-	    formwindow->layout()->activate();
+	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;
@@ -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,9 +1079,9 @@ 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 TQMetaData *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 ) {
@@ -1344,17 +1344,17 @@ void Resource::saveChildrenOf( TQObject* obj, TQTextStream &ts, int indent )
 {
     const TQObjectList l = obj->childrenListObject();
     if ( l.isEmpty() )
-	return; // no children to save
+	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;
+    // 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;
     QDesignerGridLayout* 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::layoutType( (TQWidget*)obj, tqlayout ) != WidgetFactory::NoLayout ) {
+	WidgetFactory::LayoutType lay = WidgetFactory::layoutType( (TQWidget*)obj, tqlayout );
 	switch ( lay ) {
 	case WidgetFactory::HBox:
 	    closeTag = makeIndent( indent ) + "</hbox>";
@@ -1370,15 +1370,15 @@ void Resource::saveChildrenOf( TQObject* obj, TQTextStream &ts, int indent )
 	    closeTag = makeIndent( indent ) + "</grid>";
 	    ts << makeIndent( indent ) << "<grid>" << endl;
 	    ++indent;
-	    grid = (QDesignerGridLayout*) layout;
+	    grid = (QDesignerGridLayout*) tqlayout;
 	    break;
 	default:
 	    break;
 	}
 
-	// save properties of layout
+	// save properties of tqlayout
 	if ( lay != WidgetFactory::NoLayout )
-	    saveObjectProperties( TQT_TQOBJECT(layout), ts, indent );
+	    saveObjectProperties( TQT_TQOBJECT(tqlayout), ts, indent );
 
     }
 
@@ -1399,8 +1399,8 @@ void Resource::saveObjectProperties( TQObject *w, TQTextStream &ts, int indent )
     changed = MetaDataBase::changedProperties( w );
     if ( w->isWidgetType() ) {
 	if ( ::tqqt_cast<Spacer*>(w) ) {
-	    if ( !changed.contains( "sizeHint" ) )
-		changed << "sizeHint";
+	    if ( !changed.contains( "tqsizeHint" ) )
+		changed << "tqsizeHint";
 	    if ( !changed.contains( "geometry" ) )
 		changed << "geometry";
  	} else {
@@ -1432,15 +1432,15 @@ void Resource::saveObjectProperties( TQObject *w, TQTextStream &ts, int indent )
     bool inLayout = TQT_BASE_OBJECT(w) != TQT_BASE_OBJECT(formwindow->mainContainer()) && !copying && w->isWidgetType() && ( (TQWidget*)w )->parentWidget() &&
 		    WidgetFactory::layoutType( ( (TQWidget*)w )->parentWidget() ) != WidgetFactory::NoLayout;
 
-    TQStrList lst = w->metaObject()->propertyNames( !::tqqt_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.find( TQString::tqfromLatin1( it.current() ) ) == changed.end() )
 	    continue;
-	if ( saved.find( TQString::fromLatin1( it.current() ) ) != saved.end() )
+	if ( saved.find( 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()->findProperty( it.current(), TRUE ), TRUE );
 	if ( !p || !p->stored( w ) || ( inLayout && qstrcmp( p->name(), "geometry" ) == 0 ) )
 	    continue;
 	if ( ::tqqt_cast<TQLabel*>(w) && qstrcmp( p->name(), "pixmap" ) == 0 &&
@@ -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()->findProperty( name, TRUE ), TRUE );
     TQStrList l( p->valueToKeys( w->property( name ).toInt() ) );
     TQString v;
     for ( uint i = 0; i < l.count(); ++i ) {
@@ -1509,7 +1509,7 @@ 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()->findProperty( name, TRUE ), TRUE );
     ts << makeIndent( indent ) << "<enum>" << p->valueToKey( w->property( name ).toInt() ) << "</enum>" << endl;
 }
 
@@ -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 *parent, TQLayout* tqlayout )
 {
     lastItem = 0;
     TQDomElement n = e.firstChild().toElement();
@@ -1787,7 +1787,7 @@ TQObject *Resource::createObject( const TQDomElement &e, TQWidget *parent, TQLay
 	    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 ) {
@@ -1798,16 +1798,16 @@ TQObject *Resource::createObject( const TQDomElement &e, TQWidget *parent, TQLay
 	w = (TQWidget*)obj;
 	if ( ::tqqt_cast<TQMainWindow*>(w) )
 	    w = ( (TQMainWindow*)w )->centralWidget();
-	if ( layout ) {
-	    switch ( WidgetFactory::layoutType( layout ) ) {
+	if ( tqlayout ) {
+	    switch ( WidgetFactory::layoutType( 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,
+		( (QDesignerGridLayout*)tqlayout )->addMultiCellWidget( w, row, row + rowspan - 1,
 								      col, col + colspan - 1 );
 		break;
 	    default:
@@ -1817,7 +1817,7 @@ TQObject *Resource::createObject( const TQDomElement &e, TQWidget *parent, TQLay
 
 	if ( !toplevel )
 	    toplevel = w;
-	layout = 0;
+	tqlayout = 0;
 
 	if ( w && formwindow ) {
 	    if ( !parent ||
@@ -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 = TQT_TQOBJECT(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 = TQT_TQOBJECT(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 = TQT_TQOBJECT(layout);
+	    tqlayout = WidgetFactory::createLayout( w, tqlayout, WidgetFactory::VBox );
+	    obj = TQT_TQOBJECT(tqlayout);
 	    n = n.firstChild().toElement();
 	    continue;
 	} else if ( n.tagName() == "property" && obj ) {
@@ -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 *parent, TQLayout *tqlayout, Qt::Orientation o )
 {
     TQDomElement n = e.firstChild().toElement();
     int row = e.attribute( "row" ).toInt();
@@ -2128,12 +2128,12 @@ TQWidget *Resource::createSpacer( const TQDomElement &e, TQWidget *parent, TQLay
     spacer->setInteraciveMode( TRUE );
     if ( formwindow )
 	formwindow->insertWidget( spacer, pasting );
-    if ( layout ) {
-	if ( ::tqqt_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() );
+	    ( (QDesignerGridLayout*)tqlayout )->addMultiCellWidget( spacer, row, row + rowspan - 1, col, col + colspan - 1,
+								  spacer->tqalignment() );
     }
     return spacer;
 }
@@ -2143,7 +2143,7 @@ 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()->findProperty( prop, TRUE ), TRUE );
 
     if ( !::tqqt_cast<TQLayout*>(obj)  ) {// no layouts in metadatabase... (RS)
 	if ( obj->inherits( "CustomWidget" ) ) {
@@ -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" ) {
@@ -2897,9 +2897,9 @@ void Resource::saveMetaInfoAfter( TQTextStream &ts, int indent )
 	    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() );
+		m = TQString( " margin=\"%1\"" ).tqarg( formwindow->marginFunction() );
 	    ts << makeIndent( indent ) << "<layoutfunctions" << s << m << "/>" << endl;
 	}
     }
diff --git a/kdevdesigner/designer/resource.h b/kdevdesigner/designer/resource.h
index 8f362d95..ddbffb07 100644
--- a/kdevdesigner/designer/resource.h
+++ b/kdevdesigner/designer/resource.h
@@ -28,7 +28,7 @@
 #define RESOURCE_H
 
 #include <tqstring.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqvariant.h>
 #include <tqvaluelist.h>
 #include <tqimage.h>
@@ -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 *parent, TQLayout* tqlayout = 0 );
+    TQWidget *createSpacer( const TQDomElement &e, TQWidget *parent, 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);
diff --git a/kdevdesigner/designer/richtextfontdialog.ui b/kdevdesigner/designer/richtextfontdialog.ui
index d7d6c5a7..0eaef760 100644
--- a/kdevdesigner/designer/richtextfontdialog.ui
+++ b/kdevdesigner/designer/richtextfontdialog.ui
@@ -109,7 +109,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -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>
@@ -272,7 +272,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/richtextfontdialog.ui.h b/kdevdesigner/designer/richtextfontdialog.ui.h
index 27a11a21..263b5f90 100644
--- a/kdevdesigner/designer/richtextfontdialog.ui.h
+++ b/kdevdesigner/designer/richtextfontdialog.ui.h
@@ -11,7 +11,7 @@
 void RichTextFontDialog::init()
 {
     TQFontDatabase *db = new TQFontDatabase();
-    fontCombo->insertStringList( db->families() );
+    fontCombo->insertStringList( db->tqfamilies() );
 }
 
 void RichTextFontDialog::selectColor()
diff --git a/kdevdesigner/designer/sizehandle.cpp b/kdevdesigner/designer/sizehandle.cpp
index f9daaefc..6ba2ba3f 100644
--- a/kdevdesigner/designer/sizehandle.cpp
+++ b/kdevdesigner/designer/sizehandle.cpp
@@ -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() );
@@ -231,19 +231,19 @@ void SizeHandle::mouseReleaseEvent( TQMouseEvent *e )
 	return;
 
     formWindow->sizePreview()->hide();
-    if ( geom != widget->geometry() )
+    if ( geom != widget->tqgeometry() )
 	formWindow->commandHistory()->addCommand( new ResizeCommand( i18n( "Resize" ),
 								     formWindow,
 								     widget, origGeom,
-								     widget->geometry() ) );
+								     widget->tqgeometry() ) );
     formWindow->emitUpdateProperties( TQT_TQOBJECT(widget) );
 }
 
 void SizeHandle::trySetGeometry( TQWidget *w, int x, int y, int width, int height )
 {
-    int minw = TQMAX( w->minimumSizeHint().width(), w->minimumSize().width() );
+    int minw = TQMAX( w->tqminimumSizeHint().width(), w->tqminimumSize().width() );
     minw = TQMAX( minw, 2 * formWindow->grid().x() );
-    int minh = TQMAX( w->minimumSizeHint().height(), w->minimumSize().height() );
+    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() )
@@ -257,9 +257,9 @@ void SizeHandle::trySetGeometry( TQWidget *w, int x, int y, int width, int heigh
 
 void SizeHandle::tryResize( TQWidget *w, int width, int height )
 {
-    int minw = TQMAX( w->minimumSizeHint().width(), w->minimumSize().width() );
+    int minw = TQMAX( w->tqminimumSizeHint().width(), w->tqminimumSize().width() );
     minw = TQMAX( minw, 16 );
-    int minh = TQMAX( w->minimumSizeHint().height(), w->minimumSize().height() );
+    int minh = TQMAX( w->tqminimumSizeHint().height(), w->tqminimumSize().height() );
     minh = TQMAX( minh, 16 );
     w->resize( TQMAX( minw, width ), TQMAX( minh, height ) );
 }
diff --git a/kdevdesigner/designer/sourceeditor.cpp b/kdevdesigner/designer/sourceeditor.cpp
index 206a4646..2850e20e 100644
--- a/kdevdesigner/designer/sourceeditor.cpp
+++ b/kdevdesigner/designer/sourceeditor.cpp
@@ -37,7 +37,7 @@
 #include "sourcefile.h"
 #include "hierarchyview.h"
 #include <tqmessagebox.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include "kdevdesigner_part.h"
 
 SourceEditor::SourceEditor( TQWidget *parent, EditorInterface *iface, LanguageInterface *liface )
diff --git a/kdevdesigner/designer/sourcefile.cpp b/kdevdesigner/designer/sourcefile.cpp
index faf9dd10..ad76e201 100644
--- a/kdevdesigner/designer/sourcefile.cpp
+++ b/kdevdesigner/designer/sourcefile.cpp
@@ -26,7 +26,7 @@
 
 #include "sourcefile.h"
 #include <tqfile.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include "designerappiface.h"
 #include "sourceeditor.h"
 #include "metadatabase.h"
@@ -138,7 +138,7 @@ 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();
@@ -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() )
@@ -265,7 +265,7 @@ void SourceFile::checkTimeStamp()
     timeStamp.update();
     if ( TQMessageBox::information( MainWindow::self, i18n( "TQt Designer" ),
 				   i18n( "File '%1' has been changed outside TQt Designer.\n"
-				       "Do you want to reload it?" ).arg( filename ),
+				       "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/startdialog.ui b/kdevdesigner/designer/startdialog.ui
index 383fdfda..8843ba87 100644
--- a/kdevdesigner/designer/startdialog.ui
+++ b/kdevdesigner/designer/startdialog.ui
@@ -216,7 +216,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>0</width>
                             <height>20</height>
diff --git a/kdevdesigner/designer/startdialogimpl.cpp b/kdevdesigner/designer/startdialogimpl.cpp
index 3e1a4fdf..9bf43f87 100644
--- a/kdevdesigner/designer/startdialogimpl.cpp
+++ b/kdevdesigner/designer/startdialogimpl.cpp
@@ -10,7 +10,7 @@
 #include <tqpoint.h>
 #include <tqobjectlist.h>
 #include <tqpushbutton.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqfileinfo.h>
 #include <tqmap.h>
 #include <tqdatetime.h>
@@ -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 );
 }
 
diff --git a/kdevdesigner/designer/styledbutton.cpp b/kdevdesigner/designer/styledbutton.cpp
index d84ee135..d2aea25f 100644
--- a/kdevdesigner/designer/styledbutton.cpp
+++ b/kdevdesigner/designer/styledbutton.cpp
@@ -29,7 +29,7 @@
 #include "formwindow.h"
 #include "pixmapchooser.h"
 #include <tqcolordialog.h>
-#include <palette.h>
+#include <tqpalette.h>
 #include <tqlabel.h>
 #include <tqpainter.h>
 #include <tqimage.h>
@@ -41,7 +41,7 @@
 StyledButton::StyledButton(TQWidget* parent, const char* name)
     : TQButton( parent, 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()));
@@ -54,7 +54,7 @@ StyledButton::StyledButton( const TQBrush& b, TQWidget* parent, const char* name
 {
     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 )
 {
-    tqstyle().tqdrawPrimitive(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())
 	tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, paint,
 			      tqstyle().subRect(TQStyle::SR_PushButtonFocusRect, this),
-			      colorGroup(), TQStyle::Style_Default);
+			      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 = TQColorDialog::getColor( palette().active().background(), this );
+	TQColor c = TQColorDialog::getColor( tqpalette().active().background(), this );
 	if ( c.isValid() ) {
 	    setColor( c );
 	    emit changed();
diff --git a/kdevdesigner/designer/styledbutton.h b/kdevdesigner/designer/styledbutton.h
index c9c582bd..f5a193b6 100644
--- a/kdevdesigner/designer/styledbutton.h
+++ b/kdevdesigner/designer/styledbutton.h
@@ -65,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; }
 
diff --git a/kdevdesigner/designer/syntaxhighlighter_html.cpp b/kdevdesigner/designer/syntaxhighlighter_html.cpp
index 5bb681f9..baa6a9f5 100644
--- a/kdevdesigner/designer/syntaxhighlighter_html.cpp
+++ b/kdevdesigner/designer/syntaxhighlighter_html.cpp
@@ -46,7 +46,7 @@ SyntaxHighlighter_HTML::~SyntaxHighlighter_HTML()
 {
 }
 
-void SyntaxHighlighter_HTML::process( TQTextDocument *doc, TQTextParagraph *string, int, bool invalidate )
+void SyntaxHighlighter_HTML::process( TQTextDocument *doc, TQTextParagraph *string, int, bool tqinvalidate )
 {
 
     TQTextFormat *formatStandard = format( Standard );
@@ -131,7 +131,7 @@ void SyntaxHighlighter_HTML::process( TQTextDocument *doc, TQTextParagraph *stri
     string->setEndState( state );
     string->setFirstPreProcess( FALSE );
 
-    if ( invalidate && string->next() &&
+    if ( tqinvalidate && string->next() &&
 	 !string->next()->firstPreProcess() && string->next()->endState() != -1 ) {
 	TQTextParagraph *p = string->next();
 	while ( p ) {
diff --git a/kdevdesigner/designer/syntaxhighlighter_html.h b/kdevdesigner/designer/syntaxhighlighter_html.h
index efd1a616..87f94872 100644
--- a/kdevdesigner/designer/syntaxhighlighter_html.h
+++ b/kdevdesigner/designer/syntaxhighlighter_html.h
@@ -42,7 +42,7 @@ public:
 
     SyntaxHighlighter_HTML();
     virtual ~SyntaxHighlighter_HTML();
-    void process( TQTextDocument *doc, TQTextParagraph *string, int start, bool invalidate = TRUE );
+    void process( TQTextDocument *doc, TQTextParagraph *string, int start, bool tqinvalidate = TRUE );
     TQTextFormat *format( int id );
 
 private:
diff --git a/kdevdesigner/designer/tableeditor.ui b/kdevdesigner/designer/tableeditor.ui
index deacf5d4..b278019b 100644
--- a/kdevdesigner/designer/tableeditor.ui
+++ b/kdevdesigner/designer/tableeditor.ui
@@ -102,7 +102,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -187,7 +187,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
@@ -209,7 +209,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
@@ -314,7 +314,7 @@
                                         <property name="name">
                                             <cstring>buttonDeleteColPixmap</cstring>
                                         </property>
-                                        <property name="maximumSize">
+                                        <property name="tqmaximumSize">
                                             <size>
                                                 <width>30</width>
                                                 <height>22</height>
@@ -337,7 +337,7 @@
                                         <property name="name">
                                             <cstring>buttonChooseColPixmap</cstring>
                                         </property>
-                                        <property name="maximumSize">
+                                        <property name="tqmaximumSize">
                                             <size>
                                                 <width>30</width>
                                                 <height>22</height>
@@ -440,7 +440,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
@@ -496,7 +496,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
@@ -581,7 +581,7 @@
                                         <property name="name">
                                             <cstring>buttonDeleteRowPixmap</cstring>
                                         </property>
-                                        <property name="maximumSize">
+                                        <property name="tqmaximumSize">
                                             <size>
                                                 <width>30</width>
                                                 <height>22</height>
@@ -604,7 +604,7 @@
                                         <property name="name">
                                             <cstring>buttonChooseRowPixmap</cstring>
                                         </property>
-                                        <property name="maximumSize">
+                                        <property name="tqmaximumSize">
                                             <size>
                                                 <width>30</width>
                                                 <height>22</height>
diff --git a/kdevdesigner/designer/tableeditorimpl.cpp b/kdevdesigner/designer/tableeditorimpl.cpp
index 0013398c..4f549a28 100644
--- a/kdevdesigner/designer/tableeditorimpl.cpp
+++ b/kdevdesigner/designer/tableeditorimpl.cpp
@@ -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 );
diff --git a/kdevdesigner/designer/variabledialog.ui b/kdevdesigner/designer/variabledialog.ui
index 0e7fe478..4e4fbd83 100644
--- a/kdevdesigner/designer/variabledialog.ui
+++ b/kdevdesigner/designer/variabledialog.ui
@@ -181,7 +181,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>0</width>
                     <height>21</height>
@@ -214,7 +214,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>0</width>
                     <height>21</height>
diff --git a/kdevdesigner/designer/widgetfactory.cpp b/kdevdesigner/designer/widgetfactory.cpp
index 1cf435e5..e31f5d82 100644
--- a/kdevdesigner/designer/widgetfactory.cpp
+++ b/kdevdesigner/designer/widgetfactory.cpp
@@ -31,7 +31,7 @@
 #include "mainwindow.h"
 #include "formwindow.h"
 #include "propertyeditor.h"
-#include "layout.h"
+#include "tqlayout.h"
 #include "listboxeditorimpl.h"
 #include "listvieweditorimpl.h"
 #include "iconvieweditorimpl.h"
@@ -64,9 +64,9 @@
 #include <tqlineedit.h>
 #include <tqspinbox.h>
 #include <tqmultilineedit.h>
-#include <textedit.h>
+#include <tqtextedit.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqwidgetstack.h>
 #include <tqcombobox.h>
 #include <tqtabbar.h>
@@ -77,8 +77,8 @@
 #include <tqslider.h>
 #include <tqdial.h>
 #include <tqprogressbar.h>
-#include <textview.h>
-#include <textbrowser.h>
+#include <tqtextview.h>
+#include <tqtextbrowser.h>
 #include <tqframe.h>
 #include <tqmetaobject.h>
 #include <tqwidgetstack.h>
@@ -296,11 +296,11 @@ QDesignerWidgetStack::QDesignerWidgetStack( TQWidget *parent, const char *name )
     prev = new TQToolButton( TQt::LeftArrow, this, "designer_wizardstack_button" );
     prev->setAutoRaise( TRUE );
     prev->setAutoRepeat( TRUE );
-    prev->setSizePolicy( TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored ) );
+    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();
@@ -498,7 +498,7 @@ 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 )
@@ -553,11 +553,11 @@ TQWidget *WidgetFactory::create( int id, TQWidget *parent, const char *name, boo
     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;
@@ -570,40 +570,40 @@ TQLayout *WidgetFactory::createLayout( TQWidget *widget, TQLayout *layout, Layou
 	   widget && ::tqqt_cast<FormWindow*>(widget->parentWidget()) ) )
 	margin = MainWindow::self->currentLayoutDefaultMargin();
 
-    if ( !layout && ::tqqt_cast<TQTabWidget*>(widget) )
+    if ( !tqlayout && ::tqqt_cast<TQTabWidget*>(widget) )
 	widget = ((TQTabWidget*)widget)->currentPage();
 
-    if ( !layout && ::tqqt_cast<TQWizard*>(widget) )
+    if ( !tqlayout && ::tqqt_cast<TQWizard*>(widget) )
 	widget = ((TQWizard*)widget)->currentPage();
 
-    if ( !layout && ::tqqt_cast<TQMainWindow*>(widget) )
+    if ( !tqlayout && ::tqqt_cast<TQMainWindow*>(widget) )
 	widget = ((TQMainWindow*)widget)->centralWidget();
 
-    if ( !layout && ::tqqt_cast<TQWidgetStack*>(widget) )
+    if ( !tqlayout && ::tqqt_cast<TQWidgetStack*>(widget) )
 	widget = ((TQWidgetStack*)widget)->visibleWidget();
 
-    if ( !layout && ::tqqt_cast<TQToolBox*>(widget) )
+    if ( !tqlayout && ::tqqt_cast<TQToolBox*>(widget) )
 	widget = ((TQToolBox*)widget)->currentItem();
 
     MetaDataBase::addEntry( TQT_TQOBJECT(widget) );
 
     TQLayout *l = 0;
     int align = 0;
-    if ( !layout && ::tqqt_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 QDesignerGridLayout( tqlayout );
 	    break;
 	default:
 	    return 0;
@@ -612,16 +612,16 @@ TQLayout *WidgetFactory::createLayout( TQWidget *widget, TQLayout *layout, Layou
 	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 QDesignerGridLayout( tqlayout );
 		break;
 	    default:
 		return 0;
@@ -653,7 +653,7 @@ TQLayout *WidgetFactory::createLayout( TQWidget *widget, TQLayout *layout, Layou
 	    }
 	}
     }
-    l->setAlignment( align );
+    l->tqsetAlignment( align );
     MetaDataBase::addEntry( TQT_TQOBJECT(l) );
     return l;
 }
@@ -673,7 +673,7 @@ void WidgetFactory::deleteLayout( TQWidget *widget )
 	widget = ((TQWidgetStack*)widget)->visibleWidget();
     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
@@ -690,7 +690,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare
 	TQPushButton *b = 0;
 	if ( init ) {
 	    b = new QDesignerPushButton( parent, name );
-	    b->setText( TQString::fromLatin1( name ) );
+	    b->setText( TQString::tqfromLatin1( name ) );
 	} else {
 	    b = new QDesignerPushButton( parent, name );
 	}
@@ -714,24 +714,24 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare
     } else if ( className == TQCHECKBOX_OBJECT_NAME_STRING ) {
 	if ( init ) {
 	    QDesignerCheckBox *cb = new QDesignerCheckBox( parent, name );
-	    cb->setText( TQString::fromLatin1( name ) );
+	    cb->setText( TQString::tqfromLatin1( name ) );
 	    return cb;
 	}
 	return new QDesignerCheckBox( parent, name );
     } else if ( className == TQRADIOBUTTON_OBJECT_NAME_STRING ) {
 	if ( init ) {
 	    QDesignerRadioButton *rb = new QDesignerRadioButton( parent, name );
-	    rb->setText( TQString::fromLatin1( name ) );
+	    rb->setText( TQString::tqfromLatin1( name ) );
 	    return rb;
 	}
 	return new QDesignerRadioButton( parent, name );
     } else if ( className == TQGROUPBOX_OBJECT_NAME_STRING ) {
 	if ( init )
-	    return new TQGroupBox( TQString::fromLatin1( name ), parent, name );
+	    return new TQGroupBox( TQString::tqfromLatin1( name ), parent, name );
 	return new TQGroupBox( parent, name );
     } else if ( className == TQBUTTONGROUP_OBJECT_NAME_STRING ) {
 	if ( init )
-	    return new TQButtonGroup( TQString::fromLatin1( name ), parent, name );
+	    return new TQButtonGroup( TQString::tqfromLatin1( name ), parent, name );
 	return new TQButtonGroup( parent, name );
     } else if ( className == TQICONVIEW_OBJECT_NAME_STRING ) {
 #if !defined(TQT_NO_ICONVIEW)
@@ -789,7 +789,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare
     else if ( className == TQLABEL_OBJECT_NAME_STRING  || className == "TextLabel" ) {
 	QDesignerLabel *l = new QDesignerLabel( parent, name );
 	if ( init ) {
-	    l->setText( TQString::fromLatin1( name ) );
+	    l->setText( TQString::tqfromLatin1( name ) );
 	    MetaDataBase::addEntry( TQT_TQOBJECT(l) );
 	    MetaDataBase::setPropertyChanged( TQT_TQOBJECT(l), "text", TRUE );
 	}
@@ -1001,14 +1001,14 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare
 
 
 
-/*!  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::layoutType( TQWidget *w, TQLayout *&tqlayout )
 {
-    layout = 0;
+    tqlayout = 0;
 
     if ( ::tqqt_cast<TQTabWidget*>(w) )
 	w = ((TQTabWidget*)w)->currentPage();
@@ -1024,9 +1024,9 @@ WidgetFactory::LayoutType WidgetFactory::layoutType( TQWidget *w, TQLayout *&lay
     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 ( ::tqqt_cast<TQGroupBox*>(w) ) {
 	TQObjectList *l = TQT_TQOBJECT(lay)->queryList( TQLAYOUT_OBJECT_NAME_STRING );
@@ -1034,7 +1034,7 @@ WidgetFactory::LayoutType WidgetFactory::layoutType( TQWidget *w, TQLayout *&lay
 	    lay = (TQLayout*)l->first();
 	delete l;
     }
-    layout = lay;
+    tqlayout = lay;
 
     if ( ::tqqt_cast<TQHBoxLayout*>(lay) )
 	return HBox;
@@ -1048,13 +1048,13 @@ WidgetFactory::LayoutType WidgetFactory::layoutType( TQWidget *w, TQLayout *&lay
 /*!
   \overload
 */
-WidgetFactory::LayoutType WidgetFactory::layoutType( TQLayout *layout )
+WidgetFactory::LayoutType WidgetFactory::layoutType( TQLayout *tqlayout )
 {
-    if ( ::tqqt_cast<TQHBoxLayout*>(layout) )
+    if ( ::tqqt_cast<TQHBoxLayout*>(tqlayout) )
 	return HBox;
-    else if ( ::tqqt_cast<TQVBoxLayout*>(layout) )
+    else if ( ::tqqt_cast<TQVBoxLayout*>(tqlayout) )
 	return VBox;
-    else if ( ::tqqt_cast<TQGridLayout*>(layout) )
+    else if ( ::tqqt_cast<TQGridLayout*>(tqlayout) )
 	return Grid;
     return NoLayout;
 }
@@ -1069,9 +1069,9 @@ WidgetFactory::LayoutType WidgetFactory::layoutType( TQWidget *w )
 }
 
 
-TQWidget *WidgetFactory::layoutParent( TQLayout *layout )
+TQWidget *WidgetFactory::layoutParent( TQLayout *tqlayout )
 {
-    TQObject *o = TQT_TQOBJECT(layout);
+    TQObject *o = TQT_TQOBJECT(tqlayout);
     while ( o ) {
 	if ( o->isWidgetType() )
 	    return (TQWidget*)o;
@@ -1080,7 +1080,7 @@ TQWidget *WidgetFactory::layoutParent( TQLayout *layout )
     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
@@ -1469,7 +1469,7 @@ bool WidgetFactory::canResetProperty( TQObject *w, const TQString &propName )
 
 bool WidgetFactory::resetProperty( TQObject *w, const TQString &propName )
 {
-    const TQMetaProperty *p = w->metaObject()->property( w->metaObject()->
+    const TQMetaProperty *p = w->tqmetaObject()->property( w->tqmetaObject()->
 							findProperty( propName, TRUE ), TRUE );
     if (!p )
 	return FALSE;
@@ -1479,10 +1479,10 @@ 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" ) {
@@ -1496,10 +1496,10 @@ TQVariant WidgetFactory::defaultValue( TQObject *w, const TQString &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()->findProperty( 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";
@@ -1536,8 +1536,8 @@ TQWidget *WidgetFactory::createCustomWidget( TQWidget *parent, const char *name,
 
 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()->findProperty( name, TRUE );
+    const TQMetaProperty* p = w->tqmetaObject()->property( id, TRUE );
     if ( !p || !p->isValid() )
 	return MetaDataBase::fakeProperty( w, name );
     return w->property( name );
@@ -1549,7 +1549,7 @@ void QDesignerLabel::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;
@@ -1601,13 +1601,13 @@ bool TQLayoutWidget::event( TQEvent *e )
 
 /*
   This function must be called on TQLayoutWidget creation and whenever
-  the TQLayoutWidget's parent layout changes (e.g., from a TQHBoxLayout
+  the TQLayoutWidget's parent tqlayout changes (e.g., from a TQHBoxLayout
   to a TQVBoxLayout), because of the (illogical) way layouting works.
 */
 void TQLayoutWidget::updateSizePolicy()
 {
     if ( childrenListObject().isEmpty() || childrenListObject().count() == 0 ) {
-	sp = TQWidget::sizePolicy();
+	sp = TQWidget::tqsizePolicy();
 	return;
     }
 
@@ -1624,14 +1624,14 @@ void TQLayoutWidget::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
+	  parentLayout is set to the parent tqlayout if there is one and if it is
 	  top level, in which case layouting is illogical.
 	*/
 	TQLayout *parentLayout = 0;
 	if ( parent() && parent()->isWidgetType() ) {
-	    parentLayout = ((TQWidget *)parent())->layout();
+	    parentLayout = ((TQWidget *)parent())->tqlayout();
 	    if ( parentLayout &&
 		 ::tqqt_cast<TQLayoutWidget*>(parentLayout->mainWidget()) )
 		parentLayout = 0;
@@ -1640,7 +1640,7 @@ void TQLayoutWidget::updateSizePolicy()
 	TQObjectListIt it( childrenListObject() );
 	TQObject *o;
 
-	if ( ::tqqt_cast<TQVBoxLayout*>(layout()) ) {
+	if ( ::tqqt_cast<TQVBoxLayout*>(tqlayout()) ) {
 	    if ( ::tqqt_cast<TQHBoxLayout*>(parentLayout) )
 		vt = TQSizePolicy::Minimum;
 	    else
@@ -1652,16 +1652,16 @@ void TQLayoutWidget::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 ( ::tqqt_cast<TQHBoxLayout*>(layout()) ) {
+	} else if ( ::tqqt_cast<TQHBoxLayout*>(tqlayout()) ) {
 	    if ( ::tqqt_cast<TQVBoxLayout*>(parentLayout) )
 		ht = TQSizePolicy::Minimum;
 	    else
@@ -1673,16 +1673,16 @@ void TQLayoutWidget::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 ( ::tqqt_cast<TQGridLayout*>(layout()) ) {
+	} else if ( ::tqqt_cast<TQGridLayout*>(tqlayout()) ) {
 	    ht = TQSizePolicy::Fixed;
 	    vt = TQSizePolicy::Fixed;
 	    if ( parentLayout ) {
@@ -1698,30 +1698,30 @@ void TQLayoutWidget::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;
 	    }
 	}
 #ifdef USE_QT4
-	if ( layout()->expanding() & TQSizePolicy::Horizontally )
+	if ( tqlayout()->expandingDirections() & TQSizePolicy::Horizontally )
 #else // USE_QT4
-	if ( layout()->expanding() & TQSizePolicy::Horizontally )
+	if ( tqlayout()->expanding() & TQSizePolicy::Horizontally )
 #endif // USE_QT4
 	    ht = TQSizePolicy::Expanding;
 #ifdef USE_QT4
-	if ( layout()->expanding() & TQSizePolicy::Vertically )
+	if ( tqlayout()->expandingDirections() & TQSizePolicy::Vertically )
 #else // USE_QT4
-	if ( layout()->expanding() & TQSizePolicy::Vertically )
+	if ( tqlayout()->expanding() & TQSizePolicy::Vertically )
 #endif // USE_QT4
 	    vt = TQSizePolicy::Expanding;
 
-	layout()->invalidate();
+	tqlayout()->tqinvalidate();
     }
 
     sp = TQSizePolicy( (TQSizePolicy::SizeType) ht, (TQSizePolicy::SizeType) vt );
@@ -1734,8 +1734,8 @@ void CustomWidget::paintEvent( TQPaintEvent *e )
 	( (FormWindow*)parentWidget() )->paintGrid( this, e );
     } else {
 	TQPainter p( this );
-	p.fillRect( rect(), colorGroup().dark() );
-	p.setPen( colorGroup().light() );
+	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,
diff --git a/kdevdesigner/designer/widgetfactory.h b/kdevdesigner/designer/widgetfactory.h
index 80c43f8f..1bb1f1f3 100644
--- a/kdevdesigner/designer/widgetfactory.h
+++ b/kdevdesigner/designer/widgetfactory.h
@@ -78,13 +78,13 @@ public:
 
     static TQWidget *create( int id, TQWidget *parent, 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 layoutType( TQWidget *w, TQLayout *&tqlayout );
+    static LayoutType layoutType( TQLayout *tqlayout );
+    static TQWidget *layoutParent( TQLayout *tqlayout );
 
     static TQWidget* containerOfWidget( TQWidget *w );
     static TQWidget* widgetOfContainer( TQWidget *w );
@@ -264,16 +264,16 @@ public:
     CustomWidget( TQWidget *parent, const char *name, MetaDataBase::CustomWidget *cw )
 	: TQWidget( parent, name ), cusw( cw ) {
 	    alwaysExpand = parentWidget() && parentWidget()->inherits( "FormWindow" );
-	    setSizePolicy( cw->sizePolicy );
+	    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; }
diff --git a/kdevdesigner/designer/wizardeditor.ui b/kdevdesigner/designer/wizardeditor.ui
index 84302d09..028a1341 100644
--- a/kdevdesigner/designer/wizardeditor.ui
+++ b/kdevdesigner/designer/wizardeditor.ui
@@ -133,7 +133,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
@@ -201,7 +201,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/wizardeditorimpl.cpp b/kdevdesigner/designer/wizardeditorimpl.cpp
index 5933793e..850cafef 100644
--- a/kdevdesigner/designer/wizardeditorimpl.cpp
+++ b/kdevdesigner/designer/wizardeditorimpl.cpp
@@ -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
@@ -217,7 +217,7 @@ void WizardEditor::itemSelected( int index )
     if ( index < 0 ) return;
     // 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/workspace.cpp b/kdevdesigner/designer/workspace.cpp
index 9e948107..5f92b691 100644
--- a/kdevdesigner/designer/workspace.cpp
+++ b/kdevdesigner/designer/workspace.cpp
@@ -48,7 +48,7 @@
 #include <tqobjectlist.h>
 #include <tqworkspace.h>
 #include <tqpopupmenu.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include "qcompletionedit.h"
 
 #include <klocale.h>
@@ -121,8 +121,8 @@ void WorkspaceItem::paintCell( TQPainter *p, const TQColorGroup &cg, int column,
 	 ( !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) );
+	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, TQt::black );
     }
@@ -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();
     }
 }
 
diff --git a/kdevdesigner/plugins/languageinterfaceimpl.cpp b/kdevdesigner/plugins/languageinterfaceimpl.cpp
index 2e4f9f20..d761a9e7 100644
--- a/kdevdesigner/plugins/languageinterfaceimpl.cpp
+++ b/kdevdesigner/plugins/languageinterfaceimpl.cpp
@@ -231,7 +231,7 @@ void LanguageInterfaceImpl::preferedExtensions( TQMap<TQString, TQString> &exten
 TQStrList LanguageInterfaceImpl::signalNames( TQObject *obj ) const
 {
     TQStrList sigs;
-    sigs = obj->metaObject()->signalNames( TRUE );
+    sigs = obj->tqmetaObject()->signalNames( TRUE );
     sigs.remove( "destroyed()" );
     return sigs;
 }
diff --git a/kdevdesigner/shared/parser.cpp b/kdevdesigner/shared/parser.cpp
index 1fb2c5a7..1ba246bd 100644
--- a/kdevdesigner/shared/parser.cpp
+++ b/kdevdesigner/shared/parser.cpp
@@ -68,5 +68,5 @@ TQString Parser::cleanArgs( const TQString &func )
     }	
     res += ")";
 
-    return TQString::fromLatin1( NormalizeObject::normalizeSignalSlot( res.latin1() ) );
+    return TQString::tqfromLatin1( NormalizeObject::normalizeSignalSlot( res.latin1() ) );
 }
diff --git a/kdevdesigner/shared/ui2uib.cpp b/kdevdesigner/shared/ui2uib.cpp
index 5cff46e0..d4645eaa 100644
--- a/kdevdesigner/shared/ui2uib.cpp
+++ b/kdevdesigner/shared/ui2uib.cpp
@@ -470,11 +470,11 @@ static void outputLayoutWidgetsSubLayout( TQMap<int, TQStringList>& buddies,
 
     if ( subLayoutNo != -1 ) {
 	/*
-	  Remove the sub-layout's Object_End marker, append the grid
+	  Remove the sub-tqlayout's Object_End marker, append the grid
 	  cell and the correct name property, and put the Object_End
 	  marker back.
 	*/
-	out.device()->at( out.device()->at() - 1 );
+	out.tqdevice()->at( out.tqdevice()->at() - 1 );
 	outputGridCell( out, elem );
 	outputProperty( buddies, subLayoutNo, strings, out, nameElem );
 	out << (TQ_UINT8) Object_End;
diff --git a/kdevdesigner/shared/uib.cpp b/kdevdesigner/shared/uib.cpp
index 7072626a..443df331 100644
--- a/kdevdesigner/shared/uib.cpp
+++ b/kdevdesigner/shared/uib.cpp
@@ -31,8 +31,8 @@ static const char commonStrings[] =
     "TQComboBox\0TQDialog\0TQFrame\0TQGridLayout\0TQGroupBox\0TQHBoxLayout\0TQLabel\0"
     "TQLineEdit\0TQListView\0TQPushButton\0TQRadioButton\0TQVBoxLayout\0TQWidget\0"
     "TextLabel1\0XPM.GZ\0accept\0autoDefault\0buddy\0caption\0clicked\0"
-    "default\0destroy\0frameShadow\0frameShape\0geometry\0init\0margin\0"
-    "maximumSize\0minimumSize\0name\0reject\0sizePolicy\0spacing\0text\0title\0"
+    "default\0destroy\0frameShadow\0frameShape\0tqgeometry\0init\0margin\0"
+    "tqmaximumSize\0tqminimumSize\0name\0reject\0sizePolicy\0spacing\0text\0title\0"
     "toolTip\0unnamed\0whatsThis";
 
 UibStrTable::UibStrTable()
diff --git a/kdevdesigner/shared/uib.h b/kdevdesigner/shared/uib.h
index e6a6b05f..9f2090f7 100644
--- a/kdevdesigner/shared/uib.h
+++ b/kdevdesigner/shared/uib.h
@@ -128,7 +128,7 @@ inline TQString UibStrTable::asString( int offset ) const
 {
     if ( table[offset] == 0x7f ) {
 	TQDataStream in( table, IO_ReadOnly );
-	in.device()->at( offset + 1 );
+	in.tqdevice()->at( offset + 1 );
 	TQString str;
 	in >> str;
 	return str;
diff --git a/kdevdesigner/shared/widgetdatabase.cpp b/kdevdesigner/shared/widgetdatabase.cpp
index a37f5260..80e8c131 100644
--- a/kdevdesigner/shared/widgetdatabase.cpp
+++ b/kdevdesigner/shared/widgetdatabase.cpp
@@ -38,7 +38,7 @@
 #include <tqstrlist.h>
 #include <tqdict.h>
 #include <tqfile.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqcleanuphandler.h>
 #include <tqfeatures.h>
 
@@ -735,7 +735,7 @@ bool WidgetDatabase::isForm( int id )
     return r->isForm;
 }
 
-/*!  Returns whether the widget registered as \a id can have children.
+/*!  Returns whether the widget registered as \a id can have tqchildren.
 */
 
 bool WidgetDatabase::isContainer( int id )
diff --git a/kdevdesigner/uilib/qwidgetfactory.cpp b/kdevdesigner/uilib/qwidgetfactory.cpp
index 3dc55c01..c61584a7 100644
--- a/kdevdesigner/uilib/qwidgetfactory.cpp
+++ b/kdevdesigner/uilib/qwidgetfactory.cpp
@@ -33,7 +33,7 @@
 #include "database2.h"
 #include <tqdom.h>
 #include <tqdir.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqmetaobject.h>
 #include <domtool.h>
 #include <uib.h>
@@ -76,14 +76,14 @@
 #include <tqwizard.h>
 #include <tqlcdnumber.h>
 #include <tqprogressbar.h>
-#include <textview.h>
-#include <textbrowser.h>
+#include <tqtextview.h>
+#include <tqtextbrowser.h>
 #include <tqdial.h>
 #include <tqslider.h>
 #include <tqframe.h>
 #include <tqwidgetstack.h>
 #include <tqtoolbox.h>
-#include <textedit.h>
+#include <tqtextedit.h>
 #include <tqscrollbar.h>
 #include <tqmainwindow.h>
 #include <tqsplitter.h>
@@ -682,7 +682,7 @@ void TQWidgetFactory::inputSpacer( const UibStrTable& strings, TQDataStream& in,
 
 	    if ( name == "orientation" ) {
 		vertical = ( value == "Vertical" );
-	    } else if ( name == "sizeHint" ) {
+	    } else if ( name == "tqsizeHint" ) {
 		w = value.toSize().width();
 		h = value.toSize().height();
 	    } else if ( name == "sizeType" ) {
@@ -907,7 +907,7 @@ TQObject *TQWidgetFactory::inputObject( TQObject **objects, int& numObjects,
 {
     TQObject *obj = 0;
     TQWidget *widget = 0;
-    TQLayout *layout = 0;
+    TQLayout *tqlayout = 0;
     TQWidget *parentWidget = 0;
     TQLayout *parentLayout = 0;
 
@@ -942,11 +942,11 @@ TQObject *TQWidgetFactory::inputObject( TQObject **objects, int& numObjects,
 		type = VBox;
 	    }
 	    if ( parentLayout != 0 && parentLayout->inherits(TQGRIDLAYOUT_OBJECT_NAME_STRING) ) {
-		layout = createLayout( 0, 0, type );
+		tqlayout = createLayout( 0, 0, type );
 	    } else {
-		layout = createLayout( parentWidget, parentLayout, type );
+		tqlayout = createLayout( parentWidget, parentLayout, type );
 	    }
-	    obj = TQT_TQOBJECT(layout);
+	    obj = TQT_TQOBJECT(tqlayout);
 	} else if ( className == TQMENUBAR_OBJECT_NAME_STRING ) {
 	    unpackCString( strings, in, className );
 	    widget = ((TQMainWindow *) parent)->menuBar();
@@ -1047,7 +1047,7 @@ TQObject *TQWidgetFactory::inputObject( TQObject **objects, int& numObjects,
 	case Object_PaletteProperty:
 	    {
 		TQPalette palette;
-		TQColorGroup colorGroup;
+		TQColorGroup tqcolorGroup;
 		TQColor color;
 		int role = -1;
 
@@ -1057,26 +1057,26 @@ TQObject *TQWidgetFactory::inputObject( TQObject **objects, int& numObjects,
 		while ( !in.atEnd() && paletteTag != Palette_End ) {
 		    switch ( paletteTag ) {
 		    case Palette_Active:
-			palette.setActive( colorGroup );
+			palette.setActive( tqcolorGroup );
 			role = -1;
 			break;
 		    case Palette_Inactive:
-			palette.setInactive( colorGroup );
+			palette.setInactive( tqcolorGroup );
 			role = -1;
 			break;
 		    case Palette_Disabled:
-			palette.setDisabled( colorGroup );
+			palette.setDisabled( tqcolorGroup );
 			role = -1;
 			break;
 		    case Palette_Color:
 			role++;
 			in >> color;
-			colorGroup.setColor( (TQColorGroup::ColorRole) role,
+			tqcolorGroup.setColor( (TQColorGroup::ColorRole) role,
 					     color );
 			break;
 		    case Palette_Pixmap:
 			unpackVariant( strings, in, value );
-			colorGroup.setBrush( (TQColorGroup::ColorRole) role,
+			tqcolorGroup.setBrush( (TQColorGroup::ColorRole) role,
 					     TQBrush(color, value.asPixmap()) );
 			break;
 		    default:
@@ -1092,7 +1092,7 @@ TQObject *TQWidgetFactory::inputObject( TQObject **objects, int& numObjects,
 	    inputColumnOrRow( strings, in, obj, TRUE );
 	    break;
 	case Object_Spacer:
-	    inputSpacer( strings, in, layout );
+	    inputSpacer( strings, in, tqlayout );
 	    break;
 	case Object_Separator:
 	    ((TQToolBar *) widget)->addSeparator();
@@ -1160,10 +1160,10 @@ TQObject *TQWidgetFactory::inputObject( TQObject **objects, int& numObjects,
 	    } else {
 		((TQBoxLayout *) parentLayout)->addWidget( widget );
 	    }
-	} else if ( layout != 0 ) {
+	} else if ( tqlayout != 0 ) {
 	    if ( parentLayout->inherits(TQGRIDLAYOUT_OBJECT_NAME_STRING) ) {
 		((TQGridLayout *) parentLayout)->addMultiCellLayout(
-			layout, row, row + rowspan - 1, column,
+			tqlayout, row, row + rowspan - 1, column,
 			column + colspan - 1 );
 	    }
 	}
@@ -1175,7 +1175,7 @@ TQWidget *TQWidgetFactory::createFromUibFile( TQDataStream& in,
 	TQObject * /* connector */ , TQWidget *parent, const char *name )
 {
 #define END_OF_BLOCK() \
-	( in.atEnd() || in.device()->at() >= nextBlock )
+	( in.atEnd() || in.tqdevice()->at() >= nextBlock )
 
     TQ_UINT8 lf;
     TQ_UINT8 cr;
@@ -1204,7 +1204,7 @@ TQWidget *TQWidgetFactory::createFromUibFile( TQDataStream& in,
     in >> blockType;
     while ( !in.atEnd() && blockType != Block_End ) {
 	unpackUInt32( in, blockSize );
-	TQIODevice::Offset nextBlock = in.device()->at() + blockSize;
+	TQIODevice::Offset nextBlock = in.tqdevice()->at() + blockSize;
 
 	switch ( blockType ) {
 	case Block_Actions:
@@ -1258,7 +1258,7 @@ TQWidget *TQWidgetFactory::createFromUibFile( TQDataStream& in,
 	case Block_Functions:
 	    // ###
 	    qWarning( "Block_Functions not supported" );
-	    in.device()->at( nextBlock );
+	    in.tqdevice()->at( nextBlock );
 	    break;
 	case Block_Images:
 	    {
@@ -1340,7 +1340,7 @@ TQWidget *TQWidgetFactory::createFromUibFile( TQDataStream& in,
 	case Block_Variables:
 	    // ###
 	    qWarning( "Block_Variables not supported" );
-	    in.device()->at( nextBlock );
+	    in.tqdevice()->at( nextBlock );
 	    break;
 	case Block_Widget:
 	    toplevel = (TQWidget *)
@@ -1568,7 +1568,7 @@ bool TQWidgetFactory::supportsWidget( const TQString &widget )
 }
 
 TQWidget *TQWidgetFactory::createWidgetInternal( const TQDomElement &e, TQWidget *parent,
-					       TQLayout* layout, const TQString &classNameArg )
+					       TQLayout* tqlayout, const TQString &classNameArg )
 {
     d->lastItem = 0;
     TQDomElement n = e.firstChild().toElement();
@@ -1589,12 +1589,12 @@ TQWidget *TQWidgetFactory::createWidgetInternal( const TQDomElement &e, TQWidget
     bool isTQLayoutWidget = FALSE;
 
     if ( !className.isEmpty() ) {
-	if ( !layout && className  == TQLAYOUTWIDGET_OBJECT_NAME_STRING ) {
+	if ( !tqlayout && className  == TQLAYOUTWIDGET_OBJECT_NAME_STRING ) {
 	    className = TQWIDGET_OBJECT_NAME_STRING;
 	    isTQLayoutWidget = TRUE;
 	}
-	if ( layout && className == TQLAYOUTWIDGET_OBJECT_NAME_STRING ) {
-	    // hide layout widgets
+	if ( tqlayout && className == TQLAYOUTWIDGET_OBJECT_NAME_STRING ) {
+	    // hide tqlayout widgets
 	    w = parent;
 	} else {
 	    obj = TQT_TQOBJECT(TQWidgetFactory::createWidget( className, parent, 0 ));
@@ -1605,16 +1605,16 @@ TQWidget *TQWidgetFactory::createWidgetInternal( const TQDomElement &e, TQWidget
 		toplevel = w;
 	    if ( w->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) )
 		w = ( (TQMainWindow*)w )->centralWidget();
-	    if ( layout ) {
-		switch( layoutType( layout ) ) {
+	    if ( tqlayout ) {
+		switch( layoutType( tqlayout ) ) {
 		case HBox:
-		    ( (TQHBoxLayout*)layout )->addWidget( w );
+		    ( (TQHBoxLayout*)tqlayout )->addWidget( w );
 		    break;
 		case VBox:
-		    ( (TQVBoxLayout*)layout )->addWidget( w );
+		    ( (TQVBoxLayout*)tqlayout )->addWidget( w );
 		    break;
 		case Grid:
-		    ( (TQGridLayout*)layout )->addMultiCellWidget( w, row, row + rowspan - 1,
+		    ( (TQGridLayout*)tqlayout )->addMultiCellWidget( w, row, row + rowspan - 1,
 								  col, col + colspan - 1 );
 		    break;
 		default:
@@ -1622,7 +1622,7 @@ TQWidget *TQWidgetFactory::createWidgetInternal( const TQDomElement &e, TQWidget
 		}
 	    }
 
-	    layout = 0;
+	    tqlayout = 0;
 	}
     }
 #ifdef TQT_CONTAINER_CUSTOM_WIDGETS
@@ -1636,45 +1636,45 @@ TQWidget *TQWidgetFactory::createWidgetInternal( const TQDomElement &e, TQWidget
     int idx = 0;
     while ( !n.isNull() ) {
 	if ( n.tagName() == "spacer" ) {
-	    createSpacer( n, layout );
+	    createSpacer( n, tqlayout );
 	} else if ( n.tagName() == "widget" ) {
 	    TQMap< TQString, TQString> *oldDbControls = dbControls;
-	    createWidgetInternal( n, w, layout, n.attribute( "class", TQWIDGET_OBJECT_NAME_STRING ) );
+	    createWidgetInternal( n, w, tqlayout, n.attribute( "class", TQWIDGET_OBJECT_NAME_STRING ) );
 	    dbControls = oldDbControls;
 	} else if ( n.tagName() == "hbox" ) {
-	    TQLayout *parentLayout = layout;
-	    if ( layout && layout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) )
-		layout = createLayout( 0, 0, TQWidgetFactory::HBox, isTQLayoutWidget );
+	    TQLayout *parentLayout = tqlayout;
+	    if ( tqlayout && tqlayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) )
+		tqlayout = createLayout( 0, 0, TQWidgetFactory::HBox, isTQLayoutWidget );
 	    else
-		layout = createLayout( w, layout, TQWidgetFactory::HBox, isTQLayoutWidget );
-	    obj = TQT_TQOBJECT(layout);
+		tqlayout = createLayout( w, tqlayout, TQWidgetFactory::HBox, isTQLayoutWidget );
+	    obj = TQT_TQOBJECT(tqlayout);
 	    n = n.firstChild().toElement();
 	    if ( parentLayout && parentLayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) )
-		( (TQGridLayout*)parentLayout )->addMultiCellLayout( layout, row,
+		( (TQGridLayout*)parentLayout )->addMultiCellLayout( tqlayout, row,
 				    row + rowspan - 1, col, col + colspan - 1 );
 	    continue;
 	} else if ( n.tagName() == "grid" ) {
-	    TQLayout *parentLayout = layout;
-	    if ( layout && layout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) )
-		layout = createLayout( 0, 0, TQWidgetFactory::Grid, isTQLayoutWidget );
+	    TQLayout *parentLayout = tqlayout;
+	    if ( tqlayout && tqlayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) )
+		tqlayout = createLayout( 0, 0, TQWidgetFactory::Grid, isTQLayoutWidget );
 	    else
-		layout = createLayout( w, layout, TQWidgetFactory::Grid, isTQLayoutWidget );
-	    obj = TQT_TQOBJECT(layout);
+		tqlayout = createLayout( w, tqlayout, TQWidgetFactory::Grid, isTQLayoutWidget );
+	    obj = TQT_TQOBJECT(tqlayout);
 	    n = n.firstChild().toElement();
 	    if ( parentLayout && parentLayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) )
-		( (TQGridLayout*)parentLayout )->addMultiCellLayout( layout, row,
+		( (TQGridLayout*)parentLayout )->addMultiCellLayout( tqlayout, row,
 				    row + rowspan - 1, col, col + colspan - 1 );
 	    continue;
 	} else if ( n.tagName() == "vbox" ) {
-	    TQLayout *parentLayout = layout;
-	    if ( layout && layout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) )
-		layout = createLayout( 0, 0, TQWidgetFactory::VBox, isTQLayoutWidget );
+	    TQLayout *parentLayout = tqlayout;
+	    if ( tqlayout && tqlayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) )
+		tqlayout = createLayout( 0, 0, TQWidgetFactory::VBox, isTQLayoutWidget );
 	    else
-		layout = createLayout( w, layout, TQWidgetFactory::VBox, isTQLayoutWidget );
-	    obj = TQT_TQOBJECT(layout);
+		tqlayout = createLayout( w, tqlayout, TQWidgetFactory::VBox, isTQLayoutWidget );
+	    obj = TQT_TQOBJECT(tqlayout);
 	    n = n.firstChild().toElement();
 	    if ( parentLayout && parentLayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) )
-		( (TQGridLayout*)parentLayout )->addMultiCellLayout( layout, row,
+		( (TQGridLayout*)parentLayout )->addMultiCellLayout( tqlayout, row,
 				    row + rowspan - 1, col, col + colspan - 1 );
 	    continue;
 	} else if ( n.tagName() == "property" && obj ) {
@@ -1728,47 +1728,47 @@ TQWidget *TQWidgetFactory::createWidgetInternal( const TQDomElement &e, TQWidget
     return w;
 }
 
-TQLayout *TQWidgetFactory::createLayout( TQWidget *widget, TQLayout* layout,
+TQLayout *TQWidgetFactory::createLayout( TQWidget *widget, TQLayout* tqlayout,
 				       LayoutType type, bool isTQLayoutWidget )
 {
     int spacing = defSpacing;
     int margin = defMargin;
 
-    if ( layout || !widget || isTQLayoutWidget )
+    if ( tqlayout || !widget || isTQLayoutWidget )
 	margin = 0;
 
-    if ( !layout && widget && widget->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) )
+    if ( !tqlayout && widget && widget->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) )
 	widget = ((TQTabWidget*)widget)->currentPage();
 
-    if ( !layout && widget && widget->inherits( TQWIZARD_OBJECT_NAME_STRING ) )
+    if ( !tqlayout && widget && widget->inherits( TQWIZARD_OBJECT_NAME_STRING ) )
 	widget = ((TQWizard*)widget)->currentPage();
 
-    if ( !layout && widget && widget->inherits( TQWIDGETSTACK_OBJECT_NAME_STRING ) )
+    if ( !tqlayout && widget && widget->inherits( TQWIDGETSTACK_OBJECT_NAME_STRING ) )
 	widget = ((TQWidgetStack*)widget)->visibleWidget();
 
-    if ( !layout && widget && widget->inherits( TQTOOLBOX_OBJECT_NAME_STRING ) )
+    if ( !tqlayout && widget && widget->inherits( TQTOOLBOX_OBJECT_NAME_STRING ) )
 	widget = ((TQToolBox*)widget)->currentItem();
 
     TQLayout *l = 0;
     int align = 0;
-    if ( !layout && widget && widget->inherits( TQGROUPBOX_OBJECT_NAME_STRING ) ) {
+    if ( !tqlayout && widget && widget->inherits( TQGROUPBOX_OBJECT_NAME_STRING ) ) {
 	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 );
 	align = TQt::AlignTop;
     }
-    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 TQGridLayout( layout );
+	    l = new TQGridLayout( tqlayout );
 	    break;
 	default:
 	    return 0;
@@ -1788,19 +1788,19 @@ TQLayout *TQWidgetFactory::createLayout( TQWidget *widget, TQLayout* layout,
 	    return 0;
 	}
     }
-    l->setAlignment( align );
+    l->tqsetAlignment( align );
     l->setMargin( margin );
     l->setSpacing( spacing );
     return l;
 }
 
-TQWidgetFactory::LayoutType TQWidgetFactory::layoutType( TQLayout *layout ) const
+TQWidgetFactory::LayoutType TQWidgetFactory::layoutType( TQLayout *tqlayout ) const
 {
-    if ( layout->inherits( TQHBOXLAYOUT_OBJECT_NAME_STRING ) )
+    if ( tqlayout->inherits( TQHBOXLAYOUT_OBJECT_NAME_STRING ) )
 	return HBox;
-    else if ( layout->inherits( TQVBOXLAYOUT_OBJECT_NAME_STRING ) )
+    else if ( tqlayout->inherits( TQVBOXLAYOUT_OBJECT_NAME_STRING ) )
 	return VBox;
-    else if ( layout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) )
+    else if ( tqlayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) )
 	return Grid;
     return NoLayout;
 }
@@ -1808,7 +1808,7 @@ TQWidgetFactory::LayoutType TQWidgetFactory::layoutType( TQLayout *layout ) cons
 void TQWidgetFactory::setProperty( TQObject* obj, const TQString &prop,
 				  TQVariant value )
 {
-    int offset = obj->metaObject()->findProperty( prop.ascii(), TRUE );
+    int offset = obj->tqmetaObject()->findProperty( prop.ascii(), TRUE );
 
     if ( offset != -1 ) {
 	if ( prop == "geometry" && TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(toplevel) ) {
@@ -1819,7 +1819,7 @@ void TQWidgetFactory::setProperty( TQObject* obj, const TQString &prop,
 	    if ( value.type() == TQVariant::String ||
 		 value.type() == TQVariant::CString ) {
 		const TQMetaProperty *metaProp =
-			obj->metaObject()->property( offset, TRUE );
+			obj->tqmetaObject()->property( offset, TRUE );
 		if ( metaProp != 0 && metaProp->isEnumType() ) {
 		    if ( metaProp->isSetType() ) {
 			TQStrList flagsCStr;
@@ -1917,7 +1917,7 @@ void TQWidgetFactory::setProperty( TQObject* widget, const TQString &prop, const
     setProperty( widget, prop, value );
 }
 
-void TQWidgetFactory::createSpacer( const TQDomElement &e, TQLayout *layout )
+void TQWidgetFactory::createSpacer( const TQDomElement &e, TQLayout *tqlayout )
 {
     TQDomElement n = e.firstChild().toElement();
     int row = e.attribute( "row" ).toInt();
@@ -1938,7 +1938,7 @@ void TQWidgetFactory::createSpacer( const TQDomElement &e, TQLayout *layout )
 		    orient = Qt::Vertical;
 	    } else if ( prop == "sizeType" ) {
 		sizeType = stringToSizeType( n.firstChild().firstChild().toText().data() );
-	    } else if ( prop == "sizeHint" ) {
+	    } else if ( prop == "tqsizeHint" ) {
 		w = n.firstChild().firstChild().firstChild().toText().data().toInt();
 		h = n.firstChild().firstChild().nextSibling().firstChild().toText().data().toInt();
 	    }
@@ -1952,11 +1952,11 @@ void TQWidgetFactory::createSpacer( const TQDomElement &e, TQLayout *layout )
 	colspan = 1;
     TQSpacerItem *item = new TQSpacerItem( w, h, orient == Qt::Horizontal ? sizeType : TQSizePolicy::Minimum,
 					 orient == Qt::Vertical ? sizeType : TQSizePolicy::Minimum );
-    if ( layout ) {
-	if ( layout->inherits( TQBOXLAYOUT_OBJECT_NAME_STRING ) )
-	    ( (TQBoxLayout*)layout )->addItem( item );
+    if ( tqlayout ) {
+	if ( tqlayout->inherits( TQBOXLAYOUT_OBJECT_NAME_STRING ) )
+	    ( (TQBoxLayout*)tqlayout )->addItem( item );
 	else
-	    ( (TQGridLayout*)layout )->addMultiCell( item, row, row + rowspan - 1, col, col + colspan - 1,
+	    ( (TQGridLayout*)tqlayout )->addMultiCell( item, row, row + rowspan - 1, col, col + colspan - 1,
 						    orient == Qt::Horizontal ? TQt::AlignVCenter : TQt::AlignHCenter );
     }
 }
@@ -2140,16 +2140,16 @@ void TQWidgetFactory::loadConnections( const TQDomElement &e, TQObject *connecto
 	    }
 
 	    TQString s = "2""%1";
-	    s = s.arg( conn.signal.data() );
+	    s = s.tqarg( conn.signal.data() );
 	    TQString s2 = "1""%1";
-	    s2 = s2.arg( conn.slot.data() );
+	    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 );
 
 	    // if this is a connection to a custom slot and we have a connector, try this as receiver
 	    if ( slotList.find( conn.slot ) == -1 && (TQT_BASE_OBJECT(receiver) == TQT_BASE_OBJECT(toplevel)) && connector ) {
-		slotList = connector->metaObject()->slotNames( TRUE );
+		slotList = connector->tqmetaObject()->slotNames( TRUE );
 		receiver = connector;
 	    }
 
diff --git a/kdevdesigner/uilib/qwidgetfactory.h b/kdevdesigner/uilib/qwidgetfactory.h
index 8f2b1427..c6770341 100644
--- a/kdevdesigner/uilib/qwidgetfactory.h
+++ b/kdevdesigner/uilib/qwidgetfactory.h
@@ -66,12 +66,12 @@ private:
     void loadImageCollection( const TQDomElement &e );
     void loadConnections( const TQDomElement &e, TQObject *connector );
     void loadTabOrder( const TQDomElement &e );
-    TQWidget *createWidgetInternal( const TQDomElement &e, TQWidget *parent, TQLayout* layout, const TQString &classNameArg );
-    TQLayout *createLayout( TQWidget *widget, TQLayout*  layout, LayoutType type, bool isTQLayoutWidget = FALSE );
+    TQWidget *createWidgetInternal( const TQDomElement &e, TQWidget *parent, TQLayout* tqlayout, const TQString &classNameArg );
+    TQLayout *createLayout( TQWidget *widget, TQLayout*  tqlayout, LayoutType type, bool isTQLayoutWidget = FALSE );
     LayoutType layoutType( TQLayout *l ) const;
     void setProperty( TQObject* widget, const TQString &prop, TQVariant value );
     void setProperty( TQObject* widget, const TQString &prop, const TQDomElement &e );
-    void createSpacer( const TQDomElement &e, TQLayout *layout );
+    void createSpacer( const TQDomElement &e, TQLayout *tqlayout );
     TQImage loadFromCollection( const TQString &name );
     TQPixmap loadPixmap( const TQString &name );
     TQPixmap loadPixmap( const TQDomElement &e );