diff options
Diffstat (limited to 'kommander/factory/kommanderfactory.cpp')
| -rw-r--r-- | kommander/factory/kommanderfactory.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/kommander/factory/kommanderfactory.cpp b/kommander/factory/kommanderfactory.cpp index 11ac1cf3..504af6f9 100644 --- a/kommander/factory/kommanderfactory.cpp +++ b/kommander/factory/kommanderfactory.cpp @@ -207,7 +207,7 @@ TQWidget *KommanderFactory::create( TQIODevice *dev, TQObject *connector, TQWidg widgetFactory->variables << e.firstChild().toText().data(); } else if ( e.tagName() == "pixmapinproject" ) { widgetFactory->usePixmapCollection = true; - } else if ( e.tagName() == "tqlayoutdefaults" ) { + } else if ( e.tagName() == "layoutdefaults" ) { widgetFactory->defSpacing = e.attribute( "spacing", TQString::number( widgetFactory->defSpacing ) ).toInt(); widgetFactory->defMargin = e.attribute( "margin", TQString::number( widgetFactory->defMargin ) ).toInt(); } @@ -532,7 +532,7 @@ TQWidget *KommanderFactory::createWidgetInternal( const TQDomElement &e, TQWidge if ( w->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) ) w = ( (TQMainWindow*)w )->centralWidget(); if ( tqlayout ) { - switch( tqlayoutType( tqlayout ) ) { + switch( layoutType( tqlayout ) ) { case HBox: ( (TQHBoxLayout*)tqlayout )->addWidget( w ); break; @@ -562,37 +562,37 @@ TQWidget *KommanderFactory::createWidgetInternal( const TQDomElement &e, TQWidge createWidgetInternal( n, w, tqlayout, n.attribute( "class", TQWIDGET_OBJECT_NAME_STRING ) ); dbControls = oldDbControls; } else if ( n.tagName() == "hbox" ) { - TQLayout *tqparentLayout = tqlayout; + TQLayout *parentLayout = tqlayout; if ( tqlayout && tqlayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) ) tqlayout = createLayout( 0, 0, KommanderFactory::HBox ); else tqlayout = createLayout( w, tqlayout, KommanderFactory::HBox ); obj = TQT_TQOBJECT(tqlayout); n = n.firstChild().toElement(); - if ( tqparentLayout && tqparentLayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) ) - ( (TQGridLayout*)tqparentLayout )->addMultiCellLayout( tqlayout, row, row + rowspan - 1, col, col + colspan - 1 ); + if ( parentLayout && parentLayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) ) + ( (TQGridLayout*)parentLayout )->addMultiCellLayout( tqlayout, row, row + rowspan - 1, col, col + colspan - 1 ); continue; } else if ( n.tagName() == "grid" ) { - TQLayout *tqparentLayout = tqlayout; + TQLayout *parentLayout = tqlayout; if ( tqlayout && tqlayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) ) tqlayout = createLayout( 0, 0, KommanderFactory::Grid ); else tqlayout = createLayout( w, tqlayout, KommanderFactory::Grid ); obj = TQT_TQOBJECT(tqlayout); n = n.firstChild().toElement(); - if ( tqparentLayout && tqparentLayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) ) - ( (TQGridLayout*)tqparentLayout )->addMultiCellLayout( tqlayout, row, row + rowspan - 1, col, col + colspan - 1 ); + if ( parentLayout && parentLayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) ) + ( (TQGridLayout*)parentLayout )->addMultiCellLayout( tqlayout, row, row + rowspan - 1, col, col + colspan - 1 ); continue; } else if ( n.tagName() == "vbox" ) { - TQLayout *tqparentLayout = tqlayout; + TQLayout *parentLayout = tqlayout; if ( tqlayout && tqlayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) ) tqlayout = createLayout( 0, 0, KommanderFactory::VBox ); else tqlayout = createLayout( w, tqlayout, KommanderFactory::VBox ); obj = TQT_TQOBJECT(tqlayout); n = n.firstChild().toElement(); - if ( tqparentLayout && tqparentLayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) ) - ( (TQGridLayout*)tqparentLayout )->addMultiCellLayout( tqlayout, row, row + rowspan - 1, col, col + colspan - 1 ); + if ( parentLayout && parentLayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) ) + ( (TQGridLayout*)parentLayout )->addMultiCellLayout( tqlayout, row, row + rowspan - 1, col, col + colspan - 1 ); continue; } else if ( n.tagName() == "property" && obj ) { setProperty( obj, n.attribute( "name" ), n.firstChild().toElement() ); @@ -715,7 +715,7 @@ TQLayout *KommanderFactory::createLayout( TQWidget *widget, TQLayout* tqlayout, } } -KommanderFactory::LayoutType KommanderFactory::tqlayoutType( TQLayout *tqlayout ) const +KommanderFactory::LayoutType KommanderFactory::layoutType( TQLayout *tqlayout ) const { if ( tqlayout->inherits( TQHBOXLAYOUT_OBJECT_NAME_STRING ) ) return HBox; @@ -733,8 +733,8 @@ void KommanderFactory::setProperty( TQObject* obj, const TQString &prop, const T TQVariant defVariant; 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(); defVariant = TQVariant( f ); } |