TQt4 port kdewebdev

This enables compilation under both Qt3 and Qt4


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

1 files changed, 194 insertions, 190 deletions

diff --git a/kommander/editor/command.cpp b/kommander/editor/command.cpp
index a0f8ec37..a549c915 100644
--- a/kommander/editor/command.cpp
+++ b/kommander/editor/command.cpp
@@ -1,7 +1,7 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
@@ -43,7 +43,7 @@
 #include <tqmultilineedit.h>
 #include <tqptrstack.h>
 #include <tqheader.h>
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
 #include <tqtable.h>
 #endif
 #include <tqaction.h>
@@ -235,8 +235,8 @@ void ResizeCommand::execute()
 {
     widget->setGeometry( newRect );
     formWindow()->updateSelection( widget );
-    formWindow()->emitUpdateProperties( widget );
-    if ( WidgetFactory::layoutType( widget ) != WidgetFactory::NoLayout )
+    formWindow()->emitUpdateProperties( TQT_TQOBJECT(widget) );
+    if ( WidgetFactory::tqlayoutType( widget ) != WidgetFactory::NoLayout )
 	formWindow()->updateChildSelections( widget );
 }
 
@@ -244,8 +244,8 @@ void ResizeCommand::unexecute()
 {
     widget->setGeometry( oldRect );
     formWindow()->updateSelection( widget );
-    formWindow()->emitUpdateProperties( widget );
-    if ( WidgetFactory::layoutType( widget ) != WidgetFactory::NoLayout )
+    formWindow()->emitUpdateProperties( TQT_TQOBJECT(widget) );
+    if ( WidgetFactory::tqlayoutType( widget ) != WidgetFactory::NoLayout )
 	formWindow()->updateChildSelections( widget );
 }
 
@@ -253,32 +253,32 @@ void ResizeCommand::unexecute()
 
 InsertCommand::InsertCommand( const TQString &n, FormWindow *fw,
 			      TQWidget *w, const TQRect &g )
