diff options
| author | Sérgio Martins <sergio.martins@kdab.com> | 2015-05-15 20:03:18 +0100 |
|---|---|---|
| committer | Sérgio Martins <sergio.martins@kdab.com> | 2015-05-27 08:07:09 +0000 |
| commit | 35175b8fa5f8be93b147f57a247b8e52f28ee8cb (patch) | |
| tree | 8f2d6409c195eeb37bef527ddaf4800d233c2bff /src/corelib/io/qdir.h | |
| parent | 16b95b65a6fea501dade6e3f5f1ad48f7dfaa173 (diff) | |
Introduce QDir::listSeparator()
Qt should help abstract such platform differences.
This ifdef is proliferating in user code (seen a few times
in KDE) and even in Qt code (qstandardpaths.cpp).
[ChangeLog][QtCore][QDir] Added listSeparator().
Change-Id: Icad082a51c8efd5d63f7af9bbaedbe4bc15b8937
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/io/qdir.h')
| -rw-r--r-- | src/corelib/io/qdir.h | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/corelib/io/qdir.h b/src/corelib/io/qdir.h index e622011f98..b6946eba65 100644 --- a/src/corelib/io/qdir.h +++ b/src/corelib/io/qdir.h @@ -177,7 +177,16 @@ public: static QFileInfoList drives(); - static QChar separator(); + Q_DECL_CONSTEXPR static inline QChar listSeparator() Q_DECL_NOTHROW + { +#if defined(Q_OS_WIN) + return QLatin1Char(';'); +#else + return QLatin1Char(':'); +#endif + } + + static QChar separator(); // ### Qt6: Make it inline static bool setCurrent(const QString &path); static inline QDir current() { return QDir(currentPath()); } |