summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2019-05-26 17:01:21 +0200
committerSlávek Banko <slavek.banko@axis.cz>2019-05-26 17:01:21 +0200
commit5fcb1d91b4f52ab609864968a7320eb276f6c068 (patch)
tree68b06e9aae62d253e11bee1794e440fdff1f2f10
parent5c2e2bba886fb5aca2abead9bfc2b1d15216d229 (diff)
downloadtdevelop-5fcb1d91b4f52ab609864968a7320eb276f6c068.tar.gz
tdevelop-5fcb1d91b4f52ab609864968a7320eb276f6c068.zip
Adjusted to latest TQVariant::TQVariant(bool) function.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
-rw-r--r--kdevdesigner/designer/mainwindow.cpp8
-rw-r--r--kdevdesigner/designer/propertyeditor.cpp16
-rw-r--r--kdevdesigner/designer/widgetfactory.cpp4
-rw-r--r--kdevdesigner/shared/domtool.cpp2
-rw-r--r--kdevdesigner/uilib/qwidgetfactory.cpp2
5 files changed, 16 insertions, 16 deletions
diff --git a/kdevdesigner/designer/mainwindow.cpp b/kdevdesigner/designer/mainwindow.cpp
index 3d900532..4caaab41 100644
--- a/kdevdesigner/designer/mainwindow.cpp
+++ b/kdevdesigner/designer/mainwindow.cpp
@@ -1739,8 +1739,8 @@ void MainWindow::handleRMBProperties( int id, TQMap<TQString, int> &props, TQWid
if ( oldDoWrap != doWrap ) {
TQString pn( i18n( "Set 'wordwrap' of '%1'" ).arg( w->name() ) );
SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), TQT_TQOBJECT(w), propertyEditor,
- "wordwrap", TQVariant( oldDoWrap, 0 ),
- TQVariant( doWrap, 0 ), TQString(), TQString() );
+ "wordwrap", TQVariant( oldDoWrap ),
+ TQVariant( doWrap ), TQString(), TQString() );
cmd->execute();
formWindow()->commandHistory()->addCommand( cmd );
MetaDataBase::setPropertyChanged( TQT_TQOBJECT(w), "wordwrap", TRUE );
@@ -2642,8 +2642,8 @@ bool MainWindow::openEditor( TQWidget *w, FormWindow *f )
if ( oldDoWrap != doWrap ) {
TQString pn( i18n( "Set 'wordwrap' of '%1'" ).arg( w->name() ) );
SetPropertyCommand *cmd = new SetPropertyCommand( pn, formWindow(), TQT_TQOBJECT(w), propertyEditor,
- "wordwrap", TQVariant( oldDoWrap, 0 ),
- TQVariant( doWrap, 0 ), TQString(), TQString() );
+ "wordwrap", TQVariant( oldDoWrap ),
+ TQVariant( doWrap ), TQString(), TQString() );
cmd->execute();
formWindow()->commandHistory()->addCommand( cmd );
MetaDataBase::setPropertyChanged( TQT_TQOBJECT(w), "wordwrap", TRUE );
diff --git a/kdevdesigner/designer/propertyeditor.cpp b/kdevdesigner/designer/propertyeditor.cpp
index 8397fc22..10fd4aaf 100644
--- a/kdevdesigner/designer/propertyeditor.cpp
+++ b/kdevdesigner/designer/propertyeditor.cpp
@@ -1104,7 +1104,7 @@ PropertyBoolItem::~PropertyBoolItem()
void PropertyBoolItem::toggle()
{
bool b = value().toBool();
- setValue( TQVariant( !b, 0 ) );
+ setValue( TQVariant( !b ) );
setValue();
}
@@ -1159,7 +1159,7 @@ void PropertyBoolItem::setValue()
return;
setText( 1, combo()->currentText() );
bool b = combo()->currentItem() == 0 ? (bool)FALSE : (bool)TRUE;
- PropertyItem::setValue( TQVariant( b, 0 ) );
+ PropertyItem::setValue( TQVariant( b ) );
notifyValueChange();
}
@@ -1901,13 +1901,13 @@ void PropertyFontItem::initChildren()
} else if ( item->name() == i18n( "Point Size" ) )
item->setValue( val.toFont().pointSize() );
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" ) )
- item->setValue( TQVariant( val.toFont().italic(), 0 ) );
+ item->setValue( TQVariant( val.toFont().italic() ) );
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" ) )
- item->setValue( TQVariant( val.toFont().strikeOut(), 0 ) );
+ item->setValue( TQVariant( val.toFont().strikeOut() ) );
}
}
@@ -3712,9 +3712,9 @@ void PropertyList::setPropertyValue( PropertyItem *i )
} else if ( i->name() == "wordwrap" ) {
int align = editor->widget()->property( "alignment" ).toInt();
if ( align & WordBreak )
- i->setValue( TQVariant( TRUE, 0 ) );
+ i->setValue( TQVariant( true ) );
else
- i->setValue( TQVariant( FALSE, 0 ) );
+ i->setValue( TQVariant( false ) );
} else if ( i->name() == "layoutSpacing" ) {
( (PropertyLayoutItem*)i )->setValue( MetaDataBase::spacing( TQT_TQOBJECT(WidgetFactory::containerOfWidget( TQT_TQWIDGET(editor->widget()) ) ) ));
} else if ( i->name() == "layoutMargin" ) {
diff --git a/kdevdesigner/designer/widgetfactory.cpp b/kdevdesigner/designer/widgetfactory.cpp
index 9d04535a..9423b6a6 100644
--- a/kdevdesigner/designer/widgetfactory.cpp
+++ b/kdevdesigner/designer/widgetfactory.cpp
@@ -1480,13 +1480,13 @@ TQVariant WidgetFactory::defaultValue( TQObject *w, const TQString &propName )
{
if ( propName == "wordwrap" ) {
int v = defaultValue( w, "alignment" ).toInt();
- return TQVariant( ( v & WordBreak ) == WordBreak, 0 );
+ return TQVariant( ( v & WordBreak ) == WordBreak );
} else if ( propName == "toolTip" || propName == "whatsThis" ) {
return TQVariant( TQString::fromLatin1( "" ) );
} else if ( w->inherits( "CustomWidget" ) ) {
return TQVariant();
} else if ( propName == "frameworkCode" ) {
- return TQVariant( TRUE, 0 );
+ return TQVariant( true );
} else if ( propName == "layoutMargin" || propName == "layoutSpacing" ) {
return TQVariant( -1 );
}
diff --git a/kdevdesigner/shared/domtool.cpp b/kdevdesigner/shared/domtool.cpp
index f8ed4ec5..ec79ffad 100644
--- a/kdevdesigner/shared/domtool.cpp
+++ b/kdevdesigner/shared/domtool.cpp
@@ -192,7 +192,7 @@ TQVariant DomTool::elementToVariant( const TQDomElement& e, const TQVariant& def
v = TQVariant( e.firstChild().toText().data().toDouble() );
} else if ( e.tagName() == "bool" ) {
TQString t = e.firstChild().toText().data();
- v = TQVariant( t == "true" || t == "1", 0 );
+ v = TQVariant( t == "true" || t == "1" );
} else if ( e.tagName() == "pixmap" ) {
v = TQVariant( e.firstChild().toText().data() );
} else if ( e.tagName() == "iconset" ) {
diff --git a/kdevdesigner/uilib/qwidgetfactory.cpp b/kdevdesigner/uilib/qwidgetfactory.cpp
index 56649616..c431253e 100644
--- a/kdevdesigner/uilib/qwidgetfactory.cpp
+++ b/kdevdesigner/uilib/qwidgetfactory.cpp
@@ -626,7 +626,7 @@ void TQWidgetFactory::unpackVariant( const UibStrTable& strings, TQDataStream& i
break;
case TQVariant::Bool:
in >> bit;
- value = TQVariant( bit != 0, 0 );
+ value = TQVariant( bit != 0 );
break;
case TQVariant::Double:
in >> value.asDouble();