From 929d7ae4f69d62b8f1f6d3506adf75f017753935 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Sat, 9 Jul 2011 02:23:29 +0000
Subject: Remove the tq in front of these incorrectly TQt4-converted
 methods/data members: tqrepaint[...] tqinvalidate[...] tqparent[...]
 tqmask[...] tqlayout[...] tqalignment[...]

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdewebdev@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 kommander/editor/actiondnd.cpp                     |  20 +--
 kommander/editor/actioneditor.ui                   |   4 +-
 kommander/editor/assoctexteditor.ui                |   2 +-
 kommander/editor/choosewidget.ui                   |   2 +-
 kommander/editor/command.cpp                       |  50 ++++----
 kommander/editor/command.h                         |  12 +-
 kommander/editor/connectioneditor.ui               |   2 +-
 kommander/editor/formsettings.ui                   |   2 +-
 kommander/editor/formsettingsimpl.cpp              |   4 +-
 kommander/editor/formwindow.cpp                    | 114 ++++++++---------
 kommander/editor/formwindow.h                      |  20 +--
 kommander/editor/functions.ui                      |   2 +-
 kommander/editor/hierarchyview.cpp                 |   2 +-
 kommander/editor/kommander-new.xml                 |   6 +-
 kommander/editor/kommander.xml                     |   8 +-
 kommander/editor/layout.cpp                        | 142 ++++++++++-----------
 kommander/editor/layout.h                          |   4 +-
 kommander/editor/listeditor.ui                     |   2 +-
 kommander/editor/mainwindow.cpp                    |  54 ++++----
 kommander/editor/mainwindow.h                      |   4 +-
 kommander/editor/mainwindowactions.cpp             |  80 ++++++------
 kommander/editor/metadatabase.cpp                  |   4 +-
 kommander/editor/newform.ui                        |   2 +-
 kommander/editor/orderindicator.cpp                |   2 +-
 kommander/editor/paletteeditor.ui                  |   2 +-
 kommander/editor/paletteeditoradvanced.ui          |   4 +-
 kommander/editor/pics/images.h                     |  48 +++----
 kommander/editor/pixmapfunction.ui                 |   4 +-
 kommander/editor/propertyeditor.cpp                |  44 +++----
 kommander/editor/resource.cpp                      |  48 +++----
 kommander/editor/sizehandle.cpp                    |  12 +-
 kommander/editor/styledbutton.cpp                  |   2 +-
 kommander/editor/templates/Configuration_Dialog.ui |   2 +-
 .../templates/Dialog_with_Buttons_(Bottom).ui      |   2 +-
 .../templates/Dialog_with_Buttons_(Right).ui       |   2 +-
 kommander/editor/templates/Tab_Dialog.ui           |   2 +-
 kommander/editor/widgetdatabase.cpp                |   4 +-
 kommander/editor/widgetfactory.cpp                 |  66 +++++-----
 kommander/editor/widgetfactory.h                   |  50 ++++----
 kommander/editor/wizardeditor.ui                   |   2 +-
 40 files changed, 419 insertions(+), 419 deletions(-)

(limited to 'kommander/editor')

diff --git a/kommander/editor/actiondnd.cpp b/kommander/editor/actiondnd.cpp
index 58cdb4a3..54a5e0f9 100644
--- a/kommander/editor/actiondnd.cpp
+++ b/kommander/editor/actiondnd.cpp
@@ -194,7 +194,7 @@ void QDesignerToolBar::findFormWindow()
     while ( w ) {
 	if ( w->inherits( "FormWindow" ) )
 	    formWindow = (FormWindow*)w;
-	w = w->tqparentWidget();
+	w = w->parentWidget();
     }
 }
 
@@ -720,7 +720,7 @@ void QDesignerMenuBar::findFormWindow()
     while ( w ) {
 	if ( w->inherits( "FormWindow" ) )
 	    formWindow = (FormWindow*)w;
-	w = w->tqparentWidget();
+	w = w->parentWidget();
     }
 }
 
@@ -741,14 +741,14 @@ void QDesignerMenuBar::contextMenuEvent( TQContextMenuEvent *e )
 	TQMenuItem *item = tqfindItem( idAt( itm ) );
 	RemoveMenuCommand *cmd = new RemoveMenuCommand( i18n("Delete Menu '%1'" ).tqarg( item->text() ),
 							formWindow,
-							(TQMainWindow*)tqparentWidget(), this,
+							(TQMainWindow*)parentWidget(), this,
 							(QDesignerPopupMenu*)item->popup(),
 							idAt( itm ), itm, item->text() );
 	formWindow->commandHistory()->addCommand( cmd );
 	cmd->execute();
 	// #### need to do a proper tqinvalidate and re-tqlayout
-	tqparentWidget()->tqlayout()->tqinvalidate();
-	tqparentWidget()->tqlayout()->activate();
+	parentWidget()->tqlayout()->tqinvalidate();
+	parentWidget()->tqlayout()->activate();
     } else if ( res == 2 ) {
 	bool ok;
 	TQString old = text( idAt( itm ) );
@@ -1044,8 +1044,8 @@ void QDesignerPopupMenu::createPopupMenu()
 								   formWindow, a, this, insertAt );
 	formWindow->commandHistory()->addCommand( cmd );
 	cmd->execute();
-	( (QDesignerMenuBar*)( (TQMainWindow*)tqparentWidget() )->menuBar() )->hidePopups();
-	( (QDesignerMenuBar*)( (TQMainWindow*)tqparentWidget() )->menuBar() )->activateItemAt( -1 );
+	( (QDesignerMenuBar*)( (TQMainWindow*)parentWidget() )->menuBar() )->hidePopups();
+	( (QDesignerMenuBar*)( (TQMainWindow*)parentWidget() )->menuBar() )->activateItemAt( -1 );
 	popup( p );
     }
     // set this back to zero so we know a popup (will soon) not exist.
@@ -1169,8 +1169,8 @@ void QDesignerPopupMenu::dropEvent( TQDropEvent *e )
     formWindow->commandHistory()->addCommand( cmd );
     cmd->execute();
 
-    ( (QDesignerMenuBar*)( (TQMainWindow*)tqparentWidget() )->menuBar() )->hidePopups();
-    ( (QDesignerMenuBar*)( (TQMainWindow*)tqparentWidget() )->menuBar() )->activateItemAt( -1 );
+    ( (QDesignerMenuBar*)( (TQMainWindow*)parentWidget() )->menuBar() )->hidePopups();
+    ( (QDesignerMenuBar*)( (TQMainWindow*)parentWidget() )->menuBar() )->activateItemAt( -1 );
     indicator->hide();
     popup( p );
 }
@@ -1239,7 +1239,7 @@ void QDesignerPopupMenu::findFormWindow()
     while ( w ) {
 	if ( w->inherits( "FormWindow" ) )
 	    formWindow = (FormWindow*)w;
-	w = w->tqparentWidget();
+	w = w->parentWidget();
     }
 }
 
diff --git a/kommander/editor/actioneditor.ui b/kommander/editor/actioneditor.ui
index 794849cd..056b46cf 100644
--- a/kommander/editor/actioneditor.ui
+++ b/kommander/editor/actioneditor.ui
@@ -2,7 +2,7 @@
 <class>ActionEditorBase</class>
 <include location="local" implDecl="in declaration">actioneditor.ui.h</include>
 <forward>class QListViewItem;</forward>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <widget class="TQWidget">
     <property name="name">
         <cstring>ActionEditorBase</cstring>
@@ -18,7 +18,7 @@
     <property name="caption">
         <string>Edit Actions</string>
     </property>
-    <property name="tqlayoutMargin" stdset="0">
+    <property name="layoutMargin" stdset="0">
     </property>
     <vbox>
         <property name="name">
diff --git a/kommander/editor/assoctexteditor.ui b/kommander/editor/assoctexteditor.ui
index c7af592a..d3565506 100644
--- a/kommander/editor/assoctexteditor.ui
+++ b/kommander/editor/assoctexteditor.ui
@@ -218,5 +218,5 @@
 <Q_SLOTS>
     <slot>AssocTextEditorBase_destroyed(QObject*)</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kommander/editor/choosewidget.ui b/kommander/editor/choosewidget.ui
index 19c728f9..fc9887c9 100644
--- a/kommander/editor/choosewidget.ui
+++ b/kommander/editor/choosewidget.ui
@@ -143,7 +143,7 @@
         <slot>reject()</slot>
     </connection>
 </connections>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klistview.h</includehint>
 </includehints>
diff --git a/kommander/editor/command.cpp b/kommander/editor/command.cpp
index e20ba086..df4568fb 100644
--- a/kommander/editor/command.cpp
+++ b/kommander/editor/command.cpp
@@ -236,7 +236,7 @@ void ResizeCommand::execute()
     widget->setGeometry( newRect );
     formWindow()->updateSelection( widget );
     formWindow()->emitUpdateProperties( TQT_TQOBJECT(widget) );
-    if ( WidgetFactory::tqlayoutType( widget ) != WidgetFactory::NoLayout )
+    if ( WidgetFactory::layoutType( widget ) != WidgetFactory::NoLayout )
 	formWindow()->updateChildSelections( widget );
 }
 
@@ -245,7 +245,7 @@ void ResizeCommand::unexecute()
     widget->setGeometry( oldRect );
     formWindow()->updateSelection( widget );
     formWindow()->emitUpdateProperties( TQT_TQOBJECT(widget) );
-    if ( WidgetFactory::tqlayoutType( widget ) != WidgetFactory::NoLayout )
+    if ( WidgetFactory::layoutType( widget ) != WidgetFactory::NoLayout )
 	formWindow()->updateChildSelections( widget );
 }
 
