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.cpp28
1 files changed, 14 insertions, 14 deletions
diff --git a/kdevdesigner/uilib/qwidgetfactory.cpp b/kdevdesigner/uilib/qwidgetfactory.cpp
index c61584a7..2ac6d22e 100644
--- a/kdevdesigner/uilib/qwidgetfactory.cpp
+++ b/kdevdesigner/uilib/qwidgetfactory.cpp
@@ -682,7 +682,7 @@ void TQWidgetFactory::inputSpacer( const UibStrTable& strings, TQDataStream& in,
if ( name == "orientation" ) {
vertical = ( value == "Vertical" );
- } else if ( name == "tqsizeHint" ) {
+ } else if ( name == "sizeHint" ) {
w = value.toSize().width();
h = value.toSize().height();
} else if ( name == "sizeType" ) {
@@ -1047,7 +1047,7 @@ TQObject *TQWidgetFactory::inputObject( TQObject **objects, int& numObjects,
case Object_PaletteProperty:
{
TQPalette palette;
- TQColorGroup tqcolorGroup;
+ TQColorGroup colorGroup;
TQColor color;
int role = -1;
@@ -1057,26 +1057,26 @@ TQObject *TQWidgetFactory::inputObject( TQObject **objects, int& numObjects,
while ( !in.atEnd() && paletteTag != Palette_End ) {
switch ( paletteTag ) {
case Palette_Active:
- palette.setActive( tqcolorGroup );
+ palette.setActive( colorGroup );
role = -1;
break;
case Palette_Inactive:
- palette.setInactive( tqcolorGroup );
+ palette.setInactive( colorGroup );
role = -1;
break;
case Palette_Disabled:
- palette.setDisabled( tqcolorGroup );
+ palette.setDisabled( colorGroup );
role = -1;
break;
case Palette_Color:
role++;
in >> color;
- tqcolorGroup.setColor( (TQColorGroup::ColorRole) role,
+ colorGroup.setColor( (TQColorGroup::ColorRole) role,
color );
break;
case Palette_Pixmap:
unpackVariant( strings, in, value );
- tqcolorGroup.setBrush( (TQColorGroup::ColorRole) role,
+ colorGroup.setBrush( (TQColorGroup::ColorRole) role,
TQBrush(color, value.asPixmap()) );
break;
default:
@@ -1788,7 +1788,7 @@ TQLayout *TQWidgetFactory::createLayout( TQWidget *widget, TQLayout* tqlayout,
return 0;
}
}
- l->tqsetAlignment( align );
+ l->setAlignment( align );
l->setMargin( margin );
l->setSpacing( spacing );
return l;
@@ -1808,7 +1808,7 @@ TQWidgetFactory::LayoutType TQWidgetFactory::layoutType( TQLayout *tqlayout ) co
void TQWidgetFactory::setProperty( TQObject* obj, const TQString &prop,
TQVariant value )
{
- int offset = obj->tqmetaObject()->findProperty( prop.ascii(), TRUE );
+ int offset = obj->metaObject()->findProperty( prop.ascii(), TRUE );
if ( offset != -1 ) {
if ( prop == "geometry" && TQT_BASE_OBJECT(obj) == TQT_BASE_OBJECT(toplevel) ) {
@@ -1819,7 +1819,7 @@ void TQWidgetFactory::setProperty( TQObject* obj, const TQString &prop,
if ( value.type() == TQVariant::String ||
value.type() == TQVariant::CString ) {
const TQMetaProperty *metaProp =
- obj->tqmetaObject()->property( offset, TRUE );
+ obj->metaObject()->property( offset, TRUE );
if ( metaProp != 0 && metaProp->isEnumType() ) {
if ( metaProp->isSetType() ) {
TQStrList flagsCStr;
@@ -1938,7 +1938,7 @@ void TQWidgetFactory::createSpacer( const TQDomElement &e, TQLayout *tqlayout )
orient = Qt::Vertical;
} else if ( prop == "sizeType" ) {
sizeType = stringToSizeType( n.firstChild().firstChild().toText().data() );
- } else if ( prop == "tqsizeHint" ) {
+ } else if ( prop == "sizeHint" ) {
w = n.firstChild().firstChild().firstChild().toText().data().toInt();
h = n.firstChild().firstChild().nextSibling().firstChild().toText().data().toInt();
}
@@ -2144,12 +2144,12 @@ void TQWidgetFactory::loadConnections( const TQDomElement &e, TQObject *connecto
TQString s2 = "1""%1";
s2 = s2.tqarg( conn.slot.data() );
- TQStrList signalList = sender->tqmetaObject()->signalNames( TRUE );
- TQStrList slotList = receiver->tqmetaObject()->slotNames( TRUE );
+ TQStrList signalList = sender->metaObject()->signalNames( TRUE );
+ TQStrList slotList = receiver->metaObject()->slotNames( TRUE );
// if this is a connection to a custom slot and we have a connector, try this as receiver
if ( slotList.find( conn.slot ) == -1 && (TQT_BASE_OBJECT(receiver) == TQT_BASE_OBJECT(toplevel)) && connector ) {
- slotList = connector->tqmetaObject()->slotNames( TRUE );
+ slotList = connector->metaObject()->slotNames( TRUE );
receiver = connector;
}