Remove Q_WS_ and Q_OS_SYMBIAN from QtGui.

Change-Id: I2ac3376513c3fbfc81a2e695a73a0d948d2696bc
Reviewed-on: http://codereview.qt-project.org/6607
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>

13 files changed, 0 insertions, 298 deletions

diff --git a/src/gui/image/qbmphandler.cpp b/src/gui/image/qbmphandler.cpp
index d854b1765b..3011a6c130 100644
--- a/src/gui/image/qbmphandler.cpp
+++ b/src/gui/image/qbmphandler.cpp
@@ -580,12 +580,6 @@ bool qt_write_dib(QDataStream &s, QImage image)
     } else if (image.depth() == 32) {
         bpl_bmp = ((image.width()*24+31)/32)*4;
         nbits = 24;
-#ifdef Q_WS_QWS
-    } else if (image.depth() == 1 || image.depth() == 8) {
-        // Qt for Embedded Linux doesn't word align.
-        bpl_bmp = ((image.width()*image.depth()+31)/32)*4;
-        nbits = image.depth();
-#endif
     } else {
         bpl_bmp = bpl;
         nbits = image.depth();
@@ -631,18 +625,9 @@ bool qt_write_dib(QDataStream &s, QImage image)
     int y;
 
     if (nbits == 1 || nbits == 8) {                // direct output
-#ifdef Q_WS_QWS
-        // Qt for Embedded Linux doesn't word align.
-        int pad = bpl_bmp - bpl;
-        char padding[4];
-#endif
         for (y=image.height()-1; y>=0; y--) {
             if (d->write((char*)image.scanLine(y), bpl) == -1)
                 return false;
-#ifdef Q_WS_QWS
-            if (d->write(padding, pad) == -1)
-                return false;
-#endif
         }
         return true;
     }
diff --git a/src/gui/image/qimage.cpp b/src/gui/image/qimage.cpp
index d0de95366f..67facafade 100644
--- a/src/gui/image/qimage.cpp
+++ b/src/gui/image/qimage.cpp
@@ -5392,21 +5392,6 @@ bool qt_xForm_helper(const QTransform &trueMat, int xoffset, int type, int depth
                         dptr++;
                     }
                     break;
-#  if defined(Q_WS_WIN)
-                case QT_XFORM_TYPE_WINDOWSPIXMAP:
-                    while (dptr < maxp) {
-                        IWX_PIX(128);
-                        IWX_PIX(64);
-                        IWX_PIX(32);
-                        IWX_PIX(16);
-                        IWX_PIX(8);
-                        IWX_PIX(4);
-                        IWX_PIX(2);
-                        IWX_PIX(1);
-                        dptr++;
-                    }
-                    break;
-#  endif
             }
         }
         m21ydx += m21;
diff --git a/src/gui/image/qnativeimage.cpp b/src/gui/image/qnativeimage.cpp
index 35bca4431d..30c1c0621e 100644
--- a/src/gui/image/qnativeimage.cpp
+++ b/src/gui/image/qnativeimage.cpp
@@ -48,152 +48,10 @@
 
 #include "private/qguiapplication_p.h"
 
-#if defined(Q_WS_X11) && !defined(QT_NO_MITSHM)
-#include <qx11info_x11.h>
-#include <sys/ipc.h>
-#include <sys/shm.h>
-#endif
 
-#ifdef Q_WS_MAC
-#include <private/qpaintengine_mac_p.h>
-#endif
 
 QT_BEGIN_NAMESPACE
 
