summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Goffart <ogoffart@trolltech.com>2009-06-11 09:02:11 (GMT)
committerOlivier Goffart <ogoffart@trolltech.com>2009-06-11 10:58:04 (GMT)
commit0295d0aa5111f31eec8dd8109b4df6389f4efbce (patch)
tree7feacf6d021c80ed9c1b2ca7459ef2f0ed4e5738
parente0be99974d5d66f548543df9b5b919c8e81ade62 (diff)
downloadQt-0295d0aa5111f31eec8dd8109b4df6389f4efbce.zip
Qt-0295d0aa5111f31eec8dd8109b4df6389f4efbce.tar.gz
Qt-0295d0aa5111f31eec8dd8109b4df6389f4efbce.tar.bz2
Clean up qwidget_p.h since the last change
Reviewed-by: bnilsen Reviewed-by: Denis
-rw-r--r--src/gui/kernel/qwidget_p.h14
1 files changed, 6 insertions, 8 deletions
diff --git a/src/gui/kernel/qwidget_p.h b/src/gui/kernel/qwidget_p.h
index ff194f7..2bc4da6 100644
--- a/src/gui/kernel/qwidget_p.h
+++ b/src/gui/kernel/qwidget_p.h
@@ -131,10 +131,6 @@ struct QTLWExtra {
uint embedded : 1;
// *************************** Platform specific values (bit fields first) **********
-#ifndef QT_NO_XSYNC
- int newCounterValueHi : 32;
- uint newCounterValueLo : 32;
-#endif
#if defined(Q_WS_X11) // <----------------------------------------------------------- X11
uint spont_unmapped: 1; // window was spontaneously unmapped
uint dnd : 1; // DND properties installed
@@ -143,6 +139,12 @@ struct QTLWExtra {
WId parentWinId; // parent window Id (valid after reparenting)
WId userTimeWindow; // window id that contains user-time timestamp when WM supports a _NET_WM_USER_TIME_WINDOW atom
QPoint fullScreenOffset;
+#ifndef QT_NO_XSYNC
+ WId syncUpdateCounter;
+ ulong syncRequestTimestamp;
+ qint32 newCounterValueHi;
+ quint32 newCounterValueLo;
+#endif
#elif defined(Q_WS_WIN) // <--------------------------------------------------------- WIN
HICON winIconBig; // internal big Windows icon
HICON winIconSmall; // internal small Windows icon
@@ -160,10 +162,6 @@ struct QTLWExtra {
QWSManager *qwsManager;
#endif
#endif
-#ifndef QT_NO_XSYNC
- WId syncUpdateCounter;
- ulong syncRequestTimestamp;
-#endif
};
struct QWExtra {