Adjusted to latest TQVariant::TQVariant(bool) function.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/6/head
Michele Calgaro 5 years ago
parent 6f7662c399
commit 845e845efe
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF

@ -1085,7 +1085,7 @@ PropertyBoolItem::~PropertyBoolItem()
void PropertyBoolItem::toggle() void PropertyBoolItem::toggle()
{ {
bool b = value().toBool(); bool b = value().toBool();
setValue( TQVariant( !b, 0 ) ); setValue( TQVariant( !b ) );
setValue(); setValue();
} }
@ -1139,8 +1139,8 @@ void PropertyBoolItem::setValue()
if ( !comb ) if ( !comb )
return; return;
setText( 1, combo()->currentText() ); setText( 1, combo()->currentText() );
bool b = combo()->currentItem() == 0 ? (bool)false : (bool)true; bool b = combo()->currentItem() == 0 ? false : true;
PropertyItem::setValue( TQVariant( b, 0 ) ); PropertyItem::setValue( TQVariant( b ) );
notifyValueChange(); notifyValueChange();
} }
@ -1790,13 +1790,13 @@ void PropertyFontItem::initChildren()
} else if ( item->name() == i18n("Point Size" ) ) } else if ( item->name() == i18n("Point Size" ) )
item->setValue( val.toFont().pointSize() ); item->setValue( val.toFont().pointSize() );
else if ( item->name() == i18n("Bold" ) ) else if ( item->name() == i18n("Bold" ) )
item->setValue( TQVariant( val.toFont().bold(), 0 ) ); item->setValue( TQVariant( val.toFont().bold() ) );
else if ( item->name() == i18n("Italic" ) ) else if ( item->name() == i18n("Italic" ) )
item->setValue( TQVariant( val.toFont().italic(), 0 ) ); item->setValue( TQVariant( val.toFont().italic() ) );
else if ( item->name() == i18n("Underline" ) ) else if ( item->name() == i18n("Underline" ) )
item->setValue( TQVariant( val.toFont().underline(), 0 ) ); item->setValue( TQVariant( val.toFont().underline() ) );
else if ( item->name() == i18n("Strikeout" ) ) else if ( item->name() == i18n("Strikeout" ) )
item->setValue( TQVariant( val.toFont().strikeOut(), 0 ) ); item->setValue( TQVariant( val.toFont().strikeOut() ) );
} }
} }
@ -3081,9 +3081,9 @@ void PropertyList::setPropertyValue( PropertyItem *i )
} else if ( i->name() == "wordwrap" ) { } else if ( i->name() == "wordwrap" ) {
int align = editor->widget()->property( "alignment" ).toInt(); int align = editor->widget()->property( "alignment" ).toInt();
if ( align & WordBreak ) if ( align & WordBreak )
i->setValue( TQVariant( true, 0 ) ); i->setValue( TQVariant( true ) );
else else
i->setValue( TQVariant( false, 0 ) ); i->setValue( TQVariant( false) );
} else if ( i->name() == "layoutSpacing" ) { } else if ( i->name() == "layoutSpacing" ) {
( (PropertyIntItem*)i )->setValue( MetaDataBase::spacing( TQT_TQOBJECT(WidgetFactory::containerOfWidget( (TQWidget*)editor->widget() )) ) ); ( (PropertyIntItem*)i )->setValue( MetaDataBase::spacing( TQT_TQOBJECT(WidgetFactory::containerOfWidget( (TQWidget*)editor->widget() )) ) );
} else if ( i->name() == "layoutMargin" ) { } else if ( i->name() == "layoutMargin" ) {

@ -1679,13 +1679,13 @@ TQVariant WidgetFactory::defaultValue( TQObject *w, const TQString &propName )
{ {
if ( propName == "wordwrap" ) { if ( propName == "wordwrap" ) {
int v = defaultValue( w, "alignment" ).toInt(); int v = defaultValue( w, "alignment" ).toInt();
return TQVariant( ( v & WordBreak ) == WordBreak, 0 ); return TQVariant( ( v & WordBreak ) == WordBreak );
} else if ( propName == "toolTip" || propName == "whatsThis" ) { } else if ( propName == "toolTip" || propName == "whatsThis" ) {
return TQVariant( TQString::fromLatin1( "" ) ); return TQVariant( TQString::fromLatin1( "" ) );
} else if ( w->inherits( "CustomWidget" ) ) { } else if ( w->inherits( "CustomWidget" ) ) {
return TQVariant(); return TQVariant();
} else if ( propName == "frameworkCode" ) { } else if ( propName == "frameworkCode" ) {
return TQVariant( true, 0 ); return TQVariant( true );
} else if ( propName == "layoutMargin" ) { } else if ( propName == "layoutMargin" ) {
if ( w->inherits( TQLAYOUTWIDGET_OBJECT_NAME_STRING ) ) if ( w->inherits( TQLAYOUTWIDGET_OBJECT_NAME_STRING ) )
return TQVariant( 0 ); return TQVariant( 0 );

@ -177,7 +177,7 @@ TQVariant DomTool::elementToVariant( const TQDomElement& e, const TQVariant& def
v = TQVariant( e.firstChild().toText().data().toDouble() ); v = TQVariant( e.firstChild().toText().data().toDouble() );
} else if ( e.tagName() == "bool" ) { } else if ( e.tagName() == "bool" ) {
TQString t = e.firstChild().toText().data(); TQString t = e.firstChild().toText().data();
v = TQVariant( t == "true" || t == "1", 0 ); v = TQVariant( t == "true" || t == "1" );
} else if ( e.tagName() == "pixmap" ) { } else if ( e.tagName() == "pixmap" ) {
v = TQVariant( e.firstChild().toText().data() ); v = TQVariant( e.firstChild().toText().data() );
} else if ( e.tagName() == "iconset" ) { } else if ( e.tagName() == "iconset" ) {

@ -788,7 +788,7 @@ void KommanderFactory::setProperty( TQObject* obj, const TQString &prop, const T
if ( prop == "buddy" ) { if ( prop == "buddy" ) {
buddies.insert( obj->name(), v.toCString() ); buddies.insert( obj->name(), v.toCString() );
} else if ( prop == "frameworkCode" ) { } else if ( prop == "frameworkCode" ) {
if ( !DomTool::elementToVariant( e, TQVariant( true, 0 ) ).toBool() ) { if ( !DomTool::elementToVariant( e, TQVariant( true ) ).toBool() ) {
noDatabaseWidgets << obj->name(); noDatabaseWidgets << obj->name();
} }
} else if ( prop == "buttonGroupId" ) { } else if ( prop == "buttonGroupId" ) {

Loading…
Cancel
Save