-    : Command( n, fw ), widget( w ), geometry( g )
+    : Command( n, fw ), widget( w ), tqgeometry( g )
 {
 }
 
 void InsertCommand::execute()
 {
-    if ( geometry.size() == TQSize( 0, 0 ) ) {
-	widget->move( geometry.topLeft() );
+    if ( tqgeometry.size() == TQSize( 0, 0 ) ) {
+	widget->move( tqgeometry.topLeft() );
 	widget->adjustSize();
     } else {
-	TQSize s = geometry.size().expandedTo( widget->minimumSize() );
-	s = s.expandedTo( widget->minimumSizeHint() );
-	TQRect r( geometry.topLeft(), s );
+	TQSize s = tqgeometry.size().expandedTo( widget->tqminimumSize() );
+	s = s.expandedTo( widget->tqminimumSizeHint() );
+	TQRect r( tqgeometry.topLeft(), s );
 	widget->setGeometry( r );
     }
     widget->show();
     formWindow()->widgets()->insert( widget, widget );
     formWindow()->clearSelection( false );
-    formWindow()->selectWidget( widget );
+    formWindow()->selectWidget( TQT_TQOBJECT(widget) );
     formWindow()->mainWindow()->objectHierarchy()->widgetInserted( widget );
 }
 
 void InsertCommand::unexecute()
 {
     widget->hide();
-    formWindow()->selectWidget( widget, false );
+    formWindow()->selectWidget( TQT_TQOBJECT(widget), false );
     formWindow()->widgets()->remove( widget );
     formWindow()->mainWindow()->objectHierarchy()->widgetRemoved( widget );
  }
@@ -312,13 +312,13 @@ bool MoveCommand::canMerge( Command *c )
 void MoveCommand::execute()
 {
     for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) {
-	if ( !w->parentWidget() || WidgetFactory::layoutType( w->parentWidget() ) == WidgetFactory::NoLayout ) {
+	if ( !w->tqparentWidget() || WidgetFactory::tqlayoutType( w->tqparentWidget() ) == WidgetFactory::NoLayout ) {
 	    if ( newParent && oldParent && newParent != oldParent ) {
 		TQPoint pos = newParent->mapFromGlobal( w->mapToGlobal( TQPoint( 0,0 ) ) );
 		w->reparent( newParent, pos, true );
 		formWindow()->raiseSelection( w );
 		formWindow()->raiseChildSelections( w );
-		formWindow()->widgetChanged( w );
+		formWindow()->widgetChanged( TQT_TQOBJECT(w) );
 		formWindow()->mainWindow()->objectHierarchy()->widgetRemoved( w );
 		formWindow()->mainWindow()->objectHierarchy()->widgetInserted( w );
 	    }
@@ -326,20 +326,20 @@ void MoveCommand::execute()
 	}
 	formWindow()->updateSelection( w );
 	formWindow()->updateChildSelections( w );
-	formWindow()->emitUpdateProperties( w );
+	formWindow()->emitUpdateProperties( TQT_TQOBJECT(w) );
     }
 }
 
 void MoveCommand::unexecute()
 {
     for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) {
-	if ( !w->parentWidget() || WidgetFactory::layoutType( w->parentWidget() ) == WidgetFactory::NoLayout ) {
+	if ( !w->tqparentWidget() || WidgetFactory::tqlayoutType( w->tqparentWidget() ) == WidgetFactory::NoLayout ) {
 	    if ( newParent && oldParent && newParent != oldParent ) {
 		TQPoint pos = oldParent->mapFromGlobal( w->mapToGlobal( TQPoint( 0,0 ) ) );
 		w->reparent( oldParent, pos, true );
 		formWindow()->raiseSelection( w );
 		formWindow()->raiseChildSelections( w );
-		formWindow()->widgetChanged( w );
+		formWindow()->widgetChanged( TQT_TQOBJECT(w) );
 		formWindow()->mainWindow()->objectHierarchy()->widgetRemoved( w );
 		formWindow()->mainWindow()->objectHierarchy()->widgetInserted( w );
 	    }
@@ -347,7 +347,7 @@ void MoveCommand::unexecute()
 	}
 	formWindow()->updateSelection( w );
 	formWindow()->updateChildSelections( w );
-	formWindow()->emitUpdateProperties( w );
+	formWindow()->emitUpdateProperties( TQT_TQOBJECT(w) );
     }
 }
 
@@ -369,13 +369,13 @@ void DeleteCommand::execute()
 	TQString s = w->name();
 	s.prepend( "qt_dead_widget_" );
 	w->setName( s );
-	formWindow()->selectWidget( w, false );
+	formWindow()->selectWidget( TQT_TQOBJECT(w), false );
 	formWindow()->widgets()->remove( w );
-	TQValueList<MetaDataBase::Connection> conns = MetaDataBase::connections( formWindow(), w );
+	TQValueList<MetaDataBase::Connection> conns = MetaDataBase::connections( TQT_TQOBJECT(formWindow()), TQT_TQOBJECT(w) );
 	connections.insert( w, conns );
 	TQValueList<MetaDataBase::Connection>::Iterator it = conns.begin();
 	for ( ; it != conns.end(); ++it ) {
-	    MetaDataBase::removeConnection( formWindow(), (*it).sender,
+	    MetaDataBase::removeConnection( TQT_TQOBJECT(formWindow()), (*it).sender,
 					    (*it).signal, (*it).receiver, (*it).slot );
 	}
     }
@@ -395,11 +395,11 @@ void DeleteCommand::unexecute()
 	s.remove( 0, TQString( "qt_dead_widget_" ).length() );
 	w->setName( s );
 	formWindow()->widgets()->insert( w, w );
-	formWindow()->selectWidget( w );
-	TQValueList<MetaDataBase::Connection> conns = *connections.find( w );
+	formWindow()->selectWidget( TQT_TQOBJECT(w) );
+	TQValueList<MetaDataBase::Connection> conns = *connections.tqfind( w );
 	TQValueList<MetaDataBase::Connection>::Iterator it = conns.begin();
 	for ( ; it != conns.end(); ++it ) {
-	    MetaDataBase::addConnection( formWindow(), (*it).sender,
+	    MetaDataBase::addConnection( TQT_TQOBJECT(formWindow()), (*it).sender,
 					 (*it).signal, (*it).receiver, (*it).slot );
 	}
     }
@@ -430,7 +430,7 @@ void SetPropertyCommand::execute()
     if ( isResetCommand ) {
 	MetaDataBase::setPropertyChanged( widget, propName, false );
 	if ( WidgetFactory::resetProperty( widget, propName ) ) {
-	    if ( !formWindow()->isWidgetSelected( widget ) && widget != formWindow() )
+	    if ( !formWindow()->isWidgetSelected( widget ) && TQT_BASE_OBJECT(widget) != TQT_BASE_OBJECT(formWindow()) )
 		formWindow()->selectWidget( widget );
 	    if ( editor->widget() != widget )
 		editor->setWidget( widget, formWindow() );
@@ -461,7 +461,7 @@ bool SetPropertyCommand::canMerge( Command *c )
 {
     SetPropertyCommand *cmd = (SetPropertyCommand*)c;
     const TQMetaProperty *p =
-	widget->metaObject()->property( widget->metaObject()->findProperty( propName, true ), true );
+	widget->tqmetaObject()->property( widget->tqmetaObject()->tqfindProperty( propName, true ), true );
     if ( !p ) {
 	if ( propName == "toolTip" || propName == "whatsThis" )
 	    return true;
@@ -516,8 +516,8 @@ bool SetPropertyCommand::checkProperty()
 	    return false;
 	}
 
-	if ( widget->parent() && widget->parent()->inherits( "FormWindow" ) )
-	    formWindow()->mainWindow()->formNameChanged( (FormWindow*)( (TQWidget*)widget )->parentWidget() );
+	if ( widget->tqparent() && widget->tqparent()->inherits( "FormWindow" ) )
+	    formWindow()->mainWindow()->formNameChanged( (FormWindow*)( (TQWidget*)widget )->tqparentWidget() );
     }
     return true;
 }
@@ -532,30 +532,30 @@ void SetPropertyCommand::setProperty( const TQVariant &v, const TQString &curren
 	editor->propertyList()->setCurrentProperty( propName );
 
     const TQMetaProperty *p =
-	widget->metaObject()->property( widget->metaObject()->findProperty( propName, true ), true );
+	widget->tqmetaObject()->property( widget->tqmetaObject()->tqfindProperty( propName, true ), true );
     if ( !p ) {
 	if ( propName == "hAlign" ) {
-	    p = widget->metaObject()->property( widget->metaObject()->findProperty( "alignment", true ), true );
-	    int align = widget->property( "alignment" ).toInt();
+	    p = widget->tqmetaObject()->property( widget->tqmetaObject()->tqfindProperty( "tqalignment", true ), true );
+	    int align = widget->property( "tqalignment" ).toInt();
 	    align &= ~( AlignHorizontal_Mask );
 	    align |= p->keyToValue( currentItemText );
-	    widget->setProperty( "alignment", TQVariant( align ) );
+	    widget->setProperty( "tqalignment", TQVariant( align ) );
 	} else if ( propName == "vAlign" ) {
-	    p = widget->metaObject()->property( widget->metaObject()->findProperty( "alignment", true ), true );
-	    int align = widget->property( "alignment" ).toInt();
+	    p = widget->tqmetaObject()->property( widget->tqmetaObject()->tqfindProperty( "tqalignment", true ), true );
+	    int align = widget->property( "tqalignment" ).toInt();
 	    align &= ~( AlignVertical_Mask );
 	    align |= p->keyToValue( currentItemText );
-	    widget->setProperty( "alignment", TQVariant( align ) );
+	    widget->setProperty( "tqalignment", TQVariant( align ) );
 	} else if ( propName == "wordwrap" ) {
-	    int align = widget->property( "alignment" ).toInt();
+	    int align = widget->property( "tqalignment" ).toInt();
 	    align &= ~WordBreak;
 	    if ( v.toBool() )
 		align |= WordBreak;
-	    widget->setProperty( "alignment", TQVariant( align ) );
-	} else if ( propName == "layoutSpacing" ) {
-	    MetaDataBase::setSpacing( WidgetFactory::containerOfWidget( (TQWidget*)editor->widget() ), v.toInt() );
-	} else if ( propName == "layoutMargin" ) {
-	    MetaDataBase::setMargin( WidgetFactory::containerOfWidget( (TQWidget*)editor->widget() ), v.toInt() );
+	    widget->setProperty( "tqalignment", TQVariant( align ) );
+	} else if ( propName == "tqlayoutSpacing" ) {
+	    MetaDataBase::setSpacing( TQT_TQOBJECT(WidgetFactory::containerOfWidget( TQT_TQWIDGET(editor->widget()) )), v.toInt() );
+	} else if ( propName == "tqlayoutMargin" ) {
+	    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 );
 	} else if ( editor->widget()->inherits( "CustomWidget" ) ) {
@@ -567,7 +567,7 @@ void SetPropertyCommand::setProperty( const TQVariant &v, const TQString &curren
 	editor->refetchData();
 	editor->emitWidgetChanged();
 	( ( PropertyItem* )editor->propertyList()->currentItem() )->setChanged( MetaDataBase::isPropertyChanged( widget, propName ) );
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 	if ( propName == "database" )
 	    formWindow()->mainWindow()->objectHierarchy()->databasePropertyChanged( (TQWidget*)widget, MetaDataBase::fakeProperty( widget, "database" ).toStringList() );
 #endif
@@ -587,9 +587,9 @@ void SetPropertyCommand::setProperty( const TQVariant &v, const TQString &curren
 	    oldSerNum = v.toPixmap().serialNumber();
 	widget->setProperty( propName, v );
 	if ( oldSerNum != -1 && oldSerNum != widget->property( propName ).toPixmap().serialNumber() )
-	    MetaDataBase::setPixmapKey( formWindow(),
+	    MetaDataBase::setPixmapKey( TQT_TQOBJECT(formWindow()),
 					widget->property( propName ).toPixmap().serialNumber(),
-					MetaDataBase::pixmapKey( formWindow(), oldSerNum ) );
+					MetaDataBase::pixmapKey( TQT_TQOBJECT(formWindow()), oldSerNum ) );
 	if ( propName == "cursor" )
 	    MetaDataBase::setCursor( (TQWidget*)widget, v.toCursor() );
 	if ( propName == "name" && widget->isWidgetType() ) {
@@ -628,156 +628,156 @@ void SetPropertyCommand::setProperty( const TQVariant &v, const TQString &curren
 // ------------------------------------------------------------
 
 LayoutHorizontalCommand::LayoutHorizontalCommand( const TQString &n, FormWindow *fw,
-						  TQWidget *parent, TQWidget *layoutBase,
+						  TQWidget *tqparent, TQWidget *tqlayoutBase,
 						  const TQWidgetList &wl )
-    : Command( n, fw ), layout( wl, parent, fw, layoutBase )
+    : Command( n, fw ), tqlayout( wl, tqparent, fw, tqlayoutBase )
 {
 }
 
 void LayoutHorizontalCommand::execute()
 {
     formWindow()->clearSelection( false );
-    layout.doLayout();
+    tqlayout.doLayout();
     formWindow()->mainWindow()->objectHierarchy()->rebuild();
 }
 
 void LayoutHorizontalCommand::unexecute()
 {
     formWindow()->clearSelection( false );
-    layout.undoLayout();
+    tqlayout.undoLayout();
     formWindow()->mainWindow()->objectHierarchy()->rebuild();
 }
 
 // ------------------------------------------------------------
 
 LayoutHorizontalSplitCommand::LayoutHorizontalSplitCommand( const TQString &n, FormWindow *fw,
-							    TQWidget *parent, TQWidget *layoutBase,
+							    TQWidget *tqparent, TQWidget *tqlayoutBase,
 							    const TQWidgetList &wl )
-    : Command( n, fw ), layout( wl, parent, fw, layoutBase, true, true )
+    : Command( n, fw ), tqlayout( wl, tqparent, fw, tqlayoutBase, true, true )
 {
 }
 
 void LayoutHorizontalSplitCommand::execute()
 {
     formWindow()->clearSelection( false );
-    layout.doLayout();
+    tqlayout.doLayout();
     formWindow()->mainWindow()->objectHierarchy()->rebuild();
 }
 
 void LayoutHorizontalSplitCommand::unexecute()
 {
     formWindow()->clearSelection( false );
-    layout.undoLayout();
+    tqlayout.undoLayout();
     formWindow()->mainWindow()->objectHierarchy()->rebuild();
 }
 
 // ------------------------------------------------------------
 
 LayoutVerticalCommand::LayoutVerticalCommand( const TQString &n, FormWindow *fw,
-					      TQWidget *parent, TQWidget *layoutBase,
+					      TQWidget *tqparent, TQWidget *tqlayoutBase,
 					      const TQWidgetList &wl )
-    : Command( n, fw ), layout( wl, parent, fw, layoutBase )
+    : Command( n, fw ), tqlayout( wl, tqparent, fw, tqlayoutBase )
 {
 }
 
 void LayoutVerticalCommand::execute()
 {
     formWindow()->clearSelection( false );
-    layout.doLayout();
+    tqlayout.doLayout();
     formWindow()->mainWindow()->objectHierarchy()->rebuild();
 }
 
 void LayoutVerticalCommand::unexecute()
 {
     formWindow()->clearSelection( false );
-    layout.undoLayout();
+    tqlayout.undoLayout();
     formWindow()->mainWindow()->objectHierarchy()->rebuild();
 }
 
 // ------------------------------------------------------------
 
 LayoutVerticalSplitCommand::LayoutVerticalSplitCommand( const TQString &n, FormWindow *fw,
-							TQWidget *parent, TQWidget *layoutBase,
+							TQWidget *tqparent, TQWidget *tqlayoutBase,
 							const TQWidgetList &wl )
-    : Command( n, fw ), layout( wl, parent, fw, layoutBase, true, true )
+    : Command( n, fw ), tqlayout( wl, tqparent, fw, tqlayoutBase, true, true )
 {
 }
 
 void LayoutVerticalSplitCommand::execute()
 {
     formWindow()->clearSelection( false );
-    layout.doLayout();
+    tqlayout.doLayout();
     formWindow()->mainWindow()->objectHierarchy()->rebuild();
 }
 
 void LayoutVerticalSplitCommand::unexecute()
 {
     formWindow()->clearSelection( false );
-    layout.undoLayout();
+    tqlayout.undoLayout();
     formWindow()->mainWindow()->objectHierarchy()->rebuild();
 }
 
 // ------------------------------------------------------------
 
 LayoutGridCommand::LayoutGridCommand( const TQString &n, FormWindow *fw,
-				      TQWidget *parent, TQWidget *layoutBase,
+				      TQWidget *tqparent, TQWidget *tqlayoutBase,
 				      const TQWidgetList &wl, int xres, int yres )
-    : Command( n, fw ), layout( wl, parent, fw, layoutBase, TQSize( QMAX(5,xres), QMAX(5,yres) ) )
+    : Command( n, fw ), tqlayout( wl, tqparent, fw, tqlayoutBase, TQSize( TQMAX(5,xres), TQMAX(5,yres) ) )
 {
 }
 
 void LayoutGridCommand::execute()
 {
     formWindow()->clearSelection( false );
-    layout.doLayout();
+    tqlayout.doLayout();
     formWindow()->mainWindow()->objectHierarchy()->rebuild();
 }
 
 void LayoutGridCommand::unexecute()
 {
     formWindow()->clearSelection( false );
-    layout.undoLayout();
+    tqlayout.undoLayout();
     formWindow()->mainWindow()->objectHierarchy()->rebuild();
 }
 
 // ------------------------------------------------------------
 
 BreakLayoutCommand::BreakLayoutCommand( const TQString &n, FormWindow *fw,
-					TQWidget *layoutBase, const TQWidgetList &wl )
-    : Command( n, fw ), lb( layoutBase ), widgets( wl )
+					TQWidget *tqlayoutBase, const TQWidgetList &wl )
+    : Command( n, fw ), lb( tqlayoutBase ), widgets( wl )
 {
-    WidgetFactory::LayoutType lay = WidgetFactory::layoutType( layoutBase );
-    spacing = MetaDataBase::spacing( layoutBase );
-    margin = MetaDataBase::margin( layoutBase );
-    layout = 0;
+    WidgetFactory::LayoutType lay = WidgetFactory::tqlayoutType( tqlayoutBase );
+    spacing = MetaDataBase::spacing( TQT_TQOBJECT(tqlayoutBase) );
+    margin = MetaDataBase::margin( TQT_TQOBJECT(tqlayoutBase) );
+    tqlayout = 0;
     if ( lay == WidgetFactory::HBox )
-	layout = new HorizontalLayout( wl, layoutBase, fw, layoutBase, false, layoutBase->inherits( TQSPLITTER_OBJECT_NAME_STRING ) );
+	tqlayout = new HorizontalLayout( wl, tqlayoutBase, fw, tqlayoutBase, false, tqlayoutBase->inherits( TQSPLITTER_OBJECT_NAME_STRING ) );
     else if ( lay == WidgetFactory::VBox )
-	layout = new VerticalLayout( wl, layoutBase, fw, layoutBase, false, layoutBase->inherits( TQSPLITTER_OBJECT_NAME_STRING ) );
+	tqlayout = new VerticalLayout( wl, tqlayoutBase, fw, tqlayoutBase, false, tqlayoutBase->inherits( TQSPLITTER_OBJECT_NAME_STRING ) );
     else if ( lay == WidgetFactory::Grid )
-	layout = new GridLayout( wl, layoutBase, fw, layoutBase, TQSize( QMAX( 5, fw->grid().x()), QMAX( 5, fw->grid().y()) ), false );
+	tqlayout = new GridLayout( wl, tqlayoutBase, fw, tqlayoutBase, TQSize( TQMAX( 5, fw->grid().x()), TQMAX( 5, fw->grid().y()) ), false );
 }
 
 void BreakLayoutCommand::execute()
 {
-    if ( !layout )
+    if ( !tqlayout )
 	return;
     formWindow()->clearSelection( false );
-    layout->breakLayout();
+    tqlayout->breakLayout();
     formWindow()->mainWindow()->objectHierarchy()->rebuild();
     for ( TQWidget *w = widgets.first(); w; w = widgets.next() )
-	w->resize( QMAX( 16, w->width() ), QMAX( 16, w->height() ) );
+	w->resize( TQMAX( 16, w->width() ), TQMAX( 16, w->height() ) );
 }
 
 void BreakLayoutCommand::unexecute()
 {
-    if ( !layout )
+    if ( !tqlayout )
 	return;
     formWindow()->clearSelection( false );
-    layout->doLayout();
+    tqlayout->doLayout();
     formWindow()->mainWindow()->objectHierarchy()->rebuild();
-    MetaDataBase::setSpacing( WidgetFactory::containerOfWidget( lb ), spacing );
-    MetaDataBase::setMargin( WidgetFactory::containerOfWidget( lb ), margin );
+    MetaDataBase::setSpacing( TQT_TQOBJECT(WidgetFactory::containerOfWidget( lb )), spacing );
+    MetaDataBase::setMargin( TQT_TQOBJECT(WidgetFactory::containerOfWidget( lb )), margin );
 }
 
 // ------------------------------------------------------------
@@ -806,19 +806,19 @@ AddTabPageCommand::AddTabPageCommand( const TQString &n, FormWindow *fw,
 				      TQTabWidget *tw, const TQString &label )
     : Command( n, fw ), tabWidget( tw ), tabLabel( label )
 {
-    tabPage = new QDesignerWidget( formWindow(), tabWidget, "tab" );
+    tabPage = new TQDesignerWidget( formWindow(), tabWidget, "tab" );
     tabPage->hide();
     index = -1;
-    MetaDataBase::addEntry( tabPage );
+    MetaDataBase::addEntry( TQT_TQOBJECT(tabPage) );
 }
 
 void AddTabPageCommand::execute()
 {
     if ( index == -1 )
-	index = ( (QDesignerTabWidget*)tabWidget )->count();
+	index = ( (TQDesignerTabWidget*)tabWidget )->count();
     tabWidget->insertTab( tabPage, tabLabel, index );
     tabWidget->showPage( tabPage );
-    formWindow()->emitUpdateProperties( formWindow()->currentWidget() );
+    formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) );
     formWindow()->mainWindow()->objectHierarchy()->tabsChanged( tabWidget );
 }
 
@@ -826,7 +826,7 @@ void AddTabPageCommand::unexecute()
 {
     tabWidget->removePage( tabPage );
     tabPage->hide();
-    formWindow()->emitUpdateProperties( formWindow()->currentWidget() );
+    formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) );
     formWindow()->mainWindow()->objectHierarchy()->tabsChanged( tabWidget );
 }
 
@@ -837,10 +837,10 @@ AddToolBoxPageCommand::AddToolBoxPageCommand( const TQString &n, FormWindow *fw,
                       TQToolBox *tw, const TQString &_label )
     : Command( n, fw ), toolBox( tw ), label( _label )
 {
-    page = new QDesignerWidget( formWindow(), toolBox, "tab" );
+    page = new TQDesignerWidget( formWindow(), toolBox, "tab" );
     page->hide();
     index = -1;
-    MetaDataBase::addEntry( page );
+    MetaDataBase::addEntry( TQT_TQOBJECT(page) );
 }
 
 void AddToolBoxPageCommand::execute()
@@ -849,7 +849,7 @@ void AddToolBoxPageCommand::execute()
     index = ( (EditorToolBox*)toolBox)->count();
     toolBox->insertItem(index, page, label);
     toolBox->setCurrentItem( page );
-    formWindow()->emitUpdateProperties( formWindow()->currentWidget() );
+    formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) );
     formWindow()->mainWindow()->objectHierarchy()->tabsChanged( toolBox );
 }
 
