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

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/1/head
Michele Calgaro 5 years ago
parent ae59056eb2
commit 989e3c1dc4
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF

@ -165,7 +165,7 @@ TQVariant DomTool::elementToVariant( const TQDomElement& e, const TQVariant& def
v = TQVariant( e.firstChild().toText().data().toInt() ); v = TQVariant( e.firstChild().toText().data().toInt() );
} 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" ) {

@ -432,7 +432,7 @@ void Uic::createFormImpl( const TQDomElement &e )
TQString page = createObjectImpl( n, objClass, "self" ); TQString page = createObjectImpl( n, objClass, "self" );
TQString label = DomTool::readAttribute( n, "title", "" ).toString(); TQString label = DomTool::readAttribute( n, "title", "" ).toString();
out << indent << "self.addPage(" << page << ","<< trmacro << "(" << fixString( label ) << "))" << endl; out << indent << "self.addPage(" << page << ","<< trmacro << "(" << fixString( label ) << "))" << endl;
TQVariant def( FALSE, 0 ); TQVariant def( FALSE );
if ( DomTool::hasAttribute( n, "backEnabled" ) ) if ( DomTool::hasAttribute( n, "backEnabled" ) )
out << indent << "self.setBackEnabled(" << page << "," << mkBool( DomTool::readAttribute( n, "backEnabled", def).toBool() ) << ")" << endl; out << indent << "self.setBackEnabled(" << page << "," << mkBool( DomTool::readAttribute( n, "backEnabled", def).toBool() ) << ")" << endl;
if ( DomTool::hasAttribute( n, "nextEnabled" ) ) if ( DomTool::hasAttribute( n, "nextEnabled" ) )

@ -186,7 +186,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" ) {

@ -518,7 +518,7 @@ void Uic::createFormImpl( const TQDomElement &e )
TQString label = DomTool::readAttribute( n, "title", "", comment ).toString(); TQString label = DomTool::readAttribute( n, "title", "", comment ).toString();
out << indent << "self.addPage(" << page << ",TQString(\"\"))" << endl; out << indent << "self.addPage(" << page << ",TQString(\"\"))" << endl;
trout << trindent << "self.setTitle(" << page << ","<< trcall( label, comment ) << ")" << endl; trout << trindent << "self.setTitle(" << page << ","<< trcall( label, comment ) << ")" << endl;
TQVariant def( FALSE, 0 ); TQVariant def( FALSE );
if ( DomTool::hasAttribute( n, "backEnabled" ) ) if ( DomTool::hasAttribute( n, "backEnabled" ) )
out << indent << "self.setBackEnabled(" << page << "," << mkBool( DomTool::readAttribute( n, "backEnabled", def).toBool() ) << ")" << endl; out << indent << "self.setBackEnabled(" << page << "," << mkBool( DomTool::readAttribute( n, "backEnabled", def).toBool() ) << ")" << endl;
if ( DomTool::hasAttribute( n, "nextEnabled" ) ) if ( DomTool::hasAttribute( n, "nextEnabled" ) )

@ -492,7 +492,7 @@ TQString Uic::setObjectProperty( const TQString& objClass, const TQString& obj,
if ( stdset ) if ( stdset )
v = "%1"; v = "%1";
else else
v = "TQVariant(%1,0)"; v = "TQVariant(%1)";
v = v.arg( mkBool( e.firstChild().toText().data() ) ); v = v.arg( mkBool( e.firstChild().toText().data() ) );
} else if ( e.tagName() == "pixmap" ) { } else if ( e.tagName() == "pixmap" ) {
v = e.firstChild().toText().data(); v = e.firstChild().toText().data();

@ -315,7 +315,7 @@ bool Uic::isFrameworkCodeGenerated( const TQDomElement& e )
{ {
TQDomElement n = getObjectProperty( e, "frameworkCode" ); TQDomElement n = getObjectProperty( e, "frameworkCode" );
if ( n.attribute("name") == "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 FALSE;
return TRUE; return TRUE;
} }

@ -286,7 +286,7 @@ public:
// TQVariant(TQ_LLONG); // TQVariant(TQ_LLONG);
// TQVariant(TQ_ULLONG); // TQVariant(TQ_ULLONG);
%End %End
TQVariant(bool,int); TQVariant(bool /Constrained/);
TQVariant(double); TQVariant(double);
%If (TQt_2_2_0 -) %If (TQt_2_2_0 -)
TQVariant(TQSizePolicy); TQVariant(TQSizePolicy);

Loading…
Cancel
Save