summaryrefslogtreecommitdiffstats
path: root/kdevdesigner/uilib/qwidgetfactory.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'kdevdesigner/uilib/qwidgetfactory.cpp')
-rw-r--r--kdevdesigner/uilib/qwidgetfactory.cpp74
1 files changed, 37 insertions, 37 deletions
diff --git a/kdevdesigner/uilib/qwidgetfactory.cpp b/kdevdesigner/uilib/qwidgetfactory.cpp
index 7b5cf28b..d8930366 100644
--- a/kdevdesigner/uilib/qwidgetfactory.cpp
+++ b/kdevdesigner/uilib/qwidgetfactory.cpp
@@ -456,7 +456,7 @@ TQWidget *TQWidgetFactory::createFromUiFile( TQDomDocument doc, TQObject *connec
widget = e;
} else if ( e.tagName() == "pixmapinproject" ) {
usePixmapCollection = TRUE;
- } else if ( e.tagName() == "tqlayoutdefaults" ) {
+ } else if ( e.tagName() == "layoutdefaults" ) {
defSpacing = e.attribute( "spacing", TQString::number( defSpacing ) ).toInt();
defMargin = e.attribute( "margin", TQString::number( defMargin ) ).toInt();
}
@@ -776,7 +776,7 @@ void TQWidgetFactory::inputColumnOrRow( const UibStrTable& strings,
}
void TQWidgetFactory::inputItem( const UibStrTable& strings, TQDataStream& in,
- TQObject *tqparent, TQListViewItem *tqparentItem )
+ TQObject *tqparent, TQListViewItem *parentItem )
{
TQStringList texts;
TQValueList<TQPixmap> pixmaps;
@@ -790,10 +790,10 @@ void TQWidgetFactory::inputItem( const UibStrTable& strings, TQDataStream& in,
tqparent = TQT_TQOBJECT((TQListView *) tqparent);
TQListViewItem *item = 0;
if ( listView != 0 ) {
- if ( tqparentItem == 0 ) {
+ if ( parentItem == 0 ) {
item = new TQListViewItem( listView, d->lastItem );
} else {
- item = new TQListViewItem( tqparentItem, d->lastItem );
+ item = new TQListViewItem( parentItem, d->lastItem );
}
d->lastItem = item;
}
@@ -880,7 +880,7 @@ void TQWidgetFactory::inputMenuItem( TQObject **objects,
unpackCString( strings, in, name );
unpackCString( strings, in, text );
- TQPopupMenu *popupMenu = new TQPopupMenu( menuBar->tqparentWidget(), name );
+ TQPopupMenu *popupMenu = new TQPopupMenu( menuBar->parentWidget(), name );
in >> objectTag;
while ( !in.atEnd() && objectTag != Object_End ) {
@@ -908,21 +908,21 @@ TQObject *TQWidgetFactory::inputObject( TQObject **objects, int& numObjects,
TQObject *obj = 0;
TQWidget *widget = 0;
TQLayout *tqlayout = 0;
- TQWidget *tqparentWidget = 0;
- TQLayout *tqparentLayout = 0;
+ TQWidget *parentWidget = 0;
+ TQLayout *parentLayout = 0;
bool isTQObject = !className.isEmpty();
if ( isTQObject ) {
if ( tqparent != 0 ) {
if ( tqparent->isWidgetType() ) {
if ( tqparent->inherits(TQMAINWINDOW_OBJECT_NAME_STRING) ) {
- tqparentWidget = ((TQMainWindow *) tqparent)->centralWidget();
+ parentWidget = ((TQMainWindow *) tqparent)->centralWidget();
} else {
- tqparentWidget = (TQWidget *) tqparent;
+ parentWidget = (TQWidget *) tqparent;
}
} else if ( tqparent->inherits(TQLAYOUT_OBJECT_NAME_STRING) ) {
- tqparentLayout = (TQLayout *) tqparent;
- tqparentWidget = ancestorWidget;
+ parentLayout = (TQLayout *) tqparent;
+ parentWidget = ancestorWidget;
}
}
@@ -941,10 +941,10 @@ TQObject *TQWidgetFactory::inputObject( TQObject **objects, int& numObjects,
} else if ( className == TQVBOXLAYOUT_OBJECT_NAME_STRING ) {
type = VBox;
}
- if ( tqparentLayout != 0 && tqparentLayout->inherits(TQGRIDLAYOUT_OBJECT_NAME_STRING) ) {
+ if ( parentLayout != 0 && parentLayout->inherits(TQGRIDLAYOUT_OBJECT_NAME_STRING) ) {
tqlayout = createLayout( 0, 0, type );
} else {
- tqlayout = createLayout( tqparentWidget, tqparentLayout, type );
+ tqlayout = createLayout( parentWidget, parentLayout, type );
}
obj = TQT_TQOBJECT(tqlayout);
} else if ( className == TQMENUBAR_OBJECT_NAME_STRING ) {
@@ -960,7 +960,7 @@ TQObject *TQWidgetFactory::inputObject( TQObject **objects, int& numObjects,
obj = TQT_TQOBJECT(widget);
} else if ( className == TQWIDGET_OBJECT_NAME_STRING ) {
unpackCString( strings, in, className );
- widget = createWidget( className, tqparentWidget, 0 );
+ widget = createWidget( className, parentWidget, 0 );
obj = TQT_TQOBJECT(widget);
}
@@ -1098,15 +1098,15 @@ TQObject *TQWidgetFactory::inputObject( TQObject **objects, int& numObjects,
((TQToolBar *) widget)->addSeparator();
break;
case Object_SubAction:
- inputObject( objects, numObjects, strings, in, tqparentWidget,
+ inputObject( objects, numObjects, strings, in, parentWidget,
obj != 0 ? obj : tqparent, TQACTION_OBJECT_NAME_STRING );
break;
case Object_SubLayout:
- inputObject( objects, numObjects, strings, in, tqparentWidget, obj,
+ inputObject( objects, numObjects, strings, in, parentWidget, obj,
TQLAYOUT_OBJECT_NAME_STRING );
break;
case Object_SubWidget:
- inputObject( objects, numObjects, strings, in, tqparentWidget, obj,
+ inputObject( objects, numObjects, strings, in, parentWidget, obj,
TQWIDGET_OBJECT_NAME_STRING );
break;
case Object_TextProperty:
@@ -1151,18 +1151,18 @@ TQObject *TQWidgetFactory::inputObject( TQObject **objects, int& numObjects,
metAttribute--;
}
- if ( tqparentLayout != 0 ) {
+ if ( parentLayout != 0 ) {
if ( widget != 0 ) {
- if ( tqparentLayout->inherits(TQGRIDLAYOUT_OBJECT_NAME_STRING) ) {
- ((TQGridLayout *) tqparentLayout)->addMultiCellWidget(
+ if ( parentLayout->inherits(TQGRIDLAYOUT_OBJECT_NAME_STRING) ) {
+ ((TQGridLayout *) parentLayout)->addMultiCellWidget(
widget, row, row + rowspan - 1, column,
column + colspan - 1 );
} else {
- ((TQBoxLayout *) tqparentLayout)->addWidget( widget );
+ ((TQBoxLayout *) parentLayout)->addWidget( widget );
}
} else if ( tqlayout != 0 ) {
- if ( tqparentLayout->inherits(TQGRIDLAYOUT_OBJECT_NAME_STRING) ) {
- ((TQGridLayout *) tqparentLayout)->addMultiCellLayout(
+ if ( parentLayout->inherits(TQGRIDLAYOUT_OBJECT_NAME_STRING) ) {
+ ((TQGridLayout *) parentLayout)->addMultiCellLayout(
tqlayout, row, row + rowspan - 1, column,
column + colspan - 1 );
}
@@ -1606,7 +1606,7 @@ TQWidget *TQWidgetFactory::createWidgetInternal( const TQDomElement &e, TQWidget
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;
@@ -1626,7 +1626,7 @@ TQWidget *TQWidgetFactory::createWidgetInternal( const TQDomElement &e, TQWidget
}
}
#ifdef TQT_CONTAINER_CUSTOM_WIDGETS
- TQString tqparentClassName = tqparent ? tqparent->className() : 0;
+ TQString parentClassName = tqparent ? tqparent->className() : 0;
bool isPlugin = tqparent ? !!d->customWidgets.tqfind( tqparent->className() ) : FALSE;
if ( isPlugin )
qWarning( "####### loading custom container widgets without page support not implemented!" );
@@ -1642,39 +1642,39 @@ TQWidget *TQWidgetFactory::createWidgetInternal( const TQDomElement &e, TQWidget
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, TQWidgetFactory::HBox, isTQLayoutWidget );
else
tqlayout = createLayout( w, tqlayout, TQWidgetFactory::HBox, isTQLayoutWidget );
obj = TQT_TQOBJECT(tqlayout);
n = n.firstChild().toElement();
- if ( tqparentLayout && tqparentLayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) )
- ( (TQGridLayout*)tqparentLayout )->addMultiCellLayout( tqlayout, row,
+ 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, TQWidgetFactory::Grid, isTQLayoutWidget );
else
tqlayout = createLayout( w, tqlayout, TQWidgetFactory::Grid, isTQLayoutWidget );
obj = TQT_TQOBJECT(tqlayout);
n = n.firstChild().toElement();
- if ( tqparentLayout && tqparentLayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) )
- ( (TQGridLayout*)tqparentLayout )->addMultiCellLayout( tqlayout, row,
+ 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, TQWidgetFactory::VBox, isTQLayoutWidget );
else
tqlayout = createLayout( w, tqlayout, TQWidgetFactory::VBox, isTQLayoutWidget );
obj = TQT_TQOBJECT(tqlayout);
n = n.firstChild().toElement();
- if ( tqparentLayout && tqparentLayout->inherits( TQGRIDLAYOUT_OBJECT_NAME_STRING ) )
- ( (TQGridLayout*)tqparentLayout )->addMultiCellLayout( tqlayout, row,
+ 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 ) {
@@ -1699,13 +1699,13 @@ TQWidget *TQWidgetFactory::createWidgetInternal( const TQDomElement &e, TQWidget
} else if ( isPlugin ) {
if ( attrib == "label" ) {
WidgetInterface *iface = 0;
- widgetInterfaceManager->queryInterface( tqparentClassName, &iface );
+ widgetInterfaceManager->queryInterface( parentClassName, &iface );
if ( iface ) {
TQWidgetContainerInterfacePrivate *iface2 = 0;
iface->queryInterface( IID_TQWidgetContainer,
(TQUnknownInterface**)&iface2 );
if ( iface2 ) {
- iface2->insertPage( tqparentClassName,
+ iface2->insertPage( parentClassName,
(TQWidget*)tqparent, translate( v.toString() ), -1, w );
iface2->release();
}
@@ -1794,7 +1794,7 @@ TQLayout *TQWidgetFactory::createLayout( TQWidget *widget, TQLayout* tqlayout,
return l;
}
-TQWidgetFactory::LayoutType TQWidgetFactory::tqlayoutType( TQLayout *tqlayout ) const
+TQWidgetFactory::LayoutType TQWidgetFactory::layoutType( TQLayout *tqlayout ) const
{
if ( tqlayout->inherits( TQHBOXLAYOUT_OBJECT_NAME_STRING ) )
return HBox;