@@ -857,7 +857,7 @@ void AddToolBoxPageCommand::unexecute()
 {
     toolBox->removeItem( page );
     page->hide();
-    formWindow()->emitUpdateProperties( formWindow()->currentWidget() );
+    formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) );
     formWindow()->mainWindow()->objectHierarchy()->tabsChanged( toolBox );
 }
 
@@ -873,19 +873,19 @@ MoveTabPageCommand::MoveTabPageCommand( const TQString &n, FormWindow *fw,
 
 void MoveTabPageCommand::execute()
 {
-    ((QDesignerTabWidget*)tabWidget )->removePage( tabPage );
-    ((QDesignerTabWidget*)tabWidget )->insertTab( tabPage, tabLabel, newIndex );
-    ((QDesignerTabWidget*)tabWidget )->showPage( tabPage );
-    formWindow()->emitUpdateProperties( formWindow()->currentWidget() );
+    ((TQDesignerTabWidget*)tabWidget )->removePage( tabPage );
+    ((TQDesignerTabWidget*)tabWidget )->insertTab( tabPage, tabLabel, newIndex );
+    ((TQDesignerTabWidget*)tabWidget )->showPage( tabPage );
+    formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) );
     formWindow()->mainWindow()->objectHierarchy()->tabsChanged( tabWidget );
 }
 
 void MoveTabPageCommand::unexecute()
 {
-    ((QDesignerTabWidget*)tabWidget )->removePage( tabPage );
-    ((QDesignerTabWidget*)tabWidget )->insertTab( tabPage, tabLabel, oldIndex );
-    ((QDesignerTabWidget*)tabWidget )->showPage( tabPage );
-    formWindow()->emitUpdateProperties( formWindow()->currentWidget() );
+    ((TQDesignerTabWidget*)tabWidget )->removePage( tabPage );
+    ((TQDesignerTabWidget*)tabWidget )->insertTab( tabPage, tabLabel, oldIndex );
+    ((TQDesignerTabWidget*)tabWidget )->showPage( tabPage );
+    formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) );
     formWindow()->mainWindow()->objectHierarchy()->tabsChanged( tabWidget );
 }
 
