Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-01-13 08:19:50 -05:00
Code Issues Packages Projects Releases Wiki Activity

Don't add double "/" to paths.

Browse Source
This commit is contained in:
Felix Geyer 2012-07-18 21:04:47 +02:00
parent 3100c202e8
commit f01076856b
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/core/FilePath.cpp
View File

@ -27,7 +27,12 @@ FilePath* FilePath::m_instance(Q_NULLPTR);
QString FilePath::dataPath(const QString& name)
{
return m_basePath + name;
if (name.isEmpty() || name.startsWith('/')) {
return m_dataPath + name;
}
else {
return m_dataPath + "/" + name;
}
}
QString FilePath::pluginPath(const QString& name)
@ -76,12 +81,12 @@ QIcon FilePath::icon(const QString& category, const QString& name, bool fromThem
pngSizes << "16" << "22" << "24" << "32" << "48" << "64" << "128";
QString filename;
Q_FOREACH (const QString& size, pngSizes) {
filename = QString("%1/icons/application/%2x%2/%3/%4.png").arg(m_basePath, size, category, name);
filename = QString("%1/icons/application/%2x%2/%3/%4.png").arg(m_dataPath, size, category, name);
if (QFile::exists(filename)) {
icon.addFile(filename);
}
}
filename = QString("%1/icons/application/scalable/%3/%4.svgz").arg(m_basePath, category, name);
filename = QString("%1/icons/application/scalable/%3/%4.svgz").arg(m_dataPath, category, name);
if (QFile::exists(filename)) {
icon.addFile(filename);
}
@ -111,18 +116,18 @@ FilePath::FilePath()
}
#endif
if (m_basePath.isEmpty()) {
qWarning("DataPath::DataPath: can't find data dir");
if (m_dataPath.isEmpty()) {
qWarning("FilePath::DataPath: can't find data dir");
}
else {
m_basePath = QDir::cleanPath(m_basePath) + "/";
m_dataPath = QDir::cleanPath(m_dataPath);
}
}
bool FilePath::testSetDir(const QString& dir)
{
if (QFile::exists(dir + "/icons/database/C00_Password.png")) {
m_basePath = dir;
m_dataPath = dir;
return true;
}
else {

2
src/core/FilePath.h
View File

@ -39,7 +39,7 @@ private:
static FilePath* m_instance;
QString m_basePath;
QString m_dataPath;
Q_DISABLE_COPY(FilePath)
};