feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Rewrite SettingsAccessor::settingsFiles()

Browse Source 
This no longer has the default name first, but that does
not matter since we check all files anyway.

Change-Id: Ib3505d2cafa57e86290237e74dd1f89374da4509
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
Tobias Hunger
2014-03-03 16:58:28 +01:00
parent 327abfb30b
commit 031666c670
1 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/plugins/projectexplorer/settingsaccessor.cpp
View File

@@ -776,24 +776,28 @@ bool SettingsAccessor::addVersionUpgrader(VersionUpgrader *upgrader)
return true; return true;
} }
/* Will always return the default name first */ /* Will always return the default name first (if applicable) */
QList<FileName> SettingsAccessor::settingsFiles(const QString &suffix) const QList<FileName> SettingsAccessor::settingsFiles(const QString &suffix) const
{ {
const QString defaultName = defaultFileName(suffix);
QDir projectDir = QDir(project()->projectDirectory().toString());
QList<Utils::FileName> result; QList<Utils::FileName> result;
if (QFileInfo(defaultName).exists())
result << Utils::FileName::fromString(defaultName);
QFileInfoList fiList = projectDir.entryInfoList( const Utils::FileName baseName = project()->projectFilePath();
QStringList(QFileInfo(defaultName).fileName() + QLatin1String("*")), QDir::Files); QFileInfo fi = baseName.toFileInfo();
QDir dir = QDir(fi.absolutePath());
QString filter = fi.fileName() + suffix + QLatin1String("*");
foreach (const QFileInfo &fi, fiList) { QFileInfoList list = dir.entryInfoList(QStringList() << filter, QDir::Files);
foreach (const QFileInfo &fi, list) {
const Utils::FileName path = Utils::FileName::fromString(fi.absoluteFilePath()); const Utils::FileName path = Utils::FileName::fromString(fi.absoluteFilePath());
if (!result.contains(path)) if (!result.contains(path)) {
result.append(path); if (path.endsWith(suffix))
result.prepend(path);
else
result.append(path);
}
} }
return result; return result;
} }