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

Place all XML files in config

Browse Source
This commit is contained in:
craig.p.drummond
2014-07-07 19:06:29 +00:00
parent 313ad1c13e
commit d70f7819ca
7 changed files with 13 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
context/ultimatelyrics.cpp
View File

@@ -150,14 +150,14 @@ void UltimateLyrics::load()
return;
}
QStringList dirs=QStringList() << Utils::dataDir("lyrics") << CANTATA_SYS_LYRICS_DIR;
QStringList dirs=QStringList() << Utils::dataDir() << CANTATA_SYS_CONFIG_DIR;
QSet<QString> providerNames;
foreach (const QString &d, dirs) {
if (d.isEmpty()) {
continue;
}
QFileInfoList files=QDir(d).entryInfoList(QStringList() << QLatin1String("*.xml"), QDir::NoDotAndDotDot|QDir::Files);
QFileInfoList files=QDir(d).entryInfoList(QStringList() << QLatin1String("lyrics_*.xml"), QDir::NoDotAndDotDot|QDir::Files);
foreach (const QFileInfo &f, files) {
QFile file(f.absoluteFilePath());
if (file.open(QIODevice::ReadOnly)) {