jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-04-27 07:48:01 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

mac patches

Browse source
This commit is contained in:
Max-Wilhelm Bruker 2010-06-19 18:18:04 +02:00
parent 0d63bb7316
commit 4f13c01e12
6 changed files with 43 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
cockatrice/src/carddatabase.cpp
View file

@ -492,15 +492,19 @@ void CardDatabase::picDownloadChanged()
}
}
bool CardDatabase::loadCardDatabase()
bool CardDatabase::loadCardDatabase(const QString &path)
{
QString cardDatabasePath = settingsCache->getCardDatabasePath();
if (!cardDatabasePath.isEmpty())
loadSuccess = loadFromFile(cardDatabasePath);
if (!path.isEmpty())
loadSuccess = loadFromFile(path);
else loadSuccess = false;
return loadSuccess;
}
bool CardDatabase::loadCardDatabase()
{
return loadCardDatabase(settingsCache->getCardDatabasePath());
}
QStringList CardDatabase::getAllColors() const
{
QSet<QString> colors;