Browse Source

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

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
master
Michele Calgaro 3 months ago
parent
commit
989e3c1dc4
Signed by: Michele Calgaro <michele.calgaro@yahoo.it> GPG Key ID: 2A75B7CA8ADED5CF
7 changed files with 7 additions and 7 deletions
  1. 1
    1
      pyuic2/domtool.cpp
  2. 1
    1
      pyuic2/uic.cpp
  3. 1
    1
      pyuic3/domtool.cpp
  4. 1
    1
      pyuic3/form.cpp
  5. 1
    1
      pyuic3/object.cpp
  6. 1
    1
      pyuic3/uic.cpp
  7. 1
    1
      sip/qt/qvariant.sip

+ 1
- 1
pyuic2/domtool.cpp View File

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

+ 1
- 1
pyuic2/uic.cpp View File

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

+ 1
- 1
pyuic3/domtool.cpp View File

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

+ 1
- 1
pyuic3/form.cpp View File

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

+ 1
- 1
pyuic3/object.cpp View File

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

+ 1
- 1
pyuic3/uic.cpp View File

@@ -315,7 +315,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;
}

+ 1
- 1
sip/qt/qvariant.sip View File

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

Loading…
Cancel
Save