remove unused QX11PixmapData::Uninitialized enum

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

diff --git a/src/gui/image/qpixmap.cpp b/src/gui/image/qpixmap.cpp
index 06240a3..9c9038e 100644 (file)
--- a/src/gui/image/qpixmap.cpp
+++ b/src/gui/image/qpixmap.cpp
@@ -1729,7 +1729,6 @@ void QPixmap::detach()
 #if defined(Q_WS_X11)
     if (pd->classId() == QPixmapData::X11Class) {
         QX11PixmapData *d = static_cast<QX11PixmapData*>(pd);
-        d->flags &= ~QX11PixmapData::Uninitialized;
 
         // reset the cache data
         if (d->hd2) {

diff --git a/src/gui/image/qpixmap_x11.cpp b/src/gui/image/qpixmap_x11.cpp
index b311cc8..14c5cb8 100644 (file)
--- a/src/gui/image/qpixmap_x11.cpp
+++ b/src/gui/image/qpixmap_x11.cpp
@@ -186,7 +186,7 @@ QAtomicInt qt_pixmap_serial = QAtomicInt(0);
 
 QX11PixmapData::QX11PixmapData(PixelType type)
     : QPixmapData(type, X11Class), hd(0),
-      flags(Uninitialized), x11_mask(0), picture(0), mask_picture(0), hd2(0),
+      flags(NoFlags), x11_mask(0), picture(0), mask_picture(0), hd2(0),
       share_mode(QPixmap::ImplicitlyShared), pengine(0)
 {
 }
@@ -1826,7 +1826,6 @@ QPixmap QX11PixmapData::transformed(const QTransform &transform,
     } else {                                        // color pixmap
         QX11PixmapData *x11Data = new QX11PixmapData(QPixmapData::PixmapType);
         QPixmap pm(x11Data);
-        x11Data->flags &= ~QX11PixmapData::Uninitialized;
         x11Data->xinfo = xinfo;
         x11Data->d = d;
         x11Data->w = w;
@@ -1965,8 +1964,6 @@ QPixmap QPixmap::grabWindow(WId window, int x, int y, int w, int h)
     data->resize(w, h);
 
     QPixmap pm(data);
-
-    data->flags &= ~QX11PixmapData::Uninitialized;
     pm.x11SetScreen(scr);
 
     GC gc = XCreateGC(dpy, pm.handle(), 0, 0);
@@ -2083,7 +2080,6 @@ void QX11PixmapData::copy(const QPixmapData *data, const QRect &rect)
 
     setSerialNumber(qt_pixmap_serial.fetchAndAddRelaxed(1));
 
-    flags &= ~Uninitialized;
     xinfo = x11Data->xinfo;
     d = x11Data->d;
     w = rect.width();

diff --git a/src/gui/image/qpixmap_x11_p.h b/src/gui/image/qpixmap_x11_p.h
index 57070ef..68b213d 100644 (file)
--- a/src/gui/image/qpixmap_x11_p.h
+++ b/src/gui/image/qpixmap_x11_p.h
@@ -114,8 +114,7 @@ private:
 
     enum Flag {
          NoFlags = 0x0,
-         Uninitialized = 0x1,
-         Readonly = 0x2
+         Readonly = 0x1
     };
     uint flags;