From 2ed4e4afbb267c407699bbb384af778f84168c2f Mon Sep 17 00:00:00 2001
From: Joerg Bornemann <joerg.bornemann@nokia.com>
Date: Thu, 1 Oct 2009 14:18:07 +0200
Subject: remove unused member from QWidgetData on Windows CE

Reviewed-by: thartman
---
 src/gui/kernel/qwidget.cpp       | 4 ----
 src/gui/kernel/qwidget.h         | 3 ---
 src/gui/kernel/qwidget_win.cpp   | 2 +-
 src/gui/kernel/qwidget_wince.cpp | 2 --
 4 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp
index 83593ab..0b75b06 100644
--- a/src/gui/kernel/qwidget.cpp
+++ b/src/gui/kernel/qwidget.cpp
@@ -1177,10 +1177,6 @@ void QWidgetPrivate::init(QWidget *parentWidget, Qt::WindowFlags f)
     if (f & Qt::MSWindowsOwnDC)
         q->setAttribute(Qt::WA_NativeWindow);
 
-#ifdef Q_WS_WINCE
-    data.window_state_internal = 0;
-#endif
-
     q->setAttribute(Qt::WA_QuitOnClose); // might be cleared in adjustQuitOnCloseAttribute()
     adjustQuitOnCloseAttribute();
 
diff --git a/src/gui/kernel/qwidget.h b/src/gui/kernel/qwidget.h
index 7e250e2..76418af 100644
--- a/src/gui/kernel/qwidget.h
+++ b/src/gui/kernel/qwidget.h
@@ -133,9 +133,6 @@ public:
     int alloc_region_index;
 //    int alloc_region_revision;
 #endif
-#if defined(Q_WS_WINCE)
-    uint window_state_internal : 4;
-#endif
     QRect wrect;
 };
 
diff --git a/src/gui/kernel/qwidget_win.cpp b/src/gui/kernel/qwidget_win.cpp
index c705e2a..a0982f4 100644
--- a/src/gui/kernel/qwidget_win.cpp
+++ b/src/gui/kernel/qwidget_win.cpp
@@ -1402,7 +1402,7 @@ void QWidgetPrivate::setGeometry_sys(int x, int y, int w, int h, bool isMove)
                     SetWindowPlacement(q->internalWinId(), &wndpl);
                 } else {
 #else
-                if (data.window_state_internal & Qt::WindowMaximized) {
+                if (data.window_state & Qt::WindowMaximized) {
                     qt_wince_maximize(q);
                 } else {
 #endif
diff --git a/src/gui/kernel/qwidget_wince.cpp b/src/gui/kernel/qwidget_wince.cpp
index c0664f4..4a0d30c 100644
--- a/src/gui/kernel/qwidget_wince.cpp
+++ b/src/gui/kernel/qwidget_wince.cpp
@@ -480,7 +480,6 @@ void QWidget::setWindowState(Qt::WindowStates newstate)
     if (isWindow()) {
         createWinId();
         Q_ASSERT(testAttribute(Qt::WA_WState_Created));
-        data->window_state_internal = newstate;
         // Ensure the initial size is valid, since we store it as normalGeometry below.
         if ((!testAttribute(Qt::WA_Resized) && !isVisible()))
             adjustSize();
@@ -573,7 +572,6 @@ void QWidget::setWindowState(Qt::WindowStates newstate)
         }
     }
     data->window_state = newstate;
-    data->window_state_internal = newstate;
     QWindowStateChangeEvent e(oldstate);
     QApplication::sendEvent(this, &e);
 }
-- 
cgit v0.12