From 1582407fc782c0befd0760633324dd5c206524a1 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Thu, 13 Oct 2011 14:25:18 +0200
Subject: Remove Q_WS_ and Q_OS_SYMBIAN from QtGui.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I2ac3376513c3fbfc81a2e695a73a0d948d2696bc
Reviewed-on: http://codereview.qt-project.org/6607
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
---
 src/gui/kernel/qwindowdefs.h | 36 ------------------------------------
 1 file changed, 36 deletions(-)

(limited to 'src/gui/kernel/qwindowdefs.h')

diff --git a/src/gui/kernel/qwindowdefs.h b/src/gui/kernel/qwindowdefs.h
index 165b62da8f..b77ec0b2f3 100644
--- a/src/gui/kernel/qwindowdefs.h
+++ b/src/gui/kernel/qwindowdefs.h
@@ -92,53 +92,17 @@ QT_END_HEADER
 
 // Window system dependent definitions
 
-#if defined(Q_WS_MAC) && !defined(Q_WS_QWS)
-
-#include <QtGui/qmacdefines_mac.h>
-
-#ifdef Q_WS_MAC32
-typedef int WId;
-#else
-typedef long WId;
-#endif
-
-#endif // Q_WS_MAC
 
 #if defined(Q_OS_WIN)
 #  include <QtGui/qwindowdefs_win.h>
 #endif // Q_OS_WIN
 
-#if defined(Q_WS_X11)
-
-typedef struct _XDisplay Display;
-typedef union  _XEvent XEvent;
-typedef struct _XGC *GC;
-typedef struct _XRegion *Region;
-typedef unsigned long  WId;
-
-#endif // Q_WS_X11
-
-#if defined(Q_WS_QWS)
-
-typedef unsigned long  WId;
-QT_BEGIN_HEADER
-QT_BEGIN_NAMESPACE
-struct QWSEvent;
-QT_END_NAMESPACE
-QT_END_HEADER
 
-#endif // Q_WS_QWS
 
-#if defined(Q_WS_QPA)
 
 typedef unsigned long  WId;
 
-#endif // Q_WS_QPA
 
-#if defined(Q_OS_SYMBIAN)
-class CCoeControl;
-typedef CCoeControl * WId;
-#endif // Q_OS_SYMBIAN
 
 QT_BEGIN_HEADER
 QT_BEGIN_NAMESPACE
-- 
cgit v1.2.3