@@ -895,15 +895,15 @@ DeleteTabPageCommand::DeleteTabPageCommand( const TQString &n, FormWindow *fw,
 					    TQTabWidget *tw, TQWidget *page )
     : Command( n, fw ), tabWidget( tw ), tabPage( page )
 {
-    tabLabel = ( (QDesignerTabWidget*)tabWidget )->pageTitle();
-    index = ( (QDesignerTabWidget*)tabWidget )->currentPage();
+    tabLabel = ( (TQDesignerTabWidget*)tabWidget )->pageTitle();
+    index = ( (TQDesignerTabWidget*)tabWidget )->currentPage();
 }
 
 void DeleteTabPageCommand::execute()
 {
     tabWidget->removePage( tabPage );
     tabPage->hide();
-    formWindow()->emitUpdateProperties( formWindow()->currentWidget() );
+    formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) );
     formWindow()->mainWindow()->objectHierarchy()->tabsChanged( tabWidget );
 }
 
@@ -911,7 +911,7 @@ void DeleteTabPageCommand::unexecute()
 {
     tabWidget->insertTab( tabPage, tabLabel, index );
     tabWidget->showPage( tabPage );
-    formWindow()->emitUpdateProperties( formWindow()->currentWidget() );
+    formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) );
     formWindow()->mainWindow()->objectHierarchy()->tabsChanged( tabWidget );
 }
 
