From 3fbca5d9a4bd057ed5f9df138333e6c16dbdcc62 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 14 Nov 2011 18:33:16 -0600 Subject: [PATCH] Fix tdelibs FTBFS --- tdecore/kdebug.h | 4 ++-- tdecore/svgicons/ksvgiconpainter.cpp | 2 +- tdefx/kpixmap.cpp | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tdecore/kdebug.h b/tdecore/kdebug.h index e9cf141f7..fbeefcc48 100644 --- a/tdecore/kdebug.h +++ b/tdecore/kdebug.h @@ -216,7 +216,7 @@ class TDECORE_EXPORT kdbgstream { kdbgstream &operator<<(const TQString& string) { if (!print) return *this; output += string; - if (output.tqat(output.length() -1 ) == (QChar)'\n') + if (output.tqat(output.length() -1 ) == (TQChar)'\n') flush(); return *this; } @@ -228,7 +228,7 @@ class TDECORE_EXPORT kdbgstream { kdbgstream &operator<<(const char *string) { if (!print) return *this; output += TQString::fromUtf8(string); - if (output.tqat(output.length() - 1) == (QChar)'\n') + if (output.tqat(output.length() - 1) == (TQChar)'\n') flush(); return *this; } diff --git a/tdecore/svgicons/ksvgiconpainter.cpp b/tdecore/svgicons/ksvgiconpainter.cpp index 2f988ce78..6c4c52c6a 100644 --- a/tdecore/svgicons/ksvgiconpainter.cpp +++ b/tdecore/svgicons/ksvgiconpainter.cpp @@ -672,7 +672,7 @@ public: for(int y = 0; y < m_height; y++) { - QRgb *sl = reinterpret_cast(m_image->scanLine(y)); + TQRgb *sl = reinterpret_cast(m_image->scanLine(y)); for(int x = 0; x < m_width; x++) sl[x] = tqRgba(line[x * 4], line[x * 4 + 1], line[x * 4 + 2], line[x * 4 + 3]); diff --git a/tdefx/kpixmap.cpp b/tdefx/kpixmap.cpp index 152ae6e83..ae28efb9d 100644 --- a/tdefx/kpixmap.cpp +++ b/tdefx/kpixmap.cpp @@ -98,7 +98,7 @@ static bool kdither_32_to_8( const TQImage *src, TQImage *dst ) // Bi-directional error diffusion if ( y&1 ) { for (x=0; x0; ) { - int pix = QMAX(QMIN(2, (l1[x] * 2 + 128)/ 255), 0); + int pix = TQMAX(TQMIN(2, (l1[x] * 2 + 128)/ 255), 0); int err = l1[x] - pix * 255 / 2; pv[chan][x] = pix; @@ -357,7 +357,7 @@ bool KPixmap::checkColorTable( const TQImage &image ) } - QRgb* ctable = image.tqcolorTable(); + TQRgb* ctable = image.tqcolorTable(); int ncols = image.numColors(); int j;