1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Inline QDir::separator(), as requested by a ### Qt6 comment

Browse Source 
Task-number: QTBUG-85700
Change-Id: Icd44e428b607703defb9be1c149db6a564e6b4f0
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
This commit is contained in:
Edward Welbourne 2020-07-21 16:42:11 +02:00
parent 02c2c930f0
commit 197ba3e938
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/corelib/io/qdir.cpp
View File

@ -1969,6 +1969,8 @@ QFileInfoList QDir::drives()
} }
/*! /*!
\fn QChar QDir::separator()
Returns the native directory separator: "/" under Unix Returns the native directory separator: "/" under Unix
and "\\" under Windows. and "\\" under Windows.
@ -1980,14 +1982,6 @@ QFileInfoList QDir::drives()
\sa listSeparator() \sa listSeparator()
*/ */
QChar QDir::separator()
{
#if defined(Q_OS_WIN)
return QLatin1Char('\\');
#else
return QLatin1Char('/');
#endif
}
/*! /*!
\fn QDir::listSeparator() \fn QDir::listSeparator()

9
src/corelib/io/qdir.h
View File

@ -239,7 +239,14 @@ public:
#endif #endif
} }
static QChar separator(); // ### Qt6: Make it inline static QChar separator()
{
#if defined(Q_OS_WIN)
return QLatin1Char('\\');
#else
return QLatin1Char('/');
#endif
}
static bool setCurrent(const QString &path); static bool setCurrent(const QString &path);
static inline QDir current() { return QDir(currentPath()); } static inline QDir current() { return QDir(currentPath()); }