@@ -929,7 +929,7 @@ void DeleteToolBoxPageCommand::execute()
 {
     toolBox->removeItem( page );
     page->hide();
-    formWindow()->emitUpdateProperties( formWindow()->currentWidget() );
+    formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) );
     formWindow()->mainWindow()->objectHierarchy()->tabsChanged( toolBox );
 }
 
@@ -937,7 +937,7 @@ void DeleteToolBoxPageCommand::unexecute()
 {
     toolBox->insertItem(index, page, label);
     toolBox->setCurrentItem( page );
-    formWindow()->emitUpdateProperties( formWindow()->currentWidget() );
+    formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) );
     formWindow()->mainWindow()->objectHierarchy()->tabsChanged( toolBox );
 }
 
@@ -947,11 +947,11 @@ AddWizardPageCommand::AddWizardPageCommand( const TQString &n, FormWindow *fw,
 					    TQWizard *w, const TQString &label, int i, bool s )
     : Command( n, fw ), wizard( w ), pageLabel( label )
 {
-    page = new QDesignerWidget( formWindow(), wizard, "page" );
+    page = new TQDesignerWidget( formWindow(), wizard, "page" );
     page->hide();
     index = i;
     show = s;
-    MetaDataBase::addEntry( page );
+    MetaDataBase::addEntry( TQT_TQOBJECT(page) );
 }
 
 void AddWizardPageCommand::execute()
@@ -960,8 +960,8 @@ void AddWizardPageCommand::execute()
 	index = wizard->pageCount();
     wizard->insertPage( page, pageLabel, index );
     if ( show )
-      ( (QDesignerWizard*)wizard )->setCurrentPage( ( (QDesignerWizard*)wizard )->pageNum( page ) );
-    formWindow()->emitUpdateProperties( formWindow()->currentWidget() );
+      ( (TQDesignerWizard*)wizard )->setCurrentPage( ( (TQDesignerWizard*)wizard )->pageNum( page ) );
+    formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) );
     formWindow()->mainWindow()->objectHierarchy()->pagesChanged( wizard );
 }
 
@@ -969,7 +969,7 @@ void AddWizardPageCommand::unexecute()
 {
     wizard->removePage( page );
     page->hide();
-    formWindow()->emitUpdateProperties( formWindow()->currentWidget() );
+    formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) );
     formWindow()->mainWindow()->objectHierarchy()->pagesChanged( wizard );
 }
 
@@ -988,7 +988,7 @@ void DeleteWizardPageCommand::execute()
     pageLabel = wizard->title( page );
     wizard->removePage( page );
     page->hide();
-    formWindow()->emitUpdateProperties( formWindow()->currentWidget() );
+    formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) );
     formWindow()->mainWindow()->objectHierarchy()->pagesChanged( wizard );
 }
 
@@ -996,8 +996,8 @@ void DeleteWizardPageCommand::unexecute()
 {
     wizard->insertPage( page, pageLabel, index );
     if ( show )
-      ( (QDesignerWizard*)wizard )->setCurrentPage( ( (QDesignerWizard*)wizard )->pageNum( page ) );
-    formWindow()->emitUpdateProperties( formWindow()->currentWidget() );
+      ( (TQDesignerWizard*)wizard )->setCurrentPage( ( (TQDesignerWizard*)wizard )->pageNum( page ) );
+    formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) );
     formWindow()->mainWindow()->objectHierarchy()->pagesChanged( wizard );
 }
 
@@ -1017,7 +1017,7 @@ void RenameWizardPageCommand::execute()
 
     wizard->setTitle( page, label );
     label = oldLabel;
-    formWindow()->emitUpdateProperties( formWindow()->currentWidget() );
+    formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) );
 }
 
 void RenameWizardPageCommand::unexecute()
@@ -1042,7 +1042,7 @@ void SwapWizardPagesCommand::execute()
     wizard->removePage( page2 );
     wizard->insertPage( page1, page1Label, index2 );
     wizard->insertPage( page2, page2Label, index1 );
-    formWindow()->emitUpdateProperties( formWindow()->currentWidget() );
+    formWindow()->emitUpdateProperties( TQT_TQOBJECT(formWindow()->currentWidget()) );
     formWindow()->mainWindow()->objectHierarchy()->pagesChanged( wizard );
 }
 
