diff options
Diffstat (limited to 'tdeui/kpixmapio.cpp')
| -rw-r--r-- | tdeui/kpixmapio.cpp | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/tdeui/kpixmapio.cpp b/tdeui/kpixmapio.cpp index 02054aad3..46c0e2aff 100644 --- a/tdeui/kpixmapio.cpp +++ b/tdeui/kpixmapio.cpp @@ -1,4 +1,4 @@ -/* vi: ts=8 sts=4 sw=4 +/* * * * This file is part of the KDE project, module tdeui. @@ -28,16 +28,13 @@ #include <sys/shm.h> #endif -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 #include <X11/X.h> #include <X11/Xlib.h> #include <X11/Xutil.h> #ifdef HAVE_MITSHM #include <X11/extensions/XShm.h> #endif -#ifdef __osf__ -extern "C" int XShmQueryExtension(Display *display); -#endif #else #undef HAVE_MITSHM #endif @@ -51,7 +48,7 @@ struct KPixmapIOPrivate int threshold; int bpp; int byteorder; -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 XImage *ximage; #ifdef HAVE_MITSHM XShmSegmentInfo *shminfo; @@ -664,7 +661,7 @@ void KPixmapIO::convertToXImage(const TQImage &img) { uchar *src; TQ_INT32 val, *dst; - TQRgb pixel, *clut = img.tqcolorTable(); + TQRgb pixel, *clut = img.colorTable(); for (y=0; y<height; y++) { src = const_cast<TQImage&>(img).scanLine(y); @@ -721,7 +718,7 @@ void KPixmapIO::convertToXImage(const TQImage &img) { uchar *src; TQ_INT32 val, *dst; - TQRgb pixel, *clut = img.tqcolorTable(); + TQRgb pixel, *clut = img.colorTable(); for (y=0; y<height; y++) { src = const_cast<TQImage&>(img).scanLine(y); @@ -780,7 +777,7 @@ void KPixmapIO::convertToXImage(const TQImage &img) { uchar *src, *dst; int w1 = width/4; - TQRgb *clut = img.tqcolorTable(), d1, d2, d3, d4; + TQRgb *clut = img.colorTable(), d1, d2, d3, d4; for (y=0; y<height; y++) { src = const_cast<TQImage&>(img).scanLine(y); @@ -841,7 +838,7 @@ void KPixmapIO::convertToXImage(const TQImage &img) { uchar *src, *dst; int w1 = width/4; - TQRgb *clut = img.tqcolorTable(), d1, d2, d3, d4; + TQRgb *clut = img.colorTable(), d1, d2, d3, d4; for (y=0; y<height; y++) { src = const_cast<TQImage&>(img).scanLine(y); @@ -878,7 +875,7 @@ void KPixmapIO::convertToXImage(const TQImage &img) } else { uchar *src; - TQRgb *dst, *clut = img.tqcolorTable(); + TQRgb *dst, *clut = img.colorTable(); for (y=0; y<height; y++) { src = const_cast<TQImage&>(img).scanLine(y); |