From deae55568422b16bd4ed20d4a098b1a826828a2f Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sun, 26 May 2019 01:02:21 +0900 Subject: Adjusted to latest TQVariant::TQVariant(bool) function. Signed-off-by: Michele Calgaro --- puic/domtool.cpp | 2 +- puic/form.cpp | 2 +- puic/uic.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/puic/domtool.cpp b/puic/domtool.cpp index 2ed5796..6c2809f 100644 --- a/puic/domtool.cpp +++ b/puic/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/puic/form.cpp b/puic/form.cpp index e54f338..e1e74cc 100644 --- a/puic/form.cpp +++ b/puic/form.cpp @@ -791,7 +791,7 @@ void Uic::createFormImpl( const TQDomElement &e ) TQString label = DomTool::readAttribute( n, "title", "", comment ).toString(); out << indent << "addPage( " << page << ", \"\" );" << endl; trout << indent << "setTitle( " << page << ", " << trcall( label, comment ) << " );" << endl; - TQVariant def( FALSE, 0 ); + TQVariant def( FALSE ); if ( DomTool::hasAttribute( n, "backEnabled" ) ) out << indent << "setBackEnabled(" << page << "," << mkBool( DomTool::readAttribute( n, "backEnabled", def).toBool() ) << ");" << endl; if ( DomTool::hasAttribute( n, "nextEnabled" ) ) diff --git a/puic/uic.cpp b/puic/uic.cpp index d2fbed4..67ec24b 100644 --- a/puic/uic.cpp +++ b/puic/uic.cpp @@ -266,7 +266,7 @@ bool Uic::isFrameworkCodeGenerated( const TQDomElement& e ) { TQDomElement n = getObjectProperty( e, "frameworkCode" ); if ( n.attribute("name") == "frameworkCode" && - !DomTool::elementToVariant( n.firstChild().toElement(), TQVariant( TRUE, 0 ) ).toBool() ) + !DomTool::elementToVariant( n.firstChild().toElement(), TQVariant( TRUE ) ).toBool() ) return FALSE; return TRUE; } -- cgit v1.2.1