diff options
| author | Michele Calgaro <[email protected]> | 2019-05-27 00:31:56 +0900 |
|---|---|---|
| committer | Michele Calgaro <[email protected]> | 2019-05-27 00:31:56 +0900 |
| commit | a2fa7ca9838e204ec41c39fcb80ee82ec93d084f (patch) | |
| tree | 667608ea9bc8d1e4827077c1321ad6fa02bf8cc3 /tools/designer/uic | |
| parent | 2c29133f7ee2a270da8d8504345390a1d60e80fa (diff) | |
| download | qt3-a2fa7ca9838e204ec41c39fcb80ee82ec93d084f.tar.gz qt3-a2fa7ca9838e204ec41c39fcb80ee82ec93d084f.zip | |
Adjusted to latest QVariant::QVariant(bool) function.
Signed-off-by: Michele Calgaro <[email protected]>
Diffstat (limited to 'tools/designer/uic')
| -rw-r--r-- | tools/designer/uic/form.cpp | 2 | ||||
| -rw-r--r-- | tools/designer/uic/object.cpp | 2 | ||||
| -rw-r--r-- | tools/designer/uic/uic.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/tools/designer/uic/form.cpp b/tools/designer/uic/form.cpp index 699e446..6ded3f3 100644 --- a/tools/designer/uic/form.cpp +++ b/tools/designer/uic/form.cpp @@ -1052,7 +1052,7 @@ void Uic::createFormImpl( const QDomElement &e ) QString label = DomTool::readAttribute( n, "title", "", comment ).toString(); out << indent << "addPage( " << page << ", QString(\"\") );" << endl; trout << indent << "setTitle( " << page << ", " << trcall( label, comment ) << " );" << endl; - QVariant def( FALSE, 0 ); + QVariant 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/tools/designer/uic/object.cpp b/tools/designer/uic/object.cpp index 00eaa55..20a5400 100644 --- a/tools/designer/uic/object.cpp +++ b/tools/designer/uic/object.cpp @@ -537,7 +537,7 @@ QString Uic::setObjectProperty( const QString& objClass, const QString& obj, con if ( stdset ) v = "%1"; else - v = "QVariant( %1, 0 )"; + v = "QVariant( %1 )"; v = v.arg( mkBool( e.firstChild().toText().data() ) ); } else if ( e.tagName() == "pixmap" ) { v = e.firstChild().toText().data(); diff --git a/tools/designer/uic/uic.cpp b/tools/designer/uic/uic.cpp index b0a61d6..d8b1d25 100644 --- a/tools/designer/uic/uic.cpp +++ b/tools/designer/uic/uic.cpp @@ -263,7 +263,7 @@ bool Uic::isFrameworkCodeGenerated( const QDomElement& e ) { QDomElement n = getObjectProperty( e, "frameworkCode" ); if ( n.attribute("name") == "frameworkCode" && - !DomTool::elementToVariant( n.firstChild().toElement(), QVariant( TRUE, 0 ) ).toBool() ) + !DomTool::elementToVariant( n.firstChild().toElement(), QVariant( true ) ).toBool() ) return FALSE; return TRUE; } |