diff options
Diffstat (limited to 'kdevdesigner/designer/command.cpp')
| -rw-r--r-- | kdevdesigner/designer/command.cpp | 50 | 
1 files changed, 25 insertions, 25 deletions
| diff --git a/kdevdesigner/designer/command.cpp b/kdevdesigner/designer/command.cpp index f461a877..63ed9e0a 100644 --- a/kdevdesigner/designer/command.cpp +++ b/kdevdesigner/designer/command.cpp @@ -244,7 +244,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 );  } @@ -253,7 +253,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 );  } @@ -320,7 +320,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 ); @@ -341,7 +341,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 ); @@ -546,7 +546,7 @@ bool SetPropertyCommand::checkProperty()  	}  	if ( ::tqqt_cast<FormWindow*>(widget->tqparent()) ) -	    formWindow()->mainWindow()->formNameChanged( (FormWindow*)((TQWidget*)(TQObject*)widget)->tqparentWidget() ); +	    formWindow()->mainWindow()->formNameChanged( (FormWindow*)((TQWidget*)(TQObject*)widget)->parentWidget() );      }      return TRUE;  } @@ -583,12 +583,12 @@ void SetPropertyCommand::setProperty( const TQVariant &v, const TQString ¤  	    if ( v.toBool() )  		align |= WordBreak;  	    widget->setProperty( "tqalignment", TQVariant( align ) ); -	} else if ( propName == "tqlayoutSpacing" ) { +	} else if ( propName == "layoutSpacing" ) {  	    TQVariant val = v;  	    if ( val.toString() == "default" )  		val = -1;  	    MetaDataBase::setSpacing( TQT_TQOBJECT(WidgetFactory::containerOfWidget( TQT_TQWIDGET(editor->widget()) )), val.toInt() ); -	} else if ( propName == "tqlayoutMargin" ) { +	} else if ( propName == "layoutMargin" ) {  	    TQVariant val = v;  	    if ( val.toString() == "default" )  		val = -1; @@ -672,9 +672,9 @@ void SetPropertyCommand::setProperty( const TQVariant &v, const TQString ¤  // ------------------------------------------------------------  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 )  {  } @@ -695,9 +695,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 )  {  } @@ -718,9 +718,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 )  {  } @@ -741,9 +741,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 )  {  } @@ -764,9 +764,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) ) )  {  } @@ -787,19 +787,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, ::tqqt_cast<TQSplitter*>(tqlayoutBase) != 0 ); +	tqlayout = new HorizontalLayout( wl, layoutBase, fw, layoutBase, FALSE, ::tqqt_cast<TQSplitter*>(layoutBase) != 0 );      else if ( lay == WidgetFactory::VBox ) -	tqlayout = new VerticalLayout( wl, tqlayoutBase, fw, tqlayoutBase, FALSE, ::tqqt_cast<TQSplitter*>(tqlayoutBase) != 0 ); +	tqlayout = new VerticalLayout( wl, layoutBase, fw, layoutBase, FALSE, ::tqqt_cast<TQSplitter*>(layoutBase) != 0 );      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() | 
