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/widgets/dialogs/qfiledialog.cpp | 25 +++++++++++++++++++++++-- src/widgets/dialogs/qfiledialog_p.h | 20 +------------------- src/widgets/dialogs/qfilesystemmodel.cpp | 6 ++---- src/widgets/dialogs/qwizard_win_p.h | 2 +- src/widgets/itemviews/qfileiconprovider.cpp | 6 +++--- src/widgets/kernel/qapplication_qpa.cpp | 5 +++++ src/widgets/kernel/qwidget.cpp | 3 --- src/widgets/widgets/qabstractscrollarea.cpp | 4 ++-- src/widgets/widgets/qsizegrip.cpp | 11 +++++------ src/widgets/widgets/qwidgetresizehandler.cpp | 3 --- 10 files changed, 42 insertions(+), 43 deletions(-) (limited to 'src/widgets') diff --git a/src/widgets/dialogs/qfiledialog.cpp b/src/widgets/dialogs/qfiledialog.cpp index da734c80f0..e5a24075d9 100644 --- a/src/widgets/dialogs/qfiledialog.cpp +++ b/src/widgets/dialogs/qfiledialog.cpp @@ -45,6 +45,7 @@ #ifndef QT_NO_FILEDIALOG #include "qfiledialog_p.h" +#include "qplatformdialoghelper_qpa.h" #include #include #include @@ -67,11 +68,12 @@ #if defined(Q_OS_WINCE) extern bool qt_priv_ptr_valid; #endif +#endif #if defined(Q_OS_UNIX) #include +#elif defined(Q_OS_WIN) +# include #endif -#endif -#include "qplatformdialoghelper_qpa.h" QT_BEGIN_NAMESPACE @@ -1386,6 +1388,25 @@ QLineEdit *QFileDialogPrivate::lineEdit() const { return (QLineEdit*)qFileDialogUi->fileNameEdit; } +int QFileDialogPrivate::maxNameLength(const QString &path) +{ +#if defined(Q_OS_UNIX) + return ::pathconf(QFile::encodeName(path).data(), _PC_NAME_MAX); +#elif defined(Q_OS_WINCE) + Q_UNUSED(path); + return MAX_PATH; +#elif defined(Q_OS_WIN) + DWORD maxLength; + const QString drive = path.left(3); + if (::GetVolumeInformation(reinterpret_cast(drive.utf16()), NULL, 0, NULL, &maxLength, NULL, NULL, 0) == FALSE) + return -1; + return maxLength; +#else + Q_UNUSED(path); +#endif + return -1; +} + /* Sets the view root index to be the file system model index */ diff --git a/src/widgets/dialogs/qfiledialog_p.h b/src/widgets/dialogs/qfiledialog_p.h index 12b2b9a755..a66ee757f6 100644 --- a/src/widgets/dialogs/qfiledialog_p.h +++ b/src/widgets/dialogs/qfiledialog_p.h @@ -143,25 +143,7 @@ public: QLineEdit *lineEdit() const; - int maxNameLength(const QString &path) { -#if defined(Q_OS_UNIX) - return ::pathconf(QFile::encodeName(path).data(), _PC_NAME_MAX); -#elif defined(Q_OS_WIN) -#ifndef Q_OS_WINCE - DWORD maxLength; - QString drive = path.left(3); - if (::GetVolumeInformation(reinterpret_cast(drive.utf16()), NULL, 0, NULL, &maxLength, NULL, NULL, 0) == FALSE) - return -1; - return maxLength; -#else - Q_UNUSED(path); - return MAX_PATH; -#endif //Q_OS_WINCE -#else - Q_UNUSED(path); -#endif - return -1; - } + static int maxNameLength(const QString &path); QString basename(const QString &path) const { diff --git a/src/widgets/dialogs/qfilesystemmodel.cpp b/src/widgets/dialogs/qfilesystemmodel.cpp index 3d26594a00..7ea4302a56 100644 --- a/src/widgets/dialogs/qfilesystemmodel.cpp +++ b/src/widgets/dialogs/qfilesystemmodel.cpp @@ -49,10 +49,8 @@ #include #ifdef Q_OS_WIN -#include -#endif -#ifdef Q_OS_WIN32 -#include +# include +# include #endif QT_BEGIN_NAMESPACE diff --git a/src/widgets/dialogs/qwizard_win_p.h b/src/widgets/dialogs/qwizard_win_p.h index 2d567feab4..80b5fd8241 100644 --- a/src/widgets/dialogs/qwizard_win_p.h +++ b/src/widgets/dialogs/qwizard_win_p.h @@ -56,12 +56,12 @@ #ifndef QT_NO_WIZARD #ifndef QT_NO_STYLE_WINDOWSVISTA -#include #include #include #include #include #include +#include QT_BEGIN_NAMESPACE diff --git a/src/widgets/itemviews/qfileiconprovider.cpp b/src/widgets/itemviews/qfileiconprovider.cpp index 0da942eba0..dd52aebea5 100644 --- a/src/widgets/itemviews/qfileiconprovider.cpp +++ b/src/widgets/itemviews/qfileiconprovider.cpp @@ -46,6 +46,9 @@ #include #include #include +#include +#include + #if defined(Q_OS_WIN) # define _WIN32_IE 0x0500 # include @@ -56,9 +59,6 @@ # include #endif -#include -#include - #if defined(Q_WS_X11) && !defined(Q_NO_STYLE_GTK) # include # include diff --git a/src/widgets/kernel/qapplication_qpa.cpp b/src/widgets/kernel/qapplication_qpa.cpp index f17e2e10dd..e3429dc17c 100644 --- a/src/widgets/kernel/qapplication_qpa.cpp +++ b/src/widgets/kernel/qapplication_qpa.cpp @@ -64,6 +64,10 @@ #include "qdesktopwidget_qpa_p.h" #include "qwidgetwindow_qpa_p.h" +#ifdef Q_OS_WIN +# include // for qt_win_display_dc() +#endif + QT_BEGIN_NAMESPACE static QString appName; @@ -398,6 +402,7 @@ void qt_init(QApplicationPrivate *priv, int type) } #ifdef Q_OS_WIN +// #fixme: Remove. static HDC displayDC = 0; // display device context Q_WIDGETS_EXPORT HDC qt_win_display_dc() // get display DC diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp index 9310622a5b..321a374652 100644 --- a/src/widgets/kernel/qwidget.cpp +++ b/src/widgets/kernel/qwidget.cpp @@ -60,9 +60,6 @@ #ifndef QT_NO_ACCESSIBILITY # include "qaccessible.h" #endif -#if defined(Q_WS_WIN) -# include "qt_windows.h" -#endif #ifdef Q_WS_MAC # include "qt_mac_p.h" # include "qt_cocoa_helpers_mac_p.h" diff --git a/src/widgets/widgets/qabstractscrollarea.cpp b/src/widgets/widgets/qabstractscrollarea.cpp index ba9aa155fc..03ec21680d 100644 --- a/src/widgets/widgets/qabstractscrollarea.cpp +++ b/src/widgets/widgets/qabstractscrollarea.cpp @@ -64,9 +64,9 @@ #include #include #endif -#ifdef Q_WS_WIN +#ifdef Q_OS_WIN # include -# include +# include #endif QT_BEGIN_NAMESPACE diff --git a/src/widgets/widgets/qsizegrip.cpp b/src/widgets/widgets/qsizegrip.cpp index 4d326737ee..145bdf02d4 100644 --- a/src/widgets/widgets/qsizegrip.cpp +++ b/src/widgets/widgets/qsizegrip.cpp @@ -52,12 +52,6 @@ #include "qdebug.h" #include -#if defined(Q_WS_X11) -#include -#elif defined (Q_OS_WIN) -# include -# include "private/qapplication_p.h" -#endif #ifdef Q_WS_MAC #include #endif @@ -65,6 +59,11 @@ #include #include +#ifdef Q_OS_WIN +# include +# include "private/qapplication_p.h" +#endif + QT_BEGIN_NAMESPACE #if defined (Q_OS_WIN) diff --git a/src/widgets/widgets/qwidgetresizehandler.cpp b/src/widgets/widgets/qwidgetresizehandler.cpp index 63cf7080cd..aba0ca58c6 100644 --- a/src/widgets/widgets/qwidgetresizehandler.cpp +++ b/src/widgets/widgets/qwidgetresizehandler.cpp @@ -48,9 +48,6 @@ #include "qcursor.h" #include "qsizegrip.h" #include "qevent.h" -#if defined(Q_WS_WIN) -#include "qt_windows.h" -#endif #include "qdebug.h" #include "private/qlayoutengine_p.h" -- cgit v1.2.3