diff options
author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-02-01 10:19:07 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-01 11:06:19 +0100 |
commit | b44e67e1ca5766daef3e4f7a6dd433ebe0f744d1 (patch) | |
tree | fd10ab1e36f4b0c2c6b8d2061ae3dc71c508ba7b /src/corelib/thread | |
parent | 9fa4e51dbb8cac4f7f5a6bee6e1b9b029b57f393 (diff) |
Windows: Fix inclusion of <windows.h>
- Always use <qt_windows.h> as the last file to be included.
- Remove it from some headers, use Qt::HANDLE instead of HANDLE.
- Clean up #ifdef, use Q_OS_WIN for Windows/Windows CE.
- Add NOMINMAX to qt_windows.h to avoid problems with the
min/max macros.
- Remove <windows.h> from qplatformdefs.h (VS2005)
Change-Id: Ic44e2cb3eafce38e1ad645c3bf85745439398e50
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Diffstat (limited to 'src/corelib/thread')
-rw-r--r-- | src/corelib/thread/qmutex_p.h | 4 | ||||
-rw-r--r-- | src/corelib/thread/qmutex_win.cpp | 3 | ||||
-rw-r--r-- | src/corelib/thread/qthread.cpp | 18 | ||||
-rw-r--r-- | src/corelib/thread/qthread_p.h | 11 | ||||
-rw-r--r-- | src/corelib/thread/qwaitcondition_win.cpp | 2 |
5 files changed, 8 insertions, 30 deletions
diff --git a/src/corelib/thread/qmutex_p.h b/src/corelib/thread/qmutex_p.h index ec6b24b8bc..3cf0938e94 100644 --- a/src/corelib/thread/qmutex_p.h +++ b/src/corelib/thread/qmutex_p.h @@ -118,8 +118,8 @@ public: bool wakeup; pthread_mutex_t mutex; pthread_cond_t cond; -#elif defined(Q_OS_WIN32) || defined(Q_OS_WINCE) - HANDLE event; +#elif defined(Q_OS_WIN) + Qt::HANDLE event; #endif }; #endif //Q_OS_LINUX diff --git a/src/corelib/thread/qmutex_win.cpp b/src/corelib/thread/qmutex_win.cpp index ec08a043be..1fdf97b0d0 100644 --- a/src/corelib/thread/qmutex_win.cpp +++ b/src/corelib/thread/qmutex_win.cpp @@ -39,11 +39,10 @@ ** ****************************************************************************/ -#include <qt_windows.h> - #include "qmutex.h" #include <qatomic.h> #include "qmutex_p.h" +#include <qt_windows.h> QT_BEGIN_NAMESPACE diff --git a/src/corelib/thread/qthread.cpp b/src/corelib/thread/qthread.cpp index c4e2b21d4e..be0a98d3b5 100644 --- a/src/corelib/thread/qthread.cpp +++ b/src/corelib/thread/qthread.cpp @@ -52,24 +52,6 @@ #include "qthread_p.h" #include "private/qcoreapplication_p.h" -/* -#ifdef Q_OS_WIN32 -# include "qt_windows.h" -#else -# include <unistd.h> -# include <netinet/in.h> -# include <sys/utsname.h> -# include <sys/socket.h> -*/ -/* -# elif defined(Q_OS_HPUX) -# include <sys/pstat.h> -# elif defined(Q_OS_FREEBSD) || defined(Q_OS_OPENBSD) || defined(Q_OS_MAC) -# include <sys/sysctl.h> -# endif -#endif -*/ - QT_BEGIN_NAMESPACE /* diff --git a/src/corelib/thread/qthread_p.h b/src/corelib/thread/qthread_p.h index e764a3f729..d8374e9805 100644 --- a/src/corelib/thread/qthread_p.h +++ b/src/corelib/thread/qthread_p.h @@ -167,16 +167,13 @@ public: #endif // Q_OS_UNIX -#if defined(Q_OS_WIN32) || defined(Q_OS_WINCE) - HANDLE handle; - unsigned int id; - int waiters; - +#ifdef Q_OS_WIN static unsigned int __stdcall start(void *); static void finish(void *, bool lockAnyway=true); -#endif // Q_OS_WIN32 -#if defined(Q_OS_WIN32) || defined(Q_OS_WINCE) + Qt::HANDLE handle; + unsigned int id; + int waiters; bool terminationEnabled, terminatePending; # endif QThreadData *data; diff --git a/src/corelib/thread/qwaitcondition_win.cpp b/src/corelib/thread/qwaitcondition_win.cpp index 9060840dbe..3528d6a0ff 100644 --- a/src/corelib/thread/qwaitcondition_win.cpp +++ b/src/corelib/thread/qwaitcondition_win.cpp @@ -45,13 +45,13 @@ #include "qreadwritelock.h" #include "qlist.h" #include "qalgorithms.h" -#include "qt_windows.h" #ifndef QT_NO_THREAD #define Q_MUTEX_T void* #include <private/qmutex_p.h> #include <private/qreadwritelock_p.h> +#include <qt_windows.h> QT_BEGIN_NAMESPACE |