diff options
| author | Ben Boeckel <MathStuf@gmail.com> | 2009-05-02 04:32:35 -0400 |
|---|---|---|
| committer | Ben Boeckel <MathStuf@gmail.com> | 2009-05-02 04:32:35 -0400 |
| commit | cbd61ab459ff4799a7e2f95820f59fb0f3a2454b (patch) | |
| tree | c35efa208044371bc2f76042b02637a3f6ca639f /sigmodr/tree/TreeItem.cpp | |
| parent | 769eccb231308270a9539a3d1e3c8a3d4782f850 (diff) | |
Fix build, mostly const checks
Diffstat (limited to 'sigmodr/tree/TreeItem.cpp')
| -rw-r--r-- | sigmodr/tree/TreeItem.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sigmodr/tree/TreeItem.cpp b/sigmodr/tree/TreeItem.cpp index 3cb71756..0b5509ee 100644 --- a/sigmodr/tree/TreeItem.cpp +++ b/sigmodr/tree/TreeItem.cpp @@ -195,12 +195,12 @@ QString TreeItem::text() const CoinListItem* coinListItem = qobject_cast<CoinListItem*>(m_object); if (coinListItem->type() == CoinListItem::Item) { - Item* item = m_object->game()->itemById(coinListItem->object()); + const Item* item = m_object->game()->itemById(coinListItem->object()); name = item ? item->name() : QString::fromUtf8("«unknown»"); } else if (coinListItem->type() == CoinListItem::Species) { - Species* species = m_object->game()->speciesById(coinListItem->object()); + const Species* species = m_object->game()->speciesById(coinListItem->object()); name = species ? species->name() : QString::fromUtf8("«unknown»"); } else @@ -227,14 +227,14 @@ QString TreeItem::text() const break; case EntryMapTrainer: { - Trainer* trainer = m_object->game()->trainerById(qobject_cast<MapTrainer*>(m_object)); + const Trainer* trainer = m_object->game()->trainerById(qobject_cast<MapTrainer*>(m_object)->trainerClass()); name = trainer ? trainer->name() : QString::fromUtf8("«unknown»"); break; } case EntryMapTrainerTeamMember: { - MapTrainerTeamMember* member = qobject_cast<MapTrainer*>(m_object); - Species* species = m_object->game()->speciesById(member->species()); + MapTrainerTeamMember* member = qobject_cast<MapTrainerTeamMember*>(m_object); + const Species* species = m_object->game()->speciesById(member->species()); name = QString("%1 L%2%3").arg(species ? species->name() : QString::fromUtf8("«unknown»")).arg(member->level()); if (static_cast<const MapTrainer*>(member->parent())->leadTeamMember().contains(member->id())) name.append(" (leading)"); @@ -249,7 +249,7 @@ QString TreeItem::text() const case EntryMapWildListEncounter: { MapWildListEncounter* encounter = qobject_cast<MapWildListEncounter*>(m_object); - Species* species = m_object->game()->speciesById(encounter->species()); + const Species* species = m_object->game()->speciesById(encounter->species()); name = QString("%1 L%2 (weight: %3)").arg(species ? species->name() : QString::fromUtf8("«unknown»")).arg(encounter->level()).arg(encounter->weight()); break; } @@ -271,7 +271,7 @@ QString TreeItem::text() const case EntrySpeciesMove: { SpeciesMove* speciesMove = qobject_cast<SpeciesMove*>(m_object); - Move* move = m_object->game()->moveById(speciesMove->move()); + const Move* move = m_object->game()->moveById(speciesMove->move()); name = QString("%1 L%2").arg(move ? move->name() : QString::fromUtf8("«unknown»")).arg(speciesMove->level()); if (speciesMove->wild() != speciesMove->level()) name.append(QString(" (wild: L%1)").arg(speciesMove->wild())); |