-#ifdef Q_WS_WIN
-typedef struct {
-    BITMAPINFOHEADER bmiHeader;
-    DWORD redMask;
-    DWORD greenMask;
-    DWORD blueMask;
-} BITMAPINFO_MASK;
-
-
-QNativeImage::QNativeImage(int width, int height, QImage::Format format, bool isTextBuffer, QWindow *)
-{
-#ifndef Q_WS_WINCE
-    Q_UNUSED(isTextBuffer);
-#endif
-    BITMAPINFO_MASK bmi;
-    memset(&bmi, 0, sizeof(bmi));
-    bmi.bmiHeader.biSize        = sizeof(BITMAPINFOHEADER);
-    bmi.bmiHeader.biWidth       = width;
-    bmi.bmiHeader.biHeight      = -height;
-    bmi.bmiHeader.biPlanes      = 1;
-    bmi.bmiHeader.biSizeImage   = 0;
-
-    if (format == QImage::Format_RGB16) {
-        bmi.bmiHeader.biBitCount = 16;
-#ifdef Q_WS_WINCE
-        if (isTextBuffer) {
-            bmi.bmiHeader.biCompression = BI_RGB;
-            bmi.redMask = 0;
-            bmi.greenMask = 0;
-            bmi.blueMask = 0;
-        } else
-#endif
-        {
-            bmi.bmiHeader.biCompression = BI_BITFIELDS;
-            bmi.redMask = 0xF800;
-            bmi.greenMask = 0x07E0;
-            bmi.blueMask = 0x001F;
-        }
-    } else {
-        bmi.bmiHeader.biBitCount    = 32;
-        bmi.bmiHeader.biCompression = BI_RGB;
-        bmi.redMask = 0;
-        bmi.greenMask = 0;
-        bmi.blueMask = 0;
-    }
-
-    HDC display_dc = GetDC(0);
-    hdc = CreateCompatibleDC(display_dc);
-    ReleaseDC(0, display_dc);
-    Q_ASSERT(hdc);
-
-    uchar *bits = 0;
-    bitmap = CreateDIBSection(hdc, reinterpret_cast<BITMAPINFO *>(&bmi), DIB_RGB_COLORS, (void**) &bits, 0, 0);
-    Q_ASSERT(bitmap);
-    Q_ASSERT(bits);
-
-    null_bitmap = (HBITMAP)SelectObject(hdc, bitmap);
-    image = QImage(bits, width, height, format);
-
-    Q_ASSERT(image.paintEngine()->type() == QPaintEngine::Raster);
-    static_cast<QRasterPaintEngine *>(image.paintEngine())->setDC(hdc);
-
-#ifndef Q_WS_WINCE
-    GdiFlush();
-#endif
-}
-
-QNativeImage::~QNativeImage()
-{
-    if (bitmap || hdc) {
-        Q_ASSERT(hdc);
-        Q_ASSERT(bitmap);
-        if (null_bitmap)
-            SelectObject(hdc, null_bitmap);
-        DeleteDC(hdc);
-        DeleteObject(bitmap);
-    }
-}
-
-QImage::Format QNativeImage::systemFormat()
-{
-    if (QGuiApplication::primaryScreen()->depth() == 16)
-        return QImage::Format_RGB16;
-    return QImage::Format_RGB32;
-}
-
-#elif defined(Q_WS_MAC)
-
-QNativeImage::QNativeImage(int width, int height, QImage::Format format, bool /* isTextBuffer */, QWindow *)
-    : image(width, height, format)
-{
-
-    uint cgflags = kCGImageAlphaNoneSkipFirst;
-    switch (format) {
-    case QImage::Format_ARGB32:
-        cgflags = kCGImageAlphaFirst;
-        break;
-    case QImage::Format_ARGB32_Premultiplied:
-    case QImage::Format_ARGB8565_Premultiplied:
-    case QImage::Format_ARGB6666_Premultiplied:
-    case QImage::Format_ARGB8555_Premultiplied:
-    case QImage::Format_ARGB4444_Premultiplied:
-        cgflags = kCGImageAlphaPremultipliedFirst;
-        break;
-    default:
-        break;
-    }
-
-#ifdef kCGBitmapByteOrder32Host //only needed because CGImage.h added symbols in the minor version
-    cgflags |= kCGBitmapByteOrder32Host;
-#endif
-
-    cg = CGBitmapContextCreate(image.bits(), width, height, 8, image.bytesPerLine(),
-                               QCoreGraphicsPaintEngine::macDisplayColorSpace(0), cgflags);
-    CGContextTranslateCTM(cg, 0, height);
-    CGContextScaleCTM(cg, 1, -1);
-
-    Q_ASSERT(image.paintEngine()->type() == QPaintEngine::Raster);
-    static_cast<QRasterPaintEngine *>(image.paintEngine())->setCGContext(cg);
-}
-
-
-QNativeImage::~QNativeImage()
-{
-    CGContextRelease(cg);
-}
-
-QImage::Format QNativeImage::systemFormat()
-{
-    return QImage::Format_RGB32;
-}
-
-
-#else // other platforms...
 
 QNativeImage::QNativeImage(int width, int height, QImage::Format format,  bool /* isTextBuffer */, QWindow *)
     : image(width, height, format)
@@ -211,7 +69,6 @@ QImage::Format QNativeImage::systemFormat()
     return QGuiApplication::primaryScreen()->handle()->format();
 }
 
-#endif // platforms
 
 QT_END_NAMESPACE
 
diff --git a/src/gui/image/qnativeimage_p.h b/src/gui/image/qnativeimage_p.h
index f9132de69e..433460b463 100644
--- a/src/gui/image/qnativeimage_p.h
+++ b/src/gui/image/qnativeimage_p.h
@@ -55,13 +55,6 @@
 
 #include "qimage.h"
 
-#ifdef Q_WS_WIN
-#include "qt_windows.h"
-
-#elif defined(Q_WS_MAC)
-#include <private/qt_mac_p.h>
-
-#endif
 
 QT_BEGIN_NAMESPACE
 
@@ -80,14 +73,6 @@ public:
 
     static QImage::Format systemFormat();
 
-#ifdef Q_WS_WIN
-    HDC hdc;
-    HBITMAP bitmap;
-    HBITMAP null_bitmap;
-
-#elif defined(Q_WS_MAC)
-    CGContextRef cg;
-#endif
 
 private:
     Q_DISABLE_COPY(QNativeImage)
diff --git a/src/gui/image/qpixmap.cpp b/src/gui/image/qpixmap.cpp
index 35b9ae33ec..c025aa9283 100644
--- a/src/gui/image/qpixmap.cpp
+++ b/src/gui/image/qpixmap.cpp
@@ -63,9 +63,7 @@
 #include "qthread.h"
 #include "qdebug.h"
 
-#ifdef Q_WS_QPA
 # include "qplatformintegration_qpa.h"
-#endif
 
 #include "qpixmap_raster_p.h"
 #include "private/qhexstring_p.h"
diff --git a/src/gui/image/qpixmap_blitter.cpp b/src/gui/image/qpixmap_blitter.cpp
index 25801dbd4c..16e914c8ee 100644
--- a/src/gui/image/qpixmap_blitter.cpp
+++ b/src/gui/image/qpixmap_blitter.cpp
@@ -93,9 +93,7 @@ void QBlittablePlatformPixmap::resize(int width, int height)
 {
     m_blittable.reset(0);
     m_engine.reset(0);
-#ifdef Q_WS_QPA
     d = QGuiApplication::primaryScreen()->depth();
-#endif
     w = width;
     h = height;
     is_null = (w <= 0 || h <= 0);
diff --git a/src/gui/image/qpixmap_raster.cpp b/src/gui/image/qpixmap_raster.cpp
index ce7d66043c..887074c7b7 100644
--- a/src/gui/image/qpixmap_raster.cpp
+++ b/src/gui/image/qpixmap_raster.cpp
@@ -98,22 +98,10 @@ QPlatformPixmap *QRasterPlatformPixmap::createCompatiblePlatformPixmap() const
 void QRasterPlatformPixmap::resize(int width, int height)
 {
     QImage::Format format;
-#ifdef Q_WS_QWS
-    if (pixelType() == BitmapType) {
-        format = QImage::Format_Mono;
-    } else {
-        format = QScreen::instance()->pixelFormat();
-        if (format == QImage::Format_Invalid)
-            format = QImage::Format_ARGB32_Premultiplied;
-        else if (format == QImage::Format_Indexed8) // currently not supported
-            format = QImage::Format_RGB444;
-    }
-#else
     if (pixelType() == BitmapType)
         format = QImage::Format_MonoLSB;
     else
         format = QNativeImage::systemFormat();
-#endif
 
     image = QImage(width, height, format);
     w = width;
@@ -340,41 +328,6 @@ void QRasterPlatformPixmap::createPixmapForImage(QImage &sourceImage, Qt::ImageC
     if (flags & Qt::NoFormatConversion)
         format = sourceImage.format();
     else
-#ifdef Q_WS_QWS
-    if (pixelType() == BitmapType) {
-        format = QImage::Format_Mono;
-    } else {
-        format = QScreen::instance()->pixelFormat();
-        if (format == QImage::Format_Invalid)
-            format = QImage::Format_ARGB32_Premultiplied;
-        else if (format == QImage::Format_Indexed8) // currently not supported
-            format = QImage::Format_RGB444;
-    }
-
-    if (sourceImage.hasAlphaChannel()
-        && ((flags & Qt::NoOpaqueDetection)
-            || const_cast<QImage &>(sourceImage).data_ptr()->checkForAlphaPixels())) {
-        switch (format) {
-            case QImage::Format_RGB16:
-                format = QImage::Format_ARGB8565_Premultiplied;
-                break;
-            case QImage::Format_RGB666:
-                format = QImage::Format_ARGB6666_Premultiplied;
-                break;
-            case QImage::Format_RGB555:
-                format = QImage::Format_ARGB8555_Premultiplied;
-                break;
-            case QImage::Format_RGB444:
-                format = QImage::Format_ARGB4444_Premultiplied;
-                break;
-            default:
-                format = QImage::Format_ARGB32_Premultiplied;
-                break;
-        }
-    } else if (format == QImage::Format_Invalid) {
-        format = QImage::Format_ARGB32_Premultiplied;
-    }
-#else
     if (pixelType() == BitmapType) {
         format = QImage::Format_MonoLSB;
     } else {
@@ -416,7 +369,6 @@ void QRasterPlatformPixmap::createPixmapForImage(QImage &sourceImage, Qt::ImageC
             }
         }
     }
-#endif
 
     if (inPlace && sourceImage.d->convertInPlace(format, flags)) {
         image = sourceImage;
diff --git a/src/gui/image/qpixmap_raster_p.h b/src/gui/image/qpixmap_raster_p.h
index c451a94858..0de212dd61 100644
--- a/src/gui/image/qpixmap_raster_p.h
+++ b/src/gui/image/qpixmap_raster_p.h
@@ -55,9 +55,6 @@
 
 #include <QtGui/qplatformpixmap_qpa.h>
 
-#ifdef Q_WS_WIN
-# include "qt_windows.h"
-#endif
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/gui/image/qpixmapcache.cpp b/src/gui/image/qpixmapcache.cpp
index a85e092b83..94f38347c1 100644
--- a/src/gui/image/qpixmapcache.cpp
+++ b/src/gui/image/qpixmapcache.cpp
@@ -91,11 +91,7 @@ QT_BEGIN_NAMESPACE
     \sa QCache, QPixmap
 */
 
-#if defined(Q_WS_QWS) || defined(Q_WS_WINCE)
-static int cache_limit = 2048; // 2048 KB cache limit for embedded
-#else
 static int cache_limit = 10240; // 10 MB cache limit for desktop
-#endif
 
 /*!
     \class QPixmapCache::Key
diff --git a/src/gui/image/qplatformpixmap.cpp b/src/gui/image/qplatformpixmap.cpp
index a214f397ed..e1bf944d9b 100644
--- a/src/gui/image/qplatformpixmap.cpp
+++ b/src/gui/image/qplatformpixmap.cpp
@@ -174,16 +174,5 @@ QImage* QPlatformPixmap::buffer()
     return 0;
 }
 
-#if defined(Q_OS_SYMBIAN)
-void* QPlatformPixmap::toNativeType(NativeType /* type */)
-{
-    return 0;
-}
-
-void QPlatformPixmap::fromNativeType(void* /* pixmap */, NativeType /* typre */)
-{
-    return;
-}
-#endif
 
 QT_END_NAMESPACE
diff --git a/src/gui/image/qplatformpixmap_qpa.h b/src/gui/image/qplatformpixmap_qpa.h
index 929d7df789..ad0a8dc69e 100644
--- a/src/gui/image/qplatformpixmap_qpa.h
+++ b/src/gui/image/qplatformpixmap_qpa.h
@@ -154,9 +154,6 @@ private:
 
 #  define QT_XFORM_TYPE_MSBFIRST 0
 #  define QT_XFORM_TYPE_LSBFIRST 1
-#  if defined(Q_WS_WIN)
-#    define QT_XFORM_TYPE_WINDOWSPIXMAP 2
-#  endif
 extern bool qt_xForm_helper(const QTransform&, int, int, int, uchar*, int, int, int, const uchar*, int, int, int);
 
 QT_END_NAMESPACE
diff --git a/src/gui/image/qvolatileimage.cpp b/src/gui/image/qvolatileimage.cpp
index f7fe70c496..8fd3620b4b 100644
--- a/src/gui/image/qvolatileimage.cpp
+++ b/src/gui/image/qvolatileimage.cpp
@@ -274,36 +274,12 @@ bool QVolatileImagePaintEngine::end()
 
 void QVolatileImagePaintEngine::drawPixmap(const QPointF &p, const QPixmap &pm)
 {
-#ifdef Q_OS_SYMBIAN
-    void *nativeData = pm.handle()->toNativeType(QPlatformPixmap::VolatileImage);
-    if (nativeData) {
-        QVolatileImage *img = static_cast<QVolatileImage *>(nativeData);
-        img->beginDataAccess();
-        QRasterPaintEngine::drawImage(p, img->imageRef());
-        img->endDataAccess(true);
-    } else {
-        QRasterPaintEngine::drawPixmap(p, pm);
-    }
-#else
     QRasterPaintEngine::drawPixmap(p, pm);
-#endif
 }
 
 void QVolatileImagePaintEngine::drawPixmap(const QRectF &r, const QPixmap &pm, const QRectF &sr)
 {
-#ifdef Q_OS_SYMBIAN
-    void *nativeData = pm.handle()->toNativeType(QPlatformPixmap::VolatileImage);
-    if (nativeData) {
-        QVolatileImage *img = static_cast<QVolatileImage *>(nativeData);
-        img->beginDataAccess();
-        QRasterPaintEngine::drawImage(r, img->imageRef(), sr);
-        img->endDataAccess(true);
-    } else {
-        QRasterPaintEngine::drawPixmap(r, pm, sr);
-    }
-#else
     QRasterPaintEngine::drawPixmap(r, pm, sr);
-#endif
 }
 
 QT_END_NAMESPACE
diff --git a/src/gui/image/qvolatileimagedata_p.h b/src/gui/image/qvolatileimagedata_p.h
index b2161fc6db..9f817874a4 100644
--- a/src/gui/image/qvolatileimagedata_p.h
+++ b/src/gui/image/qvolatileimagedata_p.h
@@ -56,9 +56,6 @@
 #include <QtGui/qimage.h>
 #include <QtCore/qshareddata.h>
 
-#ifdef Q_OS_SYMBIAN
-class CFbsBitmap;
-#endif
 
 QT_BEGIN_NAMESPACE
 
@@ -78,16 +75,6 @@ public:
     void *duplicateNativeImage() const;
     void ensureImage();
 
-#ifdef Q_OS_SYMBIAN
-    void updateImage();
-    void initWithBitmap(CFbsBitmap *source);
-    void applyMask(CFbsBitmap *mask);
-    void ensureBitmap();
-    void release();
-    QVolatileImageData *next;
-    QVolatileImageData *prev;
-    CFbsBitmap *bitmap;
-#endif
     QImage image;
     QPaintEngine *pengine;
 };