Changeset 846 for trunk/src/gui/image/qpixmap_x11_p.h

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/gui/image/qpixmap_x11_p.h (modified) (5 diffs)

trunk/src/gui/image/qpixmap_x11_p.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -63 +63 @@
 class QX11PaintEngine;
 
+
+
 class Q_GUI_EXPORT QX11PixmapData : public QPixmapData
 {
@@ -88 +90 @@
                         Qt::TransformationMode mode) const;
     QImage toImage() const;
+
     QPaintEngine* paintEngine() const;
 
     Qt::HANDLE handle() const { return hd; }
     Qt::HANDLE x11ConvertToDefaultDepth();
+
+
+
+
+
+
+
 
 protected:
@@ -104 +114 @@
     friend class QGLContextPrivate; // Needs to access xinfo, gl_surface & flags
     friend class QEglContext; // Needs gl_surface
+
     friend class QX11GLPixmapData; // Needs gl_surface
+
     friend bool  qt_createEGLSurfaceForPixmap(QPixmapData*, bool); // Needs gl_surface
 
     void release();
 
+
+
     QBitmap mask_to_bitmap(int screen) const;
     static Qt::HANDLE bitmap_to_mask(const QBitmap &, int screen);
     void bitmapFromImage(const QImage &image);
+
+
+
 
     Qt::HANDLE hd;
@@ -129 +146 @@
     Qt::HANDLE mask_picture;
     Qt::HANDLE hd2; // sorted in the default display depth
-    Qt::HANDLE gl_surface;
-#ifndef QT_NO_XRENDER
-    void convertToARGB32(bool preserveContents = true);
-#endif
     QPixmap::ShareMode share_mode;