1 files changed, 33 insertions, 33 deletions

diff --git a/src/kernel/qvariant.cpp b/src/kernel/qvariant.cpp
index 3f4fe430a..6c7372b09 100644
--- a/src/kernel/qvariant.cpp
+++ b/src/kernel/qvariant.cpp
@@ -856,7 +856,7 @@ TQVariant::TQVariant( uint val )
 /*!
     Constructs a new variant with a long long integer value, \a val.
 */
-TQVariant::TQVariant( Q_LLONG val )
+TQVariant::TQVariant( TQ_LLONG val )
 {
     d = new Private;
     d->typ = LongLong;
@@ -868,7 +868,7 @@ TQVariant::TQVariant( Q_LLONG val )
     Constructs a new variant with an unsigned long long integer value, \a val.
 */
 
-TQVariant::TQVariant( Q_ULLONG val )
+TQVariant::TQVariant( TQ_ULLONG val )
 {
     d = new Private;
     d->typ = ULongLong;
@@ -1027,8 +1027,8 @@ static const char* const type_map[ntypes] =
     "TQBitArray",
     "TQKeySequence",
     "TQPen",
-    "Q_LLONG",
-    "Q_ULLONG"
+    "TQ_LLONG",
+    "TQ_ULLONG"
 };
 
 
@@ -1070,7 +1070,7 @@ TQVariant::Type TQVariant::nameToType( const char* name )
 void TQVariant::load( TQDataStream& s )
 {
     clear();
-    Q_UINT32 u;
+    TQ_UINT32 u;
     s >> u;
     Type t = (Type)u;
 
@@ -1267,21 +1267,21 @@ void TQVariant::load( TQDataStream& s )
 	break;
     case LongLong:
 	{
-	    Q_LLONG x;
+	    TQ_LLONG x;
 	    s >> x;
 	    d->value.ll = x;
 	}
 	break;
     case ULongLong:
 	{
-	    Q_ULLONG x;
+	    TQ_ULLONG x;
 	    s >> x;
 	    d->value.ull = x;
 	}
 	break;
     case Bool:
 	{
-	    Q_INT8 x;
+	    TQ_INT8 x;
 	    s >> x;
 	    d->value.b = x;
 	    d->is_null = FALSE;
@@ -1298,7 +1298,7 @@ void TQVariant::load( TQDataStream& s )
     case SizePolicy:
 	{
 	    int h,v;
-	    Q_INT8 hfw;
+	    TQ_INT8 hfw;
 	    s >> h >> v >> hfw;
 	    d->value.ptr = new TQSizePolicy( (TQSizePolicy::SizeType)h,
 					    (TQSizePolicy::SizeType)v,
@@ -1371,7 +1371,7 @@ void TQVariant::load( TQDataStream& s )
 */
 void TQVariant::save( TQDataStream& s ) const
 {
-    s << (Q_UINT32)type();
+    s << (TQ_UINT32)type();
 
     switch( d->typ ) {
     case Cursor:
@@ -1462,7 +1462,7 @@ void TQVariant::save( TQDataStream& s ) const
 	s << d->value.ull;
 	break;
     case Bool:
-	s << (Q_INT8)d->value.b;
+	s << (TQ_INT8)d->value.b;
 	break;
     case Double:
 	s << d->value.d;
@@ -1471,7 +1471,7 @@ void TQVariant::save( TQDataStream& s ) const
 	{
 	    TQSizePolicy p = toSizePolicy();
 	    s << (int) p.horData() << (int) p.verData()
-	      << (Q_INT8) p.hasHeightForWidth();
+	      << (TQ_INT8) p.hasHeightForWidth();
 	}
 	break;
     case Date:
@@ -1532,7 +1532,7 @@ TQDataStream& operator<< ( TQDataStream& s, const TQVariant& p )
 */
 TQDataStream& operator>> ( TQDataStream& s, TQVariant::Type& p )
 {
-    Q_UINT32 u;
+    TQ_UINT32 u;
     s >> u;
     p = (TQVariant::Type) u;
 
@@ -1544,7 +1544,7 @@ TQDataStream& operator>> ( TQDataStream& s, TQVariant::Type& p )
 */
 TQDataStream& operator<< ( TQDataStream& s, const TQVariant::Type p )
 {
-    s << (Q_UINT32)p;
+    s << (TQ_UINT32)p;
 
     return s;
 }
@@ -2247,7 +2247,7 @@ uint TQVariant::toUInt( bool * ok ) const
 
     \sa asLongLong(), canCast()
 */
-Q_LLONG TQVariant::toLongLong( bool * ok ) const
+TQ_LLONG TQVariant::toLongLong( bool * ok ) const
 {
     if ( ok )
 	*ok = canCast( LongLong );
@@ -2259,17 +2259,17 @@ Q_LLONG TQVariant::toLongLong( bool * ok ) const
     case ByteArray:
 	return TQString(*(TQCString*)d->value.ptr).toLongLong(ok);
     case Int:
-	return (Q_LLONG)d->value.i;
+	return (TQ_LLONG)d->value.i;
     case UInt:
-	return (Q_LLONG)d->value.u;
+	return (TQ_LLONG)d->value.u;
     case LongLong:
 	return d->value.ll;
     case ULongLong:
-	return (Q_LLONG)d->value.ull;
+	return (TQ_LLONG)d->value.ull;
     case Double:
-	return (Q_LLONG)d->value.d;
+	return (TQ_LLONG)d->value.d;
     case Bool:
-	return (Q_LLONG)d->value.b;
+	return (TQ_LLONG)d->value.b;
     default:
 	return 0;
     }
@@ -2284,24 +2284,24 @@ Q_LLONG TQVariant::toLongLong( bool * ok ) const
 
     \sa asULongLong(), canCast()
 */
-Q_ULLONG TQVariant::toULongLong( bool * ok ) const
+TQ_ULLONG TQVariant::toULongLong( bool * ok ) const
 {
     if ( ok )
 	*ok = canCast( ULongLong );
 
     switch ( d->typ ) {
     case Int:
-	return (Q_ULLONG)d->value.i;
+	return (TQ_ULLONG)d->value.i;
     case UInt:
-	return (Q_ULLONG)d->value.u;
+	return (TQ_ULLONG)d->value.u;
     case LongLong:
-	return (Q_ULLONG)d->value.ll;
+	return (TQ_ULLONG)d->value.ll;
     case ULongLong:
 	return d->value.ull;
     case Double:
-	return (Q_ULLONG)d->value.d;
+	return (TQ_ULLONG)d->value.d;
     case Bool:
-	return (Q_ULLONG)d->value.b;
+	return (TQ_ULLONG)d->value.b;
     case String:
 	return ((TQString*)d->value.ptr)->toULongLong( ok );
     case CString:
@@ -2382,7 +2382,7 @@ double TQVariant::toDouble( bool * ok ) const
 	return (double)d->value.ll;
     case ULongLong:
 #if defined(Q_CC_MSVC) && !defined(Q_CC_MSVC_NET)
-	return (double)(Q_LLONG)d->value.ull;
+	return (double)(TQ_LLONG)d->value.ull;
 #else
 	return (double)d->value.ull;
 #endif
@@ -2819,11 +2819,11 @@ uint& TQVariant::asUInt()
 /*!
     Returns the variant's value as long long reference.
 */
-Q_LLONG& TQVariant::asLongLong()
+TQ_LLONG& TQVariant::asLongLong()
 {
     detach();
     if ( d->typ != LongLong ) {
-	Q_LLONG ll = toLongLong();
+	TQ_LLONG ll = toLongLong();
 	bool b = isNull();
 	d->clear();
  	d->value.ll = ll;
@@ -2836,11 +2836,11 @@ Q_LLONG& TQVariant::asLongLong()
 /*!
     Returns the variant's value as unsigned long long reference.
 */
-Q_ULLONG& TQVariant::asULongLong()
+TQ_ULLONG& TQVariant::asULongLong()
 {
     detach();
     if ( d->typ != ULongLong ) {
-	Q_ULLONG ull = toULongLong();
+	TQ_ULLONG ull = toULongLong();
 	bool b = isNull();
 	d->clear();
  	d->value.ull = ull;
@@ -3264,13 +3264,13 @@ bool TQVariant::operator==( const TQVariant &v ) const
 
 	case LongLong:
 	{
-	    Q_LLONG val = toLongLong(&ok);
+	    TQ_LLONG val = toLongLong(&ok);
 	    return (ok && val == v.toLongLong());
 	}
 
 	case ULongLong:
 	{
-	    Q_ULLONG val = toULongLong(&ok);
+	    TQ_ULLONG val = toULongLong(&ok);
 	    return (ok && val == v.toULongLong());
 	}