mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-07-15 15:02:16 -07:00
rename class
This commit is contained in:
parent
a6216c2912
commit
3c5ace00be
28 changed files with 111 additions and 108 deletions
|
|
@ -12,7 +12,7 @@
|
|||
SplitCardPart::SplitCardPart(const QString &_name,
|
||||
const QString &_text,
|
||||
const QVariantHash &_properties,
|
||||
const CardInfoPerSet &_setInfo)
|
||||
const PrintingInfo &_setInfo)
|
||||
: name(_name), text(_text), properties(_properties), setInfo(_setInfo)
|
||||
{
|
||||
}
|
||||
|
|
@ -129,7 +129,7 @@ CardInfoPtr OracleImporter::addCard(QString name,
|
|||
bool isToken,
|
||||
QVariantHash properties,
|
||||
const QList<CardRelation *> &relatedCards,
|
||||
const CardInfoPerSet &setInfo)
|
||||
const PrintingInfo &setInfo)
|
||||
{
|
||||
// Workaround for card name weirdness
|
||||
name = name.replace("Æ", "AE");
|
||||
|
|
@ -200,7 +200,7 @@ CardInfoPtr OracleImporter::addCard(QString name,
|
|||
|
||||
// insert the card and its properties
|
||||
QList<CardRelation *> reverseRelatedCards;
|
||||
CardInfoPerSetMap setsInfo;
|
||||
PrintingInfoPerSetMap setsInfo;
|
||||
setsInfo[setInfo.getPtr()->getShortName()].append(setInfo);
|
||||
CardInfoPtr newCard = CardInfo::newInstance(name, text, isToken, properties, relatedCards, reverseRelatedCards,
|
||||
setsInfo, cipt, landscapeOrientation, tableRow, upsideDown);
|
||||
|
|
@ -242,7 +242,7 @@ int OracleImporter::importCardsFromSet(const CardSetPtr ¤tSet, const QList
|
|||
static constexpr bool isToken = false;
|
||||
static const QList<QString> setsWithCardsWithSameNameButDifferentText = {"UST"};
|
||||
QVariantHash properties;
|
||||
CardInfoPerSet setInfo;
|
||||
PrintingInfo setInfo;
|
||||
QList<CardRelation *> relatedCards;
|
||||
QList<QString> allNameProps;
|
||||
|
||||
|
|
@ -281,7 +281,7 @@ int OracleImporter::importCardsFromSet(const CardSetPtr ¤tSet, const QList
|
|||
}
|
||||
|
||||
// per-set properties
|
||||
setInfo = CardInfoPerSet(currentSet);
|
||||
setInfo = PrintingInfo(currentSet);
|
||||
QMapIterator it2(setInfoProperties);
|
||||
while (it2.hasNext()) {
|
||||
it2.next();
|
||||
|
|
|
|||
|
|
@ -95,7 +95,7 @@ public:
|
|||
SplitCardPart(const QString &_name,
|
||||
const QString &_text,
|
||||
const QVariantHash &_properties,
|
||||
const CardInfoPerSet &setInfo);
|
||||
const PrintingInfo &setInfo);
|
||||
inline const QString &getName() const
|
||||
{
|
||||
return name;
|
||||
|
|
@ -108,7 +108,7 @@ public:
|
|||
{
|
||||
return properties;
|
||||
}
|
||||
inline const CardInfoPerSet &getSetInfo() const
|
||||
inline const PrintingInfo &getSetInfo() const
|
||||
{
|
||||
return setInfo;
|
||||
}
|
||||
|
|
@ -117,7 +117,7 @@ private:
|
|||
QString name;
|
||||
QString text;
|
||||
QVariantHash properties;
|
||||
CardInfoPerSet setInfo;
|
||||
PrintingInfo setInfo;
|
||||
};
|
||||
|
||||
class OracleImporter : public QObject
|
||||
|
|
@ -143,7 +143,7 @@ private:
|
|||
bool isToken,
|
||||
QVariantHash properties,
|
||||
const QList<CardRelation *> &relatedCards,
|
||||
const CardInfoPerSet &setInfo);
|
||||
const PrintingInfo &setInfo);
|
||||
signals:
|
||||
void setIndexChanged(int cardsImported, int setIndex, const QString &setName);
|
||||
void dataReadProgress(int bytesRead, int totalBytes);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue