diff --git a/cockatrice/src/carddatabase.cpp b/cockatrice/src/carddatabase.cpp index 374dd864..08f74499 100644 --- a/cockatrice/src/carddatabase.cpp +++ b/cockatrice/src/carddatabase.cpp @@ -584,10 +584,8 @@ QStringList CardDatabase::getAllMainCardTypes() const void CardDatabase::cacheCardPixmaps(const QStringList &cardNames) { - qDebug("pixmapCache started"); for (int i = 0; i < cardNames.size(); ++i) getCard(cardNames[i])->loadPixmap(); - qDebug("pixmapCache finished"); } void CardDatabase::loadImage(CardInfo *card) diff --git a/cockatrice/src/deckview.cpp b/cockatrice/src/deckview.cpp index 87b0c52b..47977d13 100644 --- a/cockatrice/src/deckview.cpp +++ b/cockatrice/src/deckview.cpp @@ -5,7 +5,6 @@ #include "carddatabase.h" #include "settingscache.h" #include "main.h" -#include DeckViewCardDragItem::DeckViewCardDragItem(DeckViewCard *_item, const QPointF &_hotSpot, AbstractCardDragItem *parentDrag) : AbstractCardDragItem(_item, _hotSpot, parentDrag), currentZone(0) @@ -23,7 +22,6 @@ void DeckViewCardDragItem::updatePosition(const QPointF &cursorScenePos) if (!cursorZone) return; currentZone = cursorZone; - qDebug() << currentZone; QPointF newPos = cursorScenePos; if (newPos != pos()) { @@ -121,7 +119,6 @@ void DeckViewCard::mouseMoveEvent(QGraphicsSceneMouseEvent *event) DeckViewCardContainer::DeckViewCardContainer(const QString &_name) : QGraphicsItem(), name(_name), width(0), height(0), maxWidth(0) { - qDebug() << "CardContainer constructor: name=" << _name << "; this=" << this; QString bgPath = settingsCache->getTableBgPath(); if (!bgPath.isEmpty()) bgPixmap.load(bgPath); diff --git a/common/decklist.cpp b/common/decklist.cpp index 9d69b5df..75a26514 100644 --- a/common/decklist.cpp +++ b/common/decklist.cpp @@ -292,6 +292,7 @@ bool DeckList::readElement(QXmlStreamReader *xml) sideboardPlans.insert(currentSideboardPlan->getName(), currentSideboardPlan); currentSideboardPlan = 0; } + return false; } else if (xml->isEndElement()) { if (xml->name() == "deckname") name = currentElementText; @@ -301,9 +302,13 @@ bool DeckList::readElement(QXmlStreamReader *xml) currentElementText.clear(); } else if (xml->isStartElement() && (xml->name() == "zone")) currentZone = new InnerDecklistNode(xml->attributes().value("name").toString(), root); - else if (xml->isStartElement() && (xml->name() == "sideboard_plan")) + else if (xml->isStartElement() && (xml->name() == "sideboard_plan")) { currentSideboardPlan = new SideboardPlan; - else if (xml->isCharacters() && !xml->isWhitespace()) + if (currentSideboardPlan->readElement(xml)) { + sideboardPlans.insert(currentSideboardPlan->getName(), currentSideboardPlan); + currentSideboardPlan = 0; + } + } else if (xml->isCharacters() && !xml->isWhitespace()) currentElementText = xml->text().toString(); return SerializableItem::readElement(xml); }