summaryrefslogtreecommitdiffstats
path: root/src/kernel/ntqvariant.h
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2012-06-17 17:28:28 -0500
committerTimothy Pearson <[email protected]>2012-06-17 17:28:28 -0500
commit6dec101d43dcbd4195c47d54bd388db1a8d7230e (patch)
tree7c336cbed3a93807a34cd4df39b2f92a7d48a141 /src/kernel/ntqvariant.h
parentf27c2533f735d53c6b555f387c6390c0690cc246 (diff)
downloadtqt3-6dec101d43dcbd4195c47d54bd388db1a8d7230e.tar.gz
tqt3-6dec101d43dcbd4195c47d54bd388db1a8d7230e.zip
Automated update from Qt3
Diffstat (limited to 'src/kernel/ntqvariant.h')
-rw-r--r--src/kernel/ntqvariant.h16
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;