From b44e67e1ca5766daef3e4f7a6dd433ebe0f744d1 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Wed, 1 Feb 2012 10:19:07 +0100 Subject: Windows: Fix inclusion of - Always use 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 from qplatformdefs.h (VS2005) Change-Id: Ic44e2cb3eafce38e1ad645c3bf85745439398e50 Reviewed-by: Thiago Macieira Reviewed-by: Joerg Bornemann --- src/corelib/kernel/qcoreapplication_win.cpp | 2 +- src/corelib/kernel/qcorecmdlineargs_p.h | 11 ++++------- src/corelib/kernel/qsharedmemory.cpp | 3 +++ src/corelib/kernel/qsharedmemory_p.h | 10 ++++------ src/corelib/kernel/qsharedmemory_win.cpp | 1 + src/corelib/kernel/qsystemerror.cpp | 2 +- src/corelib/kernel/qsystemsemaphore_p.h | 6 +++--- src/corelib/kernel/qsystemsemaphore_win.cpp | 1 + 8 files changed, 18 insertions(+), 18 deletions(-) (limited to 'src/corelib/kernel') diff --git a/src/corelib/kernel/qcoreapplication_win.cpp b/src/corelib/kernel/qcoreapplication_win.cpp index e087174d8b..9a45f28f16 100644 --- a/src/corelib/kernel/qcoreapplication_win.cpp +++ b/src/corelib/kernel/qcoreapplication_win.cpp @@ -42,13 +42,13 @@ #include "qcoreapplication.h" #include "qcoreapplication_p.h" #include "qstringlist.h" -#include "qt_windows.h" #include "qvector.h" #include "qmutex.h" #include "qfileinfo.h" #include "qcorecmdlineargs_p.h" #include #include +#include QT_BEGIN_NAMESPACE diff --git a/src/corelib/kernel/qcorecmdlineargs_p.h b/src/corelib/kernel/qcorecmdlineargs_p.h index 70e41ac52a..151818b005 100644 --- a/src/corelib/kernel/qcorecmdlineargs_p.h +++ b/src/corelib/kernel/qcorecmdlineargs_p.h @@ -58,13 +58,11 @@ QT_BEGIN_NAMESPACE -#if defined(Q_OS_WIN32) || defined(Q_OS_WINCE) +#ifdef Q_OS_WIN QT_BEGIN_INCLUDE_NAMESPACE -#include "QtCore/qvector.h" -#if defined(Q_OS_WIN32) || defined(Q_OS_WINCE) -# include "qt_windows.h" -#endif +# include "QtCore/qvector.h" +# include QT_END_INCLUDE_NAMESPACE // template implementation of the parsing algorithm @@ -132,7 +130,6 @@ static QVector qWinCmdLine(Char *cmdParam, int length, int &argc) return argv; } -#if defined(Q_OS_WIN32) || defined(Q_OS_WINCE) static inline QStringList qWinCmdArgs(QString cmdLine) // not const-ref: this might be modified { QStringList args; @@ -153,7 +150,7 @@ static inline QStringList qCmdLineArgs(int argc, char *argv[]) QString cmdLine = QString::fromWCharArray(GetCommandLine()); return qWinCmdArgs(cmdLine); } -#endif + #else // !Q_OS_WIN static inline QStringList qCmdLineArgs(int argc, char *argv[]) diff --git a/src/corelib/kernel/qsharedmemory.cpp b/src/corelib/kernel/qsharedmemory.cpp index 9ffa3506ac..640dfc0f94 100644 --- a/src/corelib/kernel/qsharedmemory.cpp +++ b/src/corelib/kernel/qsharedmemory.cpp @@ -45,6 +45,9 @@ #include #include #include +#ifdef Q_OS_WIN +# include +#endif QT_BEGIN_NAMESPACE diff --git a/src/corelib/kernel/qsharedmemory_p.h b/src/corelib/kernel/qsharedmemory_p.h index 4fd83fcae6..2eb90c2c1a 100644 --- a/src/corelib/kernel/qsharedmemory_p.h +++ b/src/corelib/kernel/qsharedmemory_p.h @@ -69,10 +69,8 @@ namespace QSharedMemoryPrivate #include "qsystemsemaphore.h" #include "private/qobject_p.h" -#ifdef Q_OS_WIN -#include -#else -#include +#ifndef Q_OS_WIN +# include #endif QT_BEGIN_NAMESPACE @@ -131,7 +129,7 @@ public: static QString makePlatformSafeKey(const QString &key, const QString &prefix = QLatin1String("qipc_sharedmemory_")); #ifdef Q_OS_WIN - HANDLE handle(); + Qt::HANDLE handle(); #else key_t handle(); #endif @@ -156,7 +154,7 @@ public: private: #ifdef Q_OS_WIN - HANDLE hand; + Qt::HANDLE hand; #else key_t unix_key; #endif diff --git a/src/corelib/kernel/qsharedmemory_win.cpp b/src/corelib/kernel/qsharedmemory_win.cpp index 742b701b4f..c3f8dcf2ff 100644 --- a/src/corelib/kernel/qsharedmemory_win.cpp +++ b/src/corelib/kernel/qsharedmemory_win.cpp @@ -43,6 +43,7 @@ #include "qsharedmemory_p.h" #include "qsystemsemaphore.h" #include +#include QT_BEGIN_NAMESPACE diff --git a/src/corelib/kernel/qsystemerror.cpp b/src/corelib/kernel/qsystemerror.cpp index 774c9b975d..74815d9e4e 100644 --- a/src/corelib/kernel/qsystemerror.cpp +++ b/src/corelib/kernel/qsystemerror.cpp @@ -52,7 +52,7 @@ # endif #endif #ifdef Q_OS_WIN -#include +# include #endif QT_BEGIN_NAMESPACE diff --git a/src/corelib/kernel/qsystemsemaphore_p.h b/src/corelib/kernel/qsystemsemaphore_p.h index 10665228ea..527cb312cb 100644 --- a/src/corelib/kernel/qsystemsemaphore_p.h +++ b/src/corelib/kernel/qsystemsemaphore_p.h @@ -76,7 +76,7 @@ public: } #ifdef Q_OS_WIN - HANDLE handle(QSystemSemaphore::AccessMode mode = QSystemSemaphore::Open); + Qt::HANDLE handle(QSystemSemaphore::AccessMode mode = QSystemSemaphore::Open); void setErrorString(const QString &function); #else key_t handle(QSystemSemaphore::AccessMode mode = QSystemSemaphore::Open); @@ -89,8 +89,8 @@ public: QString fileName; int initialValue; #ifdef Q_OS_WIN - HANDLE semaphore; - HANDLE semaphoreLock; + Qt::HANDLE semaphore; + Qt::HANDLE semaphoreLock; #else int semaphore; bool createdFile; diff --git a/src/corelib/kernel/qsystemsemaphore_win.cpp b/src/corelib/kernel/qsystemsemaphore_win.cpp index 6138ff402d..fef53585fe 100644 --- a/src/corelib/kernel/qsystemsemaphore_win.cpp +++ b/src/corelib/kernel/qsystemsemaphore_win.cpp @@ -43,6 +43,7 @@ #include "qsystemsemaphore_p.h" #include "qcoreapplication.h" #include +#include QT_BEGIN_NAMESPACE -- cgit v1.2.3