Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-25 03:12:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

avoid temporary and remove always true case in QDir::cleanPath()

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
This commit is contained in:
Ivailo Monev 2020-01-25 23:58:06 +00:00
parent 62da531ca4
commit 996edf7e69
1 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/core/io/qdir.cpp
View file

@ -1738,17 +1738,13 @@ QString QDir::cleanPath(const QString &path)
{ {
if (path.isEmpty()) if (path.isEmpty())
return path; return path;
QString name = path;
QChar dir_separator = separator();
if (dir_separator != QLatin1Char('/'))
name.replace(dir_separator, QLatin1Char('/'));
int used = 0, levels = 0; int used = 0, levels = 0;
const int len = name.length(); const int len = path.length();
QVarLengthArray<QChar> outVector(len); QVarLengthArray<QChar> outVector(len);
QChar *out = outVector.data(); QChar *out = outVector.data();
const QChar *p = name.unicode(); const QChar *p = path.unicode();
for (int i = 0, last = -1, iwrite = 0; i < len; ++i) { for (int i = 0, last = -1, iwrite = 0; i < len; ++i) {
if (p[i] == QLatin1Char('/')) { if (p[i] == QLatin1Char('/')) {
while (i+1 < len && p[i+1] == QLatin1Char('/')) { while (i+1 < len && p[i+1] == QLatin1Char('/')) {
@ -1836,7 +1832,7 @@ QString QDir::cleanPath(const QString &path)
used++; used++;
} }
QString ret = (used == len ? name : QString(out, used)); QString ret = (used == len ? path : QString(out, used));
// Strip away last slash except for root directories // Strip away last slash except for root directories
if (ret.length() > 1 && ret.endsWith(QLatin1Char('/'))) { if (ret.length() > 1 && ret.endsWith(QLatin1Char('/'))) {
ret.chop(1); ret.chop(1);