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/io/qfilesystemwatcher_win_p.h | |
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/io/qfilesystemwatcher_win_p.h')
-rw-r--r-- | src/corelib/io/qfilesystemwatcher_win_p.h | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/src/corelib/io/qfilesystemwatcher_win_p.h b/src/corelib/io/qfilesystemwatcher_win_p.h index 84b1dcc693..8daf5a94ad 100644 --- a/src/corelib/io/qfilesystemwatcher_win_p.h +++ b/src/corelib/io/qfilesystemwatcher_win_p.h @@ -57,8 +57,6 @@ #ifndef QT_NO_FILESYSTEMWATCHER -#include <qt_windows.h> - #include <QtCore/qdatetime.h> #include <QtCore/qthread.h> #include <QtCore/qfile.h> @@ -90,15 +88,10 @@ public: class Handle { public: - HANDLE handle; + Qt::HANDLE handle; uint flags; - Handle() - : handle(INVALID_HANDLE_VALUE), flags(0u) - { } - Handle(const Handle &other) - : handle(other.handle), flags(other.flags) - { } + Handle(); }; class PathInfo { @@ -147,12 +140,12 @@ public: void wakeup(); QMutex mutex; - QVector<HANDLE> handles; + QVector<Qt::HANDLE> handles; int msg; QHash<QString, QWindowsFileSystemWatcherEngine::Handle> handleForDir; - QHash<HANDLE, QHash<QString, QWindowsFileSystemWatcherEngine::PathInfo> > pathInfoForHandle; + QHash<Qt::HANDLE, QHash<QString, QWindowsFileSystemWatcherEngine::PathInfo> > pathInfoForHandle; Q_SIGNALS: void fileChanged(const QString &path, bool removed); |