diff options
author | Michele Calgaro <michele.calgaro@yahoo.it> | 2019-05-27 00:31:56 +0900 |
---|---|---|
committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2019-05-27 00:31:56 +0900 |
commit | a2fa7ca9838e204ec41c39fcb80ee82ec93d084f (patch) | |
tree | 667608ea9bc8d1e4827077c1321ad6fa02bf8cc3 /src/kernel | |
parent | 2c29133f7ee2a270da8d8504345390a1d60e80fa (diff) | |
download | qt3-a2fa7ca9838e204ec41c39fcb80ee82ec93d084f.tar.gz qt3-a2fa7ca9838e204ec41c39fcb80ee82ec93d084f.zip |
Adjusted to latest QVariant::QVariant(bool) function.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Diffstat (limited to 'src/kernel')
-rw-r--r-- | src/kernel/qucomextra.cpp | 2 | ||||
-rw-r--r-- | src/kernel/qvariant.cpp | 8 | ||||
-rw-r--r-- | src/kernel/qvariant.h | 3 |
3 files changed, 5 insertions, 8 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 ); |