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

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

7 files changed, 17 insertions, 24 deletions

diff --git a/src/kernel/qucomextra.cpp b/src/kernel/qucomextra.cpp
index 427c29a..0ea698a 100644
--- a/src/kernel/qucomextra.cpp
+++ b/src/kernel/qucomextra.cpp
@@ -85,7 +85,7 @@ bool QUType_QVariant::convertFrom( QUObject *o, QUType *t )
     else if ( isEqual( o->type, &static_QUType_int ) )
 	var = new QVariant( static_QUType_int.get( o ) );
     else if ( isEqual( o->type, &static_QUType_bool ) )
-	var = new QVariant( static_QUType_bool.get( o ), 42 );
+	var = new QVariant( static_QUType_bool.get( o ) );
     else if ( isEqual( o->type, &static_QUType_double ) )
 	var = new QVariant( static_QUType_double.get( o ) );
     else if ( isEqual( o->type, &static_QUType_charstar ) )
diff --git a/src/kernel/qvariant.cpp b/src/kernel/qvariant.cpp
index c9ea5b1..99659df 100644
--- a/src/kernel/qvariant.cpp
+++ b/src/kernel/qvariant.cpp
@@ -877,12 +877,10 @@ QVariant::QVariant( Q_ULLONG val )
 }
 
 /*!
-    Constructs a new variant with a boolean value, \a val. The integer
-    argument is a dummy, necessary for compatibility with some
-    compilers.
+    Constructs a new variant with a boolean value, \a val.
 */
-QVariant::QVariant( bool val, int )
-{ // this is the comment that does NOT name said compiler.
+QVariant::QVariant( bool val )
+{
     d = new Private;
     d->typ = Bool;
     d->value.b = val;
diff --git a/src/kernel/qvariant.h b/src/kernel/qvariant.h
index b2cab8d..d4b49df 100644
--- a/src/kernel/qvariant.h
+++ b/src/kernel/qvariant.h
@@ -167,8 +167,7 @@ public:
     QVariant( uint );
     QVariant( Q_LLONG );
     QVariant( Q_ULLONG );
-    // ### Problems on some compilers ?
-    QVariant( bool, int );
+    QVariant( bool );
     QVariant( double );
     QVariant( QSizePolicy );
 
diff --git a/src/moc/moc.y b/src/moc/moc.y
index 90f72ab..b117b68 100644
--- a/src/moc/moc.y
+++ b/src/moc/moc.y
@@ -3441,16 +3441,14 @@ void generateClass()		      // generate C++ source code for a class
 	    }
 	    if ( it.current()->getfunc ) {
 		if ( it.current()->gspec == Property::Pointer )
-		    fprintf( out, "\tcase 1: if ( this->%s() ) *v = QVariant( %s*%s()%s ); break;\n",
+		    fprintf( out, "\tcase 1: if ( this->%s() ) *v = QVariant( %s*%s() ); break;\n",
 			     it.current()->getfunc->name.data(),
 			     !isVariantType( it.current()->type ) ? "(int)" : "",
-			     it.current()->getfunc->name.data(),
-			     it.current()->type == "bool" ? ", 0" : "" );
+			     it.current()->getfunc->name.data());
 		else
-		    fprintf( out, "\tcase 1: *v = QVariant( %sthis->%s()%s ); break;\n",
+		    fprintf( out, "\tcase 1: *v = QVariant( %sthis->%s() ); break;\n",
 			     !isVariantType( it.current()->type ) ? "(int)" : "",
-			     it.current()->getfunc->name.data(),
-			     it.current()->type == "bool" ? ", 0" : "" );
+			     it.current()->getfunc->name.data());
 	    } else if ( it.current()->override ) {
 		flag_propagate |= 1<< (1+1);
 	    }
diff --git a/src/moc/moc_yacc.cpp b/src/moc/moc_yacc.cpp
index 2ab0be7..8d48f86 100644
--- a/src/moc/moc_yacc.cpp
+++ b/src/moc/moc_yacc.cpp
@@ -6267,16 +6267,14 @@ void generateClass()		      // generate C++ source code for a class
 	    }
 	    if ( it.current()->getfunc ) {
 		if ( it.current()->gspec == Property::Pointer )
-		    fprintf( out, "\tcase 1: if ( this->%s() ) *v = QVariant( %s*%s()%s ); break;\n",
+		    fprintf( out, "\tcase 1: if ( this->%s() ) *v = QVariant( %s*%s() ); break;\n",
 			     it.current()->getfunc->name.data(),
 			     !isVariantType( it.current()->type ) ? "(int)" : "",
-			     it.current()->getfunc->name.data(),
-			     it.current()->type == "bool" ? ", 0" : "" );
+			     it.current()->getfunc->name.data());
 		else
-		    fprintf( out, "\tcase 1: *v = QVariant( %sthis->%s()%s ); break;\n",
+		    fprintf( out, "\tcase 1: *v = QVariant( %sthis->%s() ); break;\n",
 			     !isVariantType( it.current()->type ) ? "(int)" : "",
-			     it.current()->getfunc->name.data(),
-			     it.current()->type == "bool" ? ", 0" : "" );
+			     it.current()->getfunc->name.data());
 	    } else if ( it.current()->override ) {
 		flag_propagate |= 1<< (1+1);
 	    }
diff --git a/src/sql/drivers/psql/qsql_psql.cpp b/src/sql/drivers/psql/qsql_psql.cpp
index 9d028c0..c5e93c0 100644
--- a/src/sql/drivers/psql/qsql_psql.cpp
+++ b/src/sql/drivers/psql/qsql_psql.cpp
@@ -288,7 +288,7 @@ QVariant QPSQLResult::data( int i )
     switch ( type ) {
     case QVariant::Bool:
 	{
-	    QVariant b ( (bool)(val == "t"), 0 );
+	    QVariant b ( (bool)(val == "t") );
 	    return ( b );
 	}
     case QVariant::String:
diff --git a/src/widgets/qdialogbuttons.cpp b/src/widgets/qdialogbuttons.cpp
index 39f6d67..07e09cf 100644
--- a/src/widgets/qdialogbuttons.cpp
+++ b/src/widgets/qdialogbuttons.cpp
@@ -185,12 +185,12 @@ QDialogButtons::setDefaultButton(Button button)
     if(d->def != button) {
 #ifndef QT_NO_PROPERTIES
 	if(d->buttons.contains(d->def))
-	    d->buttons[d->def]->setProperty("default", QVariant(FALSE,0));
+	    d->buttons[d->def]->setProperty("default", QVariant(false));
 #endif
 	d->def = button;
 #ifndef QT_NO_PROPERTIES
 	if(d->buttons.contains(d->def))
-	    d->buttons[d->def]->setProperty("default", QVariant(FALSE,0));
+	    d->buttons[d->def]->setProperty("default", QVariant(false));
 #endif
     }
 }
@@ -413,7 +413,7 @@ QDialogButtons::layoutButtons()
 		    if(b == d->def) {
 			w->setFocus();
 #ifndef QT_NO_PROPERTIES
-			w->setProperty("default", QVariant(TRUE,0));
+			w->setProperty("default", QVariant(true));
 #endif
 		    }
 		    w->setEnabled(d->enabled & b);