iiiypuk/cantata
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

USe native dir separators for display

Browse Source
This commit is contained in:
craig.p.drummond
2013-10-14 18:17:34 +00:00
parent 63d6f37195
commit 9d2bcbcb98
7 changed files with 35 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
support/utils.cpp
View File

@@ -100,11 +100,25 @@ QString Utils::fixPath(const QString &dir)
}
d.replace(QLatin1String("/./"), constDirSepStr);
if (!d.isEmpty() && !d.endsWith(constDirSep)) {
d+="/";
d+=constDirSep;
}
return d;
}
QString Utils::convertDirForDisplay(const QString &dir)
{
QString d(dir);
if (d.endsWith(constDirSep)) {
d=d.left(d.length()-1);
}
return QDir::toNativeSeparators(d);
}
QString Utils::convertDirFromDisplay(const QString &dir)
{
return fixPath(QDir::fromNativeSeparators(dir.trimmed()));
}
QString Utils::getDir(const QString &file)
{
QString d(file);
@@ -241,7 +255,7 @@ bool Utils::createDir(const QString &dir, const QString &base, const char *group
QString d(base);
foreach (const QString &p, parts) {
d+='/'+p;
d+=constDirSep+p;
int rv=::chown(QFile::encodeName(d).constData(), geteuid(), gid);
Q_UNUSED(rv);
}