diff options
| author | João Abecasis <joao.abecasis@nokia.com> | 2012-02-05 21:25:31 +0100 |
|---|---|---|
| committer | João Abecasis <joao.abecasis@nokia.com> | 2012-02-05 21:26:33 +0100 |
| commit | d065dfd454890c332482a6109ed34a989e50809b (patch) | |
| tree | 0d3e9c5367c1fad7d089d368182374e8d1d46ca1 /src/widgets/dialogs/qfiledialog_p.h | |
| parent | 632840cb0f5ad355d87fc040b015d04af86371ec (diff) | |
| parent | 9f54846d951838361f4188b423e7aa7c7b9a9540 (diff) | |
Merge remote-tracking branch 'gerrit/master' into containers
Conflicts:
src/corelib/tools/qstring.cpp
Change-Id: I23d214bf33c2badfae1876da3cc7d6d8f6e635fb
Diffstat (limited to 'src/widgets/dialogs/qfiledialog_p.h')
| -rw-r--r-- | src/widgets/dialogs/qfiledialog_p.h | 26 |
1 files changed, 4 insertions, 22 deletions
diff --git a/src/widgets/dialogs/qfiledialog_p.h b/src/widgets/dialogs/qfiledialog_p.h index 30c73ade7b..a66ee757f6 100644 --- a/src/widgets/dialogs/qfiledialog_p.h +++ b/src/widgets/dialogs/qfiledialog_p.h @@ -1,8 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: http://www.qt-project.org/ ** ** This file is part of the QtGui module of the Qt Toolkit. ** @@ -35,6 +34,7 @@ ** ** ** +** ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -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 { @@ -187,7 +169,7 @@ public: static inline QString toInternal(const QString &path) { -#if defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN) +#if defined(Q_OS_WIN) QString n(path); n.replace(QLatin1Char('\\'), QLatin1Char('/')); #if defined(Q_OS_WINCE) |