Automated update from Qt3

1 files changed, 14 insertions, 14 deletions

diff --git a/src/kernel/qfont.cpp b/src/kernel/qfont.cpp
index be0275151..a49dd3493 100644
--- a/src/kernel/qfont.cpp
+++ b/src/kernel/qfont.cpp
@@ -1547,13 +1547,13 @@ TQStringList TQFont::substitutions()
     Internal function. Converts boolean font settings to an unsigned
     8-bit number. Used for serialization etc.
 */
-static Q_UINT8 get_font_bits( const TQFontPrivate *f )
+static TQ_UINT8 get_font_bits( const TQFontPrivate *f )
 {
 #ifdef QT_CHECK_STATE
     Q_ASSERT( f != 0 );
 #endif
 
-    Q_UINT8 bits = 0;
+    TQ_UINT8 bits = 0;
     if ( f->request.italic )
 	bits |= 0x01;
     if ( f->underline )
@@ -1578,7 +1578,7 @@ static Q_UINT8 get_font_bits( const TQFontPrivate *f )
     Internal function. Sets boolean font settings from an unsigned
     8-bit number. Used for serialization etc.
 */
-static void set_font_bits( Q_UINT8 bits, TQFontPrivate *f )
+static void set_font_bits( TQ_UINT8 bits, TQFontPrivate *f )
 {
 #ifdef QT_CHECK_STATE
     Q_ASSERT( f != 0 );
@@ -1728,25 +1728,25 @@ TQDataStream &operator<<( TQDataStream &s, const TQFont &font )
     }
 
     if ( s.version() <= 3 ) {
-	Q_INT16 pointSize = (Q_INT16) font.d->request.pointSize;
+	TQ_INT16 pointSize = (TQ_INT16) font.d->request.pointSize;
 	if ( pointSize == -1 ) {
 #ifdef Q_WS_X11
-	    pointSize = (Q_INT16)(font.d->request.pixelSize*720/TQPaintDevice::x11AppDpiY());
+	    pointSize = (TQ_INT16)(font.d->request.pixelSize*720/TQPaintDevice::x11AppDpiY());
 #else
-	    pointSize = (Q_INT16)TQFontInfo( font ).pointSize() * 10;
+	    pointSize = (TQ_INT16)TQFontInfo( font ).pointSize() * 10;
 #endif
 	}
 	s << pointSize;
     } else {
-	s << (Q_INT16) font.d->request.pointSize;
-	s << (Q_INT16) font.d->request.pixelSize;
+	s << (TQ_INT16) font.d->request.pointSize;
+	s << (TQ_INT16) font.d->request.pixelSize;
     }
 
-    s << (Q_UINT8) font.d->request.styleHint;
+    s << (TQ_UINT8) font.d->request.styleHint;
     if ( s.version() >= 5 )
-	s << (Q_UINT8 ) font.d->request.styleStrategy;
-    return s << (Q_UINT8) 0
-	     << (Q_UINT8) font.d->request.weight
+	s << (TQ_UINT8 ) font.d->request.styleStrategy;
+    return s << (TQ_UINT8) 0
+	     << (TQ_UINT8) font.d->request.weight
 	     << get_font_bits(font.d);
 }
 
@@ -1766,8 +1766,8 @@ TQDataStream &operator>>( TQDataStream &s, TQFont &font )
     font.d = new TQFontPrivate;
     font.d->mask = TQFontPrivate::Complete;
 
-    Q_INT16 pointSize, pixelSize = -1;
-    Q_UINT8 styleHint, styleStrategy = TQFont::PreferDefault, charSet, weight, bits;
+    TQ_INT16 pointSize, pixelSize = -1;
+    TQ_UINT8 styleHint, styleStrategy = TQFont::PreferDefault, charSet, weight, bits;
 
     if ( s.version() == 1 ) {
 	TQCString fam;