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/widgets/dialogs/qfiledialog_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/widgets/dialogs/qfiledialog_p.h')
| -rw-r--r-- | src/widgets/dialogs/qfiledialog_p.h | 20 |
1 files changed, 1 insertions, 19 deletions
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<const wchar_t *>(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 { |