From 10308be19ef7fa44699562cc75946e7ea1fdf6b9 Mon Sep 17 00:00:00 2001 From: tpearson Date: Fri, 7 Jan 2011 03:45:53 +0000 Subject: Revert automated changes Sorry guys, they are just not ready for prime time Work will continue as always git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1212479 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kimgio/pcx.h | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) (limited to 'kimgio/pcx.h') diff --git a/kimgio/pcx.h b/kimgio/pcx.h index 0eacba8c0..eef3293c5 100644 --- a/kimgio/pcx.h +++ b/kimgio/pcx.h @@ -29,14 +29,14 @@ class RGB RGB( const QRgb color ) { - r = tqRed( color ); - g = tqGreen( color ); - b = tqBlue( color ); + r = qRed( color ); + g = qGreen( color ); + b = qBlue( color ); } - TQ_UINT8 r; - TQ_UINT8 g; - TQ_UINT8 b; + Q_UINT8 r; + Q_UINT8 g; + Q_UINT8 b; }; class Palette @@ -51,7 +51,7 @@ class Palette QRgb color( int i ) const { - return tqRgb( rgb[ i ].r, rgb[ i ].g, rgb[ i ].b ); + return qRgb( rgb[ i ].r, rgb[ i ].g, rgb[ i ].b ); } struct RGB rgb[ 16 ]; @@ -66,8 +66,8 @@ class PCXHEADER inline int height() const { return ( YMax-YMin ) + 1; } inline bool isCompressed() const { return ( Encoding==1 ); } - TQ_UINT8 Manufacturer; // Constant Flag, 10 = ZSoft .pcx - TQ_UINT8 Version; // Version informationˇ + Q_UINT8 Manufacturer; // Constant Flag, 10 = ZSoft .pcx + Q_UINT8 Version; // Version informationˇ // 0 = Version 2.5 of PC Paintbrushˇ // 2 = Version 2.8 w/palette informationˇ // 3 = Version 2.8 w/o palette informationˇ @@ -77,26 +77,26 @@ class PCXHEADER // and PC Paintbrush +, includes // Publisher's Paintbrush . Includes // 24-bit .PCX filesˇ - TQ_UINT8 Encoding; // 1 = .PCX run length encoding - TQ_UINT8 Bpp; // Number of bits to represent a pixel + Q_UINT8 Encoding; // 1 = .PCX run length encoding + Q_UINT8 Bpp; // Number of bits to represent a pixel // (per Plane) - 1, 2, 4, or 8ˇ - TQ_UINT16 XMin; - TQ_UINT16 YMin; - TQ_UINT16 XMax; - TQ_UINT16 YMax; - TQ_UINT16 HDpi; - TQ_UINT16 YDpi; + Q_UINT16 XMin; + Q_UINT16 YMin; + Q_UINT16 XMax; + Q_UINT16 YMax; + Q_UINT16 HDpi; + Q_UINT16 YDpi; Palette ColorMap; - TQ_UINT8 Reserved; // Should be set to 0. - TQ_UINT8 NPlanes; // Number of color planes - TQ_UINT16 BytesPerLine; // Number of bytes to allocate for a scanline + Q_UINT8 Reserved; // Should be set to 0. + Q_UINT8 NPlanes; // Number of color planes + Q_UINT16 BytesPerLine; // Number of bytes to allocate for a scanline // plane. MUST be an EVEN number. Do NOT // calculate from Xmax-Xmin.ˇ - TQ_UINT16 PaletteInfo; // How to interpret palette- 1 = Color/BW, + Q_UINT16 PaletteInfo; // How to interpret palette- 1 = Color/BW, // 2 = Grayscale ( ignored in PB IV/ IV + )ˇ - TQ_UINT16 HScreenSize; // Horizontal screen size in pixels. New field + Q_UINT16 HScreenSize; // Horizontal screen size in pixels. New field // found only in PB IV/IV Plus - TQ_UINT16 VScreenSize; // Vertical screen size in pixels. New field + Q_UINT16 VScreenSize; // Vertical screen size in pixels. New field // found only in PB IV/IV Plus } KDE_PACKED; -- cgit v1.2.3