@@ -312,7 +312,7 @@ bool MoveCommand::canMerge( Command *c )
 void MoveCommand::execute()
 {
     for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) {
-	if ( !w->tqparentWidget() || WidgetFactory::tqlayoutType( w->tqparentWidget() ) == WidgetFactory::NoLayout ) {
+	if ( !w->parentWidget() || WidgetFactory::layoutType( w->parentWidget() ) == WidgetFactory::NoLayout ) {
 	    if ( newParent && oldParent && newParent != oldParent ) {
 		TQPoint pos = newParent->mapFromGlobal( w->mapToGlobal( TQPoint( 0,0 ) ) );
 		w->reparent( newParent, pos, true );
@@ -333,7 +333,7 @@ void MoveCommand::execute()
 void MoveCommand::unexecute()
 {
     for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) {
-	if ( !w->tqparentWidget() || WidgetFactory::tqlayoutType( w->tqparentWidget() ) == WidgetFactory::NoLayout ) {
+	if ( !w->parentWidget() || WidgetFactory::layoutType( w->parentWidget() ) == WidgetFactory::NoLayout ) {
 	    if ( newParent && oldParent && newParent != oldParent ) {
 		TQPoint pos = oldParent->mapFromGlobal( w->mapToGlobal( TQPoint( 0,0 ) ) );
 		w->reparent( oldParent, pos, true );
@@ -517,7 +517,7 @@ bool SetPropertyCommand::checkProperty()
 	}
 
 	if ( widget->tqparent() && widget->tqparent()->inherits( "FormWindow" ) )
-	    formWindow()->mainWindow()->formNameChanged( (FormWindow*)( (TQWidget*)widget )->tqparentWidget() );
+	    formWindow()->mainWindow()->formNameChanged( (FormWindow*)( (TQWidget*)widget )->parentWidget() );
     }
     return true;
 }
@@ -552,9 +552,9 @@ void SetPropertyCommand::setProperty( const TQVariant &v, const TQString &curren
 	    if ( v.toBool() )
 		align |= WordBreak;
 	    widget->setProperty( "tqalignment", TQVariant( align ) );
-	} else if ( propName == "tqlayoutSpacing" ) {
+	} else if ( propName == "layoutSpacing" ) {
 	    MetaDataBase::setSpacing( TQT_TQOBJECT(WidgetFactory::containerOfWidget( TQT_TQWIDGET(editor->widget()) )), v.toInt() );
-	} else if ( propName == "tqlayoutMargin" ) {
+	} else if ( propName == "layoutMargin" ) {
 	    MetaDataBase::setMargin( TQT_TQOBJECT(WidgetFactory::containerOfWidget( TQT_TQWIDGET(editor->widget()) )), v.toInt() );
 	} else if ( propName == "toolTip" || propName == "whatsThis" || propName == "database" || propName == "frameworkCode" ) {
 	    MetaDataBase::setFakeProperty( editor->widget(), propName, v );
@@ -628,9 +628,9 @@ void SetPropertyCommand::setProperty( const TQVariant &v, const TQString &curren
 // ------------------------------------------------------------
 
 LayoutHorizontalCommand::LayoutHorizontalCommand( const TQString &n, FormWindow *fw,
-						  TQWidget *tqparent, TQWidget *tqlayoutBase,
+						  TQWidget *tqparent, TQWidget *layoutBase,
 						  const TQWidgetList &wl )
-    : Command( n, fw ), tqlayout( wl, tqparent, fw, tqlayoutBase )
+    : Command( n, fw ), tqlayout( wl, tqparent, fw, layoutBase )
 {
 }
 
@@ -651,9 +651,9 @@ void LayoutHorizontalCommand::unexecute()
 // ------------------------------------------------------------
 
 LayoutHorizontalSplitCommand::LayoutHorizontalSplitCommand( const TQString &n, FormWindow *fw,
-							    TQWidget *tqparent, TQWidget *tqlayoutBase,
+							    TQWidget *tqparent, TQWidget *layoutBase,
 							    const TQWidgetList &wl )
-    : Command( n, fw ), tqlayout( wl, tqparent, fw, tqlayoutBase, true, true )
+    : Command( n, fw ), tqlayout( wl, tqparent, fw, layoutBase, true, true )
 {
 }
 
@@ -674,9 +674,9 @@ void LayoutHorizontalSplitCommand::unexecute()
 // ------------------------------------------------------------
 
 LayoutVerticalCommand::LayoutVerticalCommand( const TQString &n, FormWindow *fw,
-					      TQWidget *tqparent, TQWidget *tqlayoutBase,
+					      TQWidget *tqparent, TQWidget *layoutBase,
 					      const TQWidgetList &wl )
-    : Command( n, fw ), tqlayout( wl, tqparent, fw, tqlayoutBase )
+    : Command( n, fw ), tqlayout( wl, tqparent, fw, layoutBase )
 {
 }
 
@@ -697,9 +697,9 @@ void LayoutVerticalCommand::unexecute()
 // ------------------------------------------------------------
 
 LayoutVerticalSplitCommand::LayoutVerticalSplitCommand( const TQString &n, FormWindow *fw,
-							TQWidget *tqparent, TQWidget *tqlayoutBase,
+							TQWidget *tqparent, TQWidget *layoutBase,
 							const TQWidgetList &wl )
-    : Command( n, fw ), tqlayout( wl, tqparent, fw, tqlayoutBase, true, true )
+    : Command( n, fw ), tqlayout( wl, tqparent, fw, layoutBase, true, true )
 {
 }
 
@@ -720,9 +720,9 @@ void LayoutVerticalSplitCommand::unexecute()
 // ------------------------------------------------------------
 
 LayoutGridCommand::LayoutGridCommand( const TQString &n, FormWindow *fw,
-				      TQWidget *tqparent, TQWidget *tqlayoutBase,
+				      TQWidget *tqparent, TQWidget *layoutBase,
 				      const TQWidgetList &wl, int xres, int yres )
-    : Command( n, fw ), tqlayout( wl, tqparent, fw, tqlayoutBase, TQSize( TQMAX(5,xres), TQMAX(5,yres) ) )
+    : Command( n, fw ), tqlayout( wl, tqparent, fw, layoutBase, TQSize( TQMAX(5,xres), TQMAX(5,yres) ) )
 {
 }
 
@@ -743,19 +743,19 @@ void LayoutGridCommand::unexecute()
 // ------------------------------------------------------------
 
 BreakLayoutCommand::BreakLayoutCommand( const TQString &n, FormWindow *fw,
-					TQWidget *tqlayoutBase, const TQWidgetList &wl )
-    : Command( n, fw ), lb( tqlayoutBase ), widgets( wl )
+					TQWidget *layoutBase, const TQWidgetList &wl )
+    : Command( n, fw ), lb( layoutBase ), widgets( wl )
 {
-    WidgetFactory::LayoutType lay = WidgetFactory::tqlayoutType( tqlayoutBase );
-    spacing = MetaDataBase::spacing( TQT_TQOBJECT(tqlayoutBase) );
-    margin = MetaDataBase::margin( TQT_TQOBJECT(tqlayoutBase) );
+    WidgetFactory::LayoutType lay = WidgetFactory::layoutType( layoutBase );
+    spacing = MetaDataBase::spacing( TQT_TQOBJECT(layoutBase) );
+    margin = MetaDataBase::margin( TQT_TQOBJECT(layoutBase) );
     tqlayout = 0;
     if ( lay == WidgetFactory::HBox )
-	tqlayout = new HorizontalLayout( wl, tqlayoutBase, fw, tqlayoutBase, false, tqlayoutBase->inherits( TQSPLITTER_OBJECT_NAME_STRING ) );
+	tqlayout = new HorizontalLayout( wl, layoutBase, fw, layoutBase, false, layoutBase->inherits( TQSPLITTER_OBJECT_NAME_STRING ) );
     else if ( lay == WidgetFactory::VBox )
-	tqlayout = new VerticalLayout( wl, tqlayoutBase, fw, tqlayoutBase, false, tqlayoutBase->inherits( TQSPLITTER_OBJECT_NAME_STRING ) );
+	tqlayout = new VerticalLayout( wl, layoutBase, fw, layoutBase, false, layoutBase->inherits( TQSPLITTER_OBJECT_NAME_STRING ) );
     else if ( lay == WidgetFactory::Grid )
-	tqlayout = new GridLayout( wl, tqlayoutBase, fw, tqlayoutBase, 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()
diff --git a/kommander/editor/command.h b/kommander/editor/command.h
index f56e21a6..d288564e 100644
--- a/kommander/editor/command.h
+++ b/kommander/editor/command.h
@@ -255,7 +255,7 @@ class LayoutHorizontalCommand : public Command
 {
 public:
     LayoutHorizontalCommand( const TQString &n, FormWindow *fw,
-			     TQWidget *tqparent, TQWidget *tqlayoutBase,
+			     TQWidget *tqparent, TQWidget *layoutBase,
 			     const TQWidgetList &wl );
 
     void execute();
@@ -271,7 +271,7 @@ class LayoutHorizontalSplitCommand : public Command
 {
 public:
     LayoutHorizontalSplitCommand( const TQString &n, FormWindow *fw,
-				  TQWidget *tqparent, TQWidget *tqlayoutBase,
+				  TQWidget *tqparent, TQWidget *layoutBase,
 				  const TQWidgetList &wl );
 
     void execute();
@@ -287,7 +287,7 @@ class LayoutVerticalCommand : public Command
 {
 public:
     LayoutVerticalCommand( const TQString &n, FormWindow *fw,
-			   TQWidget *tqparent, TQWidget *tqlayoutBase,
+			   TQWidget *tqparent, TQWidget *layoutBase,
 			   const TQWidgetList &wl );
 
     void execute();
@@ -303,7 +303,7 @@ class LayoutVerticalSplitCommand : public Command
 {
 public:
     LayoutVerticalSplitCommand( const TQString &n, FormWindow *fw,
-				TQWidget *tqparent, TQWidget *tqlayoutBase,
+				TQWidget *tqparent, TQWidget *layoutBase,
 				const TQWidgetList &wl );
 
     void execute();
@@ -319,7 +319,7 @@ class LayoutGridCommand : public Command
 {
 public:
     LayoutGridCommand( const TQString &n, FormWindow *fw,
-		       TQWidget *tqparent, TQWidget *tqlayoutBase,
+		       TQWidget *tqparent, TQWidget *layoutBase,
 		       const TQWidgetList &wl, int xres, int yres );
 
     void execute();
@@ -335,7 +335,7 @@ class BreakLayoutCommand : public Command
 {
 public:
     BreakLayoutCommand( const TQString &n, FormWindow *fw,
-			TQWidget *tqlayoutBase, const TQWidgetList &wl );
+			TQWidget *layoutBase, const TQWidgetList &wl );
 
     void execute();
     void unexecute();
diff --git a/kommander/editor/connectioneditor.ui b/kommander/editor/connectioneditor.ui
index 5eed9c1e..63d59f49 100644
--- a/kommander/editor/connectioneditor.ui
+++ b/kommander/editor/connectioneditor.ui
@@ -403,7 +403,7 @@
     <slot access="protected">Q_SLOTSChanged()</slot>
     <slot access="protected">cancelClicked()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klistview.h</includehint>
     <includehint>klistbox.h</includehint>
diff --git a/kommander/editor/formsettings.ui b/kommander/editor/formsettings.ui
index 6e391265..02ff5699 100644
--- a/kommander/editor/formsettings.ui
+++ b/kommander/editor/formsettings.ui
@@ -329,7 +329,7 @@
 <Q_SLOTS>
     <slot>okClicked()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klineedit.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/kommander/editor/formsettingsimpl.cpp b/kommander/editor/formsettingsimpl.cpp
index 9912634f..dc292102 100644
--- a/kommander/editor/formsettingsimpl.cpp
+++ b/kommander/editor/formsettingsimpl.cpp
@@ -35,8 +35,8 @@ FormSettings::FormSettings( TQWidget *tqparent, FormWindow *fw )
   editVersion->setText(info.version);
   editLicense->setText(info.license);
   editComment->setText(info.comment);
-  spinSpacing->setValue(formwindow->tqlayoutDefaultSpacing());
-  spinMargin->setValue(formwindow->tqlayoutDefaultMargin());
+  spinSpacing->setValue(formwindow->layoutDefaultSpacing());
+  spinMargin->setValue(formwindow->layoutDefaultMargin());
 }
 
 void FormSettings::okClicked()
diff --git a/kommander/editor/formwindow.cpp b/kommander/editor/formwindow.cpp
index e6088172..590d1c47 100644
--- a/kommander/editor/formwindow.cpp
+++ b/kommander/editor/formwindow.cpp
@@ -460,9 +460,9 @@ void FormWindow::handleContextMenu(TQContextMenuEvent *e, TQWidget *w)
         selectWidget(TQT_TQOBJECT(w));
         // if widget is laid out, find the first non-laid out super-widget
         TQWidget *realWidget = w; // but store the original one
-        while (w->tqparentWidget() &&  (WidgetFactory::tqlayoutType(w->tqparentWidget()) !=
+        while (w->parentWidget() &&  (WidgetFactory::layoutType(w->parentWidget()) !=
            WidgetFactory::NoLayout || !insertedWidgets.tqfind(w)))
-          w = w->tqparentWidget();
+          w = w->parentWidget();
         if (mainContainer()->inherits(TQMAINWINDOW_OBJECT_NAME_STRING) &&
           ((TQMainWindow*)mainContainer())->centralWidget() == realWidget)
         {
@@ -503,7 +503,7 @@ void FormWindow::handleMousePress(TQMouseEvent *e, TQWidget *w)
         if (!isMainContainer(TQT_TQOBJECT(w)) && qstrcmp(w->name(), "central widget") != 0)
         { // press on a child widget
             // if the clicked widget is not in a tqlayout, raise it
-          if (!w->tqparentWidget() || WidgetFactory::tqlayoutType(w->tqparentWidget()) == WidgetFactory::NoLayout)
+          if (!w->parentWidget() || WidgetFactory::layoutType(w->parentWidget()) == WidgetFactory::NoLayout)
             w->raise();
           if ((e->state() & ControlButton))
           { // with control pressed, always start rubber band selection
@@ -522,7 +522,7 @@ void FormWindow::handleMousePress(TQMouseEvent *e, TQWidget *w)
             { // ...widget selected
               // only if widget has a tqlayout (it is a tqlayout meta widget or a laid out container!),
               // unselect its childs
-              if (WidgetFactory::tqlayoutType(w) != WidgetFactory::NoLayout)
+              if (WidgetFactory::layoutType(w) != WidgetFactory::NoLayout)
               {
                 TQObjectList *l = w->queryList(TQWIDGET_OBJECT_NAME_STRING);
                 setPropertyShowingBlocked(true);
@@ -550,10 +550,10 @@ void FormWindow::handleMousePress(TQMouseEvent *e, TQWidget *w)
           selectWidget(TQT_TQOBJECT(w));
 
           // if widget is laid out, find the first non-laid out super-widget
-          while (w->tqparentWidget() &&
-            (WidgetFactory::tqlayoutType(w->tqparentWidget()) != WidgetFactory::NoLayout
+          while (w->parentWidget() &&
+            (WidgetFactory::layoutType(w->parentWidget()) != WidgetFactory::NoLayout
                 || !insertedWidgets.tqfind(w)))
-            w = w->tqparentWidget();
+            w = w->parentWidget();
 
           if (e->button() == Qt::LeftButton)
           { // left button: store original tqgeometry and more as the widget might start moving
@@ -563,12 +563,12 @@ void FormWindow::handleMousePress(TQMouseEvent *e, TQWidget *w)
             origPressPos = oldPressPos;
             checkedSelectionsForMove = false;
             moving.clear();
-            if (w->tqparentWidget() && !isMainContainer(TQT_TQOBJECT(w->tqparentWidget())) &&
-               !isCentralWidget(TQT_TQOBJECT(w->tqparentWidget())))
+            if (w->parentWidget() && !isMainContainer(TQT_TQOBJECT(w->parentWidget())) &&
+               !isCentralWidget(TQT_TQOBJECT(w->parentWidget())))
             {
-              targetContainer = w->tqparentWidget();
-              hadOwnPalette = w->tqparentWidget()->ownPalette();
-              restorePalette = w->tqparentWidget()->palette();
+              targetContainer = w->parentWidget();
+              hadOwnPalette = w->parentWidget()->ownPalette();
+              restorePalette = w->parentWidget()->palette();
             }
           }
         }
@@ -643,7 +643,7 @@ void FormWindow::handleMousePress(TQMouseEvent *e, TQWidget *w)
               }
               else
               {
-                wid = wid->tqparentWidget();
+                wid = wid->parentWidget();
                 if (!wid)
                   break;
               }
@@ -695,9 +695,9 @@ void FormWindow::handleMouseMove(TQMouseEvent *e, TQWidget *w)
       if (widgetPressed && allowMove(w))
       { // we are prepated for a move
         // if widget is laid out, find the first non-laid out super-widget
-        while (w->tqparentWidget() && (WidgetFactory::tqlayoutType(w->tqparentWidget()) !=
+        while (w->parentWidget() && (WidgetFactory::layoutType(w->parentWidget()) !=
            WidgetFactory::NoLayout || !insertedWidgets.tqfind(w)))
-          w = w->tqparentWidget();
+          w = w->parentWidget();
         // calc correct position
         TQPoint pos = w->mapFromGlobal(e->globalPos());
         // calc move distance and store it
@@ -807,7 +807,7 @@ void FormWindow::handleMouseMove(TQMouseEvent *e, TQWidget *w)
         arg(connectReceiver->name()));
     tqApp->processEvents();
     if (drawRecRect)
-      restoreRect(TQRect(mapToForm(((TQWidget*)oldReceiver)->tqparentWidget(),
+      restoreRect(TQRect(mapToForm(((TQWidget*)oldReceiver)->parentWidget(),
           ((TQWidget*)oldReceiver)->pos()), ((TQWidget*)oldReceiver)->size()));
     drawConnectLine();
     break;
@@ -848,7 +848,7 @@ void FormWindow::handleMouseRelease(TQMouseEvent * e, TQWidget * w)
         emitUpdateProperties(propertyWidget);
 
       TQMapConstIterator < ulong, TQPoint > it = moving.begin();
-      TQWidget *oldParent = ((TQWidget *) it.key())->tqparentWidget();
+      TQWidget *oldParent = ((TQWidget *) it.key())->parentWidget();
       TQWidget *newParent = oldParent;
       // check whether we have to reparent the selection
       TQWidget *wa = containerAt(e->globalPos(), ((TQWidget *) it.key()));
@@ -857,12 +857,12 @@ void FormWindow::handleMouseRelease(TQMouseEvent * e, TQWidget * w)
         wa = WidgetFactory::containerOfWidget(wa);
         // ok, looks like we moved onto a container
 
-        // check whether we really have different tqparents.
-        if (wa == ((TQWidget *) it.key())->tqparentWidget())
+        // check whether we really have different parents.
+        if (wa == ((TQWidget *) it.key())->parentWidget())
           goto make_move_command;
 
         // break tqlayout if necessary
-        if (WidgetFactory::tqlayoutType(wa) != WidgetFactory::NoLayout)
+        if (WidgetFactory::layoutType(wa) != WidgetFactory::NoLayout)
         {
           if (KMessageBox::questionYesNo(mainWindow(),
                   i18n("You tried to insert a widget into the "
@@ -883,14 +883,14 @@ void FormWindow::handleMouseRelease(TQMouseEvent * e, TQWidget * w)
           TQWidget *i = (TQWidget *) it.key();
           if (!emitSelChanged && i->inherits(TQBUTTON_OBJECT_NAME_STRING))
           {
-            if (i->tqparentWidget() && i->tqparentWidget()->inherits(TQBUTTONGROUP_OBJECT_NAME_STRING) ||
+            if (i->parentWidget() && i->parentWidget()->inherits(TQBUTTONGROUP_OBJECT_NAME_STRING) ||
                 wa->inherits(TQBUTTONGROUP_OBJECT_NAME_STRING))
               emitSelChanged = true;
             if (!wa->inherits(TQBUTTONGROUP_OBJECT_NAME_STRING))
             {
               MetaDataBase::setPropertyChanged(TQT_TQOBJECT(i), "buttonGroupId", false);
-              if (i->tqparentWidget() && i->tqparentWidget()->inherits(TQBUTTONGROUP_OBJECT_NAME_STRING))
-                ((TQButtonGroup *) i->tqparentWidget())->remove((TQButton *) i);
+              if (i->parentWidget() && i->parentWidget()->inherits(TQBUTTONGROUP_OBJECT_NAME_STRING))
+                ((TQButtonGroup *) i->parentWidget())->remove((TQButton *) i);
             }
           }
           TQPoint pos = wa->mapFromGlobal(i->mapToGlobal(TQPoint(0, 0)));
@@ -935,10 +935,10 @@ void FormWindow::handleMouseRelease(TQMouseEvent * e, TQWidget * w)
   case CONNECT_TOOL:
     restoreConnectionLine();
     if (connectSender)
-      restoreRect(TQRect(mapToForm(((TQWidget *) connectSender)->tqparentWidget(),
+      restoreRect(TQRect(mapToForm(((TQWidget *) connectSender)->parentWidget(),
                   ((TQWidget *) connectSender)->pos()), ((TQWidget *) connectSender)->size()));
     if (connectReceiver)
-      restoreRect(TQRect(mapToForm(((TQWidget *) connectReceiver)->tqparentWidget(),
+      restoreRect(TQRect(mapToForm(((TQWidget *) connectReceiver)->parentWidget(),
                   ((TQWidget *) connectReceiver)->pos()), ((TQWidget *) connectReceiver)->size()));
     endUnclippedPainter();
     tqApp->processEvents();
@@ -951,7 +951,7 @@ void FormWindow::handleMouseRelease(TQMouseEvent * e, TQWidget * w)
     if (insertParent)
     {                           // we should insert the new widget now
       endRectDraw();
-      if (WidgetFactory::tqlayoutType(insertParent) != WidgetFactory::NoLayout)
+      if (WidgetFactory::layoutType(insertParent) != WidgetFactory::NoLayout)
       {
         if (KMessageBox::questionYesNo(mainWindow(),
                 i18n("You tried to insert a widget into the "
@@ -1314,8 +1314,8 @@ void FormWindow::moveSelectedWidgets(int dx, int dy)
   {
     WidgetSelection *s = it.current();
     TQWidget *w = s->widget();
-    if (w->tqparentWidget()
-        && WidgetFactory::tqlayoutType(w->tqparentWidget()) != WidgetFactory::NoLayout)
+    if (w->parentWidget()
+        && WidgetFactory::layoutType(w->parentWidget()) != WidgetFactory::NoLayout)
       continue;
     w->move(w->x() + dx, w->y() + dy);
     s->updateGeometry();
@@ -1374,7 +1374,7 @@ void FormWindow::checkSelectionsForMove(TQWidget * w)
 {
   checkedSelectionsForMove = true;
 
-  TQObjectList *l = w->tqparentWidget()->queryList(TQWIDGET_OBJECT_NAME_STRING, 0, false, false);
+  TQObjectList *l = w->parentWidget()->queryList(TQWIDGET_OBJECT_NAME_STRING, 0, false, false);
   moving.clear();
   if (l)
   {
@@ -1387,11 +1387,11 @@ void FormWindow::checkSelectionsForMove(TQWidget * w)
       ++it;
       if (l->tqfind(TQT_TQOBJECT(sel->widget())) == -1)
       {
-        if (WidgetFactory::tqlayoutType(w) == WidgetFactory::NoLayout)
+        if (WidgetFactory::layoutType(w) == WidgetFactory::NoLayout)
           sel->setWidget(0);
       } else
       {
-        if (WidgetFactory::tqlayoutType(sel->widget()->tqparentWidget()) == WidgetFactory::NoLayout)
+        if (WidgetFactory::layoutType(sel->widget()->parentWidget()) == WidgetFactory::NoLayout)
         {
           moving.insert((ulong) sel->widget(), sel->widget()->pos());
           sel->widget()->raise();
@@ -1447,8 +1447,8 @@ void FormWindow::editAdjustSize()
   }
   for (TQWidget * w = widgets.first(); w; w = widgets.next())
   {
-    if (w->tqparentWidget()
-        && WidgetFactory::tqlayoutType(w->tqparentWidget()) != WidgetFactory::NoLayout)
+    if (w->parentWidget()
+        && WidgetFactory::layoutType(w->parentWidget()) != WidgetFactory::NoLayout)
       continue;
     TQRect oldr = w->tqgeometry();
     w->adjustSize();
@@ -1618,10 +1618,10 @@ void FormWindow::currentToolChanged()
   case CONNECT_TOOL:
     restoreConnectionLine();
     if (connectSender)
-      restoreRect(TQRect(mapToForm(((TQWidget *) connectSender)->tqparentWidget(),
+      restoreRect(TQRect(mapToForm(((TQWidget *) connectSender)->parentWidget(),
                   ((TQWidget *) connectSender)->pos()), ((TQWidget *) connectSender)->size()));
     if (connectReceiver)
-      restoreRect(TQRect(mapToForm(((TQWidget *) connectReceiver)->tqparentWidget(),
+      restoreRect(TQRect(mapToForm(((TQWidget *) connectReceiver)->parentWidget(),
                   ((TQWidget *) connectReceiver)->pos()), ((TQWidget *) connectReceiver)->size()));
     endUnclippedPainter();
     break;
@@ -1694,7 +1694,7 @@ void FormWindow::showOrderIndicators()
     for (TQObject * o = l->first(); o; o = l->next())
     {
       TQWidget *w = (TQWidget *) o;
-      if (w->isVisibleTo(w->tqparentWidget()) &&
+      if (w->isVisibleTo(w->parentWidget()) &&
           insertedWidgets[(void *) w] && w->focusPolicy() != TQ_NoFocus)
       {
         OrderIndicator *ind = new OrderIndicator(order++, w, this);
@@ -1903,7 +1903,7 @@ void FormWindow::selectAll()
   emitSelectionChanged();
 }
 
-void FormWindow::tqlayoutHorizontal()
+void FormWindow::layoutHorizontal()
 {
   TQWidgetList widgets(selectedWidgets());
   LayoutHorizontalCommand *cmd = new LayoutHorizontalCommand(i18n("Lay OutQt::Horizontally"),
@@ -1913,7 +1913,7 @@ void FormWindow::tqlayoutHorizontal()
   cmd->execute();
 }
 
-void FormWindow::tqlayoutVertical()
+void FormWindow::layoutVertical()
 {
   TQWidgetList widgets(selectedWidgets());
   LayoutVerticalCommand *cmd = new LayoutVerticalCommand(i18n("Lay OutQt::Vertically"),
@@ -1923,7 +1923,7 @@ void FormWindow::tqlayoutVertical()
   cmd->execute();
 }
 
-void FormWindow::tqlayoutHorizontalSplit()
+void FormWindow::layoutHorizontalSplit()
 {
   TQWidgetList widgets(selectedWidgets());
   LayoutHorizontalSplitCommand *cmd =
@@ -1934,7 +1934,7 @@ void FormWindow::tqlayoutHorizontalSplit()
   cmd->execute();
 }
 
-void FormWindow::tqlayoutVerticalSplit()
+void FormWindow::layoutVerticalSplit()
 {
   TQWidgetList widgets(selectedWidgets());
   LayoutVerticalSplitCommand *cmd =
@@ -1945,7 +1945,7 @@ void FormWindow::tqlayoutVerticalSplit()
   cmd->execute();
 }
 
-void FormWindow::tqlayoutGrid()
+void FormWindow::layoutGrid()
 {
   int xres = grid().x();
   int yres = grid().y();
@@ -1958,7 +1958,7 @@ void FormWindow::tqlayoutGrid()
   cmd->execute();
 }
 
-void FormWindow::tqlayoutHorizontalContainer(TQWidget * w)
+void FormWindow::layoutHorizontalContainer(TQWidget * w)
 {
   if (w == this)
     w = mainContainer();
@@ -1979,7 +1979,7 @@ void FormWindow::tqlayoutHorizontalContainer(TQWidget * w)
   cmd->execute();
 }
 
-void FormWindow::tqlayoutVerticalContainer(TQWidget * w)
+void FormWindow::layoutVerticalContainer(TQWidget * w)
 {
   if (w == this)
     w = mainContainer();
@@ -2000,7 +2000,7 @@ void FormWindow::tqlayoutVerticalContainer(TQWidget * w)
   cmd->execute();
 }
 
-void FormWindow::tqlayoutGridContainer(TQWidget * w)
+void FormWindow::layoutGridContainer(TQWidget * w)
 {
   if (w == this)
     w = mainContainer();
@@ -2035,7 +2035,7 @@ void FormWindow::breakLayout(TQWidget * w)
   {
     if (!w || w == this)
       break;
-    if (WidgetFactory::tqlayoutType(w) != WidgetFactory::NoLayout &&
+    if (WidgetFactory::layoutType(w) != WidgetFactory::NoLayout &&
         WidgetDatabase::isContainer(WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(TQT_TQOBJECT(w)))))
     {
       Command *cmd = breakLayoutCommand(w);
@@ -2044,7 +2044,7 @@ void FormWindow::breakLayout(TQWidget * w)
       if (!w->inherits(TQLAYOUTWIDGET_OBJECT_NAME_STRING) && !w->inherits(TQSPLITTER_OBJECT_NAME_STRING))
         break;
     }
-    w = w->tqparentWidget();
+    w = w->parentWidget();
   }
 
   if (commands.isEmpty())
@@ -2113,13 +2113,13 @@ bool FormWindow::hasInsertedChildren(TQWidget *w) const
 
 bool FormWindow::allowMove(TQWidget *w)
 {
-  w = w->tqparentWidget();
+  w = w->parentWidget();
   while (w)
   {
-    if ((isMainContainer(TQT_TQOBJECT(w)) || insertedWidgets.tqfind(w)) && WidgetFactory::tqlayoutType(w) ==
+    if ((isMainContainer(TQT_TQOBJECT(w)) || insertedWidgets.tqfind(w)) && WidgetFactory::layoutType(w) ==
         WidgetFactory::NoLayout)
       return true;
-    w = w->tqparentWidget();
+    w = w->parentWidget();
   }
   return false;
 }
@@ -2410,7 +2410,7 @@ TQPoint FormWindow::mapToForm(const TQWidget* w, const TQPoint&  pos) const
   while (i && !i->isTopLevel() && !isMainContainer(TQT_TQOBJECT(const_cast<TQWidget*>(i))))
   {
     p = i->mapToParent(p);
-    i = i->tqparentWidget();
+    i = i->parentWidget();
   }
   return mapFromGlobal(w->mapToGlobal(pos));
 }
@@ -2421,7 +2421,7 @@ static int widgetDepth(TQWidget *w)
   while (w && !w->isTopLevel())
   {
     d++;
-    w = w->tqparentWidget();
+    w = w->parentWidget();
   }
 
   return d;
@@ -2433,7 +2433,7 @@ static bool isChildOf(TQWidget *c, TQWidget *p)
   {
     if (c == p)
       return true;
-    c = c->tqparentWidget();
+    c = c->parentWidget();
   }
   return false;
 }
@@ -2469,14 +2469,14 @@ TQWidget *FormWindow::containerAt(const TQPoint &pos, TQWidget *notParentOf)
     {
       if (!TQT_TQRECT_OBJECT(w->rect()).tqcontains((w->mapFromGlobal(pos))))
         break;
-      w = w->tqparentWidget();
+      w = w->parentWidget();
     }
     if (w && !w->isTopLevel()) continue; // we did not get through the full while loop
 
     int wd = widgetDepth(it.current());
-    if (wd == depth && container &&  (it.current()->tqparentWidget()->
+    if (wd == depth && container &&  (it.current()->parentWidget()->
       childrenListObject()).tqfind(TQT_TQOBJECT(it.current())) >
-      (container->tqparentWidget()->childrenListObject()).tqfind(TQT_TQOBJECT(container)))
+      (container->parentWidget()->childrenListObject()).tqfind(TQT_TQOBJECT(container)))
       wd++;
     if (wd > depth && !isChildOf(it.current(), notParentOf)) {
       depth = wd;
@@ -2575,12 +2575,12 @@ TQObject *FormWindow::connectableObject(TQObject *w, TQObject *)
   return w;
 }
 
-int FormWindow::tqlayoutDefaultSpacing() const
+int FormWindow::layoutDefaultSpacing() const
 {
   return defSpacing;
 }
 
-int FormWindow::tqlayoutDefaultMargin() const
+int FormWindow::layoutDefaultMargin() const
 {
   return defMargin;
 }
diff --git a/kommander/editor/formwindow.h b/kommander/editor/formwindow.h
index 30500a87..5674c46d 100644
--- a/kommander/editor/formwindow.h
+++ b/kommander/editor/formwindow.h
@@ -85,15 +85,15 @@ public:
   virtual void raiseWidgets();
   virtual void checkAccels();
 
-  virtual void tqlayoutHorizontal();
-  virtual void tqlayoutVertical();
-  virtual void tqlayoutHorizontalSplit();
-  virtual void tqlayoutVerticalSplit();
-  virtual void tqlayoutGrid();
+  virtual void layoutHorizontal();
+  virtual void layoutVertical();
+  virtual void layoutHorizontalSplit();
+  virtual void layoutVerticalSplit();
+  virtual void layoutGrid();
 
-  virtual void tqlayoutHorizontalContainer( TQWidget *w );
-  virtual void tqlayoutVerticalContainer( TQWidget *w );
-  virtual void tqlayoutGridContainer( TQWidget *w );
+  virtual void layoutHorizontalContainer( TQWidget *w );
+  virtual void layoutVerticalContainer( TQWidget *w );
+  virtual void layoutGridContainer( TQWidget *w );
 
   virtual void breakLayout( TQWidget *w );
 
@@ -178,8 +178,8 @@ public:
 
   void killAccels( TQObject *top );
 
-  int tqlayoutDefaultSpacing() const;
-  int tqlayoutDefaultMargin() const;
+  int layoutDefaultSpacing() const;
+  int layoutDefaultMargin() const;
   void setLayoutDefaultSpacing( int s );
   void setLayoutDefaultMargin( int s );
 
diff --git a/kommander/editor/functions.ui b/kommander/editor/functions.ui
index 35d53c2c..ca35e191 100644
--- a/kommander/editor/functions.ui
+++ b/kommander/editor/functions.ui
@@ -695,7 +695,7 @@
     <tabstop>buttonOk</tabstop>
     <tabstop>buttonCancel</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>ktextbrowser.h</includehint>
     <includehint>kcombobox.h</includehint>
diff --git a/kommander/editor/hierarchyview.cpp b/kommander/editor/hierarchyview.cpp
index 03c6385e..318a17a2 100644
--- a/kommander/editor/hierarchyview.cpp
+++ b/kommander/editor/hierarchyview.cpp
@@ -366,7 +366,7 @@ void HierarchyList::insertObject( TQObject *o, TQListViewItem *tqparent )
     TQListViewItem *item = 0;
     TQString className = WidgetFactory::classNameOf( o );
     if ( o->inherits( TQLAYOUTWIDGET_OBJECT_NAME_STRING ) ) {
-  switch ( WidgetFactory::tqlayoutType( (TQWidget*)o ) ) {
+  switch ( WidgetFactory::layoutType( (TQWidget*)o ) ) {
   case WidgetFactory::HBox:
       className = "HBox";
       break;
diff --git a/kommander/editor/kommander-new.xml b/kommander/editor/kommander-new.xml
index 8cfe86e2..7fe9f7dc 100644
--- a/kommander/editor/kommander-new.xml
+++ b/kommander/editor/kommander-new.xml
@@ -76,7 +76,7 @@
       <item>null</item>
       <item>pid</item>
       <item>dcopid</item>
-      <item>tqparentPid</item>
+      <item>parentPid</item>
       <item>debug</item>
       <item>echo</item>
       <item>env</item>
@@ -260,7 +260,7 @@
                   
       <!-- FindCommands matches many items that can be expected outside strings, substitutions etc. -->
       <context attribute="Normal Text" lineEndContext="#stay" name="FindCommands">
-      	<!-- start expression in double tqparentheses -->
+      	<!-- start expression in double parentheses -->
       	<Detect2Chars attribute="Keyword" context="ExprDblParen" char="(" char1="(" beginRegion="expression" />
         <!-- start expression in double brackets -->
         <RegExpr attribute="Keyword" context="ExprDblBracket" String="\[\[&eos;" beginRegion="expression" column="0"/>
@@ -524,7 +524,7 @@
       </context>
 
       <!-- Case is called after the case keyword is encoutered. We handle this because of
-           the lonely closing tqparentheses that would otherwise disturb the expr matching -->
+           the lonely closing parentheses that would otherwise disturb the expr matching -->
       <context attribute="Normal Text" lineEndContext="#stay" name="Case">
         <RegExpr attribute="Keyword" context="CaseIn" String="\sin\b" />
         <IncludeRules context="FindAll" />
diff --git a/kommander/editor/kommander.xml b/kommander/editor/kommander.xml
index cfa64c8a..b88bd6d7 100644
--- a/kommander/editor/kommander.xml
+++ b/kommander/editor/kommander.xml
@@ -69,7 +69,7 @@
       <item>null</item>
       <item>pid</item>
       <item>dcopid</item>
-      <item>tqparentPid</item>
+      <item>parentPid</item>
       <item>debug</item>
       <item>echo</item>
       <item>env</item>
@@ -598,7 +598,7 @@
 	<IncludeRules context="##Alerts" />
       </context>
       
-      <!-- FindCommentsParen consumes shell comments till EOL or a closing tqparenthese -->
+      <!-- FindCommentsParen consumes shell comments till EOL or a closing parenthese -->
       <context attribute="Normal Text" lineEndContext="#pop" name="FindCommentsParen">
       	<DetectChar attribute="Comment" context="CommentParen" char="#" firstNonSpace="true"/>
 	<RegExpr attribute="Normal Text" context="CommentParen" String="[\s;](?=#)" />
@@ -621,7 +621,7 @@
       
       <!-- FindCommands matches many items that can be expected outside strings, substitutions etc. -->
       <context attribute="Normal Text" lineEndContext="#stay" name="FindCommands">
-      	<!-- start expression in double tqparentheses -->
+      	<!-- start expression in double parentheses -->
       	<Detect2Chars attribute="Keyword" context="ExprDblParen" char="(" char1="(" beginRegion="expression" />
 	<!-- start expression in double brackets -->
 	<RegExpr attribute="Keyword" context="ExprDblBracket" String="\[\[&eos;" beginRegion="expression" column="0"/>
@@ -900,7 +900,7 @@
       </context>
 
       <!-- Case is called after the case keyword is encoutered. We handle this because of
-           the lonely closing tqparentheses that would otherwise disturb the expr matching -->
+           the lonely closing parentheses that would otherwise disturb the expr matching -->
       <context attribute="Normal Text" lineEndContext="#stay" name="Case">
         <RegExpr attribute="Keyword" context="CaseIn" String="\sin\b" />
         <IncludeRules context="FindMost" />
diff --git a/kommander/editor/layout.cpp b/kommander/editor/layout.cpp
index 1b55de9c..8d7d3d50 100644
--- a/kommander/editor/layout.cpp
+++ b/kommander/editor/layout.cpp
@@ -37,18 +37,18 @@ bool operator<( const TQGuardedPtr<TQWidget> &p1, const TQGuardedPtr<TQWidget> &
 
 /*!
   \class Layout tqlayout.h
-  \brief Baseclass for tqlayouting widgets in the Designer
+  \brief Baseclass for layouting widgets in the Designer
 
-  Classes derived from this abstract base class are used for tqlayouting
+  Classes derived from this abstract base class are used for layouting
   operations in the Designer.
 
 */
 
-/*!  \a p specifies the tqparent of the tqlayoutBase \a lb. The tqparent
-  might be changed in setup(). If the tqlayoutBase is a
-  container, the tqparent and the tqlayoutBase are the same. Also they
+/*!  \a p specifies the tqparent of the layoutBase \a lb. The tqparent
+  might be changed in setup(). If the layoutBase is a
+  container, the tqparent and the layoutBase are the same. Also they
   always have to be a widget known to the designer (e.g. in the case
-  of the tabwidget tqparent and tqlayoutBase are the tabwidget and not the
+  of the tabwidget tqparent and layoutBase are the tabwidget and not the
   page which actually gets laid out. For actual usage the correct
   widget is found later by Layout.)
  */
@@ -57,13 +57,13 @@ Layout::Layout( const TQWidgetList &wl, TQWidget *p, FormWindow *fw, TQWidget *l
     : widgets( wl ), tqparent( p ), formWindow( fw ), isBreak( !doSetup ), useSplitter( splitter )
 {
     widgets.setAutoDelete( false );
-    tqlayoutBase = lb;
-    if ( !doSetup && tqlayoutBase )
-	oldGeometry = tqlayoutBase->tqgeometry();
+    layoutBase = lb;
+    if ( !doSetup && layoutBase )
+	oldGeometry = layoutBase->tqgeometry();
 }
 
 /*!  The widget list we got in the constructor might contain too much
-  widgets (like widgets with different tqparents, already laid out
+  widgets (like widgets with different parents, already laid out
   widgets, etc.). Here we set up the list and so the only the "best"
   widgets get laid out.
 */
@@ -83,14 +83,14 @@ void Layout::setup()
     // childs which has the most entries.
     // Widgets which are already laid out are thrown away here too
     for ( w = widgets.first(); w; w = widgets.next() ) {
-	if ( w->tqparentWidget() && WidgetFactory::tqlayoutType( w->tqparentWidget() ) != WidgetFactory::NoLayout )
+	if ( w->parentWidget() && WidgetFactory::layoutType( w->parentWidget() ) != WidgetFactory::NoLayout )
 	    continue;
-	if ( lastParent != w->tqparentWidget() ) {
+	if ( lastParent != w->parentWidget() ) {
 	    lastList = 0;
-	    lastParent = w->tqparentWidget();
+	    lastParent = w->parentWidget();
 	    TQValueList<TQWidgetList>::Iterator it = lists.begin();
 	    for ( ; it != lists.end(); ++it ) {
-		if ( ( *it ).first()->tqparentWidget() == w->tqparentWidget() )
+		if ( ( *it ).first()->parentWidget() == w->parentWidget() )
 		    lastList = &( *it );
 	    }
 	    if ( !lastList ) {
@@ -115,9 +115,9 @@ void Layout::setup()
     // best list has only one entry and we do not tqlayout a container,
     // we leave here.
     if ( !lastList || ( lastList->count() < 2 &&
-			( !tqlayoutBase ||
-			  ( !WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf(TQT_TQOBJECT( tqlayoutBase )) ) ) &&
-			    tqlayoutBase != formWindow->mainContainer() ) )
+			( !layoutBase ||
+			  ( !WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf(TQT_TQOBJECT( layoutBase )) ) ) &&
+			    layoutBase != formWindow->mainContainer() ) )
 			) ) {
 	widgets.clear();
 	startPoint = TQPoint( 0, 0 );
@@ -128,7 +128,7 @@ void Layout::setup()
     // to tqlayout
     widgets = *lastList;
     // Also use the only correct tqparent later, so store it
-    tqparent = WidgetFactory::widgetOfContainer( widgets.first()->tqparentWidget() );
+    tqparent = WidgetFactory::widgetOfContainer( widgets.first()->parentWidget() );
     // 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
@@ -158,17 +158,17 @@ bool Layout::prepareLayout( bool &needMove, bool &needRetqparent )
 	return false;
     for ( TQWidget *w = widgets.first(); w; w = widgets.next() )
 	w->raise();
-    needMove = !tqlayoutBase;
-    needRetqparent = needMove || tqlayoutBase->inherits( TQLAYOUTWIDGET_OBJECT_NAME_STRING ) || tqlayoutBase->inherits( TQSPLITTER_OBJECT_NAME_STRING );
-    if ( !tqlayoutBase ) {
+    needMove = !layoutBase;
+    needRetqparent = needMove || layoutBase->inherits( TQLAYOUTWIDGET_OBJECT_NAME_STRING ) || layoutBase->inherits( TQSPLITTER_OBJECT_NAME_STRING );
+    if ( !layoutBase ) {
 	if ( !useSplitter )
-	    tqlayoutBase = WidgetFactory::create( WidgetDatabase::idFromClassName( TQLAYOUTWIDGET_OBJECT_NAME_STRING ),
+	    layoutBase = WidgetFactory::create( WidgetDatabase::idFromClassName( TQLAYOUTWIDGET_OBJECT_NAME_STRING ),
 						WidgetFactory::containerOfWidget( tqparent ) );
 	else
-	    tqlayoutBase = WidgetFactory::create( WidgetDatabase::idFromClassName( TQSPLITTER_OBJECT_NAME_STRING ),
+	    layoutBase = WidgetFactory::create( WidgetDatabase::idFromClassName( TQSPLITTER_OBJECT_NAME_STRING ),
 						WidgetFactory::containerOfWidget( tqparent ) );
     } else {
-	WidgetFactory::deleteLayout( tqlayoutBase );
+	WidgetFactory::deleteLayout( layoutBase );
     }
 
     return true;
@@ -177,21 +177,21 @@ bool Layout::prepareLayout( bool &needMove, bool &needRetqparent )
 void Layout::finishLayout( bool needMove, TQLayout *tqlayout )
 {
     if ( needMove )
-	tqlayoutBase->move( startPoint );
-    TQRect g( TQRect( tqlayoutBase->pos(), tqlayoutBase->size() ) );
-    if ( WidgetFactory::tqlayoutType( tqlayoutBase->tqparentWidget() ) == WidgetFactory::NoLayout && !isBreak )
-	tqlayoutBase->adjustSize();
+	layoutBase->move( startPoint );
+    TQRect g( TQRect( layoutBase->pos(), layoutBase->size() ) );
+    if ( WidgetFactory::layoutType( layoutBase->parentWidget() ) == WidgetFactory::NoLayout && !isBreak )
+	layoutBase->adjustSize();
     else if ( isBreak )
-	tqlayoutBase->setGeometry( oldGeometry );
+	layoutBase->setGeometry( oldGeometry );
     oldGeometry = g;
-    tqlayoutBase->show();
+    layoutBase->show();
     tqlayout->activate();
-    formWindow->insertWidget( tqlayoutBase );
-    formWindow->selectWidget( TQT_TQOBJECT(tqlayoutBase) );
-    TQString n = tqlayoutBase->name();
+    formWindow->insertWidget( layoutBase );
+    formWindow->selectWidget( TQT_TQOBJECT(layoutBase) );
+    TQString n = layoutBase->name();
     if ( n.tqfind( "qt_dead_widget_" ) != -1 ) {
 	n.remove( 0, TQString( "qt_dead_widget_" ).length() );
-	tqlayoutBase->setName( n );
+	layoutBase->setName( n );
     }
 }
 
@@ -206,15 +206,15 @@ void Layout::undoLayout()
 	it.key()->reparent( WidgetFactory::containerOfWidget( tqparent ), 0, ( *it ).topLeft(), it.key()->isVisibleTo( formWindow ) );
 	it.key()->resize( ( *it ).size() );
     }
-    formWindow->selectWidget( TQT_TQOBJECT(tqlayoutBase), false );
-    WidgetFactory::deleteLayout( tqlayoutBase );
-    if ( tqparent != tqlayoutBase && !tqlayoutBase->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) ) {
-	tqlayoutBase->hide();
-	TQString n = tqlayoutBase->name();
+    formWindow->selectWidget( TQT_TQOBJECT(layoutBase), false );
+    WidgetFactory::deleteLayout( layoutBase );
+    if ( tqparent != layoutBase && !layoutBase->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) ) {
+	layoutBase->hide();
+	TQString n = layoutBase->name();
 	n.prepend( "qt_dead_widget_" );
-	tqlayoutBase->setName( n );
+	layoutBase->setName( n );
     } else {
-	tqlayoutBase->setGeometry( oldGeometry );
+	layoutBase->setGeometry( oldGeometry );
     }
     if ( widgets.first() )
 	formWindow->selectWidget( TQT_TQOBJECT(widgets.first()) );
@@ -230,33 +230,33 @@ void Layout::breakLayout()
 	for ( w = widgets.first(); w; w = widgets.next() )
 	    rects.insert( w, w->tqgeometry() );
     }
-    WidgetFactory::deleteLayout( tqlayoutBase );
-    bool needRetqparent = qstrcmp( tqlayoutBase->className(), TQLAYOUTWIDGET_OBJECT_NAME_STRING ) == 0 ||
-			qstrcmp( tqlayoutBase->className(), TQSPLITTER_OBJECT_NAME_STRING ) == 0 ||
-			( !WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf(TQT_TQOBJECT( tqlayoutBase )) ) ) &&
-			  tqlayoutBase != formWindow->mainContainer() );
-    bool needResize = qstrcmp( tqlayoutBase->className(), TQSPLITTER_OBJECT_NAME_STRING ) == 0;
+    WidgetFactory::deleteLayout( layoutBase );
+    bool needRetqparent = qstrcmp( layoutBase->className(), TQLAYOUTWIDGET_OBJECT_NAME_STRING ) == 0 ||
+			qstrcmp( layoutBase->className(), TQSPLITTER_OBJECT_NAME_STRING ) == 0 ||
+			( !WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf(TQT_TQOBJECT( layoutBase )) ) ) &&
+			  layoutBase != formWindow->mainContainer() );
+    bool needResize = qstrcmp( layoutBase->className(), TQSPLITTER_OBJECT_NAME_STRING ) == 0;
     bool add = geometries.isEmpty();
     for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) {
 	if ( needRetqparent )
-	    w->reparent( tqlayoutBase->tqparentWidget(), 0,
-			 tqlayoutBase->pos() + w->pos(), true );
+	    w->reparent( layoutBase->parentWidget(), 0,
+			 layoutBase->pos() + w->pos(), true );
 	if ( needResize ) {
 	    TQMap<TQWidget*, TQRect>::Iterator it = rects.tqfind( w );
 	    if ( it != rects.end() )
-		w->setGeometry( TQRect( tqlayoutBase->pos() + (*it).topLeft(), (*it).size() ) );
+		w->setGeometry( TQRect( layoutBase->pos() + (*it).topLeft(), (*it).size() ) );
 	}
 	if ( add )
 	    geometries.insert( w, TQRect( w->pos(), w->size() ) );
     }
     if ( needRetqparent ) {
-	tqlayoutBase->hide();
-	tqparent = tqlayoutBase->tqparentWidget();
-	TQString n = tqlayoutBase->name();
+	layoutBase->hide();
+	tqparent = layoutBase->parentWidget();
+	TQString n = layoutBase->name();
 	n.prepend( "qt_dead_widget_" );
-	tqlayoutBase->setName( n );
+	layoutBase->setName( n );
     } else {
-	tqparent = tqlayoutBase;
+	tqparent = layoutBase;
     }
     if ( widgets.first() && widgets.first()->isVisibleTo( formWindow ) )
 	formWindow->selectWidget( TQT_TQOBJECT(widgets.first()) );
@@ -303,11 +303,11 @@ void HorizontalLayout::doLayout()
     if ( !prepareLayout( needMove, needRetqparent ) )
 	return;
 
-    TQHBoxLayout *tqlayout = (TQHBoxLayout*)WidgetFactory::createLayout( tqlayoutBase, 0, WidgetFactory::HBox );
+    TQHBoxLayout *tqlayout = (TQHBoxLayout*)WidgetFactory::createLayout( layoutBase, 0, WidgetFactory::HBox );
 
     for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) {
-	if ( needRetqparent && TQT_BASE_OBJECT(w->tqparent()) != TQT_BASE_OBJECT(tqlayoutBase) )
-	    w->reparent( tqlayoutBase, 0, TQPoint( 0, 0 ), false );
+	if ( needRetqparent && TQT_BASE_OBJECT(w->tqparent()) != TQT_BASE_OBJECT(layoutBase) )
+	    w->reparent( layoutBase, 0, TQPoint( 0, 0 ), false );
 	if ( !useSplitter ) {
 	    if ( qstrcmp( w->className(), "Spacer" ) == 0 )
 		tqlayout->addWidget( w, 0, ( (Spacer*)w )->tqalignment() );
@@ -319,8 +319,8 @@ void HorizontalLayout::doLayout()
 	w->show();
     }
 
-    if ( tqlayoutBase->inherits( TQSPLITTER_OBJECT_NAME_STRING ) )
-	( (TQSplitter*)tqlayoutBase )->setOrientation( Qt::Horizontal );
+    if ( layoutBase->inherits( TQSPLITTER_OBJECT_NAME_STRING ) )
+	( (TQSplitter*)layoutBase )->setOrientation( Qt::Horizontal );
 
     finishLayout( needMove, tqlayout );
 }
@@ -367,11 +367,11 @@ void VerticalLayout::doLayout()
     if ( !prepareLayout( needMove, needRetqparent ) )
 	return;
 
-    TQVBoxLayout *tqlayout = (TQVBoxLayout*)WidgetFactory::createLayout( tqlayoutBase, 0, WidgetFactory::VBox );
+    TQVBoxLayout *tqlayout = (TQVBoxLayout*)WidgetFactory::createLayout( layoutBase, 0, WidgetFactory::VBox );
 
     for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) {
-	if ( needRetqparent && TQT_BASE_OBJECT(w->tqparent()) != TQT_BASE_OBJECT(tqlayoutBase) )
-	    w->reparent( tqlayoutBase, 0, TQPoint( 0, 0 ), false );
+	if ( needRetqparent && TQT_BASE_OBJECT(w->tqparent()) != TQT_BASE_OBJECT(layoutBase) )
+	    w->reparent( layoutBase, 0, TQPoint( 0, 0 ), false );
 	if ( !useSplitter ) {
 	    if ( qstrcmp( w->className(), "Spacer" ) == 0 )
 		tqlayout->addWidget( w, 0, ( (Spacer*)w )->tqalignment() );
@@ -383,8 +383,8 @@ void VerticalLayout::doLayout()
 	w->show();
     }
 
-    if ( tqlayoutBase->inherits( TQSPLITTER_OBJECT_NAME_STRING ) )
-	( (TQSplitter*)tqlayoutBase )->setOrientation( Qt::Vertical );
+    if ( layoutBase->inherits( TQSPLITTER_OBJECT_NAME_STRING ) )
+	( (TQSplitter*)layoutBase )->setOrientation( Qt::Vertical );
 
     finishLayout( needMove, tqlayout );
 }
@@ -733,7 +733,7 @@ void GridLayout::doLayout()
     if ( !prepareLayout( needMove, needRetqparent ) )
 	return;
 
-    QDesignerGridLayout *tqlayout = (QDesignerGridLayout*)WidgetFactory::createLayout( tqlayoutBase, 0, WidgetFactory::Grid );
+    QDesignerGridLayout *tqlayout = (QDesignerGridLayout*)WidgetFactory::createLayout( layoutBase, 0, WidgetFactory::Grid );
 
     if ( !grid )
 	buildGrid();
@@ -742,8 +742,8 @@ void GridLayout::doLayout()
     int r, c, rs, cs;
     for ( w = widgets.first(); w; w = widgets.next() ) {
 	if ( grid->locateWidget( w, r, c, rs, cs) ) {
-	    if ( needRetqparent && TQT_BASE_OBJECT(w->tqparent()) != TQT_BASE_OBJECT(tqlayoutBase) )
-		w->reparent( tqlayoutBase, 0, TQPoint( 0, 0 ), false );
+	    if ( needRetqparent && TQT_BASE_OBJECT(w->tqparent()) != TQT_BASE_OBJECT(layoutBase) )
+		w->reparent( layoutBase, 0, TQPoint( 0, 0 ), false );
 	    if ( rs * cs == 1 ) {
 		tqlayout->addWidget( w, r, c, w->inherits( "Spacer" ) ? ( (Spacer*)w )->tqalignment() : 0 );
 	    } else {
@@ -846,7 +846,7 @@ void Spacer::paintEvent( TQPaintEvent * )
 void Spacer::resizeEvent( TQResizeEvent* e)
 {
     TQWidget::resizeEvent( e );
-    if ( !tqparentWidget() || WidgetFactory::tqlayoutType( tqparentWidget() ) == WidgetFactory::NoLayout )
+    if ( !parentWidget() || WidgetFactory::layoutType( parentWidget() ) == WidgetFactory::NoLayout )
 	sh = size();
 }
 
@@ -912,7 +912,7 @@ TQSize Spacer::tqsizeHint() const
 void Spacer::setSizeHint( const TQSize &s )
 {
     sh = s;
-    if ( !tqparentWidget() || WidgetFactory::tqlayoutType( tqparentWidget() ) == WidgetFactory::NoLayout )
+    if ( !parentWidget() || WidgetFactory::layoutType( parentWidget() ) == WidgetFactory::NoLayout )
 	resize( tqsizeHint() );
     updateGeometry();
 }
@@ -932,7 +932,7 @@ void Spacer::setOrientation( Qt::Orientation o )
     setSizeType( st );
     if ( interactive ) {
 	sh = TQSize( sh.height(), sh.width() );
-	if (!tqparentWidget() || WidgetFactory::tqlayoutType( tqparentWidget() ) == WidgetFactory::NoLayout )
+	if (!parentWidget() || WidgetFactory::layoutType( parentWidget() ) == WidgetFactory::NoLayout )
 	    resize( height(), width() );
     }
     updateMask();
diff --git a/kommander/editor/layout.h b/kommander/editor/layout.h
index 831ce507..cd89ba41 100644
--- a/kommander/editor/layout.h
+++ b/kommander/editor/layout.h
@@ -51,7 +51,7 @@ protected:
     TQWidget *tqparent;
     TQPoint startPoint;
     TQMap<TQGuardedPtr<TQWidget>, TQRect> geometries;
-    TQWidget *tqlayoutBase;
+    TQWidget *layoutBase;
     FormWindow *formWindow;
     TQRect oldGeometry;
     bool isBreak;
@@ -160,7 +160,7 @@ class QDesignerGridLayout : public TQGridLayout
   TQ_OBJECT
 public:
     QDesignerGridLayout( TQWidget *tqparent ) : TQGridLayout( tqparent ){};
-    QDesignerGridLayout( TQLayout *tqparentLayout ) : TQGridLayout( tqparentLayout ){};
+    QDesignerGridLayout( TQLayout *parentLayout ) : TQGridLayout( parentLayout ){};
 
     void addWidget( TQWidget *, int row, int col, int align = 0 );
     void addMultiCellWidget( TQWidget *, int fromRow, int toRow,
diff --git a/kommander/editor/listeditor.ui b/kommander/editor/listeditor.ui
index 66efc1ae..8fe16f53 100644
--- a/kommander/editor/listeditor.ui
+++ b/kommander/editor/listeditor.ui
@@ -143,5 +143,5 @@
     <slot>renameItem()</slot>
 </Q_SLOTS>
 <pixmapinproject/>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kommander/editor/mainwindow.cpp b/kommander/editor/mainwindow.cpp
index 7a47b852..8a30d812 100644
--- a/kommander/editor/mainwindow.cpp
+++ b/kommander/editor/mainwindow.cpp
@@ -143,9 +143,9 @@ MainWindow::MainWindow(bool asClient)
   setupMDI();
   setupFileActions();
   setupEditActions();
-  tqlayoutToolBar = new KToolBar(this, "Layout");
-  ((KToolBar *) tqlayoutToolBar)->setFullSize(false);
-  addToolBar(tqlayoutToolBar, i18n("Layout"));
+  layoutToolBar = new KToolBar(this, "Layout");
+  ((KToolBar *) layoutToolBar)->setFullSize(false);
+  addToolBar(layoutToolBar, i18n("Layout"));
   setupToolActions();
   setupLayoutActions();
   setupWorkspace();
@@ -171,8 +171,8 @@ MainWindow::MainWindow(bool asClient)
 
   connect(kapp->clipboard(), TQT_SIGNAL(dataChanged()), this, TQT_SLOT(clipboardChanged()));
   clipboardChanged();
-  tqlayoutChilds = false;
-  tqlayoutSelected = false;
+  layoutChilds = false;
+  layoutSelected = false;
   breakLayout = false;
   backPix = true;
 
@@ -274,7 +274,7 @@ void MainWindow::setupHierarchyView()
                       "<p>The Object Explorer provides an overview of the relationships "
                       "between the widgets in a form. You can use the clipboard functions using "
                       "a context menu for each item in the view. It is also useful for selecting widgets "
-                      "in forms that have complex tqlayouts.</p>"
+                      "in forms that have complex layouts.</p>"
                       "<p>The columns can be resized by dragging the separator in the list's header.</p>"
                       "<p>The second tab shows all the form's slots, class variables, includes, etc.</p>"));
 }
@@ -596,7 +596,7 @@ bool MainWindow::eventFilter(TQObject *o, TQEvent *e)
         while (w) {
           if (w->inherits("PropertyList"))
             break;
-          w = w->tqparentWidget(true);
+          w = w->parentWidget(true);
         }
         if (w) {
           propertyEditor->propertyList()->showCurrentWhatsThis();
@@ -634,8 +634,8 @@ bool MainWindow::eventFilter(TQObject *o, TQEvent *e)
            o->tqparent() && o->tqparent()->inherits("QDesignerToolBar"))) {
         TQWidget *w = (TQWidget*)o;
         if (w->inherits(TQTOOLBUTTON_OBJECT_NAME_STRING) || w->inherits(TQCOMBOBOX_OBJECT_NAME_STRING) || w->inherits("QDesignerToolBarSeparator"))
-          w = w->tqparentWidget();
-        TQWidget *pw = w->tqparentWidget();
+          w = w->parentWidget();
+        TQWidget *pw = w->parentWidget();
         while (pw) {
           if (pw->inherits("FormWindow")) {
             ((FormWindow*)pw)->emitShowProperties(TQT_TQOBJECT(w));
@@ -643,7 +643,7 @@ bool MainWindow::eventFilter(TQObject *o, TQEvent *e)
               return !o->inherits(TQTOOLBUTTON_OBJECT_NAME_STRING) && !o->inherits(TQMENUBAR_OBJECT_NAME_STRING) &&
                   !o->inherits(TQCOMBOBOX_OBJECT_NAME_STRING) && !o->inherits("QDesignerToolBarSeparator");
           }
-          pw = pw->tqparentWidget();
+          pw = pw->parentWidget();
         }
            }
            if (o && (o->inherits("QDesignerToolBar") || o->inherits(TQDOCKWINDOWHANDLE_OBJECT_NAME_STRING))
@@ -752,7 +752,7 @@ bool MainWindow::eventFilter(TQObject *o, TQEvent *e)
     case TQEvent::Move:
       if (!(w = isAFormWindowChild(o)) || o->inherits("SizeHandle") || o->inherits("OrderIndicator"))
         break;
-      if (WidgetFactory::tqlayoutType((TQWidget*)o->tqparent()) != WidgetFactory::NoLayout) {
+      if (WidgetFactory::layoutType((TQWidget*)o->tqparent()) != WidgetFactory::NoLayout) {
         ((FormWindow*)w)->updateSelection((TQWidget*)o);
         if (e->type() != TQEvent::Resize)
           ((FormWindow*)w)->updateChildSelections((TQWidget*)o);
@@ -1320,8 +1320,8 @@ void MainWindow::clipboardChanged()
 
 void MainWindow::selectionChanged()
 {
-    tqlayoutChilds = false;
-    tqlayoutSelected = false;
+    layoutChilds = false;
+    layoutSelected = false;
     breakLayout = false;
     if (!formWindow()) {
         actionEditCut->setEnabled(false);
@@ -1358,7 +1358,7 @@ void MainWindow::selectionChanged()
         int unlaidout = 0;
         int laidout = 0;
         for (TQWidget *w = widgets.first(); w; w = widgets.next()) {
-            if (!w->tqparentWidget() || WidgetFactory::tqlayoutType(w->tqparentWidget()) == WidgetFactory::NoLayout)
+            if (!w->parentWidget() || WidgetFactory::layoutType(w->parentWidget()) == WidgetFactory::NoLayout)
                 unlaidout++;
             else
                 laidout++;
@@ -1370,27 +1370,27 @@ void MainWindow::selectionChanged()
         actionEditGridLayout->setEnabled(unlaidout > 1);
         actionEditBreakLayout->setEnabled(laidout > 0);
         actionEditAdjustSize->setEnabled(laidout > 0);
-        tqlayoutSelected = unlaidout > 1;
+        layoutSelected = unlaidout > 1;
         breakLayout = laidout > 0;
     } else if (selectedWidgets == 1) {
         TQWidget *w = widgets.first();
         bool isContainer = WidgetDatabase::isContainer(WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(TQT_TQOBJECT(w)))) ||
                            w == formWindow()->mainContainer();
-        actionEditAdjustSize->setEnabled(!w->tqparentWidget() ||
-                                          WidgetFactory::tqlayoutType(w->tqparentWidget()) == WidgetFactory::NoLayout);
+        actionEditAdjustSize->setEnabled(!w->parentWidget() ||
+                                          WidgetFactory::layoutType(w->parentWidget()) == WidgetFactory::NoLayout);
 
         if (!isContainer) {
             actionEditHLayout->setEnabled(false);
             actionEditVLayout->setEnabled(false);
             actionEditGridLayout->setEnabled(false);
-            if (w->tqparentWidget() && WidgetFactory::tqlayoutType(w->tqparentWidget()) != WidgetFactory::NoLayout) {
+            if (w->parentWidget() && WidgetFactory::layoutType(w->parentWidget()) != WidgetFactory::NoLayout) {
                 actionEditBreakLayout->setEnabled(!isAToolBarChild(TQT_TQOBJECT(w)));
                 breakLayout = true;
             } else {
                 actionEditBreakLayout->setEnabled(false);
             }
         } else {
-            if (WidgetFactory::tqlayoutType(w) == WidgetFactory::NoLayout) {
+            if (WidgetFactory::layoutType(w) == WidgetFactory::NoLayout) {
                 if (!formWindow()->hasInsertedChildren(w)) {
                     actionEditHLayout->setEnabled(false);
                     actionEditVLayout->setEnabled(false);
@@ -1401,9 +1401,9 @@ void MainWindow::selectionChanged()
                     actionEditVLayout->setEnabled(true);
                     actionEditGridLayout->setEnabled(true);
                     actionEditBreakLayout->setEnabled(false);
-                    tqlayoutChilds = true;
+                    layoutChilds = true;
                 }
-                if (w->tqparentWidget() && WidgetFactory::tqlayoutType(w->tqparentWidget()) != WidgetFactory::NoLayout) {
+                if (w->parentWidget() && WidgetFactory::layoutType(w->parentWidget()) != WidgetFactory::NoLayout) {
                     actionEditBreakLayout->setEnabled(!isAToolBarChild(TQT_TQOBJECT(w)));
                     breakLayout = true;
                 }
@@ -1418,7 +1418,7 @@ void MainWindow::selectionChanged()
     } else if (selectedWidgets == 0 && formWindow()) {
         actionEditAdjustSize->setEnabled(true);
         TQWidget *w = formWindow()->mainContainer();
-        if (WidgetFactory::tqlayoutType(w) == WidgetFactory::NoLayout) {
+        if (WidgetFactory::layoutType(w) == WidgetFactory::NoLayout) {
             if (!formWindow()->hasInsertedChildren(w)) {
                 actionEditHLayout->setEnabled(false);
                 actionEditVLayout->setEnabled(false);
@@ -1429,7 +1429,7 @@ void MainWindow::selectionChanged()
                 actionEditVLayout->setEnabled(true);
                 actionEditGridLayout->setEnabled(true);
                 actionEditBreakLayout->setEnabled(false);
-                tqlayoutChilds = true;
+                layoutChilds = true;
             }
         } else {
             actionEditHLayout->setEnabled(false);
@@ -1836,13 +1836,13 @@ void MainWindow::setModified(bool b, TQWidget *window)
       ((FormWindow *) w)->modificationChanged(b);
       return;
     }
-    w = w->tqparentWidget(true);
+    w = w->parentWidget(true);
     if (w->inherits("FormWindow"))
     {
       ((FormWindow *) w)->modificationChanged(b);
       return;
     }
-    w = w->tqparentWidget(true);
+    w = w->parentWidget(true);
   }
 }
 
@@ -1869,14 +1869,14 @@ void MainWindow::formNameChanged(FormWindow*)
 int MainWindow::currentLayoutDefaultSpacing() const
 {
     if (((MainWindow*)this)->formWindow())
-        return ((MainWindow*)this)->formWindow()->tqlayoutDefaultSpacing();
+        return ((MainWindow*)this)->formWindow()->layoutDefaultSpacing();
     return BOXLAYOUT_DEFAULT_SPACING;
 }
 
 int MainWindow::currentLayoutDefaultMargin() const
 {
     if (((MainWindow*)this)->formWindow())
-        return ((MainWindow*)this)->formWindow()->tqlayoutDefaultMargin();
+        return ((MainWindow*)this)->formWindow()->layoutDefaultMargin();
     return BOXLAYOUT_DEFAULT_MARGIN;
 }
 
diff --git a/kommander/editor/mainwindow.h b/kommander/editor/mainwindow.h
index a8ac770e..1e0d3b79 100644
--- a/kommander/editor/mainwindow.h
+++ b/kommander/editor/mainwindow.h
@@ -256,7 +256,7 @@ private:
     TQWorkspace *qworkspace;
     KMenuBar *menubar;
     FormWindow *lastActiveFormWindow;
-    bool breakLayout, tqlayoutChilds, tqlayoutSelected;
+    bool breakLayout, layoutChilds, layoutSelected;
     TQPoint grd;
     bool sGrid, snGrid;
     bool restoreConfig;
@@ -280,7 +280,7 @@ private:
     TQPopupMenu *rmbFormWindow;
     TQPopupMenu *windowMenu, *fileMenu;
 
-    TQToolBar *tqlayoutToolBar;
+    TQToolBar *layoutToolBar;
     KToolBar *fileTb;
 
     Preferences *prefDia;
diff --git a/kommander/editor/mainwindowactions.cpp b/kommander/editor/mainwindowactions.cpp
index f57afd72..9ed36f59 100644
--- a/kommander/editor/mainwindowactions.cpp
+++ b/kommander/editor/mainwindowactions.cpp
@@ -225,14 +225,14 @@ void MainWindow::setupLayoutActions()
   actionEditGridLayout->setWhatsThis(whatsThisFrom("Layout|Lay Out in a Grid"));
   actionEditGridLayout->setEnabled(false);
 
-  actionEditSplitHorizontal = new KAction(i18n("Lay OutQt::Horizontally in Splitter"), createIconSet("editvtqlayoutsplit.xpm"),
+  actionEditSplitHorizontal = new KAction(i18n("Lay OutQt::Horizontally in Splitter"), createIconSet("editvlayoutsplit.xpm"),
                                           KShortcut::null(), TQT_TQOBJECT(this), TQT_SLOT(editLayoutHorizontalSplit()), actionCollection(),
                                           "edit_split_h");
   actionEditSplitHorizontal->setToolTip(i18n("Lays out the selected widgets horizontally in a splitter"));
   actionEditSplitHorizontal->setWhatsThis(whatsThisFrom("Layout|Lay OutQt::Horizontally in Splitter"));
   actionEditSplitHorizontal->setEnabled(false);
 
-  actionEditSplitVertical = new KAction(i18n("Lay OutQt::Vertically in Splitter"), createIconSet("edithtqlayoutsplit.xpm"),
+  actionEditSplitVertical = new KAction(i18n("Lay OutQt::Vertically in Splitter"), createIconSet("edithlayoutsplit.xpm"),
                                         KShortcut::null(), TQT_TQOBJECT(this), TQT_SLOT(editLayoutVerticalSplit()), actionCollection(),
                                         "edit_split_v");
   actionEditSplitVertical->setToolTip(i18n("Lays out the selected widgets vertically in a splitter"));
@@ -255,17 +255,17 @@ void MainWindow::setupLayoutActions()
       "or double click to keep the tool selected.").tqarg(WidgetDatabase::toolTip(id)).
       tqarg(WidgetDatabase::whatsThis(id)).tqarg(WidgetDatabase::toolTip(id)));
 
-  TQWhatsThis::add(tqlayoutToolBar, i18n("<b>The Layout toolbar</b>%1").tqarg(toolbarHelp));
-  actionEditAdjustSize->plug(tqlayoutToolBar);
-  tqlayoutToolBar->addSeparator();
-  actionEditHLayout->plug(tqlayoutToolBar);
-  actionEditVLayout->plug(tqlayoutToolBar);
-  actionEditGridLayout->plug(tqlayoutToolBar);
-  actionEditSplitHorizontal->plug(tqlayoutToolBar);
-  actionEditSplitVertical->plug(tqlayoutToolBar);
-  actionEditBreakLayout->plug(tqlayoutToolBar);
-  tqlayoutToolBar->addSeparator();
-  a->plug(tqlayoutToolBar);
+  TQWhatsThis::add(layoutToolBar, i18n("<b>The Layout toolbar</b>%1").tqarg(toolbarHelp));
+  actionEditAdjustSize->plug(layoutToolBar);
+  layoutToolBar->addSeparator();
+  actionEditHLayout->plug(layoutToolBar);
+  actionEditVLayout->plug(layoutToolBar);
+  actionEditGridLayout->plug(layoutToolBar);
+  actionEditSplitHorizontal->plug(layoutToolBar);
+  actionEditSplitVertical->plug(layoutToolBar);
+  actionEditBreakLayout->plug(layoutToolBar);
+  layoutToolBar->addSeparator();
+  a->plug(layoutToolBar);
 
   TQPopupMenu *menu = new TQPopupMenu(this, "Layout");
   menuBar()->insertItem(i18n("&Layout"), menu);
@@ -893,13 +893,13 @@ void MainWindow::editPaste()
   if (l.count() == 1)
   {
     w = l.first();
-    if (WidgetFactory::tqlayoutType(w) != WidgetFactory::NoLayout ||
+    if (WidgetFactory::layoutType(w) != WidgetFactory::NoLayout ||
         (!WidgetDatabase::isContainer(WidgetDatabase::idFromClassName(WidgetFactory::
                     classNameOf(TQT_TQOBJECT(w)))) && w != formWindow()->mainContainer()))
       w = formWindow()->mainContainer();
   }
 
-  if (w && WidgetFactory::tqlayoutType(w) == WidgetFactory::NoLayout)
+  if (w && WidgetFactory::layoutType(w) == WidgetFactory::NoLayout)
   {
     formWindow()->paste(tqApp->clipboard()->text(), WidgetFactory::containerOfWidget(w));
     hierarchyView->widgetInserted(0);
@@ -945,42 +945,42 @@ void MainWindow::editAdjustSize()
 
 void MainWindow::editLayoutHorizontal()
 {
-  if (tqlayoutChilds)
+  if (layoutChilds)
     editLayoutContainerHorizontal();
-  else if (tqlayoutSelected && formWindow())
-    formWindow()->tqlayoutHorizontal();
+  else if (layoutSelected && formWindow())
+    formWindow()->layoutHorizontal();
 }
 
 void MainWindow::editLayoutVertical()
 {
-  if (tqlayoutChilds)
+  if (layoutChilds)
     editLayoutContainerVertical();
-  else if (tqlayoutSelected && formWindow())
-    formWindow()->tqlayoutVertical();
+  else if (layoutSelected && formWindow())
+    formWindow()->layoutVertical();
 }
 
 void MainWindow::editLayoutHorizontalSplit()
 {
-  if (tqlayoutChilds)
+  if (layoutChilds)
     ;                           // no way to do that
-  else if (tqlayoutSelected && formWindow())
-    formWindow()->tqlayoutHorizontalSplit();
+  else if (layoutSelected && formWindow())
+    formWindow()->layoutHorizontalSplit();
 }
 
 void MainWindow::editLayoutVerticalSplit()
 {
-  if (tqlayoutChilds)
+  if (layoutChilds)
     ;                           // no way to do that
-  else if (tqlayoutSelected && formWindow())
-    formWindow()->tqlayoutVerticalSplit();
+  else if (layoutSelected && formWindow())
+    formWindow()->layoutVerticalSplit();
 }
 
 void MainWindow::editLayoutGrid()
 {
-  if (tqlayoutChilds)
+  if (layoutChilds)
     editLayoutContainerGrid();
-  else if (tqlayoutSelected && formWindow())
-    formWindow()->tqlayoutGrid();
+  else if (layoutSelected && formWindow())
+    formWindow()->layoutGrid();
 }
 
 void MainWindow::editLayoutContainerVertical()
@@ -992,7 +992,7 @@ void MainWindow::editLayoutContainerVertical()
   if (l.count() == 1)
     w = l.first();
   if (w)
-    formWindow()->tqlayoutVerticalContainer(w);
+    formWindow()->layoutVerticalContainer(w);
 }
 
 void MainWindow::editLayoutContainerHorizontal()
@@ -1004,7 +1004,7 @@ void MainWindow::editLayoutContainerHorizontal()
   if (l.count() == 1)
     w = l.first();
   if (w)
-    formWindow()->tqlayoutHorizontalContainer(w);
+    formWindow()->layoutHorizontalContainer(w);
 }
 
 void MainWindow::editLayoutContainerGrid()
@@ -1016,7 +1016,7 @@ void MainWindow::editLayoutContainerGrid()
   if (l.count() == 1)
     w = l.first();
   if (w)
-    formWindow()->tqlayoutGridContainer(w);
+    formWindow()->layoutGridContainer(w);
 }
 
 
@@ -1029,8 +1029,8 @@ void MainWindow::editBreakLayout()
   TQWidget *w = formWindow()->mainContainer();
   if (formWindow()->currentWidget())
     w = formWindow()->currentWidget();
-  if (WidgetFactory::tqlayoutType(w) != WidgetFactory::NoLayout ||
-      w->tqparentWidget() && WidgetFactory::tqlayoutType(w->tqparentWidget()) != WidgetFactory::NoLayout)
+  if (WidgetFactory::layoutType(w) != WidgetFactory::NoLayout ||
+      w->parentWidget() && WidgetFactory::layoutType(w->parentWidget()) != WidgetFactory::NoLayout)
   {
     formWindow()->breakLayout(w);
     return;
@@ -1040,9 +1040,9 @@ void MainWindow::editBreakLayout()
     TQWidgetList widgets = formWindow()->selectedWidgets();
     for (w = widgets.first(); w; w = widgets.next())
     {
-      if (WidgetFactory::tqlayoutType(w) != WidgetFactory::NoLayout ||
-          w->tqparentWidget()
-          && WidgetFactory::tqlayoutType(w->tqparentWidget()) != WidgetFactory::NoLayout)
+      if (WidgetFactory::layoutType(w) != WidgetFactory::NoLayout ||
+          w->parentWidget()
+          && WidgetFactory::layoutType(w->parentWidget()) != WidgetFactory::NoLayout)
         break;
     }
     if (w)
@@ -1053,8 +1053,8 @@ void MainWindow::editBreakLayout()
   }
 
   w = formWindow()->mainContainer();
-  if (WidgetFactory::tqlayoutType(w) != WidgetFactory::NoLayout ||
-      w->tqparentWidget() && WidgetFactory::tqlayoutType(w->tqparentWidget()) != WidgetFactory::NoLayout)
+  if (WidgetFactory::layoutType(w) != WidgetFactory::NoLayout ||
+      w->parentWidget() && WidgetFactory::layoutType(w->parentWidget()) != WidgetFactory::NoLayout)
   {
     formWindow()->breakLayout(w);
   }
diff --git a/kommander/editor/metadatabase.cpp b/kommander/editor/metadatabase.cpp
index 2e0064f0..72f63de5 100644
--- a/kommander/editor/metadatabase.cpp
+++ b/kommander/editor/metadatabase.cpp
@@ -270,7 +270,7 @@ void MetaDataBase::setSpacing( TQObject *o, int spacing )
 
     r->spacing = spacing;
     TQLayout * tqlayout = 0;
-    WidgetFactory::tqlayoutType( (TQWidget*)o, tqlayout );
+    WidgetFactory::layoutType( (TQWidget*)o, tqlayout );
     if ( tqlayout )
         tqlayout->setSpacing( spacing );
 }
@@ -306,7 +306,7 @@ void MetaDataBase::setMargin( TQObject *o, int margin )
 
     r->margin = margin;
     TQLayout * tqlayout = 0;
-    WidgetFactory::tqlayoutType( (TQWidget*)o, tqlayout );
+    WidgetFactory::layoutType( (TQWidget*)o, tqlayout );
     if ( margin < 1 )
         margin = 1;
     if ( tqlayout )
diff --git a/kommander/editor/newform.ui b/kommander/editor/newform.ui
index c1e14bd6..fe2f5e42 100644
--- a/kommander/editor/newform.ui
+++ b/kommander/editor/newform.ui
@@ -206,5 +206,5 @@
     <slot access="protected">itemChanged( TQIconViewItem * )</slot>
     <slot access="protected">projectChanged( const QString &amp; )</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kommander/editor/orderindicator.cpp b/kommander/editor/orderindicator.cpp
index 056601b8..24108c2f 100644
--- a/kommander/editor/orderindicator.cpp
+++ b/kommander/editor/orderindicator.cpp
@@ -72,7 +72,7 @@ void OrderIndicator::setOrder( int i, TQWidget* wid )
 
 void OrderIndicator::reposition()
 {
-    TQPoint p =tqparentWidget()->mapFromGlobal( widget->mapToGlobal( widget->rect().topLeft() ) );
+    TQPoint p =parentWidget()->mapFromGlobal( widget->mapToGlobal( widget->rect().topLeft() ) );
     move( p - TQPoint( width()/3, height()/3 ) );
 }
 
diff --git a/kommander/editor/paletteeditor.ui b/kommander/editor/paletteeditor.ui
index 814785dd..eeead240 100644
--- a/kommander/editor/paletteeditor.ui
+++ b/kommander/editor/paletteeditor.ui
@@ -509,7 +509,7 @@
     <slot access="protected">onChooseMainColor()</slot>
     <slot access="protected">paletteSelected(int)</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>styledbutton.h</includehint>
     <includehint>styledbutton.h</includehint>
diff --git a/kommander/editor/paletteeditoradvanced.ui b/kommander/editor/paletteeditoradvanced.ui
index 5d2c41af..001a39f3 100644
--- a/kommander/editor/paletteeditoradvanced.ui
+++ b/kommander/editor/paletteeditoradvanced.ui
@@ -41,7 +41,7 @@
         <bool>true</bool>
     </property>
     <property name="whatsThis" stdset="0">
-        <string>&lt;b&gt;Edit Palette&lt;/b&gt;&lt;p&gt;Change the current widget or form's palette.&lt;/p&gt;&lt;p&gt;Use a generated palette or select colors for each color group and each color role.&lt;/p&gt;&lt;p&gt;The palette can be tested with different widget tqlayouts in the preview section.&lt;/p&gt;</string>
+        <string>&lt;b&gt;Edit Palette&lt;/b&gt;&lt;p&gt;Change the current widget or form's palette.&lt;/p&gt;&lt;p&gt;Use a generated palette or select colors for each color group and each color role.&lt;/p&gt;&lt;p&gt;The palette can be tested with different widget layouts in the preview section.&lt;/p&gt;</string>
     </property>
     <vbox>
         <property name="name">
@@ -757,7 +757,7 @@
     <slot access="protected">paletteSelected(int)</slot>
     <slot>showHelp()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>styledbutton.h</includehint>
     <includehint>styledbutton.h</includehint>
diff --git a/kommander/editor/pics/images.h b/kommander/editor/pics/images.h
index 5850acd1..4b14e2ac 100644
--- a/kommander/editor/pics/images.h
+++ b/kommander/editor/pics/images.h
@@ -4717,8 +4717,8 @@ static const unsigned char small_editgrid_png_data[] = {
     0x60,0x82
 };
 
-static const unsigned int  small_edithtqlayout_png_len = 706;
-static const unsigned char small_edithtqlayout_png_data[] = {
+static const unsigned int  small_edithlayout_png_len = 706;
+static const unsigned char small_edithlayout_png_data[] = {
     0x89,0x50,0x4e,0x47,0x0d,0x0a,0x1a,0x0a,0x00,0x00,0x00,0x0d,0x49,0x48,
     0x44,0x52,0x00,0x00,0x00,0x16,0x00,0x00,0x00,0x16,0x08,0x06,0x00,0x00,
     0x00,0xc4,0xb4,0x6c,0x3b,0x00,0x00,0x00,0x04,0x67,0x41,0x4d,0x41,0x00,
@@ -4772,8 +4772,8 @@ static const unsigned char small_edithtqlayout_png_data[] = {
     0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
-static const unsigned int  small_edithtqlayoutsplit_png_len = 809;
-static const unsigned char small_edithtqlayoutsplit_png_data[] = {
+static const unsigned int  small_edithlayoutsplit_png_len = 809;
+static const unsigned char small_edithlayoutsplit_png_data[] = {
     0x89,0x50,0x4e,0x47,0x0d,0x0a,0x1a,0x0a,0x00,0x00,0x00,0x0d,0x49,0x48,
     0x44,0x52,0x00,0x00,0x00,0x16,0x00,0x00,0x00,0x16,0x08,0x06,0x00,0x00,
     0x00,0xc4,0xb4,0x6c,0x3b,0x00,0x00,0x00,0x04,0x67,0x41,0x4d,0x41,0x00,
@@ -4957,8 +4957,8 @@ static const unsigned char small_editslots_png_data[] = {
     0xae,0x42,0x60,0x82
 };
 
-static const unsigned int  small_editvtqlayout_png_len = 289;
-static const unsigned char small_editvtqlayout_png_data[] = {
+static const unsigned int  small_editvlayout_png_len = 289;
+static const unsigned char small_editvlayout_png_data[] = {
     0x89,0x50,0x4e,0x47,0x0d,0x0a,0x1a,0x0a,0x00,0x00,0x00,0x0d,0x49,0x48,
     0x44,0x52,0x00,0x00,0x00,0x16,0x00,0x00,0x00,0x16,0x08,0x06,0x00,0x00,
     0x00,0xc4,0xb4,0x6c,0x3b,0x00,0x00,0x00,0x04,0x67,0x41,0x4d,0x41,0x00,
@@ -4982,8 +4982,8 @@ static const unsigned char small_editvtqlayout_png_data[] = {
     0x00,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
-static const unsigned int  small_editvtqlayoutsplit_png_len = 355;
-static const unsigned char small_editvtqlayoutsplit_png_data[] = {
+static const unsigned int  small_editvlayoutsplit_png_len = 355;
+static const unsigned char small_editvlayoutsplit_png_data[] = {
     0x89,0x50,0x4e,0x47,0x0d,0x0a,0x1a,0x0a,0x00,0x00,0x00,0x0d,0x49,0x48,
     0x44,0x52,0x00,0x00,0x00,0x16,0x00,0x00,0x00,0x16,0x08,0x06,0x00,0x00,
     0x00,0xc4,0xb4,0x6c,0x3b,0x00,0x00,0x00,0x04,0x67,0x41,0x4d,0x41,0x00,
@@ -7784,8 +7784,8 @@ static const unsigned char small_disabled_editgrid_png_data[] = {
     0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
-static const unsigned int  small_disabled_edithtqlayout_png_len = 601;
-static const unsigned char small_disabled_edithtqlayout_png_data[] = {
+static const unsigned int  small_disabled_edithlayout_png_len = 601;
+static const unsigned char small_disabled_edithlayout_png_data[] = {
     0x89,0x50,0x4e,0x47,0x0d,0x0a,0x1a,0x0a,0x00,0x00,0x00,0x0d,0x49,0x48,
     0x44,0x52,0x00,0x00,0x00,0x16,0x00,0x00,0x00,0x16,0x08,0x06,0x00,0x00,
     0x00,0xc4,0xb4,0x6c,0x3b,0x00,0x00,0x00,0x04,0x67,0x41,0x4d,0x41,0x00,
@@ -7831,8 +7831,8 @@ static const unsigned char small_disabled_edithtqlayout_png_data[] = {
     0x35,0x00,0x00,0x00,0x00,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
 };
 
-static const unsigned int  small_disabled_edithtqlayoutsplit_png_len = 754;
-static const unsigned char small_disabled_edithtqlayoutsplit_png_data[] = {
+static const unsigned int  small_disabled_edithlayoutsplit_png_len = 754;
+static const unsigned char small_disabled_edithlayoutsplit_png_data[] = {
     0x89,0x50,0x4e,0x47,0x0d,0x0a,0x1a,0x0a,0x00,0x00,0x00,0x0d,0x49,0x48,
     0x44,0x52,0x00,0x00,0x00,0x16,0x00,0x00,0x00,0x16,0x08,0x06,0x00,0x00,
     0x00,0xc4,0xb4,0x6c,0x3b,0x00,0x00,0x00,0x04,0x67,0x41,0x4d,0x41,0x00,
@@ -7958,8 +7958,8 @@ static const unsigned char small_disabled_editpaste_png_data[] = {
     0x44,0xae,0x42,0x60,0x82
 };
 
-static const unsigned int  small_disabled_editvtqlayout_png_len = 617;
-static const unsigned char small_disabled_editvtqlayout_png_data[] = {
+static const unsigned int  small_disabled_editvlayout_png_len = 617;
+static const unsigned char small_disabled_editvlayout_png_data[] = {
     0x89,0x50,0x4e,0x47,0x0d,0x0a,0x1a,0x0a,0x00,0x00,0x00,0x0d,0x49,0x48,
     0x44,0x52,0x00,0x00,0x00,0x16,0x00,0x00,0x00,0x16,0x08,0x06,0x00,0x00,
     0x00,0xc4,0xb4,0x6c,0x3b,0x00,0x00,0x00,0x04,0x67,0x41,0x4d,0x41,0x00,
@@ -8007,8 +8007,8 @@ static const unsigned char small_disabled_editvtqlayout_png_data[] = {
     0x82
 };
 
-static const unsigned int  small_disabled_editvtqlayoutsplit_png_len = 752;
-static const unsigned char small_disabled_editvtqlayoutsplit_png_data[] = {
+static const unsigned int  small_disabled_editvlayoutsplit_png_len = 752;
+static const unsigned char small_disabled_editvlayoutsplit_png_data[] = {
     0x89,0x50,0x4e,0x47,0x0d,0x0a,0x1a,0x0a,0x00,0x00,0x00,0x0d,0x49,0x48,
     0x44,0x52,0x00,0x00,0x00,0x16,0x00,0x00,0x00,0x16,0x08,0x06,0x00,0x00,
     0x00,0xc4,0xb4,0x6c,0x3b,0x00,0x00,0x00,0x04,0x67,0x41,0x4d,0x41,0x00,
@@ -10877,12 +10877,12 @@ static struct Embed {
     { 485, small_editcopy_png_data, "small/editcopy.png" },
     { 649, small_editcut_png_data, "small/editcut.png" },
     { 520, small_editgrid_png_data, "small/editgrid.png" },
-    { 706, small_edithtqlayout_png_data, "small/edithtqlayout.png" },
-    { 809, small_edithtqlayoutsplit_png_data, "small/edithtqlayoutsplit.png" },
+    { 706, small_edithlayout_png_data, "small/edithtqlayout.png" },
+    { 809, small_edithlayoutsplit_png_data, "small/edithlayoutsplit.png" },
     { 902, small_editpaste_png_data, "small/editpaste.png" },
     { 690, small_editslots_png_data, "small/editslots.png" },
-    { 289, small_editvtqlayout_png_data, "small/editvtqlayout.png" },
-    { 355, small_editvtqlayoutsplit_png_data, "small/editvtqlayoutsplit.png" },
+    { 289, small_editvlayout_png_data, "small/editvtqlayout.png" },
+    { 355, small_editvlayoutsplit_png_data, "small/editvlayoutsplit.png" },
     { 1408, small_exec_png_data, "small/exec.png" },
     { 313, small_filenew_png_data, "small/filenew.png" },
     { 681, small_fileopen_png_data, "small/fileopen.png" },
@@ -10933,11 +10933,11 @@ static struct Embed {
     { 1126, small_disabled_editbreaklayout_png_data, "small/disabled/editbreaklayout.png" },
     { 931, small_disabled_editcopy_png_data, "small/disabled/editcopy.png" },
     { 735, small_disabled_editgrid_png_data, "small/disabled/editgrid.png" },
-    { 601, small_disabled_edithtqlayout_png_data, "small/disabled/edithtqlayout.png" },
-    { 754, small_disabled_edithtqlayoutsplit_png_data, "small/disabled/edithtqlayoutsplit.png" },
+    { 601, small_disabled_edithlayout_png_data, "small/disabled/edithtqlayout.png" },
+    { 754, small_disabled_edithlayoutsplit_png_data, "small/disabled/edithlayoutsplit.png" },
     { 901, small_disabled_editpaste_png_data, "small/disabled/editpaste.png" },
-    { 617, small_disabled_editvtqlayout_png_data, "small/disabled/editvtqlayout.png" },
-    { 752, small_disabled_editvtqlayoutsplit_png_data, "small/disabled/editvtqlayoutsplit.png" },
+    { 617, small_disabled_editvlayout_png_data, "small/disabled/editvtqlayout.png" },
+    { 752, small_disabled_editvlayoutsplit_png_data, "small/disabled/editvlayoutsplit.png" },
     { 587, small_disabled_filesave_png_data, "small/disabled/filesave.png" },
     { 531, small_disabled_redo_png_data, "small/disabled/redo.png" },
     { 1013, small_disabled_searchfind_png_data, "small/disabled/searchfind.png" },
diff --git a/kommander/editor/pixmapfunction.ui b/kommander/editor/pixmapfunction.ui
index fb2043d2..cb34cbcc 100644
--- a/kommander/editor/pixmapfunction.ui
+++ b/kommander/editor/pixmapfunction.ui
@@ -84,10 +84,10 @@
                 <number>2</number>
             </property>
             <property>
-                <name>tqlayoutMargin</name>
+                <name>layoutMargin</name>
             </property>
             <property>
-                <name>tqlayoutSpacing</name>
+                <name>layoutSpacing</name>
             </property>
             <hbox>
                 <property stdset="1">
diff --git a/kommander/editor/propertyeditor.cpp b/kommander/editor/propertyeditor.cpp
index 220613f5..d579c3b6 100644
--- a/kommander/editor/propertyeditor.cpp
+++ b/kommander/editor/propertyeditor.cpp
@@ -172,7 +172,7 @@ PropertyItem::PropertyItem( PropertyList *l, PropertyItem *after, PropertyItem *
 PropertyItem::~PropertyItem()
 {
     if ( resetButton )
-	delete resetButton->tqparentWidget();
+	delete resetButton->parentWidget();
     resetButton = 0;
 }
 
@@ -337,7 +337,7 @@ void PropertyItem::setOpen( bool b )
 void PropertyItem::showEditor()
 {
     createResetButton();
-    resetButton->tqparentWidget()->show();
+    resetButton->parentWidget()->show();
 }
 
 /*!  Subclasses have to hide the editor of the item here
@@ -346,7 +346,7 @@ void PropertyItem::showEditor()
 void PropertyItem::hideEditor()
 {
     createResetButton();
-    resetButton->tqparentWidget()->hide();
+    resetButton->parentWidget()->hide();
 }
 
 /*!  This is called to init the value of the item. Reimplement in
@@ -389,7 +389,7 @@ TQString PropertyItem::name() const
 void PropertyItem::createResetButton()
 {
     if ( resetButton ) {
-	resetButton->tqparentWidget()->lower();
+	resetButton->parentWidget()->lower();
 	return;
     }
     TQHBox *hbox = new TQHBox( listview->viewport() );
@@ -439,8 +439,8 @@ 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->tqparentWidget()->resize( resetButton->tqsizeHint().width() + 10, r.height() );
-    listview->moveChild( resetButton->tqparentWidget(), r.x() + r.width() - 8, r.y() );
+    resetButton->parentWidget()->resize( resetButton->tqsizeHint().width() + 10, r.height() );
+    listview->moveChild( resetButton->parentWidget(), r.x() + r.width() - 8, r.y() );
     resetButton->setFixedHeight( r.height() - 3 );
 }
 
@@ -2498,16 +2498,16 @@ static TQVariant::Type type_to_variant( const TQString &s )
 }
 
 #ifndef TQT_NO_SQL
-static bool tqparent_is_data_aware( TQObject *o )
+static bool parent_is_data_aware( TQObject *o )
 {
     if ( !o->inherits( TQWIDGET_OBJECT_NAME_STRING ) )
 	return false;
     TQWidget *w = (TQWidget*)o;
-    TQWidget *p = w->tqparentWidget();
+    TQWidget *p = w->parentWidget();
     while ( p && !p->isTopLevel() ) {
 	if ( p->inherits( "QDesignerDataBrowser" ) || p->inherits( "QDesignerDataView" ) )
 	    return true;
-	p = p->tqparentWidget();
+	p = p->parentWidget();
     }
     return false;
 }
@@ -2527,10 +2527,10 @@ void PropertyList::setupProperties()
     TQMap<TQString, bool> unique;
     TQObject *w = editor->widget();
     TQStringList valueSet;
-    bool tqparentHasLayout =
+    bool parentHasLayout =
 	w->isWidgetType() &&
-	!editor->formWindow()->isMainContainer( TQT_TQOBJECT((TQWidget*)w) ) && ( (TQWidget*)w )->tqparentWidget() &&
-	WidgetFactory::tqlayoutType( ( (TQWidget*)w )->tqparentWidget() ) != WidgetFactory::NoLayout;
+	!editor->formWindow()->isMainContainer( TQT_TQOBJECT((TQWidget*)w) ) && ( (TQWidget*)w )->parentWidget() &&
+	WidgetFactory::layoutType( ( (TQWidget*)w )->parentWidget() ) != WidgetFactory::NoLayout;
     for ( TQPtrListIterator<char> it( lst ); it.current(); ++it ) {
 	const TQMetaProperty* p =
 	    editor->widget()->tqmetaObject()->
@@ -2573,7 +2573,7 @@ void PropertyList::setupProperties()
 		continue;
 	    if ( qstrcmp( p->name(), "baseSize" ) == 0 )
 		continue;
-	    if ( tqparentHasLayout && qstrcmp( p->name(), "geometry" ) == 0 )
+	    if ( parentHasLayout && qstrcmp( p->name(), "geometry" ) == 0 )
 		continue;
 	    if ( w->inherits( TQLAYOUTWIDGET_OBJECT_NAME_STRING ) || w->inherits( "Spacer" ) ) {
 		if ( qstrcmp( p->name(), "sizePolicy" ) == 0 )
@@ -2679,7 +2679,7 @@ void PropertyList::setupProperties()
 		TQStringList lst;
 		for ( uint i = 0; i < l.count(); ++i ) {
 		    TQString k = l.at( i );
-		    // filter out enum-tqmasks
+		    // filter out enum-masks
 		    if ( k[0] == 'M' && k[1].category() == TQChar::Letter_Uppercase )
 			continue;
 		    lst << l.at( i );
@@ -2703,11 +2703,11 @@ void PropertyList::setupProperties()
     }
 
     if ( !w->inherits( TQSPLITTER_OBJECT_NAME_STRING ) && !w->inherits( "QDesignerMenuBar" ) && !w->inherits( "QDesignerToolBar" ) &&
-	 w->isWidgetType() && WidgetFactory::tqlayoutType( (TQWidget*)w ) != WidgetFactory::NoLayout ) {
-	item = new PropertyIntItem( this, item, 0, "tqlayoutSpacing", true );
+	 w->isWidgetType() && WidgetFactory::layoutType( (TQWidget*)w ) != WidgetFactory::NoLayout ) {
+	item = new PropertyIntItem( this, item, 0, "layoutSpacing", true );
 	setPropertyValue( item );
 	item->setChanged( true );
-	item = new PropertyIntItem( this, item, 0, "tqlayoutMargin", true );
+	item = new PropertyIntItem( this, item, 0, "layoutMargin", true );
 	setPropertyValue( item );
 	item->setChanged( true );
     }
@@ -2727,7 +2727,7 @@ void PropertyList::setupProperties()
 
 #ifndef TQT_NO_SQL
     if ( !editor->widget()->inherits( TQDATATABLE_OBJECT_NAME_STRING ) && !editor->widget()->inherits( TQDATABROWSER_OBJECT_NAME_STRING ) &&
-	 !editor->widget()->inherits( TQDATAVIEW_OBJECT_NAME_STRING ) && tqparent_is_data_aware( editor->widget() ) ) {
+	 !editor->widget()->inherits( TQDATAVIEW_OBJECT_NAME_STRING ) && parent_is_data_aware( editor->widget() ) ) {
 	item = new PropertyDatabaseItem( this, item, 0, "database", editor->formWindow()->mainContainer() != w );
 	setPropertyValue( item );
 	if ( MetaDataBase::isPropertyChanged( editor->widget(), "database" ) )
@@ -3084,9 +3084,9 @@ void PropertyList::setPropertyValue( PropertyItem *i )
 		i->setValue( TQVariant( true, 0 ) );
 	    else
 		i->setValue( TQVariant( false, 0 ) );
-	} else if ( i->name() == "tqlayoutSpacing" ) {
+	} else if ( i->name() == "layoutSpacing" ) {
 	    ( (PropertyIntItem*)i )->setValue( MetaDataBase::spacing( TQT_TQOBJECT(WidgetFactory::containerOfWidget( (TQWidget*)editor->widget() )) ) );
-	} else if ( i->name() == "tqlayoutMargin" ) {
+	} else if ( i->name() == "layoutMargin" ) {
 	    ( (PropertyIntItem*)i )->setValue( MetaDataBase::margin( TQT_TQOBJECT(WidgetFactory::containerOfWidget( (TQWidget*)editor->widget() )) ) );
 	} else if ( i->name() == "toolTip" || i->name() == "whatsThis" || i->name() == "database" || i->name() == "frameworkCode" ) {
 	    i->setValue( MetaDataBase::fakeProperty( editor->widget(), i->name() ) );
@@ -3563,11 +3563,11 @@ void PropertyEditor::setWidget( TQObject *w, FormWindow *fw )
 #endif
     if ( w && w == wid ) {
 	bool ret = true;
-	if ( wid->isWidgetType() && WidgetFactory::tqlayoutType( (TQWidget*)wid ) != WidgetFactory::NoLayout ) {
+	if ( wid->isWidgetType() && WidgetFactory::layoutType( (TQWidget*)wid ) != WidgetFactory::NoLayout ) {
 	    TQListViewItemIterator it( listview );
 	    ret = false;
 	    while ( it.current() ) {
-		if ( it.current()->text( 0 ) == "tqlayoutSpacing" || it.current()->text( 0 ) == "tqlayoutMargin" ) {
+		if ( it.current()->text( 0 ) == "layoutSpacing" || it.current()->text( 0 ) == "layoutMargin" ) {
 		    ret = true;
 		    break;
 		}
diff --git a/kommander/editor/resource.cpp b/kommander/editor/resource.cpp
index 09768081..f55c963c 100644
--- a/kommander/editor/resource.cpp
+++ b/kommander/editor/resource.cpp
@@ -290,9 +290,9 @@ bool Resource::load( FormFile *ff, TQIODevice* dev )
     metaInfo.license = e.firstChild().toText().data();
 	} else if ( e.tagName() == "exportmacro" ) {
 	    exportMacro = e.firstChild().toText().data();
-	} else if ( e.tagName() == "tqlayoutdefaults" ) {
-	    formwindow->setLayoutDefaultSpacing( e.attribute( "spacing", TQString::number( formwindow->tqlayoutDefaultSpacing() ) ).toInt() );
-	    formwindow->setLayoutDefaultMargin( e.attribute( "margin", TQString::number( formwindow->tqlayoutDefaultMargin() ) ).toInt() );
+	} else if ( e.tagName() == "layoutdefaults" ) {
+	    formwindow->setLayoutDefaultSpacing( e.attribute( "spacing", TQString::number( formwindow->layoutDefaultSpacing() ) ).toInt() );
+	    formwindow->setLayoutDefaultMargin( e.attribute( "margin", TQString::number( formwindow->layoutDefaultMargin() ) ).toInt() );
 	}
 
 	e = e.nextSibling().toElement();
@@ -473,14 +473,14 @@ TQString Resource::copy()
     TQWidgetList widgets = formwindow->selectedWidgets();
     TQWidgetList tmp( widgets );
     for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) {
-	TQWidget *p = w->tqparentWidget();
+	TQWidget *p = w->parentWidget();
 	bool save = true;
 	while ( p ) {
 	    if ( tmp.tqfindRef( p ) != -1 ) {
 		save = false;
 		break;
 	    }
-	    p = p->tqparentWidget();
+	    p = p->parentWidget();
 	}
 	if ( save )
 	    saveObject( TQT_TQOBJECT(w), 0, ts, 0 );
@@ -940,8 +940,8 @@ void Resource::saveChildrenOf( TQObject* obj, TQTextStream &ts, int indent )
     if ( !obj->inherits( TQSPLITTER_OBJECT_NAME_STRING ) &&
 	 WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( obj ) ) ) &&
 	 obj->isWidgetType() &&
-	 WidgetFactory::tqlayoutType( (TQWidget*)obj, tqlayout ) != WidgetFactory::NoLayout ) {
-	WidgetFactory::LayoutType lay = WidgetFactory::tqlayoutType( (TQWidget*)obj, tqlayout );
+	 WidgetFactory::layoutType( (TQWidget*)obj, tqlayout ) != WidgetFactory::NoLayout ) {
+	WidgetFactory::LayoutType lay = WidgetFactory::layoutType( (TQWidget*)obj, tqlayout );
 	switch ( lay ) {
 	case WidgetFactory::HBox:
 	    closeTag = makeIndent( indent ) + "</hbox>";
@@ -1003,8 +1003,8 @@ void Resource::saveObjectProperties( TQObject *w, TQTextStream &ts, int indent )
     if ( changed.isEmpty() )
 	    return;
 
-    bool inLayout = TQT_BASE_OBJECT(w) != TQT_BASE_OBJECT(formwindow->mainContainer()) && !copying && w->isWidgetType() && ( (TQWidget*)w )->tqparentWidget() &&
-		    WidgetFactory::tqlayoutType( ( (TQWidget*)w )->tqparentWidget() ) != WidgetFactory::NoLayout;
+    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->tqmetaObject()->propertyNames( !w->inherits( "Spacer" ) );
     for ( TQPtrListIterator<char> it( lst ); it.current(); ++it ) {
@@ -1085,7 +1085,7 @@ void Resource::saveEnumProperty( TQObject *w, const TQString &name, TQVariant::T
 
 void Resource::saveProperty( TQObject *w, const TQString &name, const TQVariant &value, TQVariant::Type t, TQTextStream &ts, int indent )
 {
-    if ( name == "hAlign" || name =="vAlign" || name == "wordwrap" || name == "tqlayoutMargin" || name =="tqlayoutSpacing" )
+    if ( name == "hAlign" || name =="vAlign" || name == "wordwrap" || name == "layoutMargin" || name =="layoutSpacing" )
 	return;
     int num, unum;
     double dob;
@@ -1108,9 +1108,9 @@ void Resource::saveProperty( TQObject *w, const TQString &name, const TQVariant
 	num = value.toInt();
 	if ( w && w->inherits( TQLAYOUT_OBJECT_NAME_STRING ) ) {
 	    if ( name == "spacing" )
-		num = MetaDataBase::spacing( TQT_TQOBJECT(WidgetFactory::containerOfWidget( WidgetFactory::tqlayoutParent( TQT_TQLAYOUT(TQT_BASE_OBJECT(w)) ) )) );
+		num = MetaDataBase::spacing( TQT_TQOBJECT(WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( TQT_TQLAYOUT(TQT_BASE_OBJECT(w)) ) )) );
 	    else if ( name == "margin" )
-		num = MetaDataBase::margin( TQT_TQOBJECT(WidgetFactory::containerOfWidget( WidgetFactory::tqlayoutParent( TQT_TQLAYOUT(TQT_BASE_OBJECT(w)) ) )) );
+		num = MetaDataBase::margin( TQT_TQOBJECT(WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( TQT_TQLAYOUT(TQT_BASE_OBJECT(w)) ) )) );
 	}
 	ts << makeIndent( indent ) << "<number>" << TQString::number( num ) << "</number>" << endl;
 	break;
@@ -1126,9 +1126,9 @@ void Resource::saveProperty( TQObject *w, const TQString &name, const TQVariant
 	unum = value.toUInt();
 	if ( w && w->inherits( TQLAYOUT_OBJECT_NAME_STRING ) ) {
 	    if ( name == "spacing" )
-		num = MetaDataBase::spacing( TQT_TQOBJECT(WidgetFactory::tqlayoutParent( TQT_TQLAYOUT(TQT_BASE_OBJECT(w)) )) );
+		num = MetaDataBase::spacing( TQT_TQOBJECT(WidgetFactory::layoutParent( TQT_TQLAYOUT(TQT_BASE_OBJECT(w)) )) );
 	    else if ( name == "margin" )
-		num = MetaDataBase::margin( TQT_TQOBJECT(WidgetFactory::tqlayoutParent( TQT_TQLAYOUT(TQT_BASE_OBJECT(w)) )) );
+		num = MetaDataBase::margin( TQT_TQOBJECT(WidgetFactory::layoutParent( TQT_TQLAYOUT(TQT_BASE_OBJECT(w)) )) );
 	}
 	ts << makeIndent( indent ) << "<number>" << TQString::number( unum ) << "</number>" << endl;
 	break;
@@ -1173,8 +1173,8 @@ void Resource::saveProperty( TQObject *w, const TQString &name, const TQVariant
 	TQVariant v( value );
 	ts << makeIndent( indent ) << "<font>" << endl;
 	TQFont f( tqApp->font() );
-	if ( w && w->isWidgetType() && ((TQWidget*)w)->tqparentWidget() )
-	    f = ((TQWidget*)w)->tqparentWidget()->font();
+	if ( w && w->isWidgetType() && ((TQWidget*)w)->parentWidget() )
+	    f = ((TQWidget*)w)->parentWidget()->font();
 	TQFont f2( v.toFont() );
 	indent++;
 	if ( f.family() != f2.family() )
@@ -1347,7 +1347,7 @@ TQObject *Resource::createObject( const TQDomElement &e, TQWidget *tqparent, TQL
 	if ( w->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) )
 	    w = ( (TQMainWindow*)w )->centralWidget();
 	if ( tqlayout ) {
-	    switch ( WidgetFactory::tqlayoutType( tqlayout ) ) {
+	    switch ( WidgetFactory::layoutType( tqlayout ) ) {
 	    case WidgetFactory::HBox:
 		( (TQHBoxLayout*)tqlayout )->addWidget( w );
 		break;
@@ -1646,7 +1646,7 @@ void Resource::setObjectProperty( TQObject* obj, const TQString &prop, const TQD
 {
     const TQMetaProperty *p = obj->tqmetaObject()->property( obj->tqmetaObject()->tqfindProperty( prop, true ), true );
 
-    if ( !obj->inherits( TQLAYOUT_OBJECT_NAME_STRING )  ) {// no tqlayouts in metadatabase... (RS)
+    if ( !obj->inherits( TQLAYOUT_OBJECT_NAME_STRING )  ) {// no layouts in metadatabase... (RS)
 	if ( obj->inherits( "CustomWidget" ) ) {
 	    MetaDataBase::CustomWidget *cw = ( (CustomWidget*)obj )->customWidget();
 	    if ( cw && !cw->hasProperty( prop.latin1() ) && !p && prop != "toolTip" && prop != "whatsThis" )
@@ -1658,8 +1658,8 @@ void Resource::setObjectProperty( TQObject* obj, const TQString &prop, const TQD
     TQVariant defVarient;
     if ( e.tagName() == "font" ) {
 	TQFont f( tqApp->font() );
-	if ( obj->isWidgetType() && ( (TQWidget*)obj )->tqparentWidget() )
-	    f = ( (TQWidget*)obj )->tqparentWidget()->font();
+	if ( obj->isWidgetType() && ( (TQWidget*)obj )->parentWidget() )
+	    f = ( (TQWidget*)obj )->parentWidget()->font();
 	defVarient = TQVariant( f );
     }
 
@@ -1756,11 +1756,11 @@ void Resource::setObjectProperty( TQObject* obj, const TQString &prop, const TQD
 
     if ( obj->inherits( TQLAYOUT_OBJECT_NAME_STRING ) ) {
 	if ( prop == "spacing" ) {
-	    MetaDataBase::setSpacing( TQT_TQOBJECT(WidgetFactory::containerOfWidget( WidgetFactory::tqlayoutParent( (TQLayout*)obj ) )), v.toInt() );
+	    MetaDataBase::setSpacing( TQT_TQOBJECT(WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( (TQLayout*)obj ) )), v.toInt() );
 	    return;
 	}
 	if ( prop == "margin" ) {
-	    MetaDataBase::setMargin( TQT_TQOBJECT(WidgetFactory::containerOfWidget( WidgetFactory::tqlayoutParent( (TQLayout*)obj ) )), v.toInt() );
+	    MetaDataBase::setMargin( TQT_TQOBJECT(WidgetFactory::containerOfWidget( WidgetFactory::layoutParent( (TQLayout*)obj ) )), v.toInt() );
 	    return;
 	}
     }
@@ -2342,8 +2342,8 @@ void Resource::saveMetaInfoAfter( TQTextStream &ts, int indent )
     if ( !( exportMacro = MetaDataBase::exportMacro( TQT_TQOBJECT(formwindow->mainContainer()) ) ).isEmpty() )
 	ts << makeIndent( indent ) << "<exportmacro>" << exportMacro << "</exportmacro>" << endl;
     if ( formwindow )
-	ts << makeIndent( indent ) << "<tqlayoutdefaults spacing=\"" << formwindow->tqlayoutDefaultSpacing()
-	   << "\" margin=\"" << formwindow->tqlayoutDefaultMargin() << "\"/>" << endl;
+	ts << makeIndent( indent ) << "<layoutdefaults spacing=\"" << formwindow->layoutDefaultSpacing()
+	   << "\" margin=\"" << formwindow->layoutDefaultMargin() << "\"/>" << endl;
 }
 
 TQColorGroup Resource::loadColorGroup( const TQDomElement &e )
diff --git a/kommander/editor/sizehandle.cpp b/kommander/editor/sizehandle.cpp
index af5efea9..9a29cb31 100644
--- a/kommander/editor/sizehandle.cpp
+++ b/kommander/editor/sizehandle.cpp
@@ -93,7 +93,7 @@ void SizeHandle::setWidget( TQWidget *w )
 
 void SizeHandle::paintEvent( TQPaintEvent * )
 {
-    if ( ( (FormWindow*)tqparentWidget() )->currentWidget() != widget )
+    if ( ( (FormWindow*)parentWidget() )->currentWidget() != widget )
 	return;
     TQPainter p( this );
     p.setPen( blue );
@@ -115,8 +115,8 @@ void SizeHandle::mouseMoveEvent( TQMouseEvent *e )
     TQPoint rp = mapFromGlobal( e->globalPos() );
     TQPoint d = oldPressPos - rp;
     oldPressPos = rp;
-    TQPoint checkPos = widget->tqparentWidget()->mapFromGlobal( e->globalPos() );
-    TQRect pr = widget->tqparentWidget()->rect();
+    TQPoint checkPos = widget->parentWidget()->mapFromGlobal( e->globalPos() );
+    TQRect pr = widget->parentWidget()->rect();
 
     // ##### move code around a bit to reduce duplicated code here
     switch ( dir ) {
@@ -216,7 +216,7 @@ void SizeHandle::mouseMoveEvent( TQMouseEvent *e )
     formWindow->sizePreview()->setGeometry( lg );
     formWindow->sizePreview()->show();
     formWindow->sizePreview()->raise();
-    if ( WidgetFactory::tqlayoutType( widget ) != WidgetFactory::NoLayout )
+    if ( WidgetFactory::layoutType( widget ) != WidgetFactory::NoLayout )
 	formWindow->updateChildSelections( widget );
 }
 
@@ -282,7 +282,7 @@ void WidgetSelection::setWidget( TQWidget *w, bool updateDict )
     }
 
     wid = w;
-    bool active = !wid->tqparentWidget() || WidgetFactory::tqlayoutType( wid->tqparentWidget() ) == WidgetFactory::NoLayout;
+    bool active = !wid->parentWidget() || WidgetFactory::layoutType( wid->parentWidget() ) == WidgetFactory::NoLayout;
     for ( int i = SizeHandle::LeftTop; i <= SizeHandle::Left; ++i ) {
 	SizeHandle *h = handles[ i ];
 	if ( h ) {
@@ -306,7 +306,7 @@ void WidgetSelection::updateGeometry()
     if ( !wid )
 	return;
 
-    TQPoint p = wid->tqparentWidget()->mapToGlobal( wid->pos() );
+    TQPoint p = wid->parentWidget()->mapToGlobal( wid->pos() );
     p = formWindow->mapFromGlobal( p );
     TQRect r( p, wid->size() );
 
diff --git a/kommander/editor/styledbutton.cpp b/kommander/editor/styledbutton.cpp
index 95f57d39..e09fd1e8 100644
--- a/kommander/editor/styledbutton.cpp
+++ b/kommander/editor/styledbutton.cpp
@@ -252,7 +252,7 @@ void StyledButton::dragEnterEvent( TQDragEnterEvent *e )
 void StyledButton::dragLeaveEvent( TQDragLeaveEvent * )
 {
     if ( hasFocus() )
-	tqparentWidget()->setFocus();
+	parentWidget()->setFocus();
 }
 
 void StyledButton::dragMoveEvent( TQDragMoveEvent *e )
diff --git a/kommander/editor/templates/Configuration_Dialog.ui b/kommander/editor/templates/Configuration_Dialog.ui
index 4724398b..8d792741 100644
--- a/kommander/editor/templates/Configuration_Dialog.ui
+++ b/kommander/editor/templates/Configuration_Dialog.ui
@@ -152,5 +152,5 @@
         <slot>reject()</slot>
     </connection>
 </connections>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kommander/editor/templates/Dialog_with_Buttons_(Bottom).ui b/kommander/editor/templates/Dialog_with_Buttons_(Bottom).ui
index 6d9edca0..6278ab75 100644
--- a/kommander/editor/templates/Dialog_with_Buttons_(Bottom).ui
+++ b/kommander/editor/templates/Dialog_with_Buttons_(Bottom).ui
@@ -110,5 +110,5 @@
         <slot>reject()</slot>
     </connection>
 </connections>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kommander/editor/templates/Dialog_with_Buttons_(Right).ui b/kommander/editor/templates/Dialog_with_Buttons_(Right).ui
index 93650a87..2158eabd 100644
--- a/kommander/editor/templates/Dialog_with_Buttons_(Right).ui
+++ b/kommander/editor/templates/Dialog_with_Buttons_(Right).ui
@@ -110,5 +110,5 @@
         <slot>reject()</slot>
     </connection>
 </connections>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kommander/editor/templates/Tab_Dialog.ui b/kommander/editor/templates/Tab_Dialog.ui
index 4e0a7124..c85b3e8f 100644
--- a/kommander/editor/templates/Tab_Dialog.ui
+++ b/kommander/editor/templates/Tab_Dialog.ui
@@ -134,5 +134,5 @@
         <slot>reject()</slot>
     </connection>
 </connections>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kommander/editor/widgetdatabase.cpp b/kommander/editor/widgetdatabase.cpp
index cb12834e..63f5c2d8 100644
--- a/kommander/editor/widgetdatabase.cpp
+++ b/kommander/editor/widgetdatabase.cpp
@@ -89,7 +89,7 @@ WidgetDatabaseRecord::~WidgetDatabaseRecord()
   one application doesn't make sense anyway and so you don't need more
   than an instance of the widgetdatabase.
 
-  For creating widgets, tqlayouts, etc. see WidgetFactory.
+  For creating widgets, layouts, etc. see WidgetFactory.
 */
 
 /*!
@@ -355,7 +355,7 @@ void WidgetDatabase::setupDataBase( int id )
   r->group = widgetGroup("Temp");
   r->toolTip = i18n("Spacer");
   r->whatsThis =
-      i18n("The Spacer provides horizontal and vertical spacing to be able to manipulate the behaviour of tqlayouts.");
+      i18n("The Spacer provides horizontal and vertical spacing to be able to manipulate the behaviour of layouts.");
   append(r);
 
   r = new WidgetDatabaseRecord;
diff --git a/kommander/editor/widgetfactory.cpp b/kommander/editor/widgetfactory.cpp
index b908f8e9..43011071 100644
--- a/kommander/editor/widgetfactory.cpp
+++ b/kommander/editor/widgetfactory.cpp
@@ -123,9 +123,9 @@ FormWindow *find_formwindow( TQWidget *w )
     for (;;) {
 	if ( w->inherits( "FormWindow" ) )
 	    return (FormWindow*)w;
-	if ( !w->tqparentWidget() )
+	if ( !w->parentWidget() )
 	    return 0;
-	w = w->tqparentWidget();
+	w = w->parentWidget();
     }
 }
 
@@ -387,10 +387,10 @@ TQMap< int, TQStringList > *changedProperties = 0;
 
 /*!
   \class WidgetFactory widgetfactory.h
-  \brief Set of static functions for creating widgets, tqlayouts and do other stuff
+  \brief Set of static functions for creating widgets, layouts and do other stuff
 
   The widget factory offers functions to create widgets, create and
-  delete tqlayouts find out other details - all based on the
+  delete layouts find out other details - all based on the
   WidgetDatabase's data. So the functions that use ids use the same
   ids as in the WidgetDatabase.
 */
@@ -679,7 +679,7 @@ TQLayout *WidgetFactory::createLayout( TQWidget *widget, TQLayout *tqlayout, Lay
 
     if ( widget && !widget->inherits( TQLAYOUTWIDGET_OBJECT_NAME_STRING ) &&
 	 ( WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(widget) ) ) ) ||
-	   widget && widget->tqparentWidget() && widget->tqparentWidget()->inherits( "FormWindow" ) ) )
+	   widget && widget->parentWidget() && widget->parentWidget()->inherits( "FormWindow" ) ) )
 	margin = MainWindow::self->currentLayoutDefaultMargin();
 
     if ( !tqlayout && widget && widget->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) )
@@ -1262,7 +1262,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *tqpa
   TQWidget::tqlayout() of \a w or to 0 after the function call.
 */
 
-WidgetFactory::LayoutType WidgetFactory::tqlayoutType( TQWidget *w, TQLayout *&tqlayout )
+WidgetFactory::LayoutType WidgetFactory::layoutType( TQWidget *w, TQLayout *&tqlayout )
 {
     tqlayout = 0;
 
@@ -1304,7 +1304,7 @@ WidgetFactory::LayoutType WidgetFactory::tqlayoutType( TQWidget *w, TQLayout *&t
 /*!
   \overload
 */
-WidgetFactory::LayoutType WidgetFactory::tqlayoutType( TQLayout *tqlayout )
+WidgetFactory::LayoutType WidgetFactory::layoutType( TQLayout *tqlayout )
 {
     if ( tqlayout->inherits( TQHBOXLAYOUT_OBJECT_NAME_STRING ) )
 	return HBox;
@@ -1318,14 +1318,14 @@ WidgetFactory::LayoutType WidgetFactory::tqlayoutType( TQLayout *tqlayout )
 /*!
   \overload
 */
-WidgetFactory::LayoutType WidgetFactory::tqlayoutType( TQWidget *w )
+WidgetFactory::LayoutType WidgetFactory::layoutType( TQWidget *w )
 {
     TQLayout *l = 0;
-    return tqlayoutType( w, l );
+    return layoutType( w, l );
 }
 
 
-TQWidget *WidgetFactory::tqlayoutParent( TQLayout *tqlayout )
+TQWidget *WidgetFactory::layoutParent( TQLayout *tqlayout )
 {
     TQObject *o = TQT_TQOBJECT(tqlayout);
     while ( o ) {
@@ -1365,20 +1365,20 @@ TQWidget* WidgetFactory::containerOfWidget( TQWidget *w )
 /*!  Returns the actual designer widget of the container \a w. This is
   normally \a w itself, but might be a tqparent or grand tqparent of \a w
   (e.g. when working with a tabwidget and \a w is the container which
-  contains and tqlayouts childs, but the actual widget known to the
+  contains and layouts childs, but the actual widget known to the
   designer is the tabwidget which is the tqparent of \a w. So this
   function returns the tabwidget then.)
 */
 
 TQWidget* WidgetFactory::widgetOfContainer( TQWidget *w )
 {
-    if ( w->tqparentWidget() && w->tqparentWidget()->inherits( TQWIDGETSTACK_OBJECT_NAME_STRING ) )
-	w = w->tqparentWidget();
+    if ( w->parentWidget() && w->parentWidget()->inherits( TQWIDGETSTACK_OBJECT_NAME_STRING ) )
+	w = w->parentWidget();
     while ( w ) {
 	if ( WidgetDatabase::isContainer( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( TQT_TQOBJECT(w) ) ) ) ||
-	     w && w->tqparentWidget() && w->tqparentWidget()->inherits( "FormWindow" ) )
+	     w && w->parentWidget() && w->parentWidget()->inherits( "FormWindow" ) )
 	    return w;
-	w = w->tqparentWidget();
+	w = w->parentWidget();
     }
     return w;
 }
@@ -1686,14 +1686,14 @@ TQVariant WidgetFactory::defaultValue( TQObject *w, const TQString &propName )
 	return TQVariant();
     } else if ( propName == "frameworkCode" ) {
 	return TQVariant( true, 0 );
-    } else if ( propName == "tqlayoutMargin" ) {
+    } else if ( propName == "layoutMargin" ) {
 	if ( w->inherits( TQLAYOUTWIDGET_OBJECT_NAME_STRING ) )
 	    return TQVariant( 0 );
 	else if ( MainWindow::self->formWindow() )
-	    return TQVariant( MainWindow::self->formWindow()->tqlayoutDefaultMargin() );
-    } else if ( propName == "tqlayoutSpacing" ) {
+	    return TQVariant( MainWindow::self->formWindow()->layoutDefaultMargin() );
+    } else if ( propName == "layoutSpacing" ) {
 	if ( MainWindow::self->formWindow() )
-	    return TQVariant( MainWindow::self->formWindow()->tqlayoutDefaultSpacing() );
+	    return TQVariant( MainWindow::self->formWindow()->layoutDefaultSpacing() );
     }
 
     return *( *defaultProperties->tqfind( WidgetDatabase::idFromClassName( classNameOf( w ) ) ) ).tqfind( propName );
@@ -1794,7 +1794,7 @@ bool TQLayoutWidget::event( TQEvent *e )
 /*
   This function must be called on TQLayoutWidget creation and whenever
   the TQLayoutWidget's tqparent tqlayout changes (e.g., from a TQHBoxLayout
-  to a TQVBoxLayout), because of the (illogical) way tqlayouting works.
+  to a TQVBoxLayout), because of the (illogical) way layouting works.
 */
 void TQLayoutWidget::updateSizePolicy()
 {
@@ -1819,21 +1819,21 @@ void TQLayoutWidget::updateSizePolicy()
 
     if ( tqlayout() ) {
 	/*
-	  tqparentLayout is set to the tqparent tqlayout if there is one and if it is
-	  top level, in which case tqlayouting is illogical.
+	  parentLayout is set to the tqparent tqlayout if there is one and if it is
+	  top level, in which case layouting is illogical.
 	*/
-	TQLayout *tqparentLayout = 0;
+	TQLayout *parentLayout = 0;
 	if ( tqparent() && tqparent()->isWidgetType() ) {
-	    tqparentLayout = ((TQWidget *)tqparent())->tqlayout();
-	    if ( tqparentLayout && tqparentLayout->mainWidget()->inherits(TQLAYOUTWIDGET_OBJECT_NAME_STRING) )
-		tqparentLayout = 0;
+	    parentLayout = ((TQWidget *)tqparent())->tqlayout();
+	    if ( parentLayout && parentLayout->mainWidget()->inherits(TQLAYOUTWIDGET_OBJECT_NAME_STRING) )
+		parentLayout = 0;
 	}
 
 	TQObjectListIt it( childrenListObject() );
 	TQObject *o;
 
 	if ( tqlayout()->inherits(TQVBOXLAYOUT_OBJECT_NAME_STRING) ) {
-	    if ( tqparentLayout && tqparentLayout->inherits(TQHBOXLAYOUT_OBJECT_NAME_STRING) )
+	    if ( parentLayout && parentLayout->inherits(TQHBOXLAYOUT_OBJECT_NAME_STRING) )
 		vt = TQSizePolicy::Minimum;
 	    else
 		vt = TQSizePolicy::Fixed;
@@ -1854,7 +1854,7 @@ void TQLayoutWidget::updateSizePolicy()
 		    vt |= TQSizePolicy::Maximum;
 	    }
 	} else if ( tqlayout()->inherits(TQHBOXLAYOUT_OBJECT_NAME_STRING) ) {
-	    if ( tqparentLayout && tqparentLayout->inherits(TQVBOXLAYOUT_OBJECT_NAME_STRING) )
+	    if ( parentLayout && parentLayout->inherits(TQVBOXLAYOUT_OBJECT_NAME_STRING) )
 		ht = TQSizePolicy::Minimum;
 	    else
 		ht = TQSizePolicy::Fixed;
@@ -1877,10 +1877,10 @@ void TQLayoutWidget::updateSizePolicy()
 	} else if ( tqlayout()->inherits(TQGRIDLAYOUT_OBJECT_NAME_STRING) ) {
 	    ht = TQSizePolicy::Fixed;
 	    vt = TQSizePolicy::Fixed;
-	    if ( tqparentLayout ) {
-		if ( tqparentLayout->inherits(TQVBOXLAYOUT_OBJECT_NAME_STRING) )
+	    if ( parentLayout ) {
+		if ( parentLayout->inherits(TQVBOXLAYOUT_OBJECT_NAME_STRING) )
 		    ht = TQSizePolicy::Minimum;
-		else if ( tqparentLayout->inherits(TQHBOXLAYOUT_OBJECT_NAME_STRING) )
+		else if ( parentLayout->inherits(TQHBOXLAYOUT_OBJECT_NAME_STRING) )
 		    vt = TQSizePolicy::Minimum;
 	    }
 
@@ -1921,8 +1921,8 @@ void TQLayoutWidget::updateSizePolicy()
 
 void CustomWidget::paintEvent( TQPaintEvent *e )
 {
-    if ( tqparentWidget() && tqparentWidget()->inherits( "FormWindow" ) ) {
-	( (FormWindow*)tqparentWidget() )->paintGrid( this, e );
+    if ( parentWidget() && parentWidget()->inherits( "FormWindow" ) ) {
+	( (FormWindow*)parentWidget() )->paintGrid( this, e );
     } else {
 	TQPainter p( this );
 	p.fillRect( rect(), tqcolorGroup().dark() );
diff --git a/kommander/editor/widgetfactory.h b/kommander/editor/widgetfactory.h
index ab73cd5c..9ad4ce6c 100644
--- a/kommander/editor/widgetfactory.h
+++ b/kommander/editor/widgetfactory.h
@@ -75,10 +75,10 @@ public:
     static TQLayout *createLayout( TQWidget *widget, TQLayout* tqlayout, LayoutType type );
     static void deleteLayout( TQWidget *widget );
 
-    static LayoutType tqlayoutType( TQWidget *w );
-    static LayoutType tqlayoutType( TQWidget *w, TQLayout *&tqlayout );
-    static LayoutType tqlayoutType( TQLayout *tqlayout );
-    static TQWidget *tqlayoutParent( TQLayout *tqlayout );
+    static LayoutType layoutType( TQWidget *w );
+    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 );
@@ -251,7 +251,7 @@ class CustomWidget : public TQWidget
 public:
     CustomWidget( TQWidget *tqparent, const char *name, MetaDataBase::CustomWidget *cw )
 	: TQWidget( tqparent, name ), cusw( cw ) {
-	    alwaysExpand = tqparentWidget() && tqparentWidget()->inherits( "FormWindow" );
+	    alwaysExpand = parentWidget() && parentWidget()->inherits( "FormWindow" );
 	    tqsetSizePolicy( cw->sizePolicy );
 	    if ( !alwaysExpand )
 		setBackgroundMode( PaletteDark );
@@ -381,15 +381,15 @@ public:
 	: TQToolButton( tqparent, name ) {}
 
     bool isInButtonGroup() const {
-	return tqparentWidget() && tqparentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING );
+	return parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING );
     }
     int buttonGroupId() const {
-	return tqparentWidget() && tqparentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ? ( (TQButtonGroup*)tqparentWidget() )->id( (TQButton*)this ) : -1;
+	return parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ? ( (TQButtonGroup*)parentWidget() )->id( (TQButton*)this ) : -1;
     }
     void setButtonGroupId( int id ) {
-	if ( tqparentWidget() && tqparentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ) {
-	    ( (TQButtonGroup*)tqparentWidget() )->remove( this );
-	    ( (TQButtonGroup*)tqparentWidget() )->insert( this, id );
+	if ( parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ) {
+	    ( (TQButtonGroup*)parentWidget() )->remove( this );
+	    ( (TQButtonGroup*)parentWidget() )->insert( this, id );
 	}
     }
 };
@@ -405,15 +405,15 @@ public:
 	: TQRadioButton( tqparent, name ) {}
 
     bool isInButtonGroup() const {
-	return tqparentWidget() && tqparentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING );
+	return parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING );
     }
     int buttonGroupId() const {
-	return tqparentWidget() && tqparentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ? ( (TQButtonGroup*)tqparentWidget() )->id( (TQButton*)this ) : -1;
+	return parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ? ( (TQButtonGroup*)parentWidget() )->id( (TQButton*)this ) : -1;
     }
     void setButtonGroupId( int id ) {
-	if ( tqparentWidget() && tqparentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ) {
-	    ( (TQButtonGroup*)tqparentWidget() )->remove( this );
-	    ( (TQButtonGroup*)tqparentWidget() )->insert( this, id );
+	if ( parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ) {
+	    ( (TQButtonGroup*)parentWidget() )->remove( this );
+	    ( (TQButtonGroup*)parentWidget() )->insert( this, id );
 	}
     }
 
@@ -430,15 +430,15 @@ public:
 	: TQPushButton( tqparent, name ) {}
 
     bool isInButtonGroup() const {
-	return tqparentWidget() && tqparentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING );
+	return parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING );
     }
     int buttonGroupId() const {
-	return tqparentWidget() && tqparentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ? ( (TQButtonGroup*)tqparentWidget() )->id( (TQButton*)this ) : -1;
+	return parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ? ( (TQButtonGroup*)parentWidget() )->id( (TQButton*)this ) : -1;
     }
     void setButtonGroupId( int id ) {
-	if ( tqparentWidget() && tqparentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ) {
-	    ( (TQButtonGroup*)tqparentWidget() )->remove( this );
-	    ( (TQButtonGroup*)tqparentWidget() )->insert( this, id );
+	if ( parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ) {
+	    ( (TQButtonGroup*)parentWidget() )->remove( this );
+	    ( (TQButtonGroup*)parentWidget() )->insert( this, id );
 	}
     }
 
@@ -455,15 +455,15 @@ public:
 	: TQCheckBox( tqparent, name ) {}
 
     bool isInButtonGroup() const {
-	return tqparentWidget() && tqparentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING );
+	return parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING );
     }
     int buttonGroupId() const {
-	return tqparentWidget() && tqparentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ? ( (TQButtonGroup*)tqparentWidget() )->id( (TQButton*)this ) : -1;
+	return parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ? ( (TQButtonGroup*)parentWidget() )->id( (TQButton*)this ) : -1;
     }
     void setButtonGroupId( int id ) {
-	if ( tqparentWidget() && tqparentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ) {
-	    ( (TQButtonGroup*)tqparentWidget() )->remove( this );
-	    ( (TQButtonGroup*)tqparentWidget() )->insert( this, id );
+	if ( parentWidget() && parentWidget()->inherits( TQBUTTONGROUP_OBJECT_NAME_STRING ) ) {
+	    ( (TQButtonGroup*)parentWidget() )->remove( this );
+	    ( (TQButtonGroup*)parentWidget() )->insert( this, id );
 	}
     }
 
diff --git a/kommander/editor/wizardeditor.ui b/kommander/editor/wizardeditor.ui
index f575a13a..31c64505 100644
--- a/kommander/editor/wizardeditor.ui
+++ b/kommander/editor/wizardeditor.ui
@@ -316,5 +316,5 @@
     <slot access="protected">removeClicked()</slot>
     <slot access="protected">upClicked()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
-- 
cgit v1.2.1