diff options
| author | Darrell Anderson <humanreadable@yahoo.com> | 2012-06-18 00:09:52 -0500 |
|---|---|---|
| committer | Darrell Anderson <humanreadable@yahoo.com> | 2012-06-18 00:09:52 -0500 |
| commit | d1096751ddb25cdef23919c17389fc268c31edaf (patch) | |
| tree | b910be3588cb706defc00c31aefa850bb2312784 /src/kernel/ntqvariant.h | |
| parent | af8fdcf1ca7bdbda6f0c1afecd8c2d8ffa23bebb (diff) | |
| parent | 6dec101d43dcbd4195c47d54bd388db1a8d7230e (diff) | |
| download | tqt3-d1096751ddb25cdef23919c17389fc268c31edaf.tar.gz tqt3-d1096751ddb25cdef23919c17389fc268c31edaf.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tqt3
Diffstat (limited to 'src/kernel/ntqvariant.h')
| -rw-r--r-- | src/kernel/ntqvariant.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/kernel/ntqvariant.h b/src/kernel/ntqvariant.h index e7a09f5c1..8a7be5c0e 100644 --- a/src/kernel/ntqvariant.h +++ b/src/kernel/ntqvariant.h @@ -165,8 +165,8 @@ public: #endif TQVariant( int ); TQVariant( uint ); - TQVariant( Q_LLONG ); - TQVariant( Q_ULLONG ); + TQVariant( TQ_LLONG ); + TQVariant( TQ_ULLONG ); // ### Problems on some compilers ? TQVariant( bool, int ); TQVariant( double ); @@ -218,8 +218,8 @@ public: const TQPen toPen() const; int toInt( bool * ok=0 ) const; uint toUInt( bool * ok=0 ) const; - Q_LLONG toLongLong( bool * ok=0 ) const; - Q_ULLONG toULongLong( bool * ok=0 ) const; + TQ_LLONG toLongLong( bool * ok=0 ) const; + TQ_ULLONG toULongLong( bool * ok=0 ) const; bool toBool() const; double toDouble( bool * ok=0 ) const; #ifndef QT_NO_TEMPLATE_VARIANT @@ -268,8 +268,8 @@ public: TQPen& asPen(); int& asInt(); uint& asUInt(); - Q_LLONG& asLongLong(); - Q_ULLONG& asULongLong(); + TQ_LLONG& asLongLong(); + TQ_ULLONG& asULongLong(); bool& asBool(); double& asDouble(); #ifndef QT_NO_TEMPLATE_VARIANT @@ -302,8 +302,8 @@ private: { uint u; int i; - Q_LLONG ll; - Q_ULLONG ull; + TQ_LLONG ll; + TQ_ULLONG ull; bool b; double d; void *ptr; |