@@ -1061,7 +1061,7 @@ AddConnectionCommand::AddConnectionCommand( const TQString &name, FormWindow *fw
 
 void AddConnectionCommand::execute()
 {
-    MetaDataBase::addConnection( formWindow(), connection.sender,
+    MetaDataBase::addConnection( TQT_TQOBJECT(formWindow()), connection.sender,
 				 connection.signal, connection.receiver, connection.slot );
 #ifndef KOMMANDER
     if ( connection.receiver == formWindow()->mainContainer() )
@@ -1074,7 +1074,7 @@ void AddConnectionCommand::execute()
 
 void AddConnectionCommand::unexecute()
 {
-    MetaDataBase::removeConnection( formWindow(), connection.sender,
+    MetaDataBase::removeConnection( TQT_TQOBJECT(formWindow()), connection.sender,
 				    connection.signal, connection.receiver, connection.slot );
 #ifndef KOMMANDER
     if ( connection.receiver == formWindow()->mainContainer() )
@@ -1095,7 +1095,7 @@ RemoveConnectionCommand::RemoveConnectionCommand( const TQString &name, FormWind
 
 void RemoveConnectionCommand::execute()
 {
-    MetaDataBase::removeConnection( formWindow(), connection.sender,
+    MetaDataBase::removeConnection( TQT_TQOBJECT(formWindow()), connection.sender,
 				    connection.signal, connection.receiver, connection.slot );
 #ifndef KOMMANDER
     if ( connection.receiver == formWindow()->mainContainer() )
@@ -1108,7 +1108,7 @@ void RemoveConnectionCommand::execute()
 
 void RemoveConnectionCommand::unexecute()
 {
-    MetaDataBase::addConnection( formWindow(), connection.sender,
+    MetaDataBase::addConnection( TQT_TQOBJECT(formWindow()), connection.sender,
 				 connection.signal, connection.receiver, connection.slot );
 #ifndef KOMMANDER
     if ( connection.receiver == formWindow()->mainContainer() )
@@ -1131,7 +1131,7 @@ AddSlotCommand::AddSlotCommand( const TQString &name, FormWindow *fw, const TQCS
 
 void AddSlotCommand::execute()
 {
-    MetaDataBase::addSlot( formWindow(), slot, specifier, access, language, returnType );
+    MetaDataBase::addSlot( TQT_TQOBJECT(formWindow()), slot, specifier, access, language, returnType );
 #ifndef KOMMANDER
     formWindow()->mainWindow()->slotsChanged();
 #endif
@@ -1141,7 +1141,7 @@ void AddSlotCommand::execute()
 
 void AddSlotCommand::unexecute()
 {
-    MetaDataBase::removeSlot( formWindow(), slot, specifier, access, language, returnType );
+    MetaDataBase::removeSlot( TQT_TQOBJECT(formWindow()), slot, specifier, access, language, returnType );
 #ifndef KOMMANDER
     formWindow()->mainWindow()->slotsChanged();
 #endif
@@ -1160,7 +1160,7 @@ RemoveSlotCommand::RemoveSlotCommand( const TQString &name, FormWindow *fw, cons
 
 void RemoveSlotCommand::execute()
 {
-    MetaDataBase::removeSlot( formWindow(), slot, specifier, access, language, returnType );
+    MetaDataBase::removeSlot( TQT_TQOBJECT(formWindow()), slot, specifier, access, language, returnType );
 #ifndef KOMMANDER
     formWindow()->mainWindow()->slotsChanged();
 #endif
@@ -1170,7 +1170,7 @@ void RemoveSlotCommand::execute()
 
 void RemoveSlotCommand::unexecute()
 {
-    MetaDataBase::addSlot( formWindow(), slot, specifier, access, language, returnType );
+    MetaDataBase::addSlot( TQT_TQOBJECT(formWindow()), slot, specifier, access, language, returnType );
 #ifndef KOMMANDER
     formWindow()->mainWindow()->slotsChanged();
 #endif
@@ -1238,7 +1238,7 @@ void PasteCommand::execute()
 {
     for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) {
 	w->show();
-	formWindow()->selectWidget( w );
+	formWindow()->selectWidget( TQT_TQOBJECT(w) );
 	formWindow()->widgets()->insert( w, w );
 	formWindow()->mainWindow()->objectHierarchy()->widgetInserted( w );
     }
@@ -1248,7 +1248,7 @@ void PasteCommand::unexecute()
 {
     for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) {
 	w->hide();
-	formWindow()->selectWidget( w, false );
+	formWindow()->selectWidget( TQT_TQOBJECT(w), false );
 	formWindow()->widgets()->remove( w );
 	formWindow()->mainWindow()->objectHierarchy()->widgetRemoved( w );
     }
@@ -1331,7 +1331,7 @@ PopulateIconViewCommand::PopulateIconViewCommand( const TQString &n, FormWindow
 						  TQIconView *iv, const TQValueList<Item> &items )
     : Command( n, fw ), newItems( items ), iconview( iv )
 {
-#ifndef QT_NO_ICONVIEW
+#ifndef TQT_NO_ICONVIEW
     TQIconViewItem *i = 0;
     for ( i = iconview->firstItem(); i; i = i->nextItem() ) {
 	Item item;
@@ -1345,7 +1345,7 @@ PopulateIconViewCommand::PopulateIconViewCommand( const TQString &n, FormWindow
 
 void PopulateIconViewCommand::execute()
 {
-#ifndef QT_NO_ICONVIEW
+#ifndef TQT_NO_ICONVIEW
     iconview->clear();
     for ( TQValueList<Item>::Iterator it = newItems.begin(); it != newItems.end(); ++it ) {
 	Item i = *it;
@@ -1356,7 +1356,7 @@ void PopulateIconViewCommand::execute()
 
 void PopulateIconViewCommand::unexecute()
 {
-#ifndef QT_NO_ICONVIEW
+#ifndef TQT_NO_ICONVIEW
     iconview->clear();
     for ( TQValueList<Item>::Iterator it = oldItems.begin(); it != oldItems.end(); ++it ) {
 	Item i = *it;
@@ -1417,7 +1417,7 @@ void PopulateListViewCommand::transferItems( TQListView *from, TQListView *to )
     from->setSorting( -1 );
     for ( ; it.current(); ++it ) {
 	TQListViewItem *i = it.current();
-	if ( i->parent() == fromParents.top() ) {
+	if ( i->tqparent() == fromParents.top() ) {
 	    TQListViewItem *pi = toParents.top();
 	    TQListViewItem *ni = 0;
 	    if ( pi )
@@ -1434,7 +1434,7 @@ void PopulateListViewCommand::transferItems( TQListView *from, TQListView *to )
 	    if ( pi )
 		pi->setOpen( true );
 	} else {
-	    if ( i->parent() == fromLast ) {
+	    if ( i->tqparent() == fromLast ) {
 		fromParents.push( fromLast );
 		toParents.push( toLasts.top() );
 		toLasts.push( 0 );
@@ -1454,7 +1454,7 @@ void PopulateListViewCommand::transferItems( TQListView *from, TQListView *to )
 		if ( pi )
 		    pi->setOpen( true );
 	    } else {
-		while ( fromParents.top() != i->parent() ) {
+		while ( fromParents.top() != i->tqparent() ) {
 		    fromParents.pop();
 		    toParents.pop();
 		    toLasts.pop();
@@ -1490,21 +1490,21 @@ PopulateMultiLineEditCommand::PopulateMultiLineEditCommand( const TQString &n, F
     : Command( n, fw ), newText( txt ), mlined( mle )
 {
     oldText = mlined->text();
-    wasChanged = MetaDataBase::isPropertyChanged( mlined, "text" );
+    wasChanged = MetaDataBase::isPropertyChanged( TQT_TQOBJECT(mlined), "text" );
 }
 
 void PopulateMultiLineEditCommand::execute()
 {
     mlined->setText( newText );
-    MetaDataBase::setPropertyChanged( mlined, "text", true );
-    formWindow()->emitUpdateProperties( mlined );
+    MetaDataBase::setPropertyChanged( TQT_TQOBJECT(mlined), "text", true );
+    formWindow()->emitUpdateProperties( TQT_TQOBJECT(mlined) );
 }
 
 void PopulateMultiLineEditCommand::unexecute()
 {
     mlined->setText( oldText );
-    MetaDataBase::setPropertyChanged( mlined, "text", wasChanged );
-    formWindow()->emitUpdateProperties( mlined );
+    MetaDataBase::setPropertyChanged( TQT_TQOBJECT(mlined), "text", wasChanged );
+    formWindow()->emitUpdateProperties( TQT_TQOBJECT(mlined) );
 }
 
 // ------------------------------------------------------------
@@ -1514,15 +1514,15 @@ PopulateTableCommand::PopulateTableCommand( const TQString &n, FormWindow *fw, T
 					    const TQValueList<Column> &columns )
     : Command( n, fw ), newRows( rows ), newColumns( columns ), table( t )
 {
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
     int i = 0;
-    TQMap<TQString, TQString> columnFields = MetaDataBase::columnFields( table );
+    TQMap<TQString, TQString> columnFields = MetaDataBase::columnFields( TQT_TQOBJECT(table));
     for ( i = 0; i < table->horizontalHeader()->count(); ++i ) {
 	PopulateTableCommand::Column col;
 	col.text = table->horizontalHeader()->label( i );
 	if ( table->horizontalHeader()->iconSet( i ) )
 	    col.pix = table->horizontalHeader()->iconSet( i )->pixmap();
-	col.field = *columnFields.find( col.text );
+	col.field = *columnFields.tqfind( col.text );
 	oldColumns.append( col );
     }
     for ( i = 0; i < table->verticalHeader()->count(); ++i ) {
@@ -1537,7 +1537,7 @@ PopulateTableCommand::PopulateTableCommand( const TQString &n, FormWindow *fw, T
 
 void PopulateTableCommand::execute()
 {
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
     TQMap<TQString, TQString> columnFields;
     table->setNumCols( newColumns.count() );
     int i = 0;
@@ -1546,7 +1546,7 @@ void PopulateTableCommand::execute()
 	if ( !(*cit).field.isEmpty() )
 	    columnFields.insert( (*cit).text, (*cit).field );
     }
-    MetaDataBase::setColumnFields( table, columnFields );
+    MetaDataBase::setColumnFields( TQT_TQOBJECT(table), columnFields );
     table->setNumRows( newRows.count() );
     i = 0;
     for ( TQValueList<Row>::Iterator rit = newRows.begin(); rit != newRows.end(); ++rit, ++i )
@@ -1556,7 +1556,7 @@ void PopulateTableCommand::execute()
 
 void PopulateTableCommand::unexecute()
 {
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
     TQMap<TQString, TQString> columnFields;
     table->setNumCols( oldColumns.count() );
     int i = 0;
@@ -1565,7 +1565,7 @@ void PopulateTableCommand::unexecute()
 	if ( !(*cit).field.isEmpty() )
 	    columnFields.insert( (*cit).text, (*cit).field );
     }
-    MetaDataBase::setColumnFields( table, columnFields );
+    MetaDataBase::setColumnFields( TQT_TQOBJECT(table), columnFields );
     table->setNumRows( oldRows.count() );
     i = 0;
     for ( TQValueList<Row>::Iterator rit = oldRows.begin(); rit != oldRows.end(); ++rit, ++i )
@@ -1576,7 +1576,7 @@ void PopulateTableCommand::unexecute()
 // ------------------------------------------------------------
 
 AddActionToToolBarCommand::AddActionToToolBarCommand( const TQString &n, FormWindow *fw,
-						      TQAction *a, QDesignerToolBar *tb, int idx )
+						      TQAction *a, TQDesignerToolBar *tb, int idx )
     : Command( n, fw ), action( a ), toolBar( tb ), index( idx )
 {
 }
@@ -1585,25 +1585,25 @@ void AddActionToToolBarCommand::execute()
 {
     action->addTo( toolBar );
 
-    if ( action->inherits( "QDesignerAction" ) ) {
-	TQString s = ( (QDesignerAction*)action )->widget()->name();
+    if ( action->inherits( "TQDesignerAction" ) ) {
+	TQString s = ( (TQDesignerAction*)action )->widget()->name();
 	if ( s.startsWith( "qt_dead_widget_" ) ) {
 	    s.remove( 0, TQString( "qt_dead_widget_" ).length() );
-	    ( (QDesignerAction*)action )->widget()->setName( s );
+	    ( (TQDesignerAction*)action )->widget()->setName( s );
 	}
     }
 
-    if ( action->inherits( "QDesignerAction" ) ) {
-	toolBar->insertAction( ( (QDesignerAction*)action )->widget(), action );
-	( (QDesignerAction*)action )->widget()->installEventFilter( toolBar );
-    } else if ( action->inherits( "QDesignerActionGroup" ) ) {
-	if ( ( (QDesignerActionGroup*)action )->usesDropDown() ) {
-	    toolBar->insertAction( ( (QDesignerActionGroup*)action )->widget(), action );
-	    ( (QDesignerActionGroup*)action )->widget()->installEventFilter( toolBar );
+    if ( action->inherits( "TQDesignerAction" ) ) {
+	toolBar->insertAction( ( (TQDesignerAction*)action )->widget(), action );
+	( (TQDesignerAction*)action )->widget()->installEventFilter( toolBar );
+    } else if ( action->inherits( "TQDesignerActionGroup" ) ) {
+	if ( ( (TQDesignerActionGroup*)action )->usesDropDown() ) {
+	    toolBar->insertAction( ( (TQDesignerActionGroup*)action )->widget(), action );
+	    ( (TQDesignerActionGroup*)action )->widget()->installEventFilter( toolBar );
 	}
-    } else if ( action->inherits( "QSeparatorAction" ) ) {
-	toolBar->insertAction( ( (QSeparatorAction*)action )->widget(), action );
-	( (QSeparatorAction*)action )->widget()->installEventFilter( toolBar );
+    } else if ( action->inherits( "TQSeparatorAction" ) ) {
+	toolBar->insertAction( ( (TQSeparatorAction*)action )->widget(), action );
+	( (TQSeparatorAction*)action )->widget()->installEventFilter( toolBar );
     }
     if ( !action->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ) || ( (TQActionGroup*)action )->usesDropDown()) {
 	if ( index == -1 )
@@ -1613,8 +1613,9 @@ void AddActionToToolBarCommand::execute()
 	toolBar->reInsert();
 	TQObject::connect( action, TQT_SIGNAL( destroyed() ), toolBar, TQT_SLOT( actionRemoved() ) );
     } else {
-	TQObjectListIt it( *action->children() );
-	if ( action->children() ) {
+	TQObjectList clo = action->childrenListObject();
+	if (!clo.isEmpty()) {
+	    TQObjectListIt it( clo );
 	    int i = 0;
 	    while ( it.current() ) {
 		TQObject *o = it.current();
@@ -1622,8 +1623,8 @@ void AddActionToToolBarCommand::execute()
 		if ( !o->inherits( TQACTION_OBJECT_NAME_STRING ) )
 		    continue;
 		// ### fix it for nested actiongroups
-		if ( o->inherits( "QDesignerAction" ) ) {
-		    QDesignerAction *ac = (QDesignerAction*)o;
+		if ( o->inherits( "TQDesignerAction" ) ) {
+		    TQDesignerAction *ac = (TQDesignerAction*)o;
 		    toolBar->insertAction( ac->widget(), ac );
 		    ac->widget()->installEventFilter( toolBar );
 		    if ( index == -1 )
@@ -1640,10 +1641,10 @@ void AddActionToToolBarCommand::execute()
 
 void AddActionToToolBarCommand::unexecute()
 {
-    if ( action->inherits( "QDesignerAction" ) ) {
-	TQString s = ( (QDesignerAction*)action )->widget()->name();
+    if ( action->inherits( "TQDesignerAction" ) ) {
+	TQString s = ( (TQDesignerAction*)action )->widget()->name();
 	s.prepend( "qt_dead_widget_" );
-	( (QDesignerAction*)action )->widget()->setName( s );
+	( (TQDesignerAction*)action )->widget()->setName( s );
     }
 
     toolBar->removeAction( action );
@@ -1652,14 +1653,15 @@ void AddActionToToolBarCommand::unexecute()
     if ( !action->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ) || ( (TQActionGroup*)action )->usesDropDown()) {
 	action->removeEventFilter( toolBar );
     } else {
-	if ( action->children() ) {
-	    TQObjectListIt it( *action->children() );
+	TQObjectList clo = action->childrenListObject();
+	if ( !clo.isEmpty() ) {
+	    TQObjectListIt it( clo );
 	    while ( it.current() ) {
 		TQObject *o = it.current();
 		++it;
 		if ( !o->inherits( TQACTION_OBJECT_NAME_STRING ) )
 		    continue;
-		if ( o->inherits( "QDesignerAction" ) ) {
+		if ( o->inherits( "TQDesignerAction" ) ) {
 		    o->removeEventFilter( toolBar );
 		    toolBar->removeAction( (TQAction*)o );
 		}
@@ -1671,7 +1673,7 @@ void AddActionToToolBarCommand::unexecute()
 // ------------------------------------------------------------
 
 AddActionToPopupCommand::AddActionToPopupCommand( const TQString &n, FormWindow *fw,
-						  TQAction *a, QDesignerPopupMenu *p, int idx )
+						  TQAction *a, TQDesignerPopupMenu *p, int idx )
     : Command( n, fw ), action( a ), popup( p ), index( idx )
 {
 }
@@ -1684,15 +1686,16 @@ void AddActionToPopupCommand::execute()
 	    popup->insertAction( index, action );
 	} else {
 	    action->addTo( popup );
-	    if ( action->children() ) {
-		TQObjectListIt it( *action->children() );
+	    TQObjectList clo = action->childrenListObject();
+	    if ( !clo.isEmpty() ) {
+		TQObjectListIt it( clo );
 		int i = 0;
 		while ( it.current() ) {
 		    TQObject *o = it.current();
 		    ++it;
 		    if ( !o->inherits( TQACTION_OBJECT_NAME_STRING ) )
 			continue;
-		    QDesignerAction *ac = (QDesignerAction*)o;
+		    TQDesignerAction *ac = (TQDesignerAction*)o;
 		    popup->insertAction( index + (i++), ac );
 		}
 	    }
@@ -1700,7 +1703,7 @@ void AddActionToPopupCommand::execute()
 	popup->reInsert();
 	TQObject::connect( action, TQT_SIGNAL( destroyed() ), popup, TQT_SLOT( actionRemoved() ) );
     } else {
-	if ( !action->inherits( "QDesignerAction" ) || ( (QDesignerAction*)action )->supportsMenu() ) {
+	if ( !action->inherits( "TQDesignerAction" ) || ( (TQDesignerAction*)action )->supportsMenu() ) {
 	    action->addTo( popup );
 	    popup->insertAction( index, action );
 	    popup->reInsert();
@@ -1717,14 +1720,15 @@ void AddActionToPopupCommand::unexecute()
     if ( !action->inherits( TQACTIONGROUP_OBJECT_NAME_STRING ) || ( (TQActionGroup*)action )->usesDropDown()) {
 	action->removeEventFilter( popup );
     } else {
-	if ( action->children() ) {
-	    TQObjectListIt it( *action->children() );
+	TQObjectList clo = action->childrenListObject();
+	if ( !clo.isEmpty() ) {
+	    TQObjectListIt it( clo );
 	    while ( it.current() ) {
 		TQObject *o = it.current();
 		++it;
 		if ( !o->inherits( TQACTION_OBJECT_NAME_STRING ) )
 		    continue;
-		if ( o->inherits( "QDesignerAction" ) ) {
+		if ( o->inherits( "TQDesignerAction" ) ) {
 		    o->removeEventFilter( popup );
 		    popup->removeAction( (TQAction*)o );
 		}
@@ -1744,21 +1748,21 @@ void AddMenuCommand::execute()
 {
     if ( !popup ) {
 	TQString n = "PopupMenu";
-	popup = new QDesignerPopupMenu( mainWindow );
-	formWindow()->unify( popup, n, true );
+	popup = new TQDesignerPopupMenu( mainWindow );
+	formWindow()->unify( TQT_TQOBJECT(popup), n, true );
 	popup->setName( n );
     }
     if ( !mainWindow->child( 0, TQMENUBAR_OBJECT_NAME_STRING ) ) {
-	menuBar = new QDesignerMenuBar( (TQWidget*)mainWindow );
+	menuBar = new TQDesignerMenuBar( (TQWidget*)mainWindow );
 	menuBar->setName( "menubar" );
     } else {
-	menuBar = (QDesignerMenuBar*)mainWindow->menuBar();
+	menuBar = (TQDesignerMenuBar*)mainWindow->menuBar();
     }
     if ( id == -1 )
 	id = mainWindow->menuBar()->insertItem( name, popup );
     else
 	id = mainWindow->menuBar()->insertItem( name, popup, id, index );
-    formWindow()->killAccels( formWindow() );
+    formWindow()->killAccels( TQT_TQOBJECT(formWindow()) );
 }
 
 void AddMenuCommand::unexecute()
@@ -1766,12 +1770,12 @@ void AddMenuCommand::unexecute()
     if ( !popup || !menuBar )
 	return;
     menuBar->removeItem( id );
-    formWindow()->killAccels( formWindow() );
+    formWindow()->killAccels( TQT_TQOBJECT(formWindow()) );
 }
 
 // ------------------------------------------------------------
 
-RenameMenuCommand::RenameMenuCommand( const TQString &n, FormWindow *fw, QDesignerMenuBar *mb,
+RenameMenuCommand::RenameMenuCommand( const TQString &n, FormWindow *fw, TQDesignerMenuBar *mb,
 				      int i, const TQString &on, const TQString &nn )
     : Command( n, fw ), menuBar( mb ), id( i ), oldName( on ), newName( nn )
 {
@@ -1780,19 +1784,19 @@ RenameMenuCommand::RenameMenuCommand( const TQString &n, FormWindow *fw, QDesign
 void RenameMenuCommand::execute()
 {
     menuBar->changeItem( id, newName );
-    formWindow()->killAccels( formWindow() );
+    formWindow()->killAccels( TQT_TQOBJECT(formWindow()) );
 }
 
 void RenameMenuCommand::unexecute()
 {
     menuBar->changeItem( id, oldName );
-    formWindow()->killAccels( formWindow() );
+    formWindow()->killAccels( TQT_TQOBJECT(formWindow()) );
 }
 
 // ------------------------------------------------------------
 
-MoveMenuCommand::MoveMenuCommand( const TQString &n, FormWindow *fw, QDesignerMenuBar *mb,
-				  QDesignerPopupMenu *p, int fidx, int tidx, const TQString &txt )
+MoveMenuCommand::MoveMenuCommand( const TQString &n, FormWindow *fw, TQDesignerMenuBar *mb,
+				  TQDesignerPopupMenu *p, int fidx, int tidx, const TQString &txt )
     : Command( n, fw ), menuBar( mb ), popup( p ), fromIdx( fidx ), toIdx( tidx ), text( txt )
 {
 }
@@ -1801,14 +1805,14 @@ void MoveMenuCommand::execute()
 {
     menuBar->removeItem( menuBar->idAt( fromIdx ) );
     menuBar->insertItem( text, popup, -1, toIdx );
-    formWindow()->killAccels( formWindow() );
+    formWindow()->killAccels( TQT_TQOBJECT(formWindow()) );
 }
 
 void MoveMenuCommand::unexecute()
 {
     menuBar->removeItem( menuBar->idAt( toIdx ) );
     menuBar->insertItem( text, popup, -1, fromIdx );
-    formWindow()->killAccels( formWindow() );
+    formWindow()->killAccels( TQT_TQOBJECT(formWindow()) );
 }
 
 // ------------------------------------------------------------
@@ -1821,9 +1825,9 @@ AddToolBarCommand::AddToolBarCommand( const TQString &n, FormWindow *fw, TQMainW
 void AddToolBarCommand::execute()
 {
     if ( !toolBar ) {
-	toolBar = new QDesignerToolBar( mainWindow );
+	toolBar = new TQDesignerToolBar( mainWindow );
 	TQString n = "Toolbar";
-	formWindow()->unify( toolBar, n, true );
+	formWindow()->unify( TQT_TQOBJECT(toolBar), n, true );
 	toolBar->setName( n );
 	mainWindow->addToolBar( toolBar, n );
     } else {