jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-09 15:54:47 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix some warnings

Browse source 
Ref #127
This commit is contained in:
Daenyth 2014-06-27 22:19:23 -04:00
parent d3b4ef38a0
commit 6d3fe428e7
11 changed files with 21 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

8
cockatrice/src/carddatabase.cpp
View file

@ -16,7 +16,7 @@
const int CardDatabase::versionNeeded = 3;
QXmlStreamWriter &operator<<(QXmlStreamWriter &xml, const CardSet *set)
static QXmlStreamWriter &operator<<(QXmlStreamWriter &xml, const CardSet *set)
{
xml.writeStartElement("set");
xml.writeTextElement("name", set->getShortName());
@ -280,13 +280,13 @@ CardInfo::CardInfo(CardDatabase *_db,
name(_name),
isToken(_isToken),
sets(_sets),
muIds(_muIds),
manacost(_manacost),
cardtype(_cardtype),
powtough(_powtough),
text(_text),
colors(_colors),
loyalty(_loyalty),
muIds(_muIds),
cipt(_cipt),
tableRow(_tableRow),
pixmap(NULL)
@ -434,7 +434,7 @@ int CardInfo::getPreferredMuId()
return muIds[getPreferredSet()->getShortName()];
}
QXmlStreamWriter &operator<<(QXmlStreamWriter &xml, const CardInfo *info)
static QXmlStreamWriter &operator<<(QXmlStreamWriter &xml, const CardInfo *info)
{
xml.writeStartElement("card");
xml.writeTextElement("name", info->getName());
@ -473,7 +473,7 @@ QXmlStreamWriter &operator<<(QXmlStreamWriter &xml, const CardInfo *info)
}
CardDatabase::CardDatabase(QObject *parent)
: QObject(parent), loadStatus(NotLoaded), noCard(0)
: QObject(parent), noCard(0), loadStatus(NotLoaded)
{
connect(settingsCache, SIGNAL(picsPathChanged()), this, SLOT(picsPathChanged()));
connect(settingsCache, SIGNAL(cardDatabasePathChanged()), this, SLOT(loadCardDatabase()));