diff options
325 files changed, 4804 insertions, 3848 deletions
@@ -1,4 +1,11 @@ ----------------- +Rev: 201 +Date: 8 June 2008 +User: MathStuf +----------------- +[FIX] All modules now use their own namespace + +----------------- Rev: 200 Date: 7 June 2008 User: MathStuf diff --git a/pokebattle/Arena.h b/pokebattle/Arena.h index 644819c4..be2dc1a2 100644 --- a/pokebattle/Arena.h +++ b/pokebattle/Arena.h @@ -25,13 +25,22 @@ #include <QList> #include <QObject> +namespace Pokebattle +{ class Arena : public QObject { Q_OBJECT public: - Arena(QList<Team*> teams); - ~Arena(); + static Arena* instance() + { + if (!m_arena) + m_arena = new Arena; + m_arena->connect(m_arena, SIGNAL(battleEnd()), SLOT(cleanUp())); + return m_arena; + } + + void setTeams(QList<Team*> teams); signals: // TODO: What signals need to be done here? void battleStart(); @@ -44,8 +53,17 @@ class Arena : public QObject void turnEnd(); void action(); + public slots: + protected slots: + void cleanUp(); + protected: + Arena(); + Arena(const Arena& arena); + ~Arena(); private: + static Arena* m_arena; QList<Team*> m_teams; }; +} #endif diff --git a/pokebattle/Bot.h b/pokebattle/Bot.h index 87f6d1d0..8fb77eef 100644 --- a/pokebattle/Bot.h +++ b/pokebattle/Bot.h @@ -25,6 +25,8 @@ // Standard library includes #include <climits> +namespace Pokebattle +{ class Bot : public Team { Q_OBJECT @@ -32,5 +34,6 @@ class Bot : public Team private: long alphaBeta(const Arena& arena, const int trainerClass, const long alpha = LONG_MIN, const long beta = LONG_MAX); }; +} #endif diff --git a/pokebattle/Ghost.h b/pokebattle/Ghost.h index 523d3912..bcf138b2 100644 --- a/pokebattle/Ghost.h +++ b/pokebattle/Ghost.h @@ -21,6 +21,8 @@ // Battle includes #include "TeamMember.h" +namespace Pokebattle +{ class Ghost : public TeamMember { Q_OBJECT @@ -58,5 +60,6 @@ class Ghost : public TeamMember // QList<MoveCombo> moveCombos; // unsigned unknownMoves; }; +} #endif diff --git a/pokebattle/GhostBot.h b/pokebattle/GhostBot.h index a790562f..808824ca 100644 --- a/pokebattle/GhostBot.h +++ b/pokebattle/GhostBot.h @@ -21,9 +21,12 @@ // Battle includes #include "Team.h" +namespace Pokebattle +{ class GhostBot : public Team { Q_OBJECT }; +} #endif diff --git a/pokebattle/Team.h b/pokebattle/Team.h index a10eb5b6..b30f55d0 100644 --- a/pokebattle/Team.h +++ b/pokebattle/Team.h @@ -21,9 +21,12 @@ // Qt includes #include <QObject> +namespace Pokebattle +{ class Team : public QObject { Q_OBJECT }; +} #endif diff --git a/pokebattle/TeamMember.h b/pokebattle/TeamMember.h index 7f50df82..15c08361 100644 --- a/pokebattle/TeamMember.h +++ b/pokebattle/TeamMember.h @@ -21,9 +21,12 @@ // Qt includes #include <QObject> +namespace Pokebattle +{ class TeamMember : public QObject { Q_OBJECT }; +} #endif diff --git a/pokegen.spec b/pokegen.spec index db653689..e56417e3 100644 --- a/pokegen.spec +++ b/pokegen.spec @@ -1,6 +1,6 @@ Name: pokegen -Version: 0.0.1 -Release: 4%{?dist} +Version: 0.0.2 +Release: 1%{?dist} Summary: PokéGen is a game aiming to be a customizable Pokémon-like game Group: Amusements/Games @@ -119,6 +119,9 @@ rm -rf ${buildroot} %changelog +* Sun Jun 08 2008 Ben Boeckel <MathStuf@gmail.com> 0.0.2-1 +- Rebuild for version 0.0.2 + * Sat Jun 07 2008 Ben Boeckel <MathStuf@gmail.com> 0.0.1-4 - Added libpokebattle - Moved headers to be under pokegen directory diff --git a/pokemod/Ability.cpp b/pokemod/Ability.cpp index 1afbf2f7..0e586182 100644 --- a/pokemod/Ability.cpp +++ b/pokemod/Ability.cpp @@ -21,13 +21,13 @@ // Pokemod includes #include "Pokemod.h" -Ability::Ability(const Ability& ability) : +Pokemod::Ability::Ability(const Ability& ability) : Object("Ability", ability.parent(), ability.id()) { *this = ability; } -Ability::Ability(const Pokemod* parent, const int id) : +Pokemod::Ability::Ability(const Pokemod* parent, const int id) : Object("Ability", parent, id), m_name(""), m_description(""), @@ -35,29 +35,29 @@ Ability::Ability(const Pokemod* parent, const int id) : { } -Ability::Ability(const Ability& ability, const Pokemod* parent, const int id) : +Pokemod::Ability::Ability(const Ability& ability, const Pokemod* parent, const int id) : Object("Ability", parent, id) { *this = ability; } -Ability::Ability(const QDomElement& xml, const Pokemod* parent, const int id) : +Pokemod::Ability::Ability(const QDomElement& xml, const Pokemod* parent, const int id) : Object("Ability", parent, id) { load(xml, id); } -Ability::~Ability() +Pokemod::Ability::~Ability() { } -void Ability::validate() +void Pokemod::Ability::validate() { if (m_name.isEmpty()) emit(error("Name is empty")); } -void Ability::load(const QDomElement& xml, int id) +void Pokemod::Ability::load(const QDomElement& xml, int id) { LOAD_ID(); LOAD(QString, name); @@ -65,7 +65,7 @@ void Ability::load(const QDomElement& xml, int id) LOAD(Script, script); } -QDomElement Ability::save() const +QDomElement Pokemod::Ability::save() const { SAVE_CREATE(); SAVE(QString, name); @@ -74,37 +74,37 @@ QDomElement Ability::save() const return xml; } -void Ability::setName(const QString& name) +void Pokemod::Ability::setName(const QString& name) { CHECK(name); } -void Ability::setDescription(const QString& description) +void Pokemod::Ability::setDescription(const QString& description) { CHECK(description); } -void Ability::setScript(const Script& script) +void Pokemod::Ability::setScript(const Script& script) { CHECK(script); } -QString Ability::name() const +QString Pokemod::Ability::name() const { return m_name; } -QString Ability::description() const +QString Pokemod::Ability::description() const { return m_description; } -Script Ability::script() const +Pokemod::Script Pokemod::Ability::script() const { return m_script; } -Ability& Ability::operator=(const Ability& rhs) +Pokemod::Ability& Pokemod::Ability::operator=(const Ability& rhs) { if (this == &rhs) return *this; diff --git a/pokemod/Ability.h b/pokemod/Ability.h index 9b80bf17..6cf5517f 100644 --- a/pokemod/Ability.h +++ b/pokemod/Ability.h @@ -22,6 +22,8 @@ #include "Object.h" #include "Script.h" +namespace Pokemod +{ // Forward declarations class Pokemod; @@ -55,5 +57,6 @@ class Ability : public Object QString m_description; Script m_script; }; +} #endif diff --git a/pokemod/Author.cpp b/pokemod/Author.cpp index d235d1a6..c4adc89d 100644 --- a/pokemod/Author.cpp +++ b/pokemod/Author.cpp @@ -24,13 +24,13 @@ // Qt includes #include <QRegExp> -Author::Author(const Author& author) : +Pokemod::Author::Author(const Author& author) : Object("Author", author.parent(), author.id()) { *this = author; } -Author::Author(const Pokemod* parent, const int id) : +Pokemod::Author::Author(const Pokemod* parent, const int id) : Object("Author", parent, id), m_name(""), m_email(""), @@ -38,19 +38,19 @@ Author::Author(const Pokemod* parent, const int id) : { } -Author::Author(const Author& author, const Pokemod* parent, const int id) : +Pokemod::Author::Author(const Author& author, const Pokemod* parent, const int id) : Object("Author", parent, id) { *this = author; } -Author::Author(const QDomElement& xml, const Pokemod* parent, const int id) : +Pokemod::Author::Author(const QDomElement& xml, const Pokemod* parent, const int id) : Object("Author", parent, id) { load(xml, id); } -void Author::validate() +void Pokemod::Author::validate() { if (m_name.isEmpty()) emit(error("Name is empty")); @@ -62,7 +62,7 @@ void Author::validate() emit(error("Role is empty")); } -void Author::load(const QDomElement& xml, int id) +void Pokemod::Author::load(const QDomElement& xml, int id) { LOAD_ID(); LOAD(QString, name); @@ -70,7 +70,7 @@ void Author::load(const QDomElement& xml, int id) LOAD(QString, role); } -QDomElement Author::save() const +QDomElement Pokemod::Author::save() const { SAVE_CREATE(); SAVE(QString, name); @@ -79,37 +79,37 @@ QDomElement Author::save() const return xml; } -void Author::setName(const QString& name) +void Pokemod::Author::setName(const QString& name) { CHECK(name); } -void Author::setEmail(const QString& email) +void Pokemod::Author::setEmail(const QString& email) { CHECK(email); } -void Author::setRole(const QString& role) +void Pokemod::Author::setRole(const QString& role) { CHECK(role); } -QString Author::name() const +QString Pokemod::Author::name() const { return m_name; } -QString Author::email() const +QString Pokemod::Author::email() const { return m_email; } -QString Author::role() const +QString Pokemod::Author::role() const { return m_role; } -Author& Author::operator=(const Author& rhs) +Pokemod::Author& Pokemod::Author::operator=(const Author& rhs) { if (this == &rhs) return *this; diff --git a/pokemod/Author.h b/pokemod/Author.h index 9326ea5f..738fe694 100644 --- a/pokemod/Author.h +++ b/pokemod/Author.h @@ -21,6 +21,8 @@ // Pokemod includes #include "Object.h" +namespace Pokemod +{ // Forward declarations class Pokemod; @@ -53,5 +55,6 @@ class Author : public Object QString m_email; QString m_role; }; +} #endif diff --git a/pokemod/Badge.cpp b/pokemod/Badge.cpp index 0b747e84..5a580f00 100644 --- a/pokemod/Badge.cpp +++ b/pokemod/Badge.cpp @@ -17,77 +17,78 @@ // Header include #include "Badge.h" +#include "Pokemod.h" #include "Rules.h" // Qt includes #include <QBuffer> -Badge::Badge(const Badge& badge) : +Pokemod::Badge::Badge(const Badge& badge) : Object("Badge", badge.parent(), badge.id()) { *this = badge; } -Badge::Badge(const Pokemod* parent, const int id) : +Pokemod::Badge::Badge(const Pokemod* parent, const int id) : Object("Badge", parent, id), m_name(""), m_face(64, 64), m_badge(64, 64), m_obey(0) { - for (int i = 0; i < Pokemod::ST_End_GSC; ++i) + for (int i = 0; i < ST_End_GSC; ++i) m_stat[i].set(1, 1); } -Badge::Badge(const Badge& badge, const Pokemod* parent, const int id) : +Pokemod::Badge::Badge(const Badge& badge, const Pokemod* parent, const int id) : Object("Badge", parent, id) { *this = badge; } -Badge::Badge(const QDomElement& xml, const Pokemod* parent, const int id) : +Pokemod::Badge::Badge(const QDomElement& xml, const Pokemod* parent, const int id) : Object("Badge", parent, id) { load(xml, id); } -void Badge::validate() +void Pokemod::Badge::validate() { if (m_name.isEmpty()) emit(error("Name is empty")); TEST(setFace, face); TEST(setBadge, badge); TEST(setObey, obey); - TEST_ARRAY(setStat, stat, (static_cast<const Pokemod*>(pokemod())->rules()->specialSplit() ? Pokemod::ST_End_GSC : Pokemod::ST_End_RBY)); + TEST_ARRAY(setStat, stat, (static_cast<const Pokemod*>(pokemod())->rules()->specialSplit() ? ST_End_GSC : ST_End_RBY)); } -void Badge::load(const QDomElement& xml, int id) +void Pokemod::Badge::load(const QDomElement& xml, int id) { LOAD_ID(); LOAD(QString, name); LOAD(QPixmap, face); LOAD(QPixmap, badge); LOAD(int, obey); - LOAD_ARRAY(Fraction, stat, (static_cast<const Pokemod*>(pokemod())->rules()->specialSplit() ? Pokemod::ST_End_GSC : Pokemod::ST_End_RBY)); + LOAD_ARRAY(Fraction, stat, (static_cast<const Pokemod*>(pokemod())->rules()->specialSplit() ? ST_End_GSC : ST_End_RBY)); } -QDomElement Badge::save() const +QDomElement Pokemod::Badge::save() const { SAVE_CREATE(); SAVE(QString, name); SAVE(QPixmap, face); SAVE(QPixmap, badge); SAVE(int, obey); - SAVE_ARRAY(Fraction, stat, (static_cast<const Pokemod*>(pokemod())->rules()->specialSplit() ? Pokemod::ST_End_GSC : Pokemod::ST_End_RBY)); + SAVE_ARRAY(Fraction, stat, (static_cast<const Pokemod*>(pokemod())->rules()->specialSplit() ? ST_End_GSC : ST_End_RBY)); return xml; } -void Badge::setName(const QString& name) +void Pokemod::Badge::setName(const QString& name) { CHECK(name); } -void Badge::setFace(const QPixmap& face) +void Pokemod::Badge::setFace(const QPixmap& face) { if (face.size() != QSize(64, 64)) { @@ -98,7 +99,7 @@ void Badge::setFace(const QPixmap& face) emit(changed()); } -void Badge::setBadge(const QPixmap& badge) +void Pokemod::Badge::setBadge(const QPixmap& badge) { if (badge.size() != QSize(64, 64)) { @@ -109,7 +110,7 @@ void Badge::setBadge(const QPixmap& badge) emit(changed()); } -void Badge::setObey(const int obey) +void Pokemod::Badge::setObey(const int obey) { if (static_cast<const Pokemod*>(pokemod())->rules()->maxLevel() < obey) { @@ -119,14 +120,14 @@ void Badge::setObey(const int obey) CHECK(obey); } -void Badge::setStat(const int stat, const Fraction& multiplier) +void Pokemod::Badge::setStat(const int stat, const Fraction& multiplier) { if (multiplier < 1) { emit(error(bounds("stat multiplier"))); return; } - if ((static_cast<const Pokemod*>(pokemod())->rules()->specialSplit() ? Pokemod::ST_End_GSC : Pokemod::ST_End_RBY) <= stat) + if ((static_cast<const Pokemod*>(pokemod())->rules()->specialSplit() ? ST_End_GSC : ST_End_RBY) <= stat) { emit(error(bounds("stat"))); return; @@ -134,29 +135,29 @@ void Badge::setStat(const int stat, const Fraction& multiplier) CHECK_ARRAY(stat[stat], multiplier); } -QString Badge::name() const +QString Pokemod::Badge::name() const { return m_name; } -QPixmap Badge::face() const +QPixmap Pokemod::Badge::face() const { return m_face; } -QPixmap Badge::badge() const +QPixmap Pokemod::Badge::badge() const { return m_badge; } -int Badge::obey() const +int Pokemod::Badge::obey() const { return m_obey; } -Fraction Badge::stat(const int stat) const +Pokemod::Fraction Pokemod::Badge::stat(const int stat) const { - if ((static_cast<const Pokemod*>(pokemod())->rules()->specialSplit() ? Pokemod::ST_End_GSC : Pokemod::ST_End_RBY) <= stat) + if ((static_cast<const Pokemod*>(pokemod())->rules()->specialSplit() ? ST_End_GSC : ST_End_RBY) <= stat) { emit(warning(bounds("stat"))); return Fraction(); @@ -164,7 +165,7 @@ Fraction Badge::stat(const int stat) const return m_stat[stat]; } -Badge& Badge::operator=(const Badge& rhs) +Pokemod::Badge& Pokemod::Badge::operator=(const Badge& rhs) { if (this == &rhs) return *this; @@ -172,6 +173,6 @@ Badge& Badge::operator=(const Badge& rhs) COPY(face); COPY(badge); COPY(obey); - COPY_ARRAY(stat, Pokemod::ST_End_GSC); + COPY_ARRAY(stat, ST_End_GSC); return *this; } diff --git a/pokemod/Badge.h b/pokemod/Badge.h index 861c8ac8..94f0460f 100644 --- a/pokemod/Badge.h +++ b/pokemod/Badge.h @@ -21,11 +21,16 @@ // Pokemod includes #include "Fraction.h" #include "Object.h" -#include "Pokemod.h" // Qt includes #include <QPixmap> +namespace Pokemod +{ +// Forward declarations +class Pokemod; + + class Badge : public Object { Q_OBJECT @@ -59,7 +64,8 @@ class Badge : public Object QPixmap m_face; QPixmap m_badge; int m_obey; - Fraction m_stat[Pokemod::ST_End_GSC]; + Fraction m_stat[ST_End_GSC]; }; +} #endif diff --git a/pokemod/CoinList.cpp b/pokemod/CoinList.cpp index f3bff007..336b2126 100644 --- a/pokemod/CoinList.cpp +++ b/pokemod/CoinList.cpp @@ -25,37 +25,37 @@ // Qt includes #include <QSet> -CoinList::CoinList(const CoinList& coinList) : +Pokemod::CoinList::CoinList(const CoinList& coinList) : Object("CoinList", coinList.parent(), coinList.id()) { *this = coinList; } -CoinList::CoinList(const Pokemod* parent, const int id) : +Pokemod::CoinList::CoinList(const Pokemod* parent, const int id) : Object("CoinList", parent, id), m_name(""), m_script("", "") { } -CoinList::CoinList(const CoinList& coinList, const Pokemod* parent, const int id) : +Pokemod::CoinList::CoinList(const CoinList& coinList, const Pokemod* parent, const int id) : Object("CoinList", parent, id) { *this = coinList; } -CoinList::CoinList(const QDomElement& xml, const Pokemod* parent, const int id) : +Pokemod::CoinList::CoinList(const QDomElement& xml, const Pokemod* parent, const int id) : Object("CoinList", parent, id) { load(xml, id); } -CoinList::~CoinList() +Pokemod::CoinList::~CoinList() { clear(); } -void CoinList::validate() +void Pokemod::CoinList::validate() { if (m_name.isEmpty()) emit(error("Name is empty")); @@ -85,7 +85,7 @@ void CoinList::validate() } } -void CoinList::load(const QDomElement& xml, int id) +void Pokemod::CoinList::load(const QDomElement& xml, int id) { LOAD_ID(); LOAD(QString, name); @@ -93,7 +93,7 @@ void CoinList::load(const QDomElement& xml, int id) LOAD_SUB(newObject, CoinListObject); } -QDomElement CoinList::save() const +QDomElement Pokemod::CoinList::save() const { SAVE_CREATE(); SAVE(QString, name); @@ -102,49 +102,49 @@ QDomElement CoinList::save() const return xml; } -void CoinList::setName(const QString& name) +void Pokemod::CoinList::setName(const QString& name) { CHECK(name); } -void CoinList::setScript(const Script& script) +void Pokemod::CoinList::setScript(const Script& script) { CHECK(script) } -QString CoinList::name() const +QString Pokemod::CoinList::name() const { return m_name; } -Script CoinList::script() const +Pokemod::Script Pokemod::CoinList::script() const { return m_script; } -const CoinListObject* CoinList::object(const int index) const +const Pokemod::CoinListObject* Pokemod::CoinList::object(const int index) const { Q_ASSERT(index < objectCount()); return m_objects.at(index); } -CoinListObject* CoinList::object(const int index) +Pokemod::CoinListObject* Pokemod::CoinList::object(const int index) { Q_ASSERT(index < objectCount()); return m_objects[index]; } -const CoinListObject* CoinList::objectById(const int id) const +const Pokemod::CoinListObject* Pokemod::CoinList::objectById(const int id) const { return object(objectIndex(id)); } -CoinListObject* CoinList::objectById(const int id) +Pokemod::CoinListObject* Pokemod::CoinList::objectById(const int id) { return object(objectIndex(id)); } -int CoinList::objectIndex(const int id) const +int Pokemod::CoinList::objectIndex(const int id) const { for (int i = 0; i < objectCount(); ++i) { @@ -154,45 +154,45 @@ int CoinList::objectIndex(const int id) const return INT_MAX; } -int CoinList::objectCount() const +int Pokemod::CoinList::objectCount() const { return m_objects.size(); } -CoinListObject* CoinList::newObject() +Pokemod::CoinListObject* Pokemod::CoinList::newObject() { return newObject(new CoinListObject(this, objectId())); } -CoinListObject* CoinList::newObject(const QDomElement& xml) +Pokemod::CoinListObject* Pokemod::CoinList::newObject(const QDomElement& xml) { return newObject(new CoinListObject(xml, this, objectId())); } -CoinListObject* CoinList::newObject(const CoinListObject& object) +Pokemod::CoinListObject* Pokemod::CoinList::newObject(const CoinListObject& object) { return newObject(new CoinListObject(object, this, objectId())); } -CoinListObject* CoinList::newObject(CoinListObject* object) +Pokemod::CoinListObject* Pokemod::CoinList::newObject(CoinListObject* object) { m_objects.append(object); return object; } -void CoinList::deleteObject(const int index) +void Pokemod::CoinList::deleteObject(const int index) { Q_ASSERT(index < objectCount()); delete m_objects[index]; m_objects.removeAt(index); } -void CoinList::deleteObjectById(const int id) +void Pokemod::CoinList::deleteObjectById(const int id) { deleteObject(objectIndex(id)); } -int CoinList::objectId() const +int Pokemod::CoinList::objectId() const { int i = 0; while ((i < objectCount()) && (objectIndex(i) != INT_MAX)) @@ -200,7 +200,7 @@ int CoinList::objectId() const return i; } -CoinList& CoinList::operator=(const CoinList& rhs) +Pokemod::CoinList& Pokemod::CoinList::operator=(const CoinList& rhs) { if (this == &rhs) return *this; @@ -211,7 +211,7 @@ CoinList& CoinList::operator=(const CoinList& rhs) return *this; } -void CoinList::clear() +void Pokemod::CoinList::clear() { while (objectCount()) deleteObject(0); diff --git a/pokemod/CoinList.h b/pokemod/CoinList.h index d3e1df36..1bf13393 100644 --- a/pokemod/CoinList.h +++ b/pokemod/CoinList.h @@ -25,6 +25,8 @@ // Qt includes #include <QList> +namespace Pokemod +{ // Forward declarations class CoinListObject; class Pokemod; @@ -74,5 +76,6 @@ class CoinList : public Object Script m_script; QList<CoinListObject*> m_objects; }; +} #endif diff --git a/pokemod/CoinListObject.cpp b/pokemod/CoinListObject.cpp index 2e0d4066..9720884d 100644 --- a/pokemod/CoinListObject.cpp +++ b/pokemod/CoinListObject.cpp @@ -22,15 +22,15 @@ #include "CoinList.h" #include "Pokemod.h" -const QStringList CoinListObject::TypeStr = QStringList() << "Item" << QString::fromUtf8("Pokémon"); +const QStringList Pokemod::CoinListObject::TypeStr = QStringList() << "Item" << QString::fromUtf8("Pokémon"); -CoinListObject::CoinListObject(const CoinListObject& object) : +Pokemod::CoinListObject::CoinListObject(const CoinListObject& object) : Object("CoinListObject", object.parent(), object.id()) { *this = object; } -CoinListObject::CoinListObject(const CoinList* parent, const int id) : +Pokemod::CoinListObject::CoinListObject(const CoinList* parent, const int id) : Object("CoinListObject", parent, id), m_type(Item), m_object(INT_MAX), @@ -39,26 +39,26 @@ CoinListObject::CoinListObject(const CoinList* parent, const int id) : { } -CoinListObject::CoinListObject(const CoinListObject& object, const CoinList* parent, const int id) : +Pokemod::CoinListObject::CoinListObject(const CoinListObject& object, const CoinList* parent, const int id) : Object("CoinListObject", parent, id) { *this = object; } -CoinListObject::CoinListObject(const QDomElement& xml, const CoinList* parent, const int id) : +Pokemod::CoinListObject::CoinListObject(const QDomElement& xml, const CoinList* parent, const int id) : Object("CoinListObject", parent, id) { load(xml, id); } -void CoinListObject::validate() +void Pokemod::CoinListObject::validate() { TEST(setType, type); TEST(setObject, object); TEST(setAmount, amount); } -void CoinListObject::load(const QDomElement& xml, int id) +void Pokemod::CoinListObject::load(const QDomElement& xml, int id) { LOAD_ID(); LOAD(int, type); @@ -67,7 +67,7 @@ void CoinListObject::load(const QDomElement& xml, int id) LOAD(int, cost); } -QDomElement CoinListObject::save() const +QDomElement Pokemod::CoinListObject::save() const { SAVE_CREATE(); SAVE(int, type); @@ -77,7 +77,7 @@ QDomElement CoinListObject::save() const return xml; } -void CoinListObject::setType(const int type) +void Pokemod::CoinListObject::setType(const int type) { if (End <= type) { @@ -87,7 +87,7 @@ void CoinListObject::setType(const int type) CHECK(type); } -void CoinListObject::setObject(const int object) +void Pokemod::CoinListObject::setObject(const int object) { if (((Item == m_type) && (static_cast<const Pokemod*>(pokemod())->itemIndex(object) == INT_MAX)) || ((Species == m_type) && (static_cast<const Pokemod*>(pokemod())->speciesIndex(object) == INT_MAX))) { @@ -97,7 +97,7 @@ void CoinListObject::setObject(const int object) CHECK(object); } -void CoinListObject::setAmount(const int amount) +void Pokemod::CoinListObject::setAmount(const int amount) { if (!amount || ((Species == m_type) && (1 < amount))) { @@ -107,32 +107,32 @@ void CoinListObject::setAmount(const int amount) CHECK(amount); } -void CoinListObject::setCost(const int cost) +void Pokemod::CoinListObject::setCost(const int cost) { CHECK(cost); } -int CoinListObject::type() const +int Pokemod::CoinListObject::type() const { return m_type; } -int CoinListObject::object() const +int Pokemod::CoinListObject::object() const { return m_object; } -int CoinListObject::amount() const +int Pokemod::CoinListObject::amount() const { return m_amount; } -int CoinListObject::cost() const +int Pokemod::CoinListObject::cost() const { return m_cost; } -CoinListObject& CoinListObject::operator=(const CoinListObject& rhs) +Pokemod::CoinListObject& Pokemod::CoinListObject::operator=(const CoinListObject& rhs) { if (this == &rhs) return *this; diff --git a/pokemod/CoinListObject.h b/pokemod/CoinListObject.h index 81b50047..36fe39cf 100644 --- a/pokemod/CoinListObject.h +++ b/pokemod/CoinListObject.h @@ -21,6 +21,8 @@ // Pokemod includes #include "Object.h" +namespace Pokemod +{ // Forward declarations class CoinList; @@ -64,5 +66,6 @@ class CoinListObject : public Object int m_amount; int m_cost; }; +} #endif diff --git a/pokemod/EggGroup.cpp b/pokemod/EggGroup.cpp index 1bcb96de..abebe36c 100644 --- a/pokemod/EggGroup.cpp +++ b/pokemod/EggGroup.cpp @@ -21,60 +21,60 @@ // Pokemod includes #include "Pokemod.h" -EggGroup::EggGroup(const EggGroup& eggGroup) : +Pokemod::EggGroup::EggGroup(const EggGroup& eggGroup) : Object("EggGroup", eggGroup.parent(), eggGroup.id()) { *this = eggGroup; } -EggGroup::EggGroup(const Pokemod* parent, const int id) : +Pokemod::EggGroup::EggGroup(const Pokemod* parent, const int id) : Object("EggGroup", parent, id), m_name("") { } -EggGroup::EggGroup(const EggGroup& eggGroup, const Pokemod* parent, const int id) : +Pokemod::EggGroup::EggGroup(const EggGroup& eggGroup, const Pokemod* parent, const int id) : Object("EggGroup", parent, id) { *this = eggGroup; } -EggGroup::EggGroup(const QDomElement& xml, const Pokemod* parent, const int id) : +Pokemod::EggGroup::EggGroup(const QDomElement& xml, const Pokemod* parent, const int id) : Object("EggGroup", parent, id) { load(xml, id); } -void EggGroup::validate() +void Pokemod::EggGroup::validate() { if (m_name.isEmpty()) emit(error("Name is empty")); } -void EggGroup::load(const QDomElement& xml, int id) +void Pokemod::EggGroup::load(const QDomElement& xml, int id) { LOAD_ID(); LOAD(QString, name); } -QDomElement EggGroup::save() const +QDomElement Pokemod::EggGroup::save() const { SAVE_CREATE(); SAVE(QString, name); return xml; } -void EggGroup::setName(const QString& name) +void Pokemod::EggGroup::setName(const QString& name) { CHECK(name); } -QString EggGroup::name() const +QString Pokemod::EggGroup::name() const { return m_name; } -EggGroup& EggGroup::operator=(const EggGroup& rhs) +Pokemod::EggGroup& Pokemod::EggGroup::operator=(const EggGroup& rhs) { if (this == &rhs) return *this; diff --git a/pokemod/EggGroup.h b/pokemod/EggGroup.h index 28850b9a..606dabe0 100644 --- a/pokemod/EggGroup.h +++ b/pokemod/EggGroup.h @@ -21,6 +21,8 @@ // Pokemod includes #include "Object.h" +namespace Pokemod +{ // Forward declarations class Pokemod; @@ -47,5 +49,6 @@ class EggGroup : public Object private: QString m_name; }; +} #endif diff --git a/pokemod/Fraction.cpp b/pokemod/Fraction.cpp index a4a41e7d..50ddfd63 100644 --- a/pokemod/Fraction.cpp +++ b/pokemod/Fraction.cpp @@ -18,13 +18,13 @@ // Header include #include "Fraction.h" -void Fraction::set(const int numerator, const int denominator) +void Pokemod::Fraction::set(const int numerator, const int denominator) { m_numerator = numerator; m_denominator = denominator; } -void Fraction::reduce() +void Pokemod::Fraction::reduce() { int i = m_numerator; int j = m_denominator; diff --git a/pokemod/Fraction.h b/pokemod/Fraction.h index 6a0b7c45..a83ac29f 100644 --- a/pokemod/Fraction.h +++ b/pokemod/Fraction.h @@ -21,67 +21,92 @@ // Qt includes #include <QMetaType> +namespace Pokemod +{ class Fraction { public: - inline Fraction() - { - set(1, 1); - } - inline Fraction(const int numerator, const int denominator) - { - set(numerator, denominator); - } + Fraction(); + Fraction(const int numerator, const int denominator); void set(const int numerator, const int denominator); - inline void setNumerator(const int numerator) - { - set(numerator, m_denominator); - } - inline void setDenominator(const int denominator) - { - set(m_numerator, denominator); - } + void setNumerator(const int numerator); + void setDenominator(const int denominator); - inline int numerator() const - { - return m_numerator; - } - inline int denominator() const - { - return m_denominator; - } + int numerator() const; + int denominator() const; void reduce(); - inline operator double() const - { - return (double(m_numerator) / m_denominator); - } - inline Fraction operator*(const Fraction& rhs) const - { - return Fraction(m_numerator * rhs.m_numerator, m_denominator * rhs.m_denominator); - } - inline Fraction& operator=(const Fraction& rhs) - { - if (this == &rhs) - return *this; - m_numerator = rhs.m_numerator; - m_denominator = rhs.m_denominator; - return *this; - } - inline bool operator==(const Fraction& rhs) const - { - return ((m_numerator == rhs.m_numerator) && (m_denominator == rhs.m_denominator)); - } - inline bool operator!=(const Fraction& rhs) const - { - return !(*this == rhs); - } + operator double() const; + Fraction operator*(const Fraction& rhs) const; + Fraction& operator=(const Fraction& rhs); + bool operator==(const Fraction& rhs) const; + bool operator!=(const Fraction& rhs) const; private: int m_numerator; int m_denominator; }; -Q_DECLARE_METATYPE(Fraction) + +inline Fraction::Fraction() +{ + set(1, 1); +} + +inline Fraction::Fraction(const int numerator, const int denominator) +{ + set(numerator, denominator); +} + +inline void Fraction::setNumerator(const int numerator) +{ + set(numerator, m_denominator); +} + +inline void Fraction::setDenominator(const int denominator) +{ + set(m_numerator, denominator); +} + +inline int Fraction::numerator() const +{ + return m_numerator; +} + +inline int Fraction::denominator() const +{ + return m_denominator; +} + +inline Fraction::operator double() const +{ + return (double(m_numerator) / m_denominator); +} + +inline Fraction Fraction::operator*(const Fraction& rhs) const +{ + return Fraction(m_numerator * rhs.m_numerator, m_denominator * rhs.m_denominator); +} + +inline Fraction& Fraction::operator=(const Fraction& rhs) +{ + if (this == &rhs) + return *this; + m_numerator = rhs.m_numerator; + m_denominator = rhs.m_denominator; + return *this; +} + +inline bool Fraction::operator==(const Fraction& rhs) const +{ + return ((m_numerator == rhs.m_numerator) && (m_denominator == rhs.m_denominator)); +} + +inline bool Fraction::operator!=(const Fraction& rhs) const +{ + return !(*this == rhs); +} +} +Q_DECLARE_METATYPE(Pokemod::Fraction) #endif diff --git a/pokemod/GlobalScript.cpp b/pokemod/GlobalScript.cpp index a49ac4ae..63383826 100644 --- a/pokemod/GlobalScript.cpp +++ b/pokemod/GlobalScript.cpp @@ -21,49 +21,49 @@ // Pokemod includes #include "Pokemod.h" -GlobalScript::GlobalScript(const GlobalScript& globalScript) : +Pokemod::GlobalScript::GlobalScript(const GlobalScript& globalScript) : Object("GlobalScript", globalScript.parent(), globalScript.id()) { *this = globalScript; } -GlobalScript::GlobalScript(const Pokemod* parent, const int id) : +Pokemod::GlobalScript::GlobalScript(const Pokemod* parent, const int id) : Object("GlobalScript", parent, id), m_name(""), m_script("", "") { } -GlobalScript::GlobalScript(const GlobalScript& globalScript, const Pokemod* parent, const int id) : +Pokemod::GlobalScript::GlobalScript(const GlobalScript& globalScript, const Pokemod* parent, const int id) : Object("GlobalScript", parent, id) { *this = globalScript; } -GlobalScript::GlobalScript(const QDomElement& xml, const Pokemod* parent, const int id) : +Pokemod::GlobalScript::GlobalScript(const QDomElement& xml, const Pokemod* parent, const int id) : Object("GlobalScript", parent, id) { load(xml, id); } -GlobalScript::~GlobalScript() +Pokemod::GlobalScript::~GlobalScript() { } -void GlobalScript::validate() +void Pokemod::GlobalScript::validate() { if (m_name.isEmpty()) emit(error("Name is empty")); } -void GlobalScript::load(const QDomElement& xml, int id) +void Pokemod::GlobalScript::load(const QDomElement& xml, int id) { LOAD_ID(); LOAD(QString, name); LOAD(Script, script); } -QDomElement GlobalScript::save() const +QDomElement Pokemod::GlobalScript::save() const { SAVE_CREATE(); SAVE(QString, name); @@ -71,27 +71,27 @@ QDomElement GlobalScript::save() const return xml; } -void GlobalScript::setName(const QString& name) +void Pokemod::GlobalScript::setName(const QString& name) { CHECK(name); } -void GlobalScript::setScript(const Script& script) +void Pokemod::GlobalScript::setScript(const Script& script) { CHECK(script); } -QString GlobalScript::name() const +QString Pokemod::GlobalScript::name() const { return m_name; } -Script GlobalScript::script() const +Pokemod::Script Pokemod::GlobalScript::script() const { return m_script; } -GlobalScript& GlobalScript::operator=(const GlobalScript& rhs) +Pokemod::GlobalScript& Pokemod::GlobalScript::operator=(const GlobalScript& rhs) { if (this == &rhs) return *this; diff --git a/pokemod/GlobalScript.h b/pokemod/GlobalScript.h index ae45a141..35a59b9b 100644 --- a/pokemod/GlobalScript.h +++ b/pokemod/GlobalScript.h @@ -22,6 +22,8 @@ #include "Object.h" #include "Script.h" +namespace Pokemod +{ // Forward declarations class Pokemod; @@ -52,5 +54,6 @@ class GlobalScript : public Object QString m_name; Script m_script; }; +} #endif diff --git a/pokemod/Hat.h b/pokemod/Hat.h index fd301104..739ac636 100644 --- a/pokemod/Hat.h +++ b/pokemod/Hat.h @@ -23,68 +23,89 @@ #include <QDateTime> #include <QMap> +namespace Pokemod +{ template<class T> class Hat { public: - Hat() : - m_count(0) - { - qsrand(QDateTime().toTime_t()); - } + Hat(); - T pick() const - { - int choice = qrand() % m_count; - foreach (T key, m_objects.keys()) - { - choice -= m_objects[key]; - if (choice < 0) - break; - } - return key; - } - T take() - { - T chosen = pick(); - if (!(--m_objects[chosen])) - m_objects.erase(chosen); - --m_count; - return chosen; - } - void setCount(const T& key, const unsigned weight) - { - if (m_objects.contains(key)) - m_count -= m_objects[key]; - m_objects[key] = weight; - m_count += weight; - } - void add(const T& key, const unsigned weight) - { - m_objects[key] += weight; - m_count += weight; - } - unsigned count() const - { - return m_count; - } - unsigned count(const T& key) const - { - if (m_objects.contains(key)) - return m_objects[key]; - return 0; - } - double chance(const T& key) const - { - return (double(count(key)) / m_count); - } + T pick() const; + T take(); + void setCount(const T& key, const unsigned weight); + void add(const T& key, const unsigned weight); + unsigned count() const; + unsigned count(const T& key) const; + double chance(const T& key) const; - unsigned operator[](const T& key) const - { - return count(key); - } + unsigned operator[](const T& key) const; private: QMap<T, unsigned> m_objects; unsigned m_count; }; +inline Hat::Hat() : + m_count(0) +{ + qsrand(QDateTime().toTime_t()); +} + +inline T Hat::pick() const +{ + int choice = qrand() % m_count; + foreach (T key, m_objects.keys()) + { + choice -= m_objects[key]; + if (choice < 0) + break; + } + return key; +} + +inline T Hat::take() +{ + T chosen = pick(); + if (!(--m_objects[chosen])) + m_objects.erase(chosen); + --m_count; + return chosen; +} + +inline void Hat::setCount(const T& key, const unsigned weight) +{ + if (m_objects.contains(key)) + m_count -= m_objects[key]; + m_objects[key] = weight; + m_count += weight; +} + +inline void Hat::add(const T& key, const unsigned weight) +{ + m_objects[key] += weight; + m_count += weight; +} + +inline unsigned Hat::count() const +{ + return m_count; +} + +inline unsigned Hat::count(const T& key) const +{ + if (m_objects.contains(key)) + return m_objects[key]; + return 0; +} + +inline double Hat::chance(const T& key) const +{ + return (double(count(key)) / m_count); +} + +inline unsigned Hat::operator[](const T& key) const +{ + return count(key); +} +} + #endif diff --git a/pokemod/Item.cpp b/pokemod/Item.cpp index ddba2d68..21d3fc4c 100644 --- a/pokemod/Item.cpp +++ b/pokemod/Item.cpp @@ -25,13 +25,13 @@ // Qt includes #include <QSet> -Item::Item(const Item& item) : +Pokemod::Item::Item(const Item& item) : Object("Item", item.parent(), item.id()) { *this = item; } -Item::Item(const Pokemod* parent, const int id) : +Pokemod::Item::Item(const Pokemod* parent, const int id) : Object("Item", parent, id), m_name(""), m_sellable(false), @@ -42,23 +42,23 @@ Item::Item(const Pokemod* parent, const int id) : { } -Item::Item(const Item& item, const Pokemod* parent, const int id) : +Pokemod::Item::Item(const Item& item, const Pokemod* parent, const int id) : Object("Item", parent, id) { *this = item; } -Item::Item(const QDomElement& xml, const Pokemod* parent, const int id) : +Pokemod::Item::Item(const QDomElement& xml, const Pokemod* parent, const int id) : Object("Item", parent, id) { load(xml, id); } -Item::~Item() +Pokemod::Item::~Item() { } -void Item::validate() +void Pokemod::Item::validate() { if (m_name.isEmpty()) emit(error("Name is empty")); @@ -66,7 +66,7 @@ void Item::validate() TEST(setPrice, price); } -void Item::load(const QDomElement& xml, int id) +void Pokemod::Item::load(const QDomElement& xml, int id) { LOAD_ID(); LOAD(QString, name); @@ -77,7 +77,7 @@ void Item::load(const QDomElement& xml, int id) LOAD(Script, script); } -QDomElement Item::save() const +QDomElement Pokemod::Item::save() const { SAVE_CREATE(); SAVE(QString, name); @@ -89,17 +89,17 @@ QDomElement Item::save() const return xml; } -void Item::setName(const QString& name) +void Pokemod::Item::setName(const QString& name) { CHECK(name); } -void Item::setSellable(const bool sellable) +void Pokemod::Item::setSellable(const bool sellable) { CHECK(sellable); } -void Item::setType(const int type) +void Pokemod::Item::setType(const int type) { if (static_cast<const Pokemod*>(pokemod())->itemTypeIndex(type) == INT_MAX) { @@ -109,7 +109,7 @@ void Item::setType(const int type) CHECK(type); } -void Item::setPrice(const int price) +void Pokemod::Item::setPrice(const int price) { if (static_cast<const Pokemod*>(pokemod())->rules()->maxMoney() < price) { @@ -119,47 +119,47 @@ void Item::setPrice(const int price) CHECK(price); } -void Item::setDescription(const QString& description) +void Pokemod::Item::setDescription(const QString& description) { CHECK(description); } -void Item::setScript(const Script& script) +void Pokemod::Item::setScript(const Script& script) { CHECK(script); } -QString Item::name() const +QString Pokemod::Item::name() const { return m_name; } -bool Item::sellable() const +bool Pokemod::Item::sellable() const { return m_sellable; } -int Item::type() const +int Pokemod::Item::type() const { return m_type; } -int Item::price() const +int Pokemod::Item::price() const { return m_price; } -QString Item::description() const +QString Pokemod::Item::description() const { return m_description; } -Script Item::script() const +Pokemod::Script Pokemod::Item::script() const { return m_script; } -Item& Item::operator=(const Item& rhs) +Pokemod::Item& Pokemod::Item::operator=(const Item& rhs) { if (this == &rhs) return *this; diff --git a/pokemod/Item.h b/pokemod/Item.h index 6d91cba9..9af8dc1a 100644 --- a/pokemod/Item.h +++ b/pokemod/Item.h @@ -22,6 +22,8 @@ #include "Object.h" #include "Script.h" +namespace Pokemod +{ // Forward declarations class Pokemod; @@ -64,5 +66,6 @@ class Item : public Object QString m_description; Script m_script; }; +} #endif diff --git a/pokemod/ItemType.cpp b/pokemod/ItemType.cpp index 0757a015..12a23a98 100644 --- a/pokemod/ItemType.cpp +++ b/pokemod/ItemType.cpp @@ -21,15 +21,15 @@ // Pokemod includes #include "Pokemod.h" -QStringList ItemType::CountStr = QStringList() << "Distinct" << "Total"; +QStringList Pokemod::ItemType::CountStr = QStringList() << "Distinct" << "Total"; -ItemType::ItemType(const ItemType& itemType) : +Pokemod::ItemType::ItemType(const ItemType& itemType) : Object("ItemType", itemType.parent(), itemType.id()) { *this = itemType; } -ItemType::ItemType(const Pokemod* parent, const int id) : +Pokemod::ItemType::ItemType(const Pokemod* parent, const int id) : Object("ItemType", parent, id), m_name(""), m_computer(0), @@ -38,19 +38,19 @@ ItemType::ItemType(const Pokemod* parent, const int id) : { } -ItemType::ItemType(const ItemType& itemType, const Pokemod* parent, const int id) : +Pokemod::ItemType::ItemType(const ItemType& itemType, const Pokemod* parent, const int id) : Object("ItemType", parent, id) { *this = itemType; } -ItemType::ItemType(const QDomElement& xml, const Pokemod* parent, const int id) : +Pokemod::ItemType::ItemType(const QDomElement& xml, const Pokemod* parent, const int id) : Object("ItemType", parent, id) { load(xml, id); } -void ItemType::validate() +void Pokemod::ItemType::validate() { if (m_name.isEmpty()) emit(error("Name is empty")); @@ -58,7 +58,7 @@ void ItemType::validate() TEST(setCount, count); } -void ItemType::load(const QDomElement& xml, int id) +void Pokemod::ItemType::load(const QDomElement& xml, int id) { LOAD_ID(); LOAD(QString, name); @@ -67,7 +67,7 @@ void ItemType::load(const QDomElement& xml, int id) LOAD(int, count); } -QDomElement ItemType::save() const +QDomElement Pokemod::ItemType::save() const { SAVE_CREATE(); SAVE(QString, name); @@ -77,17 +77,17 @@ QDomElement ItemType::save() const return xml; } -void ItemType::setName(const QString& name) +void Pokemod::ItemType::setName(const QString& name) { CHECK(name); } -void ItemType::setComputer(const int computer) +void Pokemod::ItemType::setComputer(const int computer) { CHECK(computer); } -void ItemType::setPlayer(const int player) +void Pokemod::ItemType::setPlayer(const int player) { if (!player) { @@ -97,7 +97,7 @@ void ItemType::setPlayer(const int player) CHECK(player); } -void ItemType::setCount(const int count) +void Pokemod::ItemType::setCount(const int count) { if (End <= count) { @@ -107,27 +107,27 @@ void ItemType::setCount(const int count) CHECK(count); } -QString ItemType::name() const +QString Pokemod::ItemType::name() const { return m_name; } -int ItemType::computer() const +int Pokemod::ItemType::computer() const { return m_computer; } -int ItemType::player() const +int Pokemod::ItemType::player() const { return m_player; } -int ItemType::count() const +int Pokemod::ItemType::count() const { return m_count; } -ItemType& ItemType::operator=(const ItemType& rhs) +Pokemod::ItemType& Pokemod::ItemType::operator=(const ItemType& rhs) { if (this == &rhs) return *this; diff --git a/pokemod/ItemType.h b/pokemod/ItemType.h index 77f0aaa5..a1322811 100644 --- a/pokemod/ItemType.h +++ b/pokemod/ItemType.h @@ -21,6 +21,8 @@ // Pokemod includes #include "Object.h" +namespace Pokemod +{ // Forward declarations class Pokemod; @@ -64,5 +66,6 @@ class ItemType : public Object int m_player; int m_count; }; +} #endif diff --git a/pokemod/Map.cpp b/pokemod/Map.cpp index 5979a045..419d75e3 100644 --- a/pokemod/Map.cpp +++ b/pokemod/Map.cpp @@ -28,15 +28,15 @@ // Qt includes #include <QSet> -const QStringList Map::TypeStr = QStringList() << "Outdoor" << "Dungeon" << "Building"; +const QStringList Pokemod::Map::TypeStr = QStringList() << "Outdoor" << "Dungeon" << "Building"; -Map::Map(const Map& map) : +Pokemod::Map::Map(const Map& map) : Object("Map", map.parent(), map.id()) { *this = map; } -Map::Map(const Pokemod* parent, const int id) : +Pokemod::Map::Map(const Pokemod* parent, const int id) : Object("Map", parent, id), m_name(""), m_flyWarp(INT_MAX), @@ -44,24 +44,24 @@ Map::Map(const Pokemod* parent, const int id) : { } -Map::Map(const Map& map, const Pokemod* parent, const int id) : +Pokemod::Map::Map(const Map& map, const Pokemod* parent, const int id) : Object("Map", parent, id) { *this = map; } -Map::Map(const QDomElement& xml, const Pokemod* parent, const int id) : +Pokemod::Map::Map(const QDomElement& xml, const Pokemod* parent, const int id) : Object("Map", parent, id) { load(xml, id); } -Map::~Map() +Pokemod::Map::~Map() { clear(); } -void Map::validate() +void Pokemod::Map::validate() { if (m_name.isEmpty()) emit(error("Name is empty")); @@ -122,7 +122,7 @@ void Map::validate() } } -void Map::load(const QDomElement& xml, int id) +void Pokemod::Map::load(const QDomElement& xml, int id) { LOAD_ID(); LOAD(QString, name); @@ -135,7 +135,7 @@ void Map::load(const QDomElement& xml, int id) LOAD_SUB(newWildList, MapWildList); } -QDomElement Map::save() const +QDomElement Pokemod::Map::save() const { SAVE_CREATE(); SAVE(QString, name); @@ -149,12 +149,12 @@ QDomElement Map::save() const return xml; } -void Map::setName(const QString& name) +void Pokemod::Map::setName(const QString& name) { CHECK(name); } -void Map::setFlyWarp(const int flyWarp) +void Pokemod::Map::setFlyWarp(const int flyWarp) { if ((flyWarp != INT_MAX) && (warpIndex(flyWarp) == INT_MAX)) { @@ -164,7 +164,7 @@ void Map::setFlyWarp(const int flyWarp) CHECK(flyWarp); } -void Map::setType(const int type) +void Pokemod::Map::setType(const int type) { if (End <= type) { @@ -174,22 +174,22 @@ void Map::setType(const int type) CHECK(type); } -QString Map::name() const +QString Pokemod::Map::name() const { return m_name; } -int Map::flyWarp() const +int Pokemod::Map::flyWarp() const { return m_flyWarp; } -int Map::type() const +int Pokemod::Map::type() const { return m_type; } -void Map::setTile(const int row, const int column, const int tile) +void Pokemod::Map::setTile(const int row, const int column, const int tile) { if (static_cast<const Pokemod*>(pokemod())->tileIndex(tile) == INT_MAX) { @@ -199,89 +199,89 @@ void Map::setTile(const int row, const int column, const int tile) m_tile.set(row, column, tile); } -void Map::insertColumn(const int column) +void Pokemod::Map::insertColumn(const int column) { m_tile.insertColumn(column, 0); } -void Map::insertRow(const int row) +void Pokemod::Map::insertRow(const int row) { m_tile.insertRow(row, 0); } -void Map::addColumn() +void Pokemod::Map::addColumn() { m_tile.addColumn(0); } -void Map::addRow() +void Pokemod::Map::addRow() { m_tile.addRow(0); } -void Map::deleteColumn(const int column) +void Pokemod::Map::deleteColumn(const int column) { m_tile.deleteColumn(column); } -void Map::deleteRow(const int row) +void Pokemod::Map::deleteRow(const int row) { m_tile.deleteRow(row); } -const Matrix<int>* Map::map() const +const Pokemod::Matrix<int>* Pokemod::Map::map() const { return &m_tile; } -Matrix<int>* Map::map() +Pokemod::Matrix<int>* Pokemod::Map::map() { return &m_tile; } -int Map::tile(const int row, const int column) const +int Pokemod::Map::tile(const int row, const int column) const { return m_tile.at(row, column); } -int Map::width() const +int Pokemod::Map::width() const { return m_tile.width(); } -int Map::height() const +int Pokemod::Map::height() const { return m_tile.height(); } -Point Map::size() const +Pokemod::Point Pokemod::Map::size() const { return m_tile.size(); } -const MapEffect* Map::effect(const int index) const +const Pokemod::MapEffect* Pokemod::Map::effect(const int index) const { Q_ASSERT(index < effectCount()); return m_effects.at(index); } -MapEffect* Map::effect(const int index) +Pokemod::MapEffect* Pokemod::Map::effect(const int index) { Q_ASSERT(index < effectCount()); return m_effects[index]; } -const MapEffect* Map::effectById(const int index) const +const Pokemod::MapEffect* Pokemod::Map::effectById(const int index) const { return effect(effectIndex(index)); } -MapEffect* Map::effectById(const int index) +Pokemod::MapEffect* Pokemod::Map::effectById(const int index) { return effect(effectIndex(index)); } -int Map::effectIndex(const int id) const +int Pokemod::Map::effectIndex(const int id) const { for (int i = 0; i < effectCount(); ++i) { @@ -291,45 +291,45 @@ int Map::effectIndex(const int id) const return INT_MAX; } -int Map::effectCount() const +int Pokemod::Map::effectCount() const { return m_effects.size(); } -MapEffect* Map::newEffect() +Pokemod::MapEffect* Pokemod::Map::newEffect() { return newEffect(new MapEffect(this, newEffectId())); } -MapEffect* Map::newEffect(const QDomElement& xml) +Pokemod::MapEffect* Pokemod::Map::newEffect(const QDomElement& xml) { return newEffect(new MapEffect(xml, this, newEffectId())); } -MapEffect* Map::newEffect(const MapEffect& effect) +Pokemod::MapEffect* Pokemod::Map::newEffect(const MapEffect& effect) { return newEffect(new MapEffect(effect, this, newEffectId())); } -MapEffect* Map::newEffect(MapEffect* effect) +Pokemod::MapEffect* Pokemod::Map::newEffect(MapEffect* effect) { m_effects.append(effect); return effect; } -void Map::deleteEffect(const int index) +void Pokemod::Map::deleteEffect(const int index) { Q_ASSERT(index < effectCount()); delete m_effects[index]; m_effects.removeAt(index); } -void Map::deleteEffectById(const int id) +void Pokemod::Map::deleteEffectById(const int id) { deleteEffect(effectIndex(id)); } -int Map::newEffectId() const +int Pokemod::Map::newEffectId() const { int i = 0; while ((i < effectCount()) && (effectIndex(i) != INT_MAX)) @@ -337,29 +337,29 @@ int Map::newEffectId() const return i; } -const MapTrainer* Map::trainer(const int index) const +const Pokemod::MapTrainer* Pokemod::Map::trainer(const int index) const { Q_ASSERT(index < trainerCount()); return m_trainers.at(index); } -MapTrainer* Map::trainer(const int index) +Pokemod::MapTrainer* Pokemod::Map::trainer(const int index) { Q_ASSERT(index < trainerCount()); return m_trainers[index]; } -const MapTrainer* Map::trainerById(const int id) const +const Pokemod::MapTrainer* Pokemod::Map::trainerById(const int id) const { return trainer(trainerIndex(id)); } -MapTrainer* Map::trainerById(const int id) +Pokemod::MapTrainer* Pokemod::Map::trainerById(const int id) { return trainer(trainerIndex(id)); } -int Map::trainerIndex(const int id) const +int Pokemod::Map::trainerIndex(const int id) const { for (int i = 0; i < trainerCount(); ++i) { @@ -369,45 +369,45 @@ int Map::trainerIndex(const int id) const return INT_MAX; } -int Map::trainerCount() const +int Pokemod::Map::trainerCount() const { return m_trainers.size(); } -MapTrainer* Map::newTrainer() +Pokemod::MapTrainer* Pokemod::Map::newTrainer() { return newTrainer(new MapTrainer(this, newTrainerId())); } -MapTrainer* Map::newTrainer(const QDomElement& xml) +Pokemod::MapTrainer* Pokemod::Map::newTrainer(const QDomElement& xml) { return newTrainer(new MapTrainer(xml, this, newTrainerId())); } -MapTrainer* Map::newTrainer(const MapTrainer& trainer) +Pokemod::MapTrainer* Pokemod::Map::newTrainer(const MapTrainer& trainer) { return newTrainer(new MapTrainer(trainer, this, newTrainerId())); } -MapTrainer* Map::newTrainer(MapTrainer* trainer) +Pokemod::MapTrainer* Pokemod::Map::newTrainer(MapTrainer* trainer) { m_trainers.append(trainer); return trainer; } -void Map::deleteTrainer(const int index) +void Pokemod::Map::deleteTrainer(const int index) { Q_ASSERT(index < trainerCount()); delete m_trainers[index]; m_trainers.removeAt(index); } -void Map::deleteTrainerById(const int id) +void Pokemod::Map::deleteTrainerById(const int id) { deleteTrainer(trainerIndex(id)); } -int Map::newTrainerId() const +int Pokemod::Map::newTrainerId() const { int i = 0; while ((i < trainerCount()) && (trainerIndex(i) != INT_MAX)) @@ -415,29 +415,29 @@ int Map::newTrainerId() const return i; } -const MapWarp* Map::warp(const int index) const +const Pokemod::MapWarp* Pokemod::Map::warp(const int index) const { Q_ASSERT(index < warpCount()); return m_warps.at(index); } -MapWarp* Map::warp(const int index) +Pokemod::MapWarp* Pokemod::Map::warp(const int index) { Q_ASSERT(index < warpCount()); return m_warps[index]; } -const MapWarp* Map::warpById(const int id) const +const Pokemod::MapWarp* Pokemod::Map::warpById(const int id) const { return warp(warpIndex(id)); } -MapWarp* Map::warpById(const int id) +Pokemod::MapWarp* Pokemod::Map::warpById(const int id) { return warp(warpIndex(id)); } -int Map::warpIndex(const int id) const +int Pokemod::Map::warpIndex(const int id) const { for (int i = 0; i < warpCount(); ++i) { @@ -447,45 +447,45 @@ int Map::warpIndex(const int id) const return INT_MAX; } -int Map::warpCount() const +int Pokemod::Map::warpCount() const { return m_warps.size(); } -MapWarp* Map::newWarp() +Pokemod::MapWarp* Pokemod::Map::newWarp() { return newWarp(new MapWarp(this, newWarpId())); } -MapWarp* Map::newWarp(const QDomElement& xml) +Pokemod::MapWarp* Pokemod::Map::newWarp(const QDomElement& xml) { return newWarp(new MapWarp(xml, this, newWarpId())); } -MapWarp* Map::newWarp(const MapWarp& warp) +Pokemod::MapWarp* Pokemod::Map::newWarp(const MapWarp& warp) { return newWarp(new MapWarp(warp, this, newWarpId())); } -MapWarp* Map::newWarp(MapWarp* warp) +Pokemod::MapWarp* Pokemod::Map::newWarp(MapWarp* warp) { m_warps.append(warp); return warp; } -void Map::deleteWarp(const int index) +void Pokemod::Map::deleteWarp(const int index) { Q_ASSERT(index < warpCount()); delete m_warps[index]; m_warps.removeAt(index); } -void Map::deleteWarpById(const int id) +void Pokemod::Map::deleteWarpById(const int id) { deleteWarp(warpIndex(id)); } -int Map::newWarpId() const +int Pokemod::Map::newWarpId() const { int i = 0; while ((i < warpCount()) && (warpIndex(i) != INT_MAX)) @@ -493,29 +493,29 @@ int Map::newWarpId() const return i; } -const MapWildList* Map::wildList(const int index) const +const Pokemod::MapWildList* Pokemod::Map::wildList(const int index) const { Q_ASSERT(index < wildListCount()); return m_wildLists.at(index); } -MapWildList* Map::wildList(const int index) +Pokemod::MapWildList* Pokemod::Map::wildList(const int index) { Q_ASSERT(index < wildListCount()); return m_wildLists[index]; } -const MapWildList* Map::wildListById(const int id) const +const Pokemod::MapWildList* Pokemod::Map::wildListById(const int id) const { return wildList(wildListIndex(id)); } -MapWildList* Map::wildListById(const int id) +Pokemod::MapWildList* Pokemod::Map::wildListById(const int id) { return wildList(wildListIndex(id)); } -int Map::wildListIndex(const int id) const +int Pokemod::Map::wildListIndex(const int id) const { for (int i = 0; i < wildListCount(); ++i) { @@ -525,45 +525,45 @@ int Map::wildListIndex(const int id) const return INT_MAX; } -int Map::wildListCount() const +int Pokemod::Map::wildListCount() const { return m_wildLists.size(); } -MapWildList* Map::newWildList() +Pokemod::MapWildList* Pokemod::Map::newWildList() { return newWildList(new MapWildList(this, newWildListId())); } -MapWildList* Map::newWildList(const QDomElement& xml) +Pokemod::MapWildList* Pokemod::Map::newWildList(const QDomElement& xml) { return newWildList(new MapWildList(xml, this, newWildListId())); } -MapWildList* Map::newWildList(const MapWildList& wildList) +Pokemod::MapWildList* Pokemod::Map::newWildList(const MapWildList& wildList) { return newWildList(new MapWildList(wildList, this, newWildListId())); } -MapWildList* Map::newWildList(MapWildList* wildList) +Pokemod::MapWildList* Pokemod::Map::newWildList(MapWildList* wildList) { m_wildLists.append(wildList); return wildList; } -void Map::deleteWildList(const int index) +void Pokemod::Map::deleteWildList(const int index) { Q_ASSERT(index < wildListCount()); delete m_wildLists[index]; m_wildLists.removeAt(index); } -void Map::deleteWildListById(const int id) +void Pokemod::Map::deleteWildListById(const int id) { deleteWildList(wildListIndex(id)); } -int Map::newWildListId() const +int Pokemod::Map::newWildListId() const { int i = 0; while ((i < warpCount()) && (warpIndex(i) != INT_MAX)) @@ -571,7 +571,7 @@ int Map::newWildListId() const return i; } -Map& Map::operator=(const Map& rhs) +Pokemod::Map& Pokemod::Map::operator=(const Map& rhs) { if (this == &rhs) return *this; @@ -587,7 +587,7 @@ Map& Map::operator=(const Map& rhs) return *this; } -void Map::clear() +void Pokemod::Map::clear() { while (effectCount()) deleteEffect(0); diff --git a/pokemod/Map.h b/pokemod/Map.h index a29f967d..dac525ea 100644 --- a/pokemod/Map.h +++ b/pokemod/Map.h @@ -25,6 +25,8 @@ // Qt includes #include <QList> +namespace Pokemod +{ // Forward declarations class MapEffect; class MapTrainer; @@ -153,5 +155,6 @@ class Map : public Object QList<MapWarp*> m_warps; QList<MapWildList*> m_wildLists; }; +} #endif diff --git a/pokemod/MapEffect.cpp b/pokemod/MapEffect.cpp index 73593d22..4f628e54 100644 --- a/pokemod/MapEffect.cpp +++ b/pokemod/MapEffect.cpp @@ -25,13 +25,13 @@ // Qt includes #include <QBuffer> -MapEffect::MapEffect(const MapEffect& effect) : +Pokemod::MapEffect::MapEffect(const MapEffect& effect) : Object("MapEffect", effect.parent(), effect.id()) { *this = effect; } -MapEffect::MapEffect(const Map* parent, const int id) : +Pokemod::MapEffect::MapEffect(const Map* parent, const int id) : Object("MapEffect", parent, id), m_name(""), m_coordinate(0, 0), @@ -41,19 +41,19 @@ MapEffect::MapEffect(const Map* parent, const int id) : { } -MapEffect::MapEffect(const MapEffect& effect, const Map* parent, const int id) : +Pokemod::MapEffect::MapEffect(const MapEffect& effect, const Map* parent, const int id) : Object("MapEffect", parent, id) { *this = effect; } -MapEffect::MapEffect(const QDomElement& xml, const Map* parent, const int id) : +Pokemod::MapEffect::MapEffect(const QDomElement& xml, const Map* parent, const int id) : Object("MapEffect", parent, id) { load(xml, id); } -void MapEffect::validate() +void Pokemod::MapEffect::validate() { if (m_name.isEmpty()) emit(error("Name is empty")); @@ -61,7 +61,7 @@ void MapEffect::validate() TEST(setSkin, skin); } -void MapEffect::load(const QDomElement& xml, int id) +void Pokemod::MapEffect::load(const QDomElement& xml, int id) { LOAD_ID(); LOAD(QString, name); @@ -71,7 +71,7 @@ void MapEffect::load(const QDomElement& xml, int id) LOAD(Script, script); } -QDomElement MapEffect::save() const +QDomElement Pokemod::MapEffect::save() const { SAVE_CREATE(); SAVE(QString, name); @@ -82,12 +82,12 @@ QDomElement MapEffect::save() const return xml; } -void MapEffect::setName(const QString& name) +void Pokemod::MapEffect::setName(const QString& name) { CHECK(name); } -void MapEffect::setCoordinate(const Point& coordinate) +void Pokemod::MapEffect::setCoordinate(const Point& coordinate) { if ((static_cast<const Map*>(parent())->width() <= coordinate.x()) || (static_cast<const Map*>(parent())->height() <= coordinate.y())) { @@ -97,7 +97,7 @@ void MapEffect::setCoordinate(const Point& coordinate) CHECK(coordinate); } -void MapEffect::setSkin(const QPixmap& skin) +void Pokemod::MapEffect::setSkin(const QPixmap& skin) { if (skin.size() != QSize(192, 128)) { @@ -108,42 +108,42 @@ void MapEffect::setSkin(const QPixmap& skin) emit(changed()); } -void MapEffect::setIsGhost(const bool isGhost) +void Pokemod::MapEffect::setIsGhost(const bool isGhost) { CHECK(isGhost); } -void MapEffect::setScript(const Script& script) +void Pokemod::MapEffect::setScript(const Script& script) { CHECK(script); } -QString MapEffect::name() const +QString Pokemod::MapEffect::name() const { return m_name; } -Point MapEffect::coordinate() const +Pokemod::Point Pokemod::MapEffect::coordinate() const { return m_coordinate; } -QPixmap MapEffect::skin() const +QPixmap Pokemod::MapEffect::skin() const { return m_skin; } -bool MapEffect::isGhost() const +bool Pokemod::MapEffect::isGhost() const { return m_isGhost; } -Script MapEffect::script() const +Pokemod::Script Pokemod::MapEffect::script() const { return m_script; } -MapEffect& MapEffect::operator=(const MapEffect& rhs) +Pokemod::MapEffect& Pokemod::MapEffect::operator=(const MapEffect& rhs) { if (this == &rhs) return *this; diff --git a/pokemod/MapEffect.h b/pokemod/MapEffect.h index 4e956add..bb5bc5e6 100644 --- a/pokemod/MapEffect.h +++ b/pokemod/MapEffect.h @@ -26,6 +26,8 @@ // Qt includes #include <QPixmap> +namespace Pokemod +{ // Forward declarations class Map; @@ -64,5 +66,6 @@ class MapEffect : public Object bool m_isGhost; Script m_script; }; +} #endif diff --git a/pokemod/MapTrainer.cpp b/pokemod/MapTrainer.cpp index d6b5f1e0..d1fead4e 100644 --- a/pokemod/MapTrainer.cpp +++ b/pokemod/MapTrainer.cpp @@ -27,13 +27,13 @@ // Qt includes #include <QSet> -MapTrainer::MapTrainer(const MapTrainer& trainer) : +Pokemod::MapTrainer::MapTrainer(const MapTrainer& trainer) : Object("MapTrainer", trainer.parent(), trainer.id()) { *this = trainer; } -MapTrainer::MapTrainer(const Map* parent, const int id) : +Pokemod::MapTrainer::MapTrainer(const Map* parent, const int id) : Object("MapTrainer", parent, id), m_name(""), m_trainerClass(INT_MAX), @@ -44,24 +44,24 @@ MapTrainer::MapTrainer(const Map* parent, const int id) : { } -MapTrainer::MapTrainer(const MapTrainer& trainer, const Map* parent, const int id) : +Pokemod::MapTrainer::MapTrainer(const MapTrainer& trainer, const Map* parent, const int id) : Object("MapTrainer", parent, id) { *this = trainer; } -MapTrainer::MapTrainer(const QDomElement& xml, const Map* parent, const int id) : +Pokemod::MapTrainer::MapTrainer(const QDomElement& xml, const Map* parent, const int id) : Object("MapTrainer", parent, id) { load(xml, id); } -MapTrainer::~MapTrainer() +Pokemod::MapTrainer::~MapTrainer() { clear(); } -void MapTrainer::validate() +void Pokemod::MapTrainer::validate() { if (m_name.isEmpty()) emit(error("Name is empty")); @@ -81,7 +81,7 @@ void MapTrainer::validate() } } -void MapTrainer::load(const QDomElement& xml, int id) +void Pokemod::MapTrainer::load(const QDomElement& xml, int id) { LOAD_ID(); LOAD(QString, name); @@ -93,7 +93,7 @@ void MapTrainer::load(const QDomElement& xml, int id) LOAD(int, leadTeamMember); } -QDomElement MapTrainer::save() const +QDomElement Pokemod::MapTrainer::save() const { SAVE_CREATE(); SAVE(QString, name); @@ -105,12 +105,12 @@ QDomElement MapTrainer::save() const return xml; } -void MapTrainer::setName(const QString& name) +void Pokemod::MapTrainer::setName(const QString& name) { CHECK(name); } -void MapTrainer::setTrainerClass(const int trainerClass) +void Pokemod::MapTrainer::setTrainerClass(const int trainerClass) { if (static_cast<const Pokemod*>(pokemod())->trainerIndex(trainerClass) == INT_MAX) { @@ -120,7 +120,7 @@ void MapTrainer::setTrainerClass(const int trainerClass) CHECK(trainerClass); } -void MapTrainer::setCoordinate(const Point& coordinate) +void Pokemod::MapTrainer::setCoordinate(const Point& coordinate) { if ((static_cast<const Map*>(parent())->width() <= coordinate.x()) || (static_cast<const Map*>(parent())->height() <= coordinate.y())) { @@ -130,7 +130,7 @@ void MapTrainer::setCoordinate(const Point& coordinate) CHECK(coordinate); } -void MapTrainer::setNumberFight(const int numberFight) +void Pokemod::MapTrainer::setNumberFight(const int numberFight) { if (!numberFight || (static_cast<const Pokemod*>(pokemod())->rules()->maxFight() < numberFight)) { @@ -140,12 +140,12 @@ void MapTrainer::setNumberFight(const int numberFight) CHECK(numberFight); } -void MapTrainer::setScript(const Script& script) +void Pokemod::MapTrainer::setScript(const Script& script) { CHECK(script); } -void MapTrainer::setLeadTeamMember(const int leadTeamMember) +void Pokemod::MapTrainer::setLeadTeamMember(const int leadTeamMember) { if (teamMemberCount() <= leadTeamMember) { @@ -155,59 +155,59 @@ void MapTrainer::setLeadTeamMember(const int leadTeamMember) CHECK(leadTeamMember); } -QString MapTrainer::name() const +QString Pokemod::MapTrainer::name() const { return m_name; } -int MapTrainer::trainerClass() const +int Pokemod::MapTrainer::trainerClass() const { return m_trainerClass; } -Point MapTrainer::coordinate() const +Pokemod::Point Pokemod::MapTrainer::coordinate() const { return m_coordinate; } -int MapTrainer::numberFight() const +int Pokemod::MapTrainer::numberFight() const { return m_numberFight; } -Script MapTrainer::script() const +Pokemod::Script Pokemod::MapTrainer::script() const { return m_script; } -int MapTrainer::leadTeamMember() const +int Pokemod::MapTrainer::leadTeamMember() const { return m_leadTeamMember; } -const MapTrainerTeamMember* MapTrainer::teamMember(const int index) const +const Pokemod::MapTrainerTeamMember* Pokemod::MapTrainer::teamMember(const int index) const { Q_ASSERT(index < teamMemberCount()); return m_teamMember.at(index); } -MapTrainerTeamMember* MapTrainer::teamMember(const int index) +Pokemod::MapTrainerTeamMember* Pokemod::MapTrainer::teamMember(const int index) { Q_ASSERT(index < teamMemberCount()); return m_teamMember[index]; } -const MapTrainerTeamMember* MapTrainer::teamMemberById(const int id) const +const Pokemod::MapTrainerTeamMember* Pokemod::MapTrainer::teamMemberById(const int id) const { return teamMember(teamMemberIndex(id)); } -MapTrainerTeamMember* MapTrainer::teamMemberById(const int id) +Pokemod::MapTrainerTeamMember* Pokemod::MapTrainer::teamMemberById(const int id) { return teamMember(teamMemberIndex(id)); } -int MapTrainer::teamMemberIndex(const int id) const +int Pokemod::MapTrainer::teamMemberIndex(const int id) const { for (int i = 0; i < teamMemberCount(); ++i) { @@ -217,45 +217,45 @@ int MapTrainer::teamMemberIndex(const int id) const return INT_MAX; } -int MapTrainer::teamMemberCount() const +int Pokemod::MapTrainer::teamMemberCount() const { return m_teamMember.size(); } -MapTrainerTeamMember* MapTrainer::newTeamMember() +Pokemod::MapTrainerTeamMember* Pokemod::MapTrainer::newTeamMember() { return newTeamMember(new MapTrainerTeamMember(this, newTeamMemberId())); } -MapTrainerTeamMember* MapTrainer::newTeamMember(const QDomElement& xml) +Pokemod::MapTrainerTeamMember* Pokemod::MapTrainer::newTeamMember(const QDomElement& xml) { return newTeamMember(new MapTrainerTeamMember(xml, this, newTeamMemberId())); } -MapTrainerTeamMember* MapTrainer::newTeamMember(const MapTrainerTeamMember& teamMember) +Pokemod::MapTrainerTeamMember* Pokemod::MapTrainer::newTeamMember(const MapTrainerTeamMember& teamMember) { return newTeamMember(new MapTrainerTeamMember(teamMember, this, newTeamMemberId())); } -MapTrainerTeamMember* MapTrainer::newTeamMember(MapTrainerTeamMember* teamMember) +Pokemod::MapTrainerTeamMember* Pokemod::MapTrainer::newTeamMember(MapTrainerTeamMember* teamMember) { m_teamMember.append(teamMember); return teamMember; } -void MapTrainer::deleteTeamMember(const int index) +void Pokemod::MapTrainer::deleteTeamMember(const int index) { Q_ASSERT(index < teamMemberCount()); delete m_teamMember[index]; m_teamMember.removeAt(index); } -void MapTrainer::deleteTeamMemberById(const int id) +void Pokemod::MapTrainer::deleteTeamMemberById(const int id) { deleteTeamMember(teamMemberIndex(id)); } -int MapTrainer::newTeamMemberId() const +int Pokemod::MapTrainer::newTeamMemberId() const { int i = 0; while ((i < teamMemberCount()) && (teamMemberIndex(i) != INT_MAX)) @@ -263,7 +263,7 @@ int MapTrainer::newTeamMemberId() const return i; } -MapTrainer& MapTrainer::operator=(const MapTrainer& rhs) +Pokemod::MapTrainer& Pokemod::MapTrainer::operator=(const MapTrainer& rhs) { if (this == &rhs) return *this; @@ -278,7 +278,7 @@ MapTrainer& MapTrainer::operator=(const MapTrainer& rhs) return *this; } -void MapTrainer::clear() +void Pokemod::MapTrainer::clear() { while (teamMemberCount()) deleteTeamMember(0); diff --git a/pokemod/MapTrainer.h b/pokemod/MapTrainer.h index 0b25ae7f..7b927c1f 100644 --- a/pokemod/MapTrainer.h +++ b/pokemod/MapTrainer.h @@ -26,6 +26,8 @@ // Qt includes #include <QList> +namespace Pokemod +{ // Forward declarations class Map; class MapTrainerTeamMember; @@ -87,5 +89,6 @@ class MapTrainer : public Object int m_leadTeamMember; QList<MapTrainerTeamMember*> m_teamMember; }; +} #endif diff --git a/pokemod/MapTrainerTeamMember.cpp b/pokemod/MapTrainerTeamMember.cpp index da8c962f..1085f1b1 100644 --- a/pokemod/MapTrainerTeamMember.cpp +++ b/pokemod/MapTrainerTeamMember.cpp @@ -29,32 +29,32 @@ // Qt includes #include <QSet> -MapTrainerTeamMember::MapTrainerTeamMember(const MapTrainerTeamMember& teamMember) : +Pokemod::MapTrainerTeamMember::MapTrainerTeamMember(const MapTrainerTeamMember& teamMember) : Object("MapTrainerTeamMember", teamMember.parent(), teamMember.id()) { *this = teamMember; } -MapTrainerTeamMember::MapTrainerTeamMember(const MapTrainer* parent, const int id) : +Pokemod::MapTrainerTeamMember::MapTrainerTeamMember(const MapTrainer* parent, const int id) : Object("MapTrainerTeamMember", parent, id), m_species(INT_MAX), m_level(INT_MAX) { } -MapTrainerTeamMember::MapTrainerTeamMember(const MapTrainerTeamMember& teamMember, const MapTrainer* parent, const int id) : +Pokemod::MapTrainerTeamMember::MapTrainerTeamMember(const MapTrainerTeamMember& teamMember, const MapTrainer* parent, const int id) : Object("MapTrainerTeamMember", parent, id) { *this = teamMember; } -MapTrainerTeamMember::MapTrainerTeamMember(const QDomElement& xml, const MapTrainer* parent, const int id) : +Pokemod::MapTrainerTeamMember::MapTrainerTeamMember(const QDomElement& xml, const MapTrainer* parent, const int id) : Object("MapTrainerTeamMember", parent, id) { load(xml, id); } -void MapTrainerTeamMember::validate() +void Pokemod::MapTrainerTeamMember::validate() { TEST(setSpecies, species); TEST(setLevel, level); @@ -72,7 +72,7 @@ void MapTrainerTeamMember::validate() TEST_LIST(setNature, nature); } -void MapTrainerTeamMember::load(const QDomElement& xml, int id) +void Pokemod::MapTrainerTeamMember::load(const QDomElement& xml, int id) { LOAD_ID(); LOAD(int, species); @@ -83,7 +83,7 @@ void MapTrainerTeamMember::load(const QDomElement& xml, int id) LOAD_LIST(int, nature); } -QDomElement MapTrainerTeamMember::save() const +QDomElement Pokemod::MapTrainerTeamMember::save() const { SAVE_CREATE(); SAVE(int, species); @@ -95,7 +95,7 @@ QDomElement MapTrainerTeamMember::save() const return xml; } -void MapTrainerTeamMember::setSpecies(const int species) +void Pokemod::MapTrainerTeamMember::setSpecies(const int species) { if (static_cast<const Pokemod*>(pokemod())->speciesIndex(species) == INT_MAX) { @@ -105,7 +105,7 @@ void MapTrainerTeamMember::setSpecies(const int species) CHECK(species); } -void MapTrainerTeamMember::setLevel(const int level) +void Pokemod::MapTrainerTeamMember::setLevel(const int level) { if (static_cast<const Pokemod*>(pokemod())->rules()->maxLevel() < level) { @@ -115,7 +115,7 @@ void MapTrainerTeamMember::setLevel(const int level) CHECK(level); } -void MapTrainerTeamMember::setAbility(const int ability, const bool state) +void Pokemod::MapTrainerTeamMember::setAbility(const int ability, const bool state) { if (static_cast<const Pokemod*>(pokemod())->abilityIndex(ability) == INT_MAX) { @@ -139,7 +139,7 @@ void MapTrainerTeamMember::setAbility(const int ability, const bool state) } } -void MapTrainerTeamMember::setItem(const int item, const bool state) +void Pokemod::MapTrainerTeamMember::setItem(const int item, const bool state) { if (static_cast<const Pokemod*>(pokemod())->itemIndex(item) == INT_MAX) { @@ -163,7 +163,7 @@ void MapTrainerTeamMember::setItem(const int item, const bool state) } } -void MapTrainerTeamMember::setMove(const int move, const bool state) +void Pokemod::MapTrainerTeamMember::setMove(const int move, const bool state) { if (static_cast<const Pokemod*>(pokemod())->moveIndex(move) == INT_MAX) { @@ -197,7 +197,7 @@ void MapTrainerTeamMember::setMove(const int move, const bool state) } } -void MapTrainerTeamMember::setNature(const int nature, const bool state) +void Pokemod::MapTrainerTeamMember::setNature(const int nature, const bool state) { if (static_cast<const Pokemod*>(pokemod())->natureIndex(nature) == INT_MAX) { @@ -221,37 +221,37 @@ void MapTrainerTeamMember::setNature(const int nature, const bool state) } } -int MapTrainerTeamMember::species() const +int Pokemod::MapTrainerTeamMember::species() const { return m_species; } -int MapTrainerTeamMember::level() const +int Pokemod::MapTrainerTeamMember::level() const { return m_level; } -bool MapTrainerTeamMember::ability(const int ability) const +bool Pokemod::MapTrainerTeamMember::ability(const int ability) const { return m_ability.contains(ability); } -bool MapTrainerTeamMember::item(const int item) const +bool Pokemod::MapTrainerTeamMember::item(const int item) const { return m_item.contains(item); } -bool MapTrainerTeamMember::move(const int move) const +bool Pokemod::MapTrainerTeamMember::move(const int move) const { return m_move.contains(move); } -bool MapTrainerTeamMember::nature(const int nature) const +bool Pokemod::MapTrainerTeamMember::nature(const int nature) const { return m_nature.contains(nature); } -MapTrainerTeamMember& MapTrainerTeamMember::operator=(const MapTrainerTeamMember& rhs) +Pokemod::MapTrainerTeamMember& Pokemod::MapTrainerTeamMember::operator=(const MapTrainerTeamMember& rhs) { if (this == &rhs) return *this; diff --git a/pokemod/MapTrainerTeamMember.h b/pokemod/MapTrainerTeamMember.h index 10176410..1e78c9ac 100644 --- a/pokemod/MapTrainerTeamMember.h +++ b/pokemod/MapTrainerTeamMember.h @@ -24,6 +24,8 @@ // Qt includes #include <QList> +namespace Pokemod +{ // Forward dclarations class MapTrainer; @@ -65,5 +67,6 @@ class MapTrainerTeamMember : public Object QList<int> m_move; QList<int> m_nature; }; +} #endif diff --git a/pokemod/MapWarp.cpp b/pokemod/MapWarp.cpp index e206bc15..3e3677b7 100644 --- a/pokemod/MapWarp.cpp +++ b/pokemod/MapWarp.cpp @@ -22,15 +22,15 @@ #include "Map.h" #include "Pokemod.h" -const QStringList MapWarp::TypeStr = QStringList() << "Door/Stair" << "Warp Pad" << "Hole" << "Boundary"; +const QStringList Pokemod::MapWarp::TypeStr = QStringList() << "Door/Stair" << "Warp Pad" << "Hole" << "Boundary"; -MapWarp::MapWarp(const MapWarp& warp) : +Pokemod::MapWarp::MapWarp(const MapWarp& warp) : Object("MapWarp", warp.parent(), warp.id()) { *this = warp; } -MapWarp::MapWarp(const Map* parent, const int id) : +Pokemod::MapWarp::MapWarp(const Map* parent, const int id) : Object("MapWarp", parent, id), m_name(""), m_coordinate(0, 0), @@ -41,19 +41,19 @@ MapWarp::MapWarp(const Map* parent, const int id) : { } -MapWarp::MapWarp(const MapWarp& warp, const Map* parent, const int id) : +Pokemod::MapWarp::MapWarp(const MapWarp& warp, const Map* parent, const int id) : Object("MapWarp", parent, id) { *this = warp; } -MapWarp::MapWarp(const QDomElement& xml, const Map* parent, const int id) : +Pokemod::MapWarp::MapWarp(const QDomElement& xml, const Map* parent, const int id) : Object("MapWarp", parent, id) { load(xml, id); } -void MapWarp::validate() +void Pokemod::MapWarp::validate() { if (m_name.isEmpty()) emit(error("Name is empty")); @@ -62,7 +62,7 @@ void MapWarp::validate() TEST(setToWarp, toWarp); } -void MapWarp::load(const QDomElement& xml, int id) +void Pokemod::MapWarp::load(const QDomElement& xml, int id) { LOAD_ID(); LOAD(QString, name); @@ -73,7 +73,7 @@ void MapWarp::load(const QDomElement& xml, int id) LOAD(Script, script); } -QDomElement MapWarp::save() const +QDomElement Pokemod::MapWarp::save() const { SAVE_CREATE(); SAVE(QString, name); @@ -85,12 +85,12 @@ QDomElement MapWarp::save() const return xml; } -void MapWarp::setName(const QString& name) +void Pokemod::MapWarp::setName(const QString& name) { CHECK(name); } -void MapWarp::setCoordinate(const Point& coordinate) +void Pokemod::MapWarp::setCoordinate(const Point& coordinate) { if ((static_cast<const Map*>(parent())->width() <= coordinate.x()) || (static_cast<const Map*>(parent())->height() <= coordinate.y())) { @@ -100,7 +100,7 @@ void MapWarp::setCoordinate(const Point& coordinate) CHECK(coordinate); } -void MapWarp::setType(const int type) +void Pokemod::MapWarp::setType(const int type) { if (End <= type) { @@ -110,7 +110,7 @@ void MapWarp::setType(const int type) CHECK(type); } -void MapWarp::setToMap(const int toMap) +void Pokemod::MapWarp::setToMap(const int toMap) { if (static_cast<const Pokemod*>(pokemod())->mapIndex(toMap) == INT_MAX) { @@ -120,7 +120,7 @@ void MapWarp::setToMap(const int toMap) CHECK(toMap); } -void MapWarp::setToWarp(const int toWarp) +void Pokemod::MapWarp::setToWarp(const int toWarp) { if (static_cast<const Pokemod*>(pokemod())->mapIndex(m_toMap) == INT_MAX) { @@ -135,42 +135,42 @@ void MapWarp::setToWarp(const int toWarp) CHECK(toWarp); } -void MapWarp::setScript(const Script& script) +void Pokemod::MapWarp::setScript(const Script& script) { CHECK(script); } -QString MapWarp::name() const +QString Pokemod::MapWarp::name() const { return m_name; } -Point MapWarp::coordinate() const +Pokemod::Point Pokemod::MapWarp::coordinate() const { return m_coordinate; } -int MapWarp::type() const +int Pokemod::MapWarp::type() const { return m_type; } -int MapWarp::toMap() const +int Pokemod::MapWarp::toMap() const { return m_toMap; } -int MapWarp::toWarp() const +int Pokemod::MapWarp::toWarp() const { return m_toWarp; } -Script MapWarp::script() const +Pokemod::Script Pokemod::MapWarp::script() const { return m_script; } -MapWarp& MapWarp::operator=(const MapWarp& rhs) +Pokemod::MapWarp& Pokemod::MapWarp::operator=(const MapWarp& rhs) { if (this == &rhs) return *this; diff --git a/pokemod/MapWarp.h b/pokemod/MapWarp.h index 2187fb0e..e9c89919 100644 --- a/pokemod/MapWarp.h +++ b/pokemod/MapWarp.h @@ -24,6 +24,8 @@ #include "Pokemod.h" #include "Script.h" +namespace Pokemod +{ class MapWarp : public Object { Q_OBJECT @@ -72,5 +74,6 @@ class MapWarp : public Object int m_toWarp; Script m_script; }; +} #endif diff --git a/pokemod/MapWildList.cpp b/pokemod/MapWildList.cpp index b2264365..d08c84ce 100644 --- a/pokemod/MapWildList.cpp +++ b/pokemod/MapWildList.cpp @@ -25,36 +25,36 @@ // Qt includes #include <QSet> -MapWildList::MapWildList(const MapWildList& wildList) : +Pokemod::MapWildList::MapWildList(const MapWildList& wildList) : Object("MapWildList", wildList.parent(), wildList.id()) { *this = wildList; } -MapWildList::MapWildList(const Map* parent, const int id) : +Pokemod::MapWildList::MapWildList(const Map* parent, const int id) : Object("MapWildList", parent, id), m_name("") { } -MapWildList::MapWildList(const MapWildList& wildList, const Map* parent, const int id) : +Pokemod::MapWildList::MapWildList(const MapWildList& wildList, const Map* parent, const int id) : Object("MapWildList", parent, id) { *this = wildList; } -MapWildList::MapWildList(const QDomElement& xml, const Map* parent, const int id) : +Pokemod::MapWildList::MapWildList(const QDomElement& xml, const Map* parent, const int id) : Object("MapWildList", parent, id) { load(xml, id); } -MapWildList::~MapWildList() +Pokemod::MapWildList::~MapWildList() { clear(); } -void MapWildList::validate() +void Pokemod::MapWildList::validate() { if (m_name.isEmpty()) emit(error("Name is empty")); @@ -70,14 +70,14 @@ void MapWildList::validate() } } -void MapWildList::load(const QDomElement& xml, int id) +void Pokemod::MapWildList::load(const QDomElement& xml, int id) { LOAD_ID(); LOAD(QString, name); LOAD_SUB(newEncounter, MapWildListEncounter); } -QDomElement MapWildList::save() const +QDomElement Pokemod::MapWildList::save() const { SAVE_CREATE(); SAVE(QString, name); @@ -85,39 +85,39 @@ QDomElement MapWildList::save() const return xml; } -void MapWildList::setName(const QString& name) +void Pokemod::MapWildList::setName(const QString& name) { CHECK(name); } -QString MapWildList::name() const +QString Pokemod::MapWildList::name() const { return m_name; } -const MapWildListEncounter* MapWildList::encounter(const int index) const +const Pokemod::MapWildListEncounter* Pokemod::MapWildList::encounter(const int index) const { Q_ASSERT(index < encounterCount()); return m_encounters.at(index); } -MapWildListEncounter* MapWildList::encounter(const int index) +Pokemod::MapWildListEncounter* Pokemod::MapWildList::encounter(const int index) { Q_ASSERT(index < encounterCount()); return m_encounters[index]; } -const MapWildListEncounter* MapWildList::encounterById(const int id) const +const Pokemod::MapWildListEncounter* Pokemod::MapWildList::encounterById(const int id) const { return encounter(encounterIndex(id)); } -MapWildListEncounter* MapWildList::encounterById(const int id) +Pokemod::MapWildListEncounter* Pokemod::MapWildList::encounterById(const int id) { return encounter(encounterIndex(id)); } -int MapWildList::encounterIndex(const int id) const +int Pokemod::MapWildList::encounterIndex(const int id) const { for (int i = 0; i < encounterCount(); ++i) { @@ -127,45 +127,45 @@ int MapWildList::encounterIndex(const int id) const return INT_MAX; } -int MapWildList::encounterCount() const +int Pokemod::MapWildList::encounterCount() const { return m_encounters.size(); } -MapWildListEncounter* MapWildList::newEncounter() +Pokemod::MapWildListEncounter* Pokemod::MapWildList::newEncounter() { return newEncounter(new MapWildListEncounter(this, newEncounterId())); } -MapWildListEncounter* MapWildList::newEncounter(const QDomElement& xml) +Pokemod::MapWildListEncounter* Pokemod::MapWildList::newEncounter(const QDomElement& xml) { return newEncounter(new MapWildListEncounter(xml, this, newEncounterId())); } -MapWildListEncounter* MapWildList::newEncounter(const MapWildListEncounter& encounter) +Pokemod::MapWildListEncounter* Pokemod::MapWildList::newEncounter(const MapWildListEncounter& encounter) { return newEncounter(new MapWildListEncounter(encounter, this, newEncounterId())); } -MapWildListEncounter* MapWildList::newEncounter(MapWildListEncounter* encounter) +Pokemod::MapWildListEncounter* Pokemod::MapWildList::newEncounter(MapWildListEncounter* encounter) { m_encounters.append(encounter); return encounter; } -void MapWildList::deleteEncounter(const int index) +void Pokemod::MapWildList::deleteEncounter(const int index) { Q_ASSERT(index < encounterCount()); delete m_encounters[index]; m_encounters.removeAt(index); } -void MapWildList::deleteEncounterById(const int id) +void Pokemod::MapWildList::deleteEncounterById(const int id) { deleteEncounter(encounterIndex(id)); } -int MapWildList::newEncounterId() const +int Pokemod::MapWildList::newEncounterId() const { int i = 0; while ((i < encounterCount()) && (encounterIndex(i) != INT_MAX)) @@ -173,7 +173,7 @@ int MapWildList::newEncounterId() const return i; } -MapWildList& MapWildList::operator=(const MapWildList& rhs) +Pokemod::MapWildList& Pokemod::MapWildList::operator=(const MapWildList& rhs) { if (this == &rhs) return *this; @@ -183,7 +183,7 @@ MapWildList& MapWildList::operator=(const MapWildList& rhs) return *this; } -void MapWildList::clear() +void Pokemod::MapWildList::clear() { while (encounterCount()) deleteEncounter(0); diff --git a/pokemod/MapWildList.h b/pokemod/MapWildList.h index 3a9397d5..4ce5d256 100644 --- a/pokemod/MapWildList.h +++ b/pokemod/MapWildList.h @@ -24,6 +24,8 @@ // Qt includes #include <QList> +namespace Pokemod +{ // Forward declarations class Map; class MapWildListEncounter; @@ -70,5 +72,6 @@ class MapWildList : public Object QString m_name; QList<MapWildListEncounter*> m_encounters; }; +} #endif diff --git a/pokemod/MapWildListEncounter.cpp b/pokemod/MapWildListEncounter.cpp index 34a05228..50407c47 100644 --- a/pokemod/MapWildListEncounter.cpp +++ b/pokemod/MapWildListEncounter.cpp @@ -24,13 +24,13 @@ #include "Rules.h" #include "Species.h" -MapWildListEncounter::MapWildListEncounter(const MapWildListEncounter& encounter) : +Pokemod::MapWildListEncounter::MapWildListEncounter(const MapWildListEncounter& encounter) : Object("MapWildListEncounter", encounter.parent(), encounter.id()) { *this = encounter; } -MapWildListEncounter::MapWildListEncounter(const MapWildList* parent, const int id) : +Pokemod::MapWildListEncounter::MapWildListEncounter(const MapWildList* parent, const int id) : Object("MapWildListEncounter", parent, id), m_species(INT_MAX), m_level(1), @@ -38,26 +38,26 @@ MapWildListEncounter::MapWildListEncounter(const MapWildList* parent, const int { } -MapWildListEncounter::MapWildListEncounter(const MapWildListEncounter& encounter, const MapWildList* parent, const int id) : +Pokemod::MapWildListEncounter::MapWildListEncounter(const MapWildListEncounter& encounter, const MapWildList* parent, const int id) : Object("MapWildListEncounter", parent, id) { *this = encounter; } -MapWildListEncounter::MapWildListEncounter(const QDomElement& xml, const MapWildList* parent, const int id) : +Pokemod::MapWildListEncounter::MapWildListEncounter(const QDomElement& xml, const MapWildList* parent, const int id) : Object("MapWildListEncounter", parent, id) { load(xml, id); } -void MapWildListEncounter::validate() +void Pokemod::MapWildListEncounter::validate() { TEST(setSpecies, species); TEST(setLevel, level); TEST(setWeight, weight); } -void MapWildListEncounter::load(const QDomElement& xml, int id) +void Pokemod::MapWildListEncounter::load(const QDomElement& xml, int id) { LOAD_ID(); LOAD(int, species); @@ -65,7 +65,7 @@ void MapWildListEncounter::load(const QDomElement& xml, int id) LOAD(int, weight); } -QDomElement MapWildListEncounter::save() const +QDomElement Pokemod::MapWildListEncounter::save() const { SAVE_CREATE(); SAVE(int, species); @@ -74,7 +74,7 @@ QDomElement MapWildListEncounter::save() const return xml; } -void MapWildListEncounter::setSpecies(const int species) +void Pokemod::MapWildListEncounter::setSpecies(const int species) { if (static_cast<const Pokemod*>(pokemod())->speciesIndex(species) == INT_MAX) { @@ -84,7 +84,7 @@ void MapWildListEncounter::setSpecies(const int species) CHECK(species); } -void MapWildListEncounter::setLevel(const int level) +void Pokemod::MapWildListEncounter::setLevel(const int level) { if (!level || (static_cast<const Pokemod*>(pokemod())->rules()->maxLevel() <= level)) { @@ -94,7 +94,7 @@ void MapWildListEncounter::setLevel(const int level) CHECK(level); } -void MapWildListEncounter::setWeight(const int weight) +void Pokemod::MapWildListEncounter::setWeight(const int weight) { if (!weight) { @@ -104,22 +104,22 @@ void MapWildListEncounter::setWeight(const int weight) CHECK(weight); } -int MapWildListEncounter::species() const +int Pokemod::MapWildListEncounter::species() const { return m_species; } -int MapWildListEncounter::level() const +int Pokemod::MapWildListEncounter::level() const { return m_level; } -int MapWildListEncounter::weight() const +int Pokemod::MapWildListEncounter::weight() const { return m_weight; } -MapWildListEncounter& MapWildListEncounter::operator=(const MapWildListEncounter& rhs) +Pokemod::MapWildListEncounter& Pokemod::MapWildListEncounter::operator=(const MapWildListEncounter& rhs) { if (this == &rhs) return *this; diff --git a/pokemod/MapWildListEncounter.h b/pokemod/MapWildListEncounter.h index 786d6312..8c87247a 100644 --- a/pokemod/MapWildListEncounter.h +++ b/pokemod/MapWildListEncounter.h @@ -21,6 +21,8 @@ // Pokemod includes #include "Object.h" +namespace Pokemod +{ // Forward declarations class MapWildList; @@ -53,5 +55,6 @@ class MapWildListEncounter: public Object int m_level; int m_weight; }; +} #endif diff --git a/pokemod/Matrix.h b/pokemod/Matrix.h index 27e57b44..9e60a5f4 100644 --- a/pokemod/Matrix.h +++ b/pokemod/Matrix.h @@ -24,172 +24,224 @@ // Qt includes #include <QVector> +namespace Pokemod +{ template<class T> class Matrix { public: - Matrix() - { - } - Matrix(const int height, const int width, const T& value = T()) - { - resize(height, width, value); - } - Matrix(const Matrix<T>& rhs) - { - *this = rhs; - } + Matrix(); + Matrix(const int height, const int width, const T& value = T()); + Matrix(const Matrix<T>& rhs); + + void addRow(const T& value = T()); + void addColumn(const T& value = T()); + void insertRow(const int row, const T& value = T()); + void insertColumn(const int column, const T& value = T()); + void deleteRow(const int row); + void deleteColumn(const int column); - void addRow(const T& value = T()) - { - if (size() == Point(0, 0)) - m_matrix.append(QVector<T>(1, value)); - else - m_matrix.append(QVector<T>(width(), value)); - } - void addColumn(const T& value = T()) - { - if (size() == Point(0, 0)) - m_matrix.append(QVector<T>(1, value)); - else - { - for (int i = 0; i < height(); ++i) - m_matrix[i].append(value); - } - } - void insertRow(const int row, const T& value = T()) - { - if (size() == Point(0, 0)) - m_matrix.append(QVector<T>(1, value)); - else - { - Q_ASSERT(row <= height()); - m_matrix.insert(row, QVector<T>(width(), value)); - } - } - void insertColumn(const int column, const T& value = T()) - { - if (size() == Point(0, 0)) - m_matrix.append(QVector<T>(1, value)); - else - { - Q_ASSERT(column <= width()); - for (int i = 0; i < height(); ++i) - m_matrix[i].insert(column, value); - } - } - void deleteRow(const int row) - { - if (height() == 1) - m_matrix.clear(); - else - { - Q_ASSERT(row < height()); - m_matrix.remove(row); - } - } - void deleteColumn(const int column) - { - if (width() == 1) - m_matrix.clear(); - else - { - Q_ASSERT(column < width()); - for (int i = 0; i < height(); ++i) - m_matrix[i].remove(column); - } - } - void clear() - { - m_matrix.clear(); - } + void clear(); - void set(const int row, const int column, const T& value) - { - Q_ASSERT(row < height()); - Q_ASSERT(column < width()); - (m_matrix[row])[column] = value; - } - void resize(const int newHeight, const int newWidth, const T& value = T()) - { - while (height() < newHeight) - addRow(value); - while (newHeight < height()) - deleteRow(newHeight); - while (width() < newWidth) - addColumn(value); - while (newWidth < width()) - deleteColumn(newWidth); - } + void set(const int row, const int column, const T& value); + void resize(const int newHeight, const int newWidth, const T& value = T()); - T at(const int row, const int column) const - { - Q_ASSERT(row < height()); - Q_ASSERT(column < width()); - return m_matrix.at(row).at(column); - } - QVector<T> row(const int row) const - { - Q_ASSERT(row < height()); - return m_matrix.at(row); - } - QVector<T> column(const int column) const - { - Q_ASSERT(column < width()); - QVector<T> col; - foreach (QVector<T> row, m_matrix) - col.append(row.at(column)); - return col; - } - int height() const - { - return m_matrix.size(); - } - int width() const - { - if (m_matrix.size()) - return m_matrix[0].size(); - return 0; - } - Point size() const - { - return Point(height(), width()); - } + T at(const int row, const int column) const; + QVector<T> row(const int row) const; + QVector<T> column(const int column) const; - T& operator()(const int row, const int column) - { - Q_ASSERT(row < height()); - Q_ASSERT(column < width()); - return m_matrix[row][column]; - } - T operator()(const int row, const int column) const - { - return at(row, column); - } - Matrix<T>& operator=(const Matrix<T>& rhs) - { - if (this == &rhs) - return *this; - resize(rhs.height(), rhs.width()); - for (int i = 0; i < height(); ++i) - { - for (int j = 0; j < width(); ++j) - m_matrix[i][j] = rhs.m_matrix[i][j]; - } - return *this; - } - bool operator==(const Matrix<T>& rhs) const - { - if (this == &rhs) - return true; - return m_matrix == rhs.m_matrix; - return true; - } - bool operator!=(const Matrix<T>& rhs) const - { - return !(*this == rhs); - } + int height() const; + int width() const; + Point size() const; + + T& operator()(const int row, const int column); + T operator()(const int row, const int column) const; + Matrix<T>& operator=(const Matrix<T>& rhs); + bool operator==(const Matrix<T>& rhs) const; + bool operator!=(const Matrix<T>& rhs) const; protected: QVector< QVector<T> > m_matrix; }; +template<class T> inline Matrix<T>::Matrix() +{ +} + +template<class T> inline Matrix<T>::Matrix(const int height, const int width, const T& value) +{ + resize(height, width, value); +} + +template<class T> inline Matrix<T>::Matrix(const Matrix<T>& rhs) +{ + *this = rhs; +} + +template<class T> inline void Matrix<T>::addRow(const T& value) +{ + if (size() == Point(0, 0)) + m_matrix.append(QVector<T>(1, value)); + else + m_matrix.append(QVector<T>(width(), value)); +} + +template<class T> inline void Matrix<T>::addColumn(const T& value) +{ + if (size() == Point(0, 0)) + m_matrix.append(QVector<T>(1, value)); + else + { + for (int i = 0; i < height(); ++i) + m_matrix[i].append(value); + } +} + +template<class T> inline void Matrix<T>::insertRow(const int row, const T& value) +{ + if (size() == Point(0, 0)) + m_matrix.append(QVector<T>(1, value)); + else + { + Q_ASSERT(row <= height()); + m_matrix.insert(row, QVector<T>(width(), value)); + } +} + +template<class T> inline void Matrix<T>::insertColumn(const int column, const T& value) +{ + if (size() == Point(0, 0)) + m_matrix.append(QVector<T>(1, value)); + else + { + Q_ASSERT(column <= width()); + for (int i = 0; i < height(); ++i) + m_matrix[i].insert(column, value); + } +} + +template<class T> inline void Matrix<T>::deleteRow(const int row) +{ + if (height() == 1) + m_matrix.clear(); + else + { + Q_ASSERT(row < height()); + m_matrix.remove(row); + } +} + +template<class T> inline void Matrix<T>::deleteColumn(const int column) +{ + if (width() == 1) + m_matrix.clear(); + else + { + Q_ASSERT(column < width()); + for (int i = 0; i < height(); ++i) + m_matrix[i].remove(column); + } +} + +template<class T> inline void Matrix<T>::clear() +{ + m_matrix.clear(); +} + +template<class T> inline void Matrix<T>::set(const int row, const int column, const T& value) +{ + Q_ASSERT(row < height()); + Q_ASSERT(column < width()); + (m_matrix[row])[column] = value; +} + +template<class T> inline void Matrix<T>::resize(const int newHeight, const int newWidth, const T& value) +{ + while (height() < newHeight) + addRow(value); + while (newHeight < height()) + deleteRow(newHeight); + while (width() < newWidth) + addColumn(value); + while (newWidth < width()) + deleteColumn(newWidth); +} + +template<class T> inline T Matrix<T>::at(const int row, const int column) const +{ + Q_ASSERT(row < height()); + Q_ASSERT(column < width()); + return m_matrix.at(row).at(column); +} + +template<class T> inline QVector<T> Matrix<T>::row(const int row) const +{ + Q_ASSERT(row < height()); + return m_matrix.at(row); +} + +template<class T> inline QVector<T> Matrix<T>::column(const int column) const +{ + Q_ASSERT(column < width()); + QVector<T> col; + foreach (QVector<T> row, m_matrix) + col.append(row.at(column)); + return col; +} + +template<class T> inline int Matrix<T>::height() const +{ + return m_matrix.size(); +} + +template<class T> inline int Matrix<T>::width() const +{ + if (m_matrix.size()) + return m_matrix[0].size(); + return 0; +} + +template<class T> inline Point Matrix<T>::size() const +{ + return Point(height(), width()); +} + +template<class T> inline T& Matrix<T>::operator()(const int row, const int column) +{ + Q_ASSERT(row < height()); + Q_ASSERT(column < width()); + return m_matrix[row][column]; +} + +template<class T> inline T Matrix<T>::operator()(const int row, const int column) const +{ + return at(row, column); +} + +template<class T> inline Matrix<T>& Matrix<T>::operator=(const Matrix<T>& rhs) +{ + if (this == &rhs) + return *this; + resize(rhs.height(), rhs.width()); + for (int i = 0; i < height(); ++i) + { + for (int j = 0; j < width(); ++j) + m_matrix[i][j] = rhs.m_matrix[i][j]; + } + return *this; +} + +template<class T> inline bool Matrix<T>::operator==(const Matrix<T>& rhs) const +{ + if (this == &rhs) + return true; + return m_matrix == rhs.m_matrix; + return true; +} + +template<class T> inline bool Matrix<T>::operator!=(const Matrix<T>& rhs) const +{ + return !(*this == rhs); +} + +} + #endif diff --git a/pokemod/Move.cpp b/pokemod/Move.cpp index b31167c2..51ed7a8a 100644 --- a/pokemod/Move.cpp +++ b/pokemod/Move.cpp @@ -24,13 +24,13 @@ // Qt includes #include <QSet> -Move::Move(const Move& move) : +Pokemod::Move::Move(const Move& move) : Object("Move", move.parent(), move.id()) { *this = move; } -Move::Move(const Pokemod* parent, const int id) : +Pokemod::Move::Move(const Pokemod* parent, const int id) : Object("Move", parent, id), m_name(""), m_accuracy(1, 1), @@ -45,24 +45,24 @@ Move::Move(const Pokemod* parent, const int id) : { } -Move::Move(const Move& move, const Pokemod* parent, const int id) : +Pokemod::Move::Move(const Move& move, const Pokemod* parent, const int id) : Object("Move", parent, id) { *this = move; } -Move::Move(const QDomElement& xml, const Pokemod* parent, const int id) : +Pokemod::Move::Move(const QDomElement& xml, const Pokemod* parent, const int id) : Object("Move", parent, id) { load(xml, id); } -Move::~Move() +Pokemod::Move::~Move() { clear(); } -void Move::validate() +void Pokemod::Move::validate() { if (m_name.isEmpty()) emit(error("Name is empty")); @@ -70,7 +70,7 @@ void Move::validate() TEST(setPowerPoints, powerPoints); } -void Move::load(const QDomElement& xml, int id) +void Pokemod::Move::load(const QDomElement& xml, int id) { LOAD_ID(); LOAD(QString, name); @@ -84,7 +84,7 @@ void Move::load(const QDomElement& xml, int id) LOAD(Script, script); } -QDomElement Move::save() const +QDomElement Pokemod::Move::save() const { SAVE_CREATE(); SAVE(QString, name); @@ -99,12 +99,12 @@ QDomElement Move::save() const return xml; } -void Move::setName(const QString& name) +void Pokemod::Move::setName(const QString& name) { CHECK(name); } -void Move::setAccuracy(const Fraction& accuracy) +void Pokemod::Move::setAccuracy(const Fraction& accuracy) { if (1 < accuracy) { @@ -114,12 +114,12 @@ void Move::setAccuracy(const Fraction& accuracy) CHECK(accuracy); } -void Move::setPower(const int power) +void Pokemod::Move::setPower(const int power) { CHECK(power); } -void Move::setType(const int type) +void Pokemod::Move::setType(const int type) { if (static_cast<const Pokemod*>(pokemod())->typeIndex(type) == INT_MAX) { @@ -129,17 +129,17 @@ void Move::setType(const int type) CHECK(type); } -void Move::setSpecial(const bool special) +void Pokemod::Move::setSpecial(const bool special) { CHECK(special); } -void Move::setOverworld(const bool overworld) +void Pokemod::Move::setOverworld(const bool overworld) { CHECK(overworld); } -void Move::setPowerPoints(const int powerPoints) +void Pokemod::Move::setPowerPoints(const int powerPoints) { if (!powerPoints) { @@ -149,62 +149,62 @@ void Move::setPowerPoints(const int powerPoints) CHECK(powerPoints); } -void Move::setDescription(const QString& description) +void Pokemod::Move::setDescription(const QString& description) { CHECK(description); } -void Move::setScript(const Script& script) +void Pokemod::Move::setScript(const Script& script) { CHECK(script); } -QString Move::name() const +QString Pokemod::Move::name() const { return m_name; } -Fraction Move::accuracy() const +Pokemod::Fraction Pokemod::Move::accuracy() const { return m_accuracy; } -int Move::power() const +int Pokemod::Move::power() const { return m_power; } -int Move::type() const +int Pokemod::Move::type() const { return m_type; } -bool Move::special() const +bool Pokemod::Move::special() const { return m_special; } -bool Move::overworld() const +bool Pokemod::Move::overworld() const { return m_overworld; } -int Move::powerPoints() const +int Pokemod::Move::powerPoints() const { return m_powerPoints; } -QString Move::description() const +QString Pokemod::Move::description() const { return m_description; } -Script Move::script() const +Pokemod::Script Pokemod::Move::script() const { return m_script; } -Move& Move::operator=(const Move& rhs) +Pokemod::Move& Pokemod::Move::operator=(const Move& rhs) { if (this == &rhs) return *this; diff --git a/pokemod/Move.h b/pokemod/Move.h index 9e55096b..3a764366 100644 --- a/pokemod/Move.h +++ b/pokemod/Move.h @@ -23,6 +23,8 @@ #include "Object.h" #include "Script.h" +namespace Pokemod +{ // Forward declarations class Pokemod; @@ -76,5 +78,6 @@ class Move : public Object QString m_description; Script m_script; }; +} #endif diff --git a/pokemod/Nature.cpp b/pokemod/Nature.cpp index bc30c80b..e36efb61 100644 --- a/pokemod/Nature.cpp +++ b/pokemod/Nature.cpp @@ -22,65 +22,65 @@ #include "Pokemod.h" #include "Rules.h" -Nature::Nature(const Nature& nature) : +Pokemod::Nature::Nature(const Nature& nature) : Object("Nature", nature.parent(), nature.id()) { *this = nature; } -Nature::Nature(const Pokemod* parent, const int id) : +Pokemod::Nature::Nature(const Pokemod* parent, const int id) : Object("Nature", parent, id), m_name(""), m_weight(1) { - for (int i = 0; i < Pokemod::ST_End_GSC; ++i) + for (int i = 0; i < ST_End_GSC; ++i) m_stat[i].set(1, 1); } -Nature::Nature(const Nature& nature, const Pokemod* parent, const int id) : +Pokemod::Nature::Nature(const Nature& nature, const Pokemod* parent, const int id) : Object("Nature", parent, id) { *this = nature; } -Nature::Nature(const QDomElement& xml, const Pokemod* parent, const int id) : +Pokemod::Nature::Nature(const QDomElement& xml, const Pokemod* parent, const int id) : Object("Nature", parent, id) { load(xml, id); } -void Nature::validate() +void Pokemod::Nature::validate() { if (m_name.isEmpty()) emit(error("Name is empty")); TEST(setWeight, weight); } -void Nature::load(const QDomElement& xml, int id) +void Pokemod::Nature::load(const QDomElement& xml, int id) { LOAD_ID(); LOAD(QString, name); - LOAD_ARRAY(Fraction, stat, Pokemod::ST_End_GSC); + LOAD_ARRAY(Fraction, stat, ST_End_GSC); LOAD(int, weight); } -QDomElement Nature::save() const +QDomElement Pokemod::Nature::save() const { SAVE_CREATE(); SAVE(QString, name); - SAVE_ARRAY(Fraction, stat, Pokemod::ST_End_GSC); + SAVE_ARRAY(Fraction, stat, ST_End_GSC); SAVE(int, weight); return xml; } -void Nature::setName(const QString& name) +void Pokemod::Nature::setName(const QString& name) { CHECK(name); } -void Nature::setStat(const int stat, const Fraction& multiplier) +void Pokemod::Nature::setStat(const int stat, const Fraction& multiplier) { - if ((static_cast<const Pokemod*>(pokemod())->rules()->specialSplit() ? Pokemod::ST_End_GSC : Pokemod::ST_End_RBY) <= stat) + if ((static_cast<const Pokemod*>(pokemod())->rules()->specialSplit() ? ST_End_GSC : ST_End_RBY) <= stat) { emit(error(bounds("stat"))); return; @@ -88,7 +88,7 @@ void Nature::setStat(const int stat, const Fraction& multiplier) CHECK_ARRAY(stat[stat], multiplier); } -void Nature::setWeight(const int weight) +void Pokemod::Nature::setWeight(const int weight) { if (!weight) { @@ -98,14 +98,14 @@ void Nature::setWeight(const int weight) CHECK(weight); } -QString Nature::name() const +QString Pokemod::Nature::name() const { return m_name; } -Fraction Nature::stat(const int stat) const +Pokemod::Fraction Pokemod::Nature::stat(const int stat) const { - if (Pokemod::ST_End_GSC <= stat) + if (ST_End_GSC <= stat) { emit(warning(bounds("stat"))); return Fraction(); @@ -113,17 +113,17 @@ Fraction Nature::stat(const int stat) const return m_stat[stat]; } -int Nature::weight() const +int Pokemod::Nature::weight() const { return m_weight; } -Nature& Nature::operator=(const Nature& rhs) +Pokemod::Nature& Pokemod::Nature::operator=(const Nature& rhs) { if (this == &rhs) return *this; COPY(name); - COPY_ARRAY(stat, Pokemod::ST_End_GSC); + COPY_ARRAY(stat, ST_End_GSC); COPY(weight); return *this; } diff --git a/pokemod/Nature.h b/pokemod/Nature.h index 1ef8bdee..75804a47 100644 --- a/pokemod/Nature.h +++ b/pokemod/Nature.h @@ -21,7 +21,11 @@ // Pokemod includes #include "Fraction.h" #include "Object.h" -#include "Pokemod.h" + +namespace Pokemod +{ +// Forward declarations +class Pokemod; class Nature : public Object { @@ -49,8 +53,9 @@ class Nature : public Object Nature& operator=(const Nature& rhs); private: QString m_name; - Fraction m_stat[Pokemod::ST_End_GSC]; + Fraction m_stat[ST_End_GSC]; int m_weight; }; +} #endif diff --git a/pokemod/Object.cpp b/pokemod/Object.cpp index 1b4ba668..ffd1d8f7 100644 --- a/pokemod/Object.cpp +++ b/pokemod/Object.cpp @@ -18,7 +18,7 @@ // Header include #include "Object.h" -Object::Object(const Object& object) : +Pokemod::Object::Object(const Object& object) : QObject(0), m_id(object.id()), m_className(object.className()), @@ -26,7 +26,7 @@ Object::Object(const Object& object) : { } -Object::Object(const QString& className, const Object* parent, const int id) : +Pokemod::Object::Object(const QString& className, const Object* parent, const int id) : QObject(0), m_id(id), m_className(className), @@ -34,58 +34,58 @@ Object::Object(const QString& className, const Object* parent, const int id) : { } -const Object* Object::parent() const +const Pokemod::Object* Pokemod::Object::parent() const { return m_parent; } -const Object* Object::pokemod() const +const Pokemod::Object* Pokemod::Object::pokemod() const { if (m_parent) return m_parent->pokemod(); return this; } -int Object::id() const +int Pokemod::Object::id() const { return m_id; } -QString Object::className() const +QString Pokemod::Object::className() const { return m_className; } -void Object::setId(const int id) +void Pokemod::Object::setId(const int id) { CHECK(id); } -QString Object::unused(const QString& variable) +QString Pokemod::Object::unused(const QString& variable) { return QString("Setting unused variable %1").arg(variable); } -QString Object::bounds(const QString& variable) +QString Pokemod::Object::bounds(const QString& variable) { return QString("Value for %1 out-of-bounds").arg(variable); } -QString Object::size(const QString& variable) +QString Pokemod::Object::size(const QString& variable) { return QString("Wrong size for %1").arg(variable); } -QString Object::subclass(const QString& subclass, const int id) +QString Pokemod::Object::subclass(const QString& subclass, const int id) { return QString("Duplicate %1 with id %2").arg(subclass, id); } -QString Object::subclass(const QString& subclass, const QString& name) +QString Pokemod::Object::subclass(const QString& subclass, const QString& name) { return QString("Duplicate %1 with name %2").arg(subclass, name); } -void Object::clear() +void Pokemod::Object::clear() { } diff --git a/pokemod/Object.h b/pokemod/Object.h index 6c64b455..9b4a7a2f 100644 --- a/pokemod/Object.h +++ b/pokemod/Object.h @@ -21,11 +21,45 @@ // Qt includes #include <QDomElement> #include <QObject> +#include <QStringList> #include <QTextStream> // C includes #include <climits> +namespace Pokemod +{ +enum Stat +{ + ST_HP = 0, + ST_No_HP_Start = 1, + ST_Attack = 1, + ST_Defense = 2, + ST_Speed = 3, + ST_Special = 4, + ST_End_RBY = 5, + ST_SpecialAttack = 4, + ST_SpecialDefense = 5, + ST_End_GSC = 6, + ST_Accuracy = 6, + ST_Evasion = 7, + ST_End_Battle = 8 +}; +const QStringList StatRBYStr = QStringList() << "HP" << "Attack" << "Defense" << "Speed" << "Special" << "Special" << "Accuracy" << "Evasion"; +const QStringList StatGSCStr = QStringList() << "HP" << "Attack" << "Defense" << "Speed" << "Special Attack" << "Special Defense" << "Accuracy" << "Evasion"; + +enum Direction +{ + D_Up = 0, + D_Down = 1, + D_Left = 2, + D_Right = 3, + D_End = 4, + D_None = 4, + D_End_None = 5 +}; +const QStringList DirectionStr = QStringList() << "Up" << "Down" << "Left" << "Right" << "None"; + class Object : public QObject { Q_OBJECT @@ -33,9 +67,7 @@ class Object : public QObject public: Object(const Object& object); Object(const QString& className, const Object* parent, const int id); - virtual ~Object() - { - } + virtual ~Object(); const Object* parent() const; const Object* pokemod() const; @@ -75,6 +107,12 @@ class Object : public QObject const Object* m_parent; }; +inline Object::~Object() +{ +} + +} + #define LOAD_NODE(variable) xml.firstChildElement(variable) #define LOAD_DATA(node) node.firstChild().toText().data() #define LOAD_ID() \ diff --git a/pokemod/Point.h b/pokemod/Point.h index 2934bf39..130f1c4c 100644 --- a/pokemod/Point.h +++ b/pokemod/Point.h @@ -18,61 +18,84 @@ #ifndef __POKEMOD_POINT__ #define __POKEMOD_POINT__ +namespace Pokemod +{ class Point { public: - inline Point(const int x = 0, const int y = 0) : - m_x(x), - m_y(y) - { - } - inline Point(const Point& rhs) - { - *this = rhs; - } + Point(const int x = 0, const int y = 0); + Point(const Point& rhs); - inline void set(const int x, const int y) - { - m_x = x; - m_y = y; - } - inline void setX(const int x) - { - m_x = x; - } - inline void setY(const int y) - { - m_y = y; - } + void set(const int x, const int y); + void setX(const int x); + void setY(const int y); - inline int x() const - { - return m_x; - } - inline int y() const - { - return m_y; - } + int x() const; + int y() const; - Point& operator=(const Point& rhs) - { - if (this == &rhs) - return *this; - m_x = rhs.m_x; - m_y = rhs.m_y; - return *this; - } - inline bool operator==(const Point& rhs) const - { - return ((m_x == rhs.m_x) && (m_y == rhs.m_y)); - } - inline bool operator!=(const Point& rhs) const - { - return !(*this == rhs); - } + Point& operator=(const Point& rhs); + bool operator==(const Point& rhs) const; + bool operator!=(const Point& rhs) const; private: int m_x; int m_y; }; +inline Point::Point(const int x, const int y) : + m_x(x), + m_y(y) +{ +} + +inline Point::Point(const Point& rhs) +{ + *this = rhs; +} + +inline void Point::set(const int x, const int y) +{ + m_x = x; + m_y = y; +} + +inline void Point::setX(const int x) +{ + m_x = x; +} + +inline void Point::setY(const int y) +{ + m_y = y; +} + +inline int Point::x() const +{ + return m_x; +} + +inline int Point::y() const +{ + return m_y; +} + +inline Point::Point& Point::operator=(const Point& rhs) +{ + if (this == &rhs) + return *this; + m_x = rhs.m_x; + m_y = rhs.m_y; + return *this; +} + +inline bool Point::operator==(const Point& rhs) const +{ + return ((m_x == rhs.m_x) && (m_y == rhs.m_y)); +} + +inline bool Point::operator!=(const Point& rhs) const +{ + return !(*this == rhs); +} +} + #endif diff --git a/pokemod/Pokemod.cpp b/pokemod/Pokemod.cpp index 2d5b4d77..e670daf7 100644 --- a/pokemod/Pokemod.cpp +++ b/pokemod/Pokemod.cpp @@ -46,11 +46,7 @@ #include <QBuffer> #include <QSet> -const QStringList Pokemod::StatRBYStr = QStringList() << "HP" << "Attack" << "Defense" << "Speed" << "Special" << "Special" << "Accuracy" << "Evasion"; -const QStringList Pokemod::StatGSCStr = QStringList() << "HP" << "Attack" << "Defense" << "Speed" << "Special Attack" << "Special Defense" << "Accuracy" << "Evasion"; -const QStringList Pokemod::DirectionStr = QStringList() << "Up" << "Down" << "Left" << "Right" << "None"; - -Pokemod::Pokemod() : +Pokemod::Pokemod::Pokemod() : Object("Pokemod", NULL, 0), m_title(""), m_version(""), @@ -68,27 +64,27 @@ Pokemod::Pokemod() : { } -Pokemod::Pokemod(const Pokemod& pokemod) : +Pokemod::Pokemod::Pokemod(const Pokemod& pokemod) : Object("Pokemod", NULL, 0), m_rules(new Rules(this)) { *this = pokemod; } -Pokemod::Pokemod(const QDomElement& xml) : +Pokemod::Pokemod::Pokemod(const QDomElement& xml) : Object("Pokemod", NULL, 0), m_rules(new Rules(this)) { load(xml); } -Pokemod::~Pokemod() +Pokemod::Pokemod::~Pokemod() { delete m_rules; clear(); } -void Pokemod::validate() +void Pokemod::Pokemod::validate() { if (m_title.isEmpty()) emit(error("Title is empty")); @@ -395,7 +391,7 @@ void Pokemod::validate() } } -void Pokemod::load(const QDomElement& xml, const int) +void Pokemod::Pokemod::load(const QDomElement& xml, const int) { clear(); LOAD(QString, title); @@ -434,7 +430,7 @@ void Pokemod::load(const QDomElement& xml, const int) LOAD_Typechart(setTypechart, Fraction, typechart); } -QDomElement Pokemod::save() const +QDomElement Pokemod::Pokemod::save() const { QDomElement xml = QDomDocument().createElement(className()); SAVE(QString, title); @@ -474,27 +470,27 @@ QDomElement Pokemod::save() const return xml; } -int Pokemod::maxCompatability(const Pokemod& pokemod) const +int Pokemod::Pokemod::maxCompatability(const Pokemod& pokemod) const { // TODO: MaxCompatability between two versions } -void Pokemod::setTitle(const QString& title) +void Pokemod::Pokemod::setTitle(const QString& title) { CHECK(title); } -void Pokemod::setVersion(const QString& version) +void Pokemod::Pokemod::setVersion(const QString& version) { CHECK(version); } -void Pokemod::setDescription(const QString& description) +void Pokemod::Pokemod::setDescription(const QString& description) { CHECK(description); } -void Pokemod::setStartMap(const int startMap) +void Pokemod::Pokemod::setStartMap(const int startMap) { if (mapIndex(startMap) == INT_MAX) { @@ -504,7 +500,7 @@ void Pokemod::setStartMap(const int startMap) CHECK(startMap); } -void Pokemod::setStartWarp(const int startWarp) +void Pokemod::Pokemod::setStartWarp(const int startWarp) { if (mapIndex(m_startMap) == INT_MAX) { @@ -519,7 +515,7 @@ void Pokemod::setStartWarp(const int startWarp) CHECK(startWarp); } -void Pokemod::setWalkSkin(const QPixmap& walkSkin) +void Pokemod::Pokemod::setWalkSkin(const QPixmap& walkSkin) { if (walkSkin.size() != QSize(192, 128)) { @@ -530,7 +526,7 @@ void Pokemod::setWalkSkin(const QPixmap& walkSkin) emit(changed()); } -void Pokemod::setBikeSkin(const QPixmap& bikeSkin) +void Pokemod::Pokemod::setBikeSkin(const QPixmap& bikeSkin) { if (bikeSkin.size() != QSize(192, 128)) { @@ -541,7 +537,7 @@ void Pokemod::setBikeSkin(const QPixmap& bikeSkin) emit(changed()); } -void Pokemod::setSurfSkin(const QPixmap& surfSkin) +void Pokemod::Pokemod::setSurfSkin(const QPixmap& surfSkin) { if (surfSkin.size() != QSize(192, 128)) { @@ -552,7 +548,7 @@ void Pokemod::setSurfSkin(const QPixmap& surfSkin) emit(changed()); } -void Pokemod::setFlySkin(const QPixmap& flySkin) +void Pokemod::Pokemod::setFlySkin(const QPixmap& flySkin) { if (flySkin.size() != QSize(192, 128)) { @@ -563,7 +559,7 @@ void Pokemod::setFlySkin(const QPixmap& flySkin) emit(changed()); } -void Pokemod::setFishSkin(const QPixmap& fishSkin) +void Pokemod::Pokemod::setFishSkin(const QPixmap& fishSkin) { if (fishSkin.size() != QSize(192, 128)) { @@ -574,7 +570,7 @@ void Pokemod::setFishSkin(const QPixmap& fishSkin) emit(changed()); } -void Pokemod::setSurfFishSkin(const QPixmap& surfFishSkin) +void Pokemod::Pokemod::setSurfFishSkin(const QPixmap& surfFishSkin) { if (surfFishSkin.size() != QSize(192, 128)) { @@ -585,124 +581,124 @@ void Pokemod::setSurfFishSkin(const QPixmap& surfFishSkin) emit(changed()); } -void Pokemod::setTypechart(const int attack, const int defense, const Fraction& multiplier) +void Pokemod::Pokemod::setTypechart(const int attack, const int defense, const Fraction& multiplier) { CHECK_ARRAY(typechart(attack, defense), multiplier); } -void Pokemod::setRules(const Rules& rules) +void Pokemod::Pokemod::setRules(const Rules& rules) { *m_rules = rules; } -void Pokemod::setRules(const QDomElement& xml) +void Pokemod::Pokemod::setRules(const QDomElement& xml) { m_rules->load(xml); } -QString Pokemod::title() const +QString Pokemod::Pokemod::title() const { return m_title; } -QString Pokemod::version() const +QString Pokemod::Pokemod::version() const { return m_version; } -QString Pokemod::description() const +QString Pokemod::Pokemod::description() const { return m_description; } -int Pokemod::startMap() const +int Pokemod::Pokemod::startMap() const { return m_startMap; } -int Pokemod::startWarp() const +int Pokemod::Pokemod::startWarp() const { return m_startWarp; } -QPixmap Pokemod::walkSkin() const +QPixmap Pokemod::Pokemod::walkSkin() const { return m_walkSkin; } -QPixmap Pokemod::bikeSkin() const +QPixmap Pokemod::Pokemod::bikeSkin() const { return m_bikeSkin; } -QPixmap Pokemod::surfSkin() const +QPixmap Pokemod::Pokemod::surfSkin() const { return m_surfSkin; } -QPixmap Pokemod::flySkin() const +QPixmap Pokemod::Pokemod::flySkin() const { return m_flySkin; } -QPixmap Pokemod::fishSkin() const +QPixmap Pokemod::Pokemod::fishSkin() const { return m_fishSkin; } -QPixmap Pokemod::surfFishSkin() const +QPixmap Pokemod::Pokemod::surfFishSkin() const { return m_surfFishSkin; } -const Matrix<Fraction>& Pokemod::typechart() const +const Pokemod::Matrix<Pokemod::Fraction>* Pokemod::Pokemod::typechart() const { - return m_typechart; + return &m_typechart; } -Matrix<Fraction>& Pokemod::typechart() +Pokemod::Matrix<Pokemod::Fraction>* Pokemod::Pokemod::typechart() { - return m_typechart; + return &m_typechart; } -Fraction Pokemod::typechart(const int attack, const int defense) const +Pokemod::Fraction Pokemod::Pokemod::typechart(const int attack, const int defense) const { return m_typechart(attack, defense); } -const Rules* Pokemod::rules() const +const Pokemod::Rules* Pokemod::Pokemod::rules() const { return m_rules; } -Rules* Pokemod::rules() +Pokemod::Rules* Pokemod::Pokemod::rules() { return m_rules; } -const Ability* Pokemod::ability(const int index) const +const Pokemod::Ability* Pokemod::Pokemod::ability(const int index) const { Q_ASSERT(index < abilityCount()); return m_abilities.at(index); } -Ability* Pokemod::ability(const int index) +Pokemod::Ability* Pokemod::Pokemod::ability(const int index) { Q_ASSERT(index < abilityCount()); return m_abilities[index]; } -const Ability* Pokemod::abilityById(const int id) const +const Pokemod::Ability* Pokemod::Pokemod::abilityById(const int id) const { return ability(abilityIndex(id)); } -Ability* Pokemod::abilityById(const int id) +Pokemod::Ability* Pokemod::Pokemod::abilityById(const int id) { return ability(abilityIndex(id)); } -int Pokemod::abilityIndex(const int id) const +int Pokemod::Pokemod::abilityIndex(const int id) const { for (int i = 0; i < abilityCount(); ++i) { @@ -712,45 +708,45 @@ int Pokemod::abilityIndex(const int id) const return INT_MAX; } -int Pokemod::abilityCount() const +int Pokemod::Pokemod::abilityCount() const { return m_abilities.size(); } -Ability* Pokemod::newAbility() +Pokemod::Ability* Pokemod::Pokemod::newAbility() { return newAbility(new Ability(this, newAbilityId())); } -Ability* Pokemod::newAbility(const QDomElement& xml) +Pokemod::Ability* Pokemod::Pokemod::newAbility(const QDomElement& xml) { return newAbility(new Ability(xml, this, newAbilityId())); } -Ability* Pokemod::newAbility(const Ability& ability) +Pokemod::Ability* Pokemod::Pokemod::newAbility(const Ability& ability) { return newAbility(new Ability(ability, this, newAbilityId())); } -Ability* Pokemod::newAbility(Ability* ability) +Pokemod::Ability* Pokemod::Pokemod::newAbility(Ability* ability) { m_abilities.append(ability); return ability; } -void Pokemod::deleteAbility(const int index) +void Pokemod::Pokemod::deleteAbility(const int index) { Q_ASSERT(index < abilityCount()); delete m_abilities[index]; m_abilities.removeAt(index); } -void Pokemod::deleteAbilityById(const int id) +void Pokemod::Pokemod::deleteAbilityById(const int id) { deleteAbility(abilityIndex(id)); } -int Pokemod::newAbilityId() const +int Pokemod::Pokemod::newAbilityId() const { int i = 0; while ((i < abilityCount()) && (abilityIndex(i) != INT_MAX)) @@ -758,29 +754,29 @@ int Pokemod::newAbilityId() const return i; } -const Author* Pokemod::author(const int index) const +const Pokemod::Author* Pokemod::Pokemod::author(const int index) const { Q_ASSERT(index < authorCount()); return m_authors.at(index); } -Author* Pokemod::author(const int index) +Pokemod::Author* Pokemod::Pokemod::author(const int index) { Q_ASSERT(index < authorCount()); return m_authors[index]; } -const Author* Pokemod::authorById(const int id) const +const Pokemod::Author* Pokemod::Pokemod::authorById(const int id) const { return author(authorIndex(id)); } -Author* Pokemod::authorById(const int id) +Pokemod::Author* Pokemod::Pokemod::authorById(const int id) { return author(authorIndex(id)); } -int Pokemod::authorIndex(const int id) const +int Pokemod::Pokemod::authorIndex(const int id) const { for (int i = 0; i < authorCount(); ++i) { @@ -790,45 +786,45 @@ int Pokemod::authorIndex(const int id) const return INT_MAX; } -int Pokemod::authorCount() const +int Pokemod::Pokemod::authorCount() const { return m_authors.size(); } -Author* Pokemod::newAuthor() +Pokemod::Author* Pokemod::Pokemod::newAuthor() { return newAuthor(new Author(this, newAuthorId())); } -Author* Pokemod::newAuthor(const QDomElement& xml) +Pokemod::Author* Pokemod::Pokemod::newAuthor(const QDomElement& xml) { return newAuthor(new Author(xml, this, newAuthorId())); } -Author* Pokemod::newAuthor(const Author& author) +Pokemod::Author* Pokemod::Pokemod::newAuthor(const Author& author) { return newAuthor(new Author(author, this, newAuthorId())); } -Author* Pokemod::newAuthor(Author* author) +Pokemod::Author* Pokemod::Pokemod::newAuthor(Author* author) { m_authors.append(author); return author; } -void Pokemod::deleteAuthor(const int index) +void Pokemod::Pokemod::deleteAuthor(const int index) { Q_ASSERT(index < authorCount()); delete m_authors[index]; m_authors.removeAt(index); } -void Pokemod::deleteAuthorById(const int id) +void Pokemod::Pokemod::deleteAuthorById(const int id) { deleteAuthor(authorIndex(id)); } -int Pokemod::newAuthorId() const +int Pokemod::Pokemod::newAuthorId() const { int i = 0; while ((i < authorCount()) && (authorIndex(i) != INT_MAX)) @@ -836,29 +832,29 @@ int Pokemod::newAuthorId() const return i; } -const Badge* Pokemod::badge(const int index) const +const Pokemod::Badge* Pokemod::Pokemod::badge(const int index) const { Q_ASSERT(index < badgeCount()); return m_badges.at(index); } -Badge* Pokemod::badge(const int index) +Pokemod::Badge* Pokemod::Pokemod::badge(const int index) { Q_ASSERT(index < badgeCount()); return m_badges[index]; } -const Badge* Pokemod::badgeById(const int id) const +const Pokemod::Badge* Pokemod::Pokemod::badgeById(const int id) const { return badge(badgeIndex(id)); } -Badge* Pokemod::badgeById(const int id) +Pokemod::Badge* Pokemod::Pokemod::badgeById(const int id) { return badge(badgeIndex(id)); } -int Pokemod::badgeIndex(const int id) const +int Pokemod::Pokemod::badgeIndex(const int id) const { for (int i = 0; i < badgeCount(); ++i) { @@ -868,45 +864,45 @@ int Pokemod::badgeIndex(const int id) const return INT_MAX; } -int Pokemod::badgeCount() const +int Pokemod::Pokemod::badgeCount() const { return m_badges.size(); } -Badge* Pokemod::newBadge() +Pokemod::Badge* Pokemod::Pokemod::newBadge() { return newBadge(new Badge(this, newBadgeId())); } -Badge* Pokemod::newBadge(const QDomElement& xml) +Pokemod::Badge* Pokemod::Pokemod::newBadge(const QDomElement& xml) { return newBadge(new Badge(xml, this, newBadgeId())); } -Badge* Pokemod::newBadge(const Badge& badge) +Pokemod::Badge* Pokemod::Pokemod::newBadge(const Badge& badge) { return newBadge(new Badge(badge, this, newBadgeId())); } -Badge* Pokemod::newBadge(Badge* badge) +Pokemod::Badge* Pokemod::Pokemod::newBadge(Badge* badge) { m_badges.append(badge); return badge; } -void Pokemod::deleteBadge(const int index) +void Pokemod::Pokemod::deleteBadge(const int index) { Q_ASSERT(index < badgeCount()); delete m_badges[index]; m_badges.removeAt(index); } -void Pokemod::deleteBadgeById(const int id) +void Pokemod::Pokemod::deleteBadgeById(const int id) { deleteBadge(badgeIndex(id)); } -int Pokemod::newBadgeId() const +int Pokemod::Pokemod::newBadgeId() const { int i = 0; while ((i < badgeCount()) && (badgeIndex(i) != INT_MAX)) @@ -914,29 +910,29 @@ int Pokemod::newBadgeId() const return i; } -const CoinList* Pokemod::coinList(const int index) const +const Pokemod::CoinList* Pokemod::Pokemod::coinList(const int index) const { Q_ASSERT(index < coinListCount()); return m_coinLists.at(index); } -CoinList* Pokemod::coinList(const int index) +Pokemod::CoinList* Pokemod::Pokemod::coinList(const int index) { Q_ASSERT(index < coinListCount()); return m_coinLists[index]; } -const CoinList* Pokemod::coinListById(const int id) const +const Pokemod::CoinList* Pokemod::Pokemod::coinListById(const int id) const { return coinList(coinListIndex(id)); } -CoinList* Pokemod::coinListById(const int id) +Pokemod::CoinList* Pokemod::Pokemod::coinListById(const int id) { return coinList(coinListIndex(id)); } -int Pokemod::coinListIndex(const int id) const +int Pokemod::Pokemod::coinListIndex(const int id) const { for (int i = 0; i < coinListCount(); ++i) { @@ -946,45 +942,45 @@ int Pokemod::coinListIndex(const int id) const return INT_MAX; } -int Pokemod::coinListCount() const +int Pokemod::Pokemod::coinListCount() const { return m_coinLists.size(); } -CoinList* Pokemod::newCoinList() +Pokemod::CoinList* Pokemod::Pokemod::newCoinList() { return newCoinList(new CoinList(this, newCoinListId())); } -CoinList* Pokemod::newCoinList(const QDomElement& xml) +Pokemod::CoinList* Pokemod::Pokemod::newCoinList(const QDomElement& xml) { return newCoinList(new CoinList(xml, this, newCoinListId())); } -CoinList* Pokemod::newCoinList(const CoinList& coinList) +Pokemod::CoinList* Pokemod::Pokemod::newCoinList(const CoinList& coinList) { return newCoinList(new CoinList(coinList, this, newCoinListId())); } -CoinList* Pokemod::newCoinList(CoinList* coinList) +Pokemod::CoinList* Pokemod::Pokemod::newCoinList(CoinList* coinList) { m_coinLists.append(coinList); return coinList; } -void Pokemod::deleteCoinList(const int index) +void Pokemod::Pokemod::deleteCoinList(const int index) { Q_ASSERT(index < coinListCount()); delete m_coinLists[index]; m_coinLists.removeAt(index); } -void Pokemod::deleteCoinListById(const int id) +void Pokemod::Pokemod::deleteCoinListById(const int id) { deleteCoinList(coinListIndex(id)); } -int Pokemod::newCoinListId() const +int Pokemod::Pokemod::newCoinListId() const { int i = 0; while ((i < coinListCount()) && (coinListIndex(i) != INT_MAX)) @@ -992,29 +988,29 @@ int Pokemod::newCoinListId() const return i; } -const EggGroup* Pokemod::eggGroup(const int index) const +const Pokemod::EggGroup* Pokemod::Pokemod::eggGroup(const int index) const { Q_ASSERT(index < eggGroupCount()); return m_eggGroups.at(index); } -EggGroup* Pokemod::eggGroup(const int index) +Pokemod::EggGroup* Pokemod::Pokemod::eggGroup(const int index) { Q_ASSERT(index < eggGroupCount()); return m_eggGroups[index]; } -const EggGroup* Pokemod::eggGroupById(const int id) const +const Pokemod::EggGroup* Pokemod::Pokemod::eggGroupById(const int id) const { return eggGroup(eggGroupIndex(id)); } -EggGroup* Pokemod::eggGroupById(const int id) +Pokemod::EggGroup* Pokemod::Pokemod::eggGroupById(const int id) { return eggGroup(eggGroupIndex(id)); } -int Pokemod::eggGroupIndex(const int id) const +int Pokemod::Pokemod::eggGroupIndex(const int id) const { for (int i = 0; i < eggGroupCount(); ++i) { @@ -1024,45 +1020,45 @@ int Pokemod::eggGroupIndex(const int id) const return INT_MAX; } -int Pokemod::eggGroupCount() const +int Pokemod::Pokemod::eggGroupCount() const { return m_eggGroups.size(); } -EggGroup* Pokemod::newEggGroup() +Pokemod::EggGroup* Pokemod::Pokemod::newEggGroup() { return newEggGroup(new EggGroup(this, newEggGroupId())); } -EggGroup* Pokemod::newEggGroup(const QDomElement& xml) +Pokemod::EggGroup* Pokemod::Pokemod::newEggGroup(const QDomElement& xml) { return newEggGroup(new EggGroup(xml, this, newEggGroupId())); } -EggGroup* Pokemod::newEggGroup(const EggGroup& eggGroup) +Pokemod::EggGroup* Pokemod::Pokemod::newEggGroup(const EggGroup& eggGroup) { return newEggGroup(new EggGroup(eggGroup, this, newEggGroupId())); } -EggGroup* Pokemod::newEggGroup(EggGroup* eggGroup) +Pokemod::EggGroup* Pokemod::Pokemod::newEggGroup(EggGroup* eggGroup) { m_eggGroups.append(eggGroup); return eggGroup; } -void Pokemod::deleteEggGroup(const int index) +void Pokemod::Pokemod::deleteEggGroup(const int index) { Q_ASSERT(index < eggGroupCount()); delete m_eggGroups[index]; m_eggGroups.removeAt(index); } -void Pokemod::deleteEggGroupById(const int id) +void Pokemod::Pokemod::deleteEggGroupById(const int id) { deleteEggGroup(eggGroupIndex(id)); } -int Pokemod::newEggGroupId() const +int Pokemod::Pokemod::newEggGroupId() const { int i = 0; while ((i < eggGroupCount()) && (eggGroupIndex(i) != INT_MAX)) @@ -1070,29 +1066,29 @@ int Pokemod::newEggGroupId() const return i; } -const GlobalScript* Pokemod::globalScript(const int index) const +const Pokemod::GlobalScript* Pokemod::Pokemod::globalScript(const int index) const { Q_ASSERT(index < globalScriptCount()); return m_globalScripts.at(index); } -GlobalScript* Pokemod::globalScript(const int index) +Pokemod::GlobalScript* Pokemod::Pokemod::globalScript(const int index) { Q_ASSERT(index < globalScriptCount()); return m_globalScripts[index]; } -const GlobalScript* Pokemod::globalScriptById(const int id) const +const Pokemod::GlobalScript* Pokemod::Pokemod::globalScriptById(const int id) const { return globalScript(globalScriptIndex(id)); } -GlobalScript* Pokemod::globalScriptById(const int id) +Pokemod::GlobalScript* Pokemod::Pokemod::globalScriptById(const int id) { return globalScript(globalScriptIndex(id)); } -int Pokemod::globalScriptIndex(const int id) const +int Pokemod::Pokemod::globalScriptIndex(const int id) const { for (int i = 0; i < globalScriptCount(); ++i) { @@ -1102,45 +1098,45 @@ int Pokemod::globalScriptIndex(const int id) const return INT_MAX; } -int Pokemod::globalScriptCount() const +int Pokemod::Pokemod::globalScriptCount() const { return m_globalScripts.size(); } -GlobalScript* Pokemod::newGlobalScript() +Pokemod::GlobalScript* Pokemod::Pokemod::newGlobalScript() { return newGlobalScript(new GlobalScript(this, newGlobalScriptId())); } -GlobalScript* Pokemod::newGlobalScript(const QDomElement& xml) +Pokemod::GlobalScript* Pokemod::Pokemod::newGlobalScript(const QDomElement& xml) { return newGlobalScript(new GlobalScript(xml, this, newGlobalScriptId())); } -GlobalScript* Pokemod::newGlobalScript(const GlobalScript& globalScript) +Pokemod::GlobalScript* Pokemod::Pokemod::newGlobalScript(const GlobalScript& globalScript) { return newGlobalScript(new GlobalScript(globalScript, this, newGlobalScriptId())); } -GlobalScript* Pokemod::newGlobalScript(GlobalScript* globalScript) +Pokemod::GlobalScript* Pokemod::Pokemod::newGlobalScript(GlobalScript* globalScript) { m_globalScripts.append(globalScript); return globalScript; } -void Pokemod::deleteGlobalScript(const int index) +void Pokemod::Pokemod::deleteGlobalScript(const int index) { Q_ASSERT(index < globalScriptCount()); delete m_globalScripts[index]; m_globalScripts.removeAt(index); } -void Pokemod::deleteGlobalScriptById(const int id) +void Pokemod::Pokemod::deleteGlobalScriptById(const int id) { deleteGlobalScript(globalScriptIndex(id)); } -int Pokemod::newGlobalScriptId() const +int Pokemod::Pokemod::newGlobalScriptId() const { int i = 0; while ((i < globalScriptCount()) && (globalScriptIndex(i) != INT_MAX)) @@ -1148,29 +1144,29 @@ int Pokemod::newGlobalScriptId() const return i; } -const Item* Pokemod::item(const int index) const +const Pokemod::Item* Pokemod::Pokemod::item(const int index) const { Q_ASSERT(index < itemCount()); return m_items.at(index); } -Item* Pokemod::item(const int index) +Pokemod::Item* Pokemod::Pokemod::item(const int index) { Q_ASSERT(index < itemCount()); return m_items[index]; } -const Item* Pokemod::itemById(const int id) const +const Pokemod::Item* Pokemod::Pokemod::itemById(const int id) const { return item(itemIndex(id)); } -Item* Pokemod::itemById(const int id) +Pokemod::Item* Pokemod::Pokemod::itemById(const int id) { return item(itemIndex(id)); } -int Pokemod::itemIndex(const int id) const +int Pokemod::Pokemod::itemIndex(const int id) const { for (int i = 0; i < itemCount(); ++i) { @@ -1180,45 +1176,45 @@ int Pokemod::itemIndex(const int id) const return INT_MAX; } -int Pokemod::itemCount() const +int Pokemod::Pokemod::itemCount() const { return m_items.size(); } -Item* Pokemod::newItem() +Pokemod::Item* Pokemod::Pokemod::newItem() { return newItem(new Item(this, newItemId())); } -Item* Pokemod::newItem(const QDomElement& xml) +Pokemod::Item* Pokemod::Pokemod::newItem(const QDomElement& xml) { return newItem(new Item(xml, this, newItemId())); } -Item* Pokemod::newItem(const Item& item) +Pokemod::Item* Pokemod::Pokemod::newItem(const Item& item) { return newItem(new Item(item, this, newItemId())); } -Item* Pokemod::newItem(Item* item) +Pokemod::Item* Pokemod::Pokemod::newItem(Item* item) { m_items.append(item); return item; } -void Pokemod::deleteItem(const int index) +void Pokemod::Pokemod::deleteItem(const int index) { Q_ASSERT(index < itemCount()); delete m_items[index]; m_items.removeAt(index); } -void Pokemod::deleteItemById(const int id) +void Pokemod::Pokemod::deleteItemById(const int id) { deleteItem(itemIndex(id)); } -int Pokemod::newItemId() const +int Pokemod::Pokemod::newItemId() const { int i = 0; for (; (i < itemCount()) && (itemIndex(i) != INT_MAX); ++i) @@ -1226,29 +1222,29 @@ int Pokemod::newItemId() const return i; } -const ItemType* Pokemod::itemType(const int index) const +const Pokemod::ItemType* Pokemod::Pokemod::itemType(const int index) const { Q_ASSERT(index < itemTypeCount()); return m_itemTypes.at(index); } -ItemType* Pokemod::itemType(const int index) +Pokemod::ItemType* Pokemod::Pokemod::itemType(const int index) { Q_ASSERT(index < itemTypeCount()); return m_itemTypes[index]; } -const ItemType* Pokemod::itemTypeById(const int id) const +const Pokemod::ItemType* Pokemod::Pokemod::itemTypeById(const int id) const { return itemType(itemTypeIndex(id)); } -ItemType* Pokemod::itemTypeById(const int id) +Pokemod::ItemType* Pokemod::Pokemod::itemTypeById(const int id) { return itemType(itemTypeIndex(id)); } -int Pokemod::itemTypeIndex(const int id) const +int Pokemod::Pokemod::itemTypeIndex(const int id) const { for (int i = 0; i < itemTypeCount(); ++i) { @@ -1258,45 +1254,45 @@ int Pokemod::itemTypeIndex(const int id) const return INT_MAX; } -int Pokemod::itemTypeCount() const +int Pokemod::Pokemod::itemTypeCount() const { return m_itemTypes.size(); } -ItemType* Pokemod::newItemType() +Pokemod::ItemType* Pokemod::Pokemod::newItemType() { return newItemType(new ItemType(this, newItemTypeId())); } -ItemType* Pokemod::newItemType(const QDomElement& xml) +Pokemod::ItemType* Pokemod::Pokemod::newItemType(const QDomElement& xml) { return newItemType(new ItemType(xml, this, newItemTypeId())); } -ItemType* Pokemod::newItemType(const ItemType& itemType) +Pokemod::ItemType* Pokemod::Pokemod::newItemType(const ItemType& itemType) { return newItemType(new ItemType(itemType, this, newItemTypeId())); } -ItemType* Pokemod::newItemType(ItemType* itemType) +Pokemod::ItemType* Pokemod::Pokemod::newItemType(ItemType* itemType) { m_itemTypes.append(itemType); return itemType; } -void Pokemod::deleteItemType(const int index) +void Pokemod::Pokemod::deleteItemType(const int index) { Q_ASSERT(index < itemTypeCount()); delete m_itemTypes[index]; m_itemTypes.removeAt(index); } -void Pokemod::deleteItemTypeById(const int id) +void Pokemod::Pokemod::deleteItemTypeById(const int id) { deleteItemType(itemTypeIndex(id)); } -int Pokemod::newItemTypeId() const +int Pokemod::Pokemod::newItemTypeId() const { int i = 0; while ((i < itemTypeCount()) && (itemTypeIndex(i) != INT_MAX)) @@ -1304,29 +1300,29 @@ int Pokemod::newItemTypeId() const return i; } -const Map* Pokemod::map(const int index) const +const Pokemod::Map* Pokemod::Pokemod::map(const int index) const { Q_ASSERT(index < mapCount()); return m_maps.at(index); } -Map* Pokemod::map(const int index) +Pokemod::Map* Pokemod::Pokemod::map(const int index) { Q_ASSERT(index < mapCount()); return m_maps[index]; } -const Map* Pokemod::mapById(const int id) const +const Pokemod::Map* Pokemod::Pokemod::mapById(const int id) const { return map(mapIndex(id)); } -Map* Pokemod::mapById(const int id) +Pokemod::Map* Pokemod::Pokemod::mapById(const int id) { return map(mapIndex(id)); } -int Pokemod::mapIndex(const int id) const +int Pokemod::Pokemod::mapIndex(const int id) const { for (int i = 0; i < mapCount(); ++i) { @@ -1336,45 +1332,45 @@ int Pokemod::mapIndex(const int id) const return INT_MAX; } -int Pokemod::mapCount() const +int Pokemod::Pokemod::mapCount() const { return m_maps.size(); } -Map* Pokemod::newMap() +Pokemod::Map* Pokemod::Pokemod::newMap() { return newMap(new Map(this, newMapId())); } -Map* Pokemod::newMap(const QDomElement& xml) +Pokemod::Map* Pokemod::Pokemod::newMap(const QDomElement& xml) { return newMap(new Map(xml, this, newMapId())); } -Map* Pokemod::newMap(const Map& map) +Pokemod::Map* Pokemod::Pokemod::newMap(const Map& map) { return newMap(new Map(map, this, newMapId())); } -Map* Pokemod::newMap(Map* map) +Pokemod::Map* Pokemod::Pokemod::newMap(Map* map) { m_maps.append(map); return map; } -void Pokemod::deleteMap(const int index) +void Pokemod::Pokemod::deleteMap(const int index) { Q_ASSERT(index < mapCount()); delete m_maps[index]; m_maps.removeAt(index); } -void Pokemod::deleteMapById(const int id) +void Pokemod::Pokemod::deleteMapById(const int id) { deleteMap(mapIndex(id)); } -int Pokemod::newMapId() const +int Pokemod::Pokemod::newMapId() const { int i = 0; while ((i < mapCount()) && (mapIndex(i) != INT_MAX)) @@ -1382,29 +1378,29 @@ int Pokemod::newMapId() const return i; } -const Move* Pokemod::move(const int index) const +const Pokemod::Move* Pokemod::Pokemod::move(const int index) const { Q_ASSERT(index < moveCount()); return m_moves.at(index); } -Move* Pokemod::move(const int index) +Pokemod::Move* Pokemod::Pokemod::move(const int index) { Q_ASSERT(index < moveCount()); return m_moves[index]; } -const Move* Pokemod::moveById(const int id) const +const Pokemod::Move* Pokemod::Pokemod::moveById(const int id) const { return move(moveIndex(id)); } -Move* Pokemod::moveById(const int id) +Pokemod::Move* Pokemod::Pokemod::moveById(const int id) { return move(moveIndex(id)); } -int Pokemod::moveIndex(const int id) const +int Pokemod::Pokemod::moveIndex(const int id) const { for (int i = 0; i < moveCount(); ++i) { @@ -1414,45 +1410,45 @@ int Pokemod::moveIndex(const int id) const return INT_MAX; } -int Pokemod::moveCount() const +int Pokemod::Pokemod::moveCount() const { return m_moves.size(); } -Move* Pokemod::newMove() +Pokemod::Move* Pokemod::Pokemod::newMove() { return newMove(new Move(this, newMoveId())); } -Move* Pokemod::newMove(const QDomElement& xml) +Pokemod::Move* Pokemod::Pokemod::newMove(const QDomElement& xml) { return newMove(new Move(xml, this, newMoveId())); } -Move* Pokemod::newMove(const Move& move) +Pokemod::Move* Pokemod::Pokemod::newMove(const Move& move) { return newMove(new Move(move, this, newMoveId())); } -Move* Pokemod::newMove(Move* move) +Pokemod::Move* Pokemod::Pokemod::newMove(Move* move) { m_moves.append(move); return move; } -void Pokemod::deleteMove(const int index) +void Pokemod::Pokemod::deleteMove(const int index) { Q_ASSERT(index < moveCount()); delete m_moves[index]; m_moves.removeAt(index); } -void Pokemod::deleteMoveById(const int id) +void Pokemod::Pokemod::deleteMoveById(const int id) { deleteMove(moveIndex(id)); } -int Pokemod::newMoveId() const +int Pokemod::Pokemod::newMoveId() const { int i = 0; while ((i < moveCount()) && (moveIndex(i) != INT_MAX)) @@ -1460,29 +1456,29 @@ int Pokemod::newMoveId() const return i; } -const Nature* Pokemod::nature(const int index) const +const Pokemod::Nature* Pokemod::Pokemod::nature(const int index) const { Q_ASSERT(index < natureCount()); return m_natures.at(index); } -Nature* Pokemod::nature(const int index) +Pokemod::Nature* Pokemod::Pokemod::nature(const int index) { Q_ASSERT(index < natureCount()); return m_natures[index]; } -const Nature* Pokemod::natureById(const int id) const +const Pokemod::Nature* Pokemod::Pokemod::natureById(const int id) const { return nature(natureIndex(id)); } -Nature* Pokemod::natureById(const int id) +Pokemod::Nature* Pokemod::Pokemod::natureById(const int id) { return nature(natureIndex(id)); } -int Pokemod::natureIndex(const int id) const +int Pokemod::Pokemod::natureIndex(const int id) const { for (int i = 0; i < natureCount(); ++i) { @@ -1492,45 +1488,45 @@ int Pokemod::natureIndex(const int id) const return INT_MAX; } -int Pokemod::natureCount() const +int Pokemod::Pokemod::natureCount() const { return m_natures.size(); } -Nature* Pokemod::newNature() +Pokemod::Nature* Pokemod::Pokemod::newNature() { return newNature(new Nature(this, newNatureId())); } -Nature* Pokemod::newNature(const QDomElement& xml) +Pokemod::Nature* Pokemod::Pokemod::newNature(const QDomElement& xml) { return newNature(new Nature(xml, this, newNatureId())); } -Nature* Pokemod::newNature(const Nature& nature) +Pokemod::Nature* Pokemod::Pokemod::newNature(const Nature& nature) { return newNature(new Nature(nature, this, newNatureId())); } -Nature* Pokemod::newNature(Nature* nature) +Pokemod::Nature* Pokemod::Pokemod::newNature(Nature* nature) { m_natures.append(nature); return nature; } -void Pokemod::deleteNature(const int index) +void Pokemod::Pokemod::deleteNature(const int index) { Q_ASSERT(index < natureCount()); delete m_natures[index]; m_natures.removeAt(index); } -void Pokemod::deleteNatureById(const int id) +void Pokemod::Pokemod::deleteNatureById(const int id) { deleteNature(natureIndex(id)); } -int Pokemod::newNatureId() const +int Pokemod::Pokemod::newNatureId() const { int i = 0; while ((i < natureCount()) && (natureIndex(i) != INT_MAX)) @@ -1538,29 +1534,29 @@ int Pokemod::newNatureId() const return i; } -const Sound* Pokemod::sound(const int index) const +const Pokemod::Sound* Pokemod::Pokemod::sound(const int index) const { Q_ASSERT(index < soundCount()); return m_sounds.at(index); } -Sound* Pokemod::sound(const int index) +Pokemod::Sound* Pokemod::Pokemod::sound(const int index) { Q_ASSERT(index < soundCount()); return m_sounds[index]; } -const Sound* Pokemod::soundById(const int id) const +const Pokemod::Sound* Pokemod::Pokemod::soundById(const int id) const { return sound(soundIndex(id)); } -Sound* Pokemod::soundById(const int id) +Pokemod::Sound* Pokemod::Pokemod::soundById(const int id) { return sound(soundIndex(id)); } -int Pokemod::soundIndex(const int id) const +int Pokemod::Pokemod::soundIndex(const int id) const { for (int i = 0; i < soundCount(); ++i) { @@ -1570,45 +1566,45 @@ int Pokemod::soundIndex(const int id) const return INT_MAX; } -int Pokemod::soundCount() const +int Pokemod::Pokemod::soundCount() const { return m_sounds.size(); } -Sound* Pokemod::newSound() +Pokemod::Sound* Pokemod::Pokemod::newSound() { return newSound(new Sound(this, newSoundId())); } -Sound* Pokemod::newSound(const QDomElement& xml) +Pokemod::Sound* Pokemod::Pokemod::newSound(const QDomElement& xml) { return newSound(new Sound(xml, this, newSoundId())); } -Sound* Pokemod::newSound(const Sound& sound) +Pokemod::Sound* Pokemod::Pokemod::newSound(const Sound& sound) { return newSound(new Sound(sound, this, newSoundId())); } -Sound* Pokemod::newSound(Sound* sound) +Pokemod::Sound* Pokemod::Pokemod::newSound(Sound* sound) { m_sounds.append(sound); return sound; } -void Pokemod::deleteSound(const int index) +void Pokemod::Pokemod::deleteSound(const int index) { Q_ASSERT(index < soundCount()); delete m_sounds[index]; m_sounds.removeAt(index); } -void Pokemod::deleteSoundById(const int id) +void Pokemod::Pokemod::deleteSoundById(const int id) { deleteSound(soundIndex(id)); } -int Pokemod::newSoundId() const +int Pokemod::Pokemod::newSoundId() const { int i = 0; while ((i < soundCount()) && (soundIndex(i) != INT_MAX)) @@ -1616,29 +1612,29 @@ int Pokemod::newSoundId() const return i; } -const Species* Pokemod::species(const int index) const +const Pokemod::Species* Pokemod::Pokemod::species(const int index) const { Q_ASSERT(index < speciesCount()); return m_species.at(index); } -Species* Pokemod::species(const int index) +Pokemod::Species* Pokemod::Pokemod::species(const int index) { Q_ASSERT(index < speciesCount()); return m_species[index]; } -const Species* Pokemod::speciesById(const int id) const +const Pokemod::Species* Pokemod::Pokemod::speciesById(const int id) const { return species(speciesIndex(id)); } -Species* Pokemod::speciesById(const int id) +Pokemod::Species* Pokemod::Pokemod::speciesById(const int id) { return species(speciesIndex(id)); } -int Pokemod::speciesIndex(const int id) const +int Pokemod::Pokemod::speciesIndex(const int id) const { for (int i = 0; i < speciesCount(); ++i) { @@ -1648,45 +1644,45 @@ int Pokemod::speciesIndex(const int id) const return INT_MAX; } -int Pokemod::speciesCount() const +int Pokemod::Pokemod::speciesCount() const { return m_species.size(); } -Species* Pokemod::newSpecies() +Pokemod::Species* Pokemod::Pokemod::newSpecies() { return newSpecies(new Species(this, newSpeciesId())); } -Species* Pokemod::newSpecies(const QDomElement& xml) +Pokemod::Species* Pokemod::Pokemod::newSpecies(const QDomElement& xml) { return newSpecies(new Species(xml, this, newSpeciesId())); } -Species* Pokemod::newSpecies(const Species& species) +Pokemod::Species* Pokemod::Pokemod::newSpecies(const Species& species) { return newSpecies(new Species(species, this, newSpeciesId())); } -Species* Pokemod::newSpecies(Species* species) +Pokemod::Species* Pokemod::Pokemod::newSpecies(Species* species) { m_species.append(species); return species; } -void Pokemod::deleteSpecies(const int index) +void Pokemod::Pokemod::deleteSpecies(const int index) { Q_ASSERT(index < speciesCount()); delete m_species[index]; m_species.removeAt(index); } -void Pokemod::deleteSpeciesById(const int id) +void Pokemod::Pokemod::deleteSpeciesById(const int id) { deleteSpecies(speciesIndex(id)); } -int Pokemod::newSpeciesId() const +int Pokemod::Pokemod::newSpeciesId() const { int i = 0; while ((i < speciesCount()) && (speciesIndex(i) != INT_MAX)) @@ -1694,29 +1690,29 @@ int Pokemod::newSpeciesId() const return i; } -const Sprite* Pokemod::sprite(const int index) const +const Pokemod::Sprite* Pokemod::Pokemod::sprite(const int index) const { Q_ASSERT(index < spriteCount()); return m_sprites.at(index); } -Sprite* Pokemod::sprite(const int index) +Pokemod::Sprite* Pokemod::Pokemod::sprite(const int index) { Q_ASSERT(index < spriteCount()); return m_sprites[index]; } -const Sprite* Pokemod::spriteById(const int id) const +const Pokemod::Sprite* Pokemod::Pokemod::spriteById(const int id) const { return sprite(spriteIndex(id)); } -Sprite* Pokemod::spriteById(const int id) +Pokemod::Sprite* Pokemod::Pokemod::spriteById(const int id) { return sprite(spriteIndex(id)); } -int Pokemod::spriteIndex(const int id) const +int Pokemod::Pokemod::spriteIndex(const int id) const { for (int i = 0; i < spriteCount(); ++i) { @@ -1726,45 +1722,45 @@ int Pokemod::spriteIndex(const int id) const return INT_MAX; } -int Pokemod::spriteCount() const +int Pokemod::Pokemod::spriteCount() const { return m_sprites.size(); } -Sprite* Pokemod::newSprite() +Pokemod::Sprite* Pokemod::Pokemod::newSprite() { return newSprite(new Sprite(this, newSpriteId())); } -Sprite* Pokemod::newSprite(const QDomElement& xml) +Pokemod::Sprite* Pokemod::Pokemod::newSprite(const QDomElement& xml) { return newSprite(new Sprite(xml, this, newSpriteId())); } -Sprite* Pokemod::newSprite(const Sprite& sprite) +Pokemod::Sprite* Pokemod::Pokemod::newSprite(const Sprite& sprite) { return newSprite(new Sprite(sprite, this, newSpriteId())); } -Sprite* Pokemod::newSprite(Sprite* sprite) +Pokemod::Sprite* Pokemod::Pokemod::newSprite(Sprite* sprite) { m_sprites.append(sprite); return sprite; } -void Pokemod::deleteSprite(const int index) +void Pokemod::Pokemod::deleteSprite(const int index) { Q_ASSERT(index < spriteCount()); delete m_sprites[index]; m_sprites.removeAt(index); } -void Pokemod::deleteSpriteById(const int id) +void Pokemod::Pokemod::deleteSpriteById(const int id) { deleteSprite(spriteIndex(id)); } -int Pokemod::newSpriteId() const +int Pokemod::Pokemod::newSpriteId() const { int i = 0; while ((i < spriteCount()) && (spriteIndex(i) != INT_MAX)) @@ -1772,29 +1768,29 @@ int Pokemod::newSpriteId() const return i; } -const Status* Pokemod::status(const int index) const +const Pokemod::Status* Pokemod::Pokemod::status(const int index) const { Q_ASSERT(index < statusCount()); return m_status.at(index); } -Status* Pokemod::status(const int index) +Pokemod::Status* Pokemod::Pokemod::status(const int index) { Q_ASSERT(index < statusCount()); return m_status[index]; } -const Status* Pokemod::statusById(const int id) const +const Pokemod::Status* Pokemod::Pokemod::statusById(const int id) const { return status(statusIndex(id)); } -Status* Pokemod::statusById(const int id) +Pokemod::Status* Pokemod::Pokemod::statusById(const int id) { return status(statusIndex(id)); } -int Pokemod::statusIndex(const int id) const +int Pokemod::Pokemod::statusIndex(const int id) const { for (int i = 0; i < statusCount(); ++i) { @@ -1804,45 +1800,45 @@ int Pokemod::statusIndex(const int id) const return INT_MAX; } -int Pokemod::statusCount() const +int Pokemod::Pokemod::statusCount() const { return m_status.size(); } -Status* Pokemod::newStatus() +Pokemod::Status* Pokemod::Pokemod::newStatus() { return newStatus(new Status(this, newStatusId())); } -Status* Pokemod::newStatus(const QDomElement& xml) +Pokemod::Status* Pokemod::Pokemod::newStatus(const QDomElement& xml) { return newStatus(new Status(xml, this, newStatusId())); } -Status* Pokemod::newStatus(const Status& status) +Pokemod::Status* Pokemod::Pokemod::newStatus(const Status& status) { return newStatus(new Status(status, this, newStatusId())); } -Status* Pokemod::newStatus(Status* status) +Pokemod::Status* Pokemod::Pokemod::newStatus(Status* status) { m_status.append(status); return status; } -void Pokemod::deleteStatus(const int index) +void Pokemod::Pokemod::deleteStatus(const int index) { Q_ASSERT(index < statusCount()); delete m_status[index]; m_status.removeAt(index); } -void Pokemod::deleteStatusById(const int id) +void Pokemod::Pokemod::deleteStatusById(const int id) { deleteStatus(statusIndex(id)); } -int Pokemod::newStatusId() const +int Pokemod::Pokemod::newStatusId() const { int i = 0; while ((i < statusCount()) && (statusIndex(i) != INT_MAX)) @@ -1850,29 +1846,29 @@ int Pokemod::newStatusId() const return i; } -const Store* Pokemod::store(const int index) const +const Pokemod::Store* Pokemod::Pokemod::store(const int index) const { Q_ASSERT(index < storeCount()); return m_stores.at(index); } -Store* Pokemod::store(const int index) +Pokemod::Store* Pokemod::Pokemod::store(const int index) { Q_ASSERT(index < storeCount()); return m_stores[index]; } -const Store* Pokemod::storeById(const int id) const +const Pokemod::Store* Pokemod::Pokemod::storeById(const int id) const { return store(storeIndex(id)); } -Store* Pokemod::storeById(const int id) +Pokemod::Store* Pokemod::Pokemod::storeById(const int id) { return store(storeIndex(id)); } -int Pokemod::storeIndex(const int id) const +int Pokemod::Pokemod::storeIndex(const int id) const { for (int i = 0; i < storeCount(); ++i) { @@ -1882,45 +1878,45 @@ int Pokemod::storeIndex(const int id) const return INT_MAX; } -int Pokemod::storeCount() const +int Pokemod::Pokemod::storeCount() const { return m_stores.size(); } -Store* Pokemod::newStore() +Pokemod::Store* Pokemod::Pokemod::newStore() { return newStore(new Store(this, newStoreId())); } -Store* Pokemod::newStore(const QDomElement& xml) +Pokemod::Store* Pokemod::Pokemod::newStore(const QDomElement& xml) { return newStore(new Store(xml, this, newStoreId())); } -Store* Pokemod::newStore(const Store& store) +Pokemod::Store* Pokemod::Pokemod::newStore(const Store& store) { return newStore(new Store(store, this, newStoreId())); } -Store* Pokemod::newStore(Store* store) +Pokemod::Store* Pokemod::Pokemod::newStore(Store* store) { m_stores.append(store); return store; } -void Pokemod::deleteStore(const int index) +void Pokemod::Pokemod::deleteStore(const int index) { Q_ASSERT(index < storeCount()); delete m_stores[index]; m_stores.removeAt(index); } -void Pokemod::deleteStoreById(const int id) +void Pokemod::Pokemod::deleteStoreById(const int id) { deleteStore(storeIndex(id)); } -int Pokemod::newStoreId() const +int Pokemod::Pokemod::newStoreId() const { int i = 0; while ((i < storeCount()) && (storeIndex(i) != INT_MAX)) @@ -1928,29 +1924,29 @@ int Pokemod::newStoreId() const return i; } -const Tile* Pokemod::tile(const int index) const +const Pokemod::Tile* Pokemod::Pokemod::tile(const int index) const { Q_ASSERT(index < tileCount()); return m_tiles.at(index); } -Tile* Pokemod::tile(const int index) +Pokemod::Tile* Pokemod::Pokemod::tile(const int index) { Q_ASSERT(index < tileCount()); return m_tiles[index]; } -const Tile* Pokemod::tileById(const int id) const +const Pokemod::Tile* Pokemod::Pokemod::tileById(const int id) const { return tile(tileIndex(id)); } -Tile* Pokemod::tileById(const int id) +Pokemod::Tile* Pokemod::Pokemod::tileById(const int id) { return tile(tileIndex(id)); } -int Pokemod::tileIndex(const int id) const +int Pokemod::Pokemod::tileIndex(const int id) const { for (int i = 0; i < tileCount(); ++i) { @@ -1960,45 +1956,45 @@ int Pokemod::tileIndex(const int id) const return INT_MAX; } -int Pokemod::tileCount() const +int Pokemod::Pokemod::tileCount() const { return m_tiles.size(); } -Tile* Pokemod::newTile() +Pokemod::Tile* Pokemod::Pokemod::newTile() { return newTile(new Tile(this, newTileId())); } -Tile* Pokemod::newTile(const QDomElement& xml) +Pokemod::Tile* Pokemod::Pokemod::newTile(const QDomElement& xml) { return newTile(new Tile(xml, this, newTileId())); } -Tile* Pokemod::newTile(const Tile& tile) +Pokemod::Tile* Pokemod::Pokemod::newTile(const Tile& tile) { return newTile(new Tile(tile, this, newTileId())); } -Tile* Pokemod::newTile(Tile* tile) +Pokemod::Tile* Pokemod::Pokemod::newTile(Tile* tile) { m_tiles.append(tile); return tile; } -void Pokemod::deleteTile(const int index) +void Pokemod::Pokemod::deleteTile(const int index) { Q_ASSERT(index < tileCount()); delete m_tiles[index]; m_tiles.removeAt(index); } -void Pokemod::deleteTileById(const int id) +void Pokemod::Pokemod::deleteTileById(const int id) { deleteTile(tileIndex(id)); } -int Pokemod::newTileId() const +int Pokemod::Pokemod::newTileId() const { int i = 0; while ((i < tileCount()) && (tileIndex(i) != INT_MAX)) @@ -2006,29 +2002,29 @@ int Pokemod::newTileId() const return i; } -const Time* Pokemod::time(const int index) const +const Pokemod::Time* Pokemod::Pokemod::time(const int index) const { Q_ASSERT(index < timeCount()); return m_times.at(index); } -Time* Pokemod::time(const int index) +Pokemod::Time* Pokemod::Pokemod::time(const int index) { Q_ASSERT(index < timeCount()); return m_times[index]; } -const Time* Pokemod::timeById(const int id) const +const Pokemod::Time* Pokemod::Pokemod::timeById(const int id) const { return time(timeIndex(id)); } -Time* Pokemod::timeById(const int id) +Pokemod::Time* Pokemod::Pokemod::timeById(const int id) { return time(timeIndex(id)); } -int Pokemod::timeIndex(const int id) const +int Pokemod::Pokemod::timeIndex(const int id) const { for (int i = 0; i < timeCount(); ++i) { @@ -2038,45 +2034,45 @@ int Pokemod::timeIndex(const int id) const return INT_MAX; } -int Pokemod::timeCount() const +int Pokemod::Pokemod::timeCount() const { return m_times.size(); } -Time* Pokemod::newTime() +Pokemod::Time* Pokemod::Pokemod::newTime() { return newTime(new Time(this, newTimeId())); } -Time* Pokemod::newTime(const QDomElement& xml) +Pokemod::Time* Pokemod::Pokemod::newTime(const QDomElement& xml) { return newTime(new Time(xml, this, newTimeId())); } -Time* Pokemod::newTime(const Time& time) +Pokemod::Time* Pokemod::Pokemod::newTime(const Time& time) { return newTime(new Time(time, this, newTimeId())); } -Time* Pokemod::newTime(Time* time) +Pokemod::Time* Pokemod::Pokemod::newTime(Time* time) { m_times.append(time); return time; } -void Pokemod::deleteTime(const int index) +void Pokemod::Pokemod::deleteTime(const int index) { Q_ASSERT(index < timeCount()); delete m_times[index]; m_times.removeAt(index); } -void Pokemod::deleteTimeById(const int id) +void Pokemod::Pokemod::deleteTimeById(const int id) { deleteTime(timeIndex(id)); } -int Pokemod::newTimeId() const +int Pokemod::Pokemod::newTimeId() const { int i = 0; while ((i < timeCount()) && (timeIndex(i) != INT_MAX)) @@ -2084,29 +2080,29 @@ int Pokemod::newTimeId() const return i; } -const Trainer* Pokemod::trainer(const int index) const +const Pokemod::Trainer* Pokemod::Pokemod::trainer(const int index) const { Q_ASSERT(index < trainerCount()); return m_trainers.at(index); } -Trainer* Pokemod::trainer(const int index) +Pokemod::Trainer* Pokemod::Pokemod::trainer(const int index) { Q_ASSERT(index < trainerCount()); return m_trainers[index]; } -const Trainer* Pokemod::trainerById(const int id) const +const Pokemod::Trainer* Pokemod::Pokemod::trainerById(const int id) const { return trainer(trainerIndex(id)); } -Trainer* Pokemod::trainerById(const int id) +Pokemod::Trainer* Pokemod::Pokemod::trainerById(const int id) { return trainer(trainerIndex(id)); } -int Pokemod::trainerIndex(const int id) const +int Pokemod::Pokemod::trainerIndex(const int id) const { for (int i = 0; i < trainerCount(); ++i) { @@ -2116,45 +2112,45 @@ int Pokemod::trainerIndex(const int id) const return INT_MAX; } -int Pokemod::trainerCount() const +int Pokemod::Pokemod::trainerCount() const { return m_trainers.size(); } -Trainer* Pokemod::newTrainer() +Pokemod::Trainer* Pokemod::Pokemod::newTrainer() { return newTrainer(new Trainer(this, newTrainerId())); } -Trainer* Pokemod::newTrainer(const QDomElement& xml) +Pokemod::Trainer* Pokemod::Pokemod::newTrainer(const QDomElement& xml) { return newTrainer(new Trainer(xml, this, newTrainerId())); } -Trainer* Pokemod::newTrainer(const Trainer& trainer) +Pokemod::Trainer* Pokemod::Pokemod::newTrainer(const Trainer& trainer) { return newTrainer(new Trainer(trainer, this, newTrainerId())); } -Trainer* Pokemod::newTrainer(Trainer* trainer) +Pokemod::Trainer* Pokemod::Pokemod::newTrainer(Trainer* trainer) { m_trainers.append(trainer); return trainer; } -void Pokemod::deleteTrainer(const int index) +void Pokemod::Pokemod::deleteTrainer(const int index) { Q_ASSERT(index < trainerCount()); delete m_trainers[index]; m_trainers.removeAt(index); } -void Pokemod::deleteTrainerById(const int id) +void Pokemod::Pokemod::deleteTrainerById(const int id) { deleteTrainer(trainerIndex(id)); } -int Pokemod::newTrainerId() const +int Pokemod::Pokemod::newTrainerId() const { int i = 0; while ((i < trainerCount()) && (trainerIndex(i) != INT_MAX)) @@ -2162,29 +2158,29 @@ int Pokemod::newTrainerId() const return i; } -const Type* Pokemod::type(const int index) const +const Pokemod::Type* Pokemod::Pokemod::type(const int index) const { Q_ASSERT(index < typeCount()); return m_types.at(index); } -Type* Pokemod::type(const int index) +Pokemod::Type* Pokemod::Pokemod::type(const int index) { Q_ASSERT(index < typeCount()); return m_types[index]; } -const Type* Pokemod::typeById(const int id) const +const Pokemod::Type* Pokemod::Pokemod::typeById(const int id) const { return type(typeIndex(id)); } -Type* Pokemod::typeById(const int id) +Pokemod::Type* Pokemod::Pokemod::typeById(const int id) { return type(typeIndex(id)); } -int Pokemod::typeIndex(const int id) const +int Pokemod::Pokemod::typeIndex(const int id) const { for (int i = 0; i < typeCount(); ++i) { @@ -2194,34 +2190,34 @@ int Pokemod::typeIndex(const int id) const return INT_MAX; } -int Pokemod::typeCount() const +int Pokemod::Pokemod::typeCount() const { return m_types.size(); } -Type* Pokemod::newType() +Pokemod::Type* Pokemod::Pokemod::newType() { return newType(new Type(this, newTypeId())); } -Type* Pokemod::newType(const QDomElement& xml) +Pokemod::Type* Pokemod::Pokemod::newType(const QDomElement& xml) { return newType(new Type(xml, this, newTypeId())); } -Type* Pokemod::newType(const Type& type) +Pokemod::Type* Pokemod::Pokemod::newType(const Type& type) { return newType(new Type(type, this, newTypeId())); } -Type* Pokemod::newType(Type* type) +Pokemod::Type* Pokemod::Pokemod::newType(Type* type) { m_types.append(type); m_typechart.resize(typeCount(), typeCount(), Fraction(1, 1)); return type; } -void Pokemod::deleteType(const int index) +void Pokemod::Pokemod::deleteType(const int index) { Q_ASSERT(index < typeCount()); delete m_types[index]; @@ -2229,12 +2225,12 @@ void Pokemod::deleteType(const int index) m_typechart.resize(typeCount(), typeCount(), Fraction(1, 1)); } -void Pokemod::deleteTypeById(const int id) +void Pokemod::Pokemod::deleteTypeById(const int id) { deleteType(typeIndex(id)); } -int Pokemod::newTypeId() const +int Pokemod::Pokemod::newTypeId() const { int i = 0; while ((i < typeCount()) && (typeIndex(i) != INT_MAX)) @@ -2242,29 +2238,29 @@ int Pokemod::newTypeId() const return i; } -const Weather* Pokemod::weather(const int index) const +const Pokemod::Weather* Pokemod::Pokemod::weather(const int index) const { Q_ASSERT(index < weatherCount()); return m_weathers.at(index); } -Weather* Pokemod::weather(const int index) +Pokemod::Weather* Pokemod::Pokemod::weather(const int index) { Q_ASSERT(index < weatherCount()); return m_weathers[index]; } -const Weather* Pokemod::weatherById(const int id) const +const Pokemod::Weather* Pokemod::Pokemod::weatherById(const int id) const { return weather(weatherIndex(id)); } -Weather* Pokemod::weatherById(const int id) +Pokemod::Weather* Pokemod::Pokemod::weatherById(const int id) { return weather(weatherIndex(id)); } -int Pokemod::weatherIndex(const int id) const +int Pokemod::Pokemod::weatherIndex(const int id) const { for (int i = 0; i < weatherCount(); ++i) { @@ -2274,45 +2270,45 @@ int Pokemod::weatherIndex(const int id) const return INT_MAX; } -int Pokemod::weatherCount() const +int Pokemod::Pokemod::weatherCount() const { return m_weathers.size(); } -Weather* Pokemod::newWeather() +Pokemod::Weather* Pokemod::Pokemod::newWeather() { return newWeather(new Weather(this, newWeatherId())); } -Weather* Pokemod::newWeather(const QDomElement& xml) +Pokemod::Weather* Pokemod::Pokemod::newWeather(const QDomElement& xml) { return newWeather(new Weather(xml, this, newWeatherId())); } -Weather* Pokemod::newWeather(const Weather& weather) +Pokemod::Weather* Pokemod::Pokemod::newWeather(const Weather& weather) { return newWeather(new Weather(weather, this, newWeatherId())); } -Weather* Pokemod::newWeather(Weather* weather) +Pokemod::Weather* Pokemod::Pokemod::newWeather(Weather* weather) { m_weathers.append(weather); return weather; } -void Pokemod::deleteWeather(const int index) +void Pokemod::Pokemod::deleteWeather(const int index) { Q_ASSERT(index < weatherCount()); delete m_weathers[index]; m_weathers.removeAt(index); } -void Pokemod::deleteWeatherById(const int id) +void Pokemod::Pokemod::deleteWeatherById(const int id) { deleteWeather(weatherIndex(id)); } -int Pokemod::newWeatherId() const +int Pokemod::Pokemod::newWeatherId() const { int i = 0; while ((i < weatherCount()) && (weatherIndex(i) != INT_MAX)) @@ -2320,7 +2316,7 @@ int Pokemod::newWeatherId() const return i; } -Pokemod& Pokemod::operator=(const Pokemod& rhs) +Pokemod::Pokemod& Pokemod::Pokemod::operator=(const Pokemod& rhs) { if (this == &rhs) return *this; @@ -2357,7 +2353,7 @@ Pokemod& Pokemod::operator=(const Pokemod& rhs) return *this; } -void Pokemod::clear() +void Pokemod::Pokemod::clear() { while (abilityCount()) deleteAbility(0); diff --git a/pokemod/Pokemod.h b/pokemod/Pokemod.h index 54c00295..94366001 100644 --- a/pokemod/Pokemod.h +++ b/pokemod/Pokemod.h @@ -24,12 +24,12 @@ #include "Object.h" #include "Point.h" -// General includes - // Qt includes #include <QList> #include <QPixmap> +namespace Pokemod +{ // Forward declarations class Ability; class Author; @@ -59,37 +59,6 @@ class Pokemod : public Object Q_OBJECT public: - enum Stat - { - ST_HP = 0, - ST_No_HP_Start = 1, - ST_Attack = 1, - ST_Defense = 2, - ST_Speed = 3, - ST_Special = 4, - ST_End_RBY = 5, - ST_SpecialAttack = 4, - ST_SpecialDefense = 5, - ST_End_GSC = 6, - ST_Accuracy = 6, - ST_Evasion = 7, - ST_End_Battle = 8 - }; - static const QStringList StatRBYStr; - static const QStringList StatGSCStr; - - enum Direction - { - D_Up = 0, - D_Down = 1, - D_Left = 2, - D_Right = 3, - D_End = 4, - D_None = 4, - D_End_None = 5 - }; - static const QStringList DirectionStr; - Pokemod(); Pokemod(const Pokemod& pokemod); Pokemod(const QDomElement& xml); @@ -126,8 +95,8 @@ class Pokemod : public Object QPixmap flySkin() const; QPixmap fishSkin() const; QPixmap surfFishSkin() const; - const Matrix<Fraction>& typechart() const; - Matrix<Fraction>& typechart(); + const Matrix<Fraction>* typechart() const; + Matrix<Fraction>* typechart(); Fraction typechart(const int attack, const int defense) const; const Rules* rules() const; Rules* rules(); @@ -488,5 +457,6 @@ class Pokemod : public Object QList<Type*> m_types; QList<Weather*> m_weathers; }; +} #endif diff --git a/pokemod/Rules.cpp b/pokemod/Rules.cpp index 21f2b428..a999cf1a 100644 --- a/pokemod/Rules.cpp +++ b/pokemod/Rules.cpp @@ -21,15 +21,15 @@ // Pokemod includes #include "Pokemod.h" -const QStringList Rules::DVStr = QStringList() << "16" << "32"; +const QStringList Pokemod::Rules::DVStr = QStringList() << "16" << "32"; -Rules::Rules(const Rules& rules) : +Pokemod::Rules::Rules(const Rules& rules) : Object("Rules", rules.parent(), 0) { *this = rules; } -Rules::Rules(const Pokemod* parent) : +Pokemod::Rules::Rules(const Pokemod* parent) : Object("Rules", parent, 0), m_genderAllowed(false), m_breedingAllowed(false), @@ -63,19 +63,19 @@ Rules::Rules(const Pokemod* parent) : { } -Rules::Rules(const Rules& rules, const Pokemod* parent) : +Pokemod::Rules::Rules(const Rules& rules, const Pokemod* parent) : Object("Rules", parent, 0) { *this = rules; } -Rules::Rules(const QDomElement& xml, const Pokemod* parent) : +Pokemod::Rules::Rules(const QDomElement& xml, const Pokemod* parent) : Object("Rules", parent, 0) { load(xml); } -void Rules::validate() +void Pokemod::Rules::validate() { TEST(setBreedingAllowed, breedingAllowed); TEST(setMaxMultiplier, maxMultiplier); @@ -98,7 +98,7 @@ void Rules::validate() emit(warning("Pokerus chance is high")); } -void Rules::load(const QDomElement& xml, const int /*id*/) +void Pokemod::Rules::load(const QDomElement& xml, const int /*id*/) { LOAD(bool, genderAllowed); LOAD(bool, breedingAllowed); @@ -131,7 +131,7 @@ void Rules::load(const QDomElement& xml, const int /*id*/) LOAD(Fraction, pokerusChance); } -QDomElement Rules::save() const +QDomElement Pokemod::Rules::save() const { QDomElement xml = QDomDocument().createElement(className()); SAVE(bool, genderAllowed); @@ -166,12 +166,12 @@ QDomElement Rules::save() const return xml; } -void Rules::setGenderAllowed(const bool genderAllowed) +void Pokemod::Rules::setGenderAllowed(const bool genderAllowed) { CHECK(genderAllowed); } -void Rules::setBreedingAllowed(const bool breedingAllowed) +void Pokemod::Rules::setBreedingAllowed(const bool breedingAllowed) { if (!m_genderAllowed && breedingAllowed) { @@ -181,12 +181,12 @@ void Rules::setBreedingAllowed(const bool breedingAllowed) CHECK(breedingAllowed); } -void Rules::setCriticalDomains(const bool criticalDomains) +void Pokemod::Rules::setCriticalDomains(const bool criticalDomains) { CHECK(criticalDomains); } -void Rules::setMaxMultiplier(const int maxMultiplier) +void Pokemod::Rules::setMaxMultiplier(const int maxMultiplier) { if (!maxMultiplier) { @@ -196,12 +196,12 @@ void Rules::setMaxMultiplier(const int maxMultiplier) CHECK(maxMultiplier); } -void Rules::setNumBoxes(const int numBoxes) +void Pokemod::Rules::setNumBoxes(const int numBoxes) { CHECK(numBoxes); } -void Rules::setBoxSize(const int boxSize) +void Pokemod::Rules::setBoxSize(const int boxSize) { if (m_numBoxes && !boxSize) { @@ -211,7 +211,7 @@ void Rules::setBoxSize(const int boxSize) CHECK(boxSize); } -void Rules::setMaxParty(const int maxParty) +void Pokemod::Rules::setMaxParty(const int maxParty) { if (!maxParty) { @@ -221,7 +221,7 @@ void Rules::setMaxParty(const int maxParty) CHECK(maxParty); } -void Rules::setMaxFight(const int maxFight) +void Pokemod::Rules::setMaxFight(const int maxFight) { if (m_maxParty < maxFight) { @@ -231,7 +231,7 @@ void Rules::setMaxFight(const int maxFight) CHECK(maxFight); } -void Rules::setMaxPlayers(const int maxPlayers) +void Pokemod::Rules::setMaxPlayers(const int maxPlayers) { if (maxPlayers < 2) { @@ -241,22 +241,22 @@ void Rules::setMaxPlayers(const int maxPlayers) CHECK(maxPlayers); } -void Rules::setMaxHeldItems(const int maxHeldItems) +void Pokemod::Rules::setMaxHeldItems(const int maxHeldItems) { CHECK(maxHeldItems); } -void Rules::setMaxAbilities(const int maxAbilities) +void Pokemod::Rules::setMaxAbilities(const int maxAbilities) { CHECK(maxAbilities); } -void Rules::setMaxNatures(const int maxNatures) +void Pokemod::Rules::setMaxNatures(const int maxNatures) { CHECK(maxNatures); } -void Rules::setMaxMoves(const int maxMoves) +void Pokemod::Rules::setMaxMoves(const int maxMoves) { if (!maxMoves) { @@ -266,7 +266,7 @@ void Rules::setMaxMoves(const int maxMoves) CHECK(maxMoves); } -void Rules::setMaxLevel(const int maxLevel) +void Pokemod::Rules::setMaxLevel(const int maxLevel) { if (!maxLevel) { @@ -276,32 +276,32 @@ void Rules::setMaxLevel(const int maxLevel) CHECK(maxLevel); } -void Rules::setMaxStages(const int maxStages) +void Pokemod::Rules::setMaxStages(const int maxStages) { CHECK(maxStages); } -void Rules::setMaxMoney(const int maxMoney) +void Pokemod::Rules::setMaxMoney(const int maxMoney) { CHECK(maxMoney); } -void Rules::setHardCash(const bool hardCash) +void Pokemod::Rules::setHardCash(const bool hardCash) { CHECK(hardCash); } -void Rules::setAllowSwitchStyle(const bool allowSwitchStyle) +void Pokemod::Rules::setAllowSwitchStyle(const bool allowSwitchStyle) { CHECK(allowSwitchStyle); } -void Rules::setSpecialSplit(const bool specialSplit) +void Pokemod::Rules::setSpecialSplit(const bool specialSplit) { CHECK(specialSplit); } -void Rules::setSpecialDVSplit(const bool specialDVSplit) +void Pokemod::Rules::setSpecialDVSplit(const bool specialDVSplit) { if (!specialDVSplit && m_specialSplit) { @@ -311,7 +311,7 @@ void Rules::setSpecialDVSplit(const bool specialDVSplit) CHECK(specialDVSplit); } -void Rules::setMaxDVValue(const int maxDVValue) +void Pokemod::Rules::setMaxDVValue(const int maxDVValue) { if (1 < maxDVValue) { @@ -321,32 +321,32 @@ void Rules::setMaxDVValue(const int maxDVValue) CHECK(maxDVValue); } -void Rules::setHappiness(const bool happiness) +void Pokemod::Rules::setHappiness(const bool happiness) { CHECK(happiness); } -void Rules::setHappyFaintLoss(const int happyFaintLoss) +void Pokemod::Rules::setHappyFaintLoss(const int happyFaintLoss) { CHECK(happyFaintLoss); } -void Rules::setHappyLevelGain(const int happyLevelGain) +void Pokemod::Rules::setHappyLevelGain(const int happyLevelGain) { CHECK(happyLevelGain); } -void Rules::setHappySteps(const int happySteps) +void Pokemod::Rules::setHappySteps(const int happySteps) { CHECK(happySteps); } -void Rules::setEffortValuesAllowed(const bool effortValuesAllowed) +void Pokemod::Rules::setEffortValuesAllowed(const bool effortValuesAllowed) { CHECK(effortValuesAllowed); } -void Rules::setMaxTotalEV(const int maxTotalEV) +void Pokemod::Rules::setMaxTotalEV(const int maxTotalEV) { if (!maxTotalEV) { @@ -356,7 +356,7 @@ void Rules::setMaxTotalEV(const int maxTotalEV) CHECK(maxTotalEV); } -void Rules::setMaxEVPerStat(const int maxEVPerStat) +void Pokemod::Rules::setMaxEVPerStat(const int maxEVPerStat) { if ((!maxEVPerStat && m_maxTotalEV) || (m_maxTotalEV < maxEVPerStat)) { @@ -366,7 +366,7 @@ void Rules::setMaxEVPerStat(const int maxEVPerStat) CHECK(maxEVPerStat); } -void Rules::setPokerusChance(const Fraction& pokerusChance) +void Pokemod::Rules::setPokerusChance(const Fraction& pokerusChance) { if (1 < pokerusChance) { @@ -376,152 +376,152 @@ void Rules::setPokerusChance(const Fraction& pokerusChance) CHECK(pokerusChance); } -bool Rules::genderAllowed() const +bool Pokemod::Rules::genderAllowed() const { return m_genderAllowed; } -bool Rules::breedingAllowed() const +bool Pokemod::Rules::breedingAllowed() const { return m_breedingAllowed; } -bool Rules::criticalDomains() const +bool Pokemod::Rules::criticalDomains() const { return m_criticalDomains; } -int Rules::maxMultiplier() const +int Pokemod::Rules::maxMultiplier() const { return m_maxMultiplier; } -int Rules::numBoxes() const +int Pokemod::Rules::numBoxes() const { return m_numBoxes; } -int Rules::boxSize() const +int Pokemod::Rules::boxSize() const { return m_boxSize; } -int Rules::maxParty() const +int Pokemod::Rules::maxParty() const { return m_maxParty; } -int Rules::maxFight() const +int Pokemod::Rules::maxFight() const { return m_maxFight; } -int Rules::maxPlayers() const +int Pokemod::Rules::maxPlayers() const { return m_maxPlayers; } -int Rules::maxHeldItems() const +int Pokemod::Rules::maxHeldItems() const { return m_maxHeldItems; } -int Rules::maxAbilities() const +int Pokemod::Rules::maxAbilities() const { return m_maxAbilities; } -int Rules::maxNatures() const +int Pokemod::Rules::maxNatures() const { return m_maxNatures; } -int Rules::maxMoves() const +int Pokemod::Rules::maxMoves() const { return m_maxMoves; } -int Rules::maxLevel() const +int Pokemod::Rules::maxLevel() const { return m_maxLevel; } -int Rules::maxStages() const +int Pokemod::Rules::maxStages() const { return m_maxStages; } -int Rules::maxMoney() const +int Pokemod::Rules::maxMoney() const { return m_maxMoney; } -bool Rules::hardCash() const +bool Pokemod::Rules::hardCash() const { return m_hardCash; } -bool Rules::allowSwitchStyle() const +bool Pokemod::Rules::allowSwitchStyle() const { return m_allowSwitchStyle; } -bool Rules::specialSplit() const +bool Pokemod::Rules::specialSplit() const { return m_specialSplit; } -bool Rules::specialDVSplit() const +bool Pokemod::Rules::specialDVSplit() const { return m_specialDVSplit; } -int Rules::maxDVValue() const +int Pokemod::Rules::maxDVValue() const { return m_maxDVValue; } -bool Rules::happiness() const +bool Pokemod::Rules::happiness() const { return m_happiness; } -int Rules::happyFaintLoss() const +int Pokemod::Rules::happyFaintLoss() const { return m_happyFaintLoss; } -int Rules::happyLevelGain() const +int Pokemod::Rules::happyLevelGain() const { return m_happyLevelGain; } -int Rules::happySteps() const +int Pokemod::Rules::happySteps() const { return m_happySteps; } -bool Rules::effortValuesAllowed() const +bool Pokemod::Rules::effortValuesAllowed() const { return m_effortValuesAllowed; } -int Rules::maxTotalEV() const +int Pokemod::Rules::maxTotalEV() const { return m_maxTotalEV; } -int Rules::maxEVPerStat() const +int Pokemod::Rules::maxEVPerStat() const { return m_maxEVPerStat; } -Fraction Rules::pokerusChance() const +Pokemod::Fraction Pokemod::Rules::pokerusChance() const { return m_pokerusChance; } -Rules& Rules::operator=(const Rules& rhs) +Pokemod::Rules& Pokemod::Rules::operator=(const Rules& rhs) { if (this == &rhs) return *this; diff --git a/pokemod/Rules.h b/pokemod/Rules.h index 1dad0b0b..16360c36 100644 --- a/pokemod/Rules.h +++ b/pokemod/Rules.h @@ -22,6 +22,8 @@ #include "Fraction.h" #include "Object.h" +namespace Pokemod +{ // Forward declarations class Pokemod; @@ -134,5 +136,6 @@ class Rules : public Object int m_maxEVPerStat; Fraction m_pokerusChance; }; +} #endif diff --git a/pokemod/Script.h b/pokemod/Script.h index 5e66f578..8ba96d9b 100644 --- a/pokemod/Script.h +++ b/pokemod/Script.h @@ -21,52 +21,71 @@ // Qt includes #include <QString> +namespace Pokemod +{ class Script { public: - inline Script(const QString& interpreter = "", const QString& script = "") : - m_interpreter(interpreter), - m_script(script) - { - } + Script(const QString& interpreter = "", const QString& script = ""); - inline void setInterpreter(const QString& interpreter) - { - m_interpreter = interpreter; - } - inline void setScript(const QString& script) - { - m_script = script; - } + void setInterpreter(const QString& interpreter); + inline void setScript(const QString& script); - inline QString interpreter() const - { - return m_interpreter; - } - inline QString script() const - { - return m_script; - } + inline QString interpreter() const; + inline QString script() const; - inline Script& operator=(const Script& rhs) - { - if (this == &rhs) - return *this; - m_interpreter = rhs.m_interpreter; - m_script = rhs.m_script; - return *this; - } - inline bool operator==(const Script& rhs) const - { - return ((m_interpreter == rhs.m_interpreter) && (m_script == rhs.m_script)); - } - inline bool operator!=(const Script& rhs) const - { - return !(*this == rhs); - } + inline Script& operator=(const Script& rhs); + inline bool operator==(const Script& rhs) const; + inline bool operator!=(const Script& rhs) const; private: QString m_interpreter; QString m_script; }; +inline Script::Script(const QString& interpreter, const QString& script) : + m_interpreter(interpreter), + m_script(script) +{ +} + +inline void Script::setInterpreter(const QString& interpreter) +{ + m_interpreter = interpreter; +} + +inline void Script::setScript(const QString& script) +{ + m_script = script; +} + +inline QString Script::interpreter() const +{ + return m_interpreter; +} + +inline QString Script::script() const +{ + return m_script; +} + +inline Script::Script& Script::operator=(const Script& rhs) +{ + if (this == &rhs) + return *this; + m_interpreter = rhs.m_interpreter; + m_script = rhs.m_script; + return *this; +} + +inline bool Script::operator==(const Script& rhs) const +{ + return ((m_interpreter == rhs.m_interpreter) && (m_script == rhs.m_script)); +} + +inline bool Script::operator!=(const Script& rhs) const +{ + return !(*this == rhs); +} +} + #endif diff --git a/pokemod/Sound.cpp b/pokemod/Sound.cpp index 374a328f..cdcd480a 100644 --- a/pokemod/Sound.cpp +++ b/pokemod/Sound.cpp @@ -21,32 +21,32 @@ // Pokemod includes #include "Pokemod.h" -Sound::Sound(const Sound& sound) : +Pokemod::Sound::Sound(const Sound& sound) : Object("Sound", sound.parent(), sound.id()) { *this = sound; } -Sound::Sound(const Pokemod* parent, const int id) : +Pokemod::Sound::Sound(const Pokemod* parent, const int id) : Object("Sound", parent, id), m_name(""), m_data() { } -Sound::Sound(const Sound& sound, const Pokemod* parent, const int id) : +Pokemod::Sound::Sound(const Sound& sound, const Pokemod* parent, const int id) : Object("Sound", parent, id) { *this = sound; } -Sound::Sound(const QDomElement& xml, const Pokemod* parent, const int id) : +Pokemod::Sound::Sound(const QDomElement& xml, const Pokemod* parent, const int id) : Object("Sound", parent, id) { load(xml, id); } -void Sound::validate() +void Pokemod::Sound::validate() { if (m_name.isEmpty()) emit(error("Name is empty")); @@ -54,14 +54,14 @@ void Sound::validate() emit(error("Data is empty")); } -void Sound::load(const QDomElement& xml, int id) +void Pokemod::Sound::load(const QDomElement& xml, int id) { LOAD_ID(); LOAD(QString, name); LOAD(QByteArray, data); } -QDomElement Sound::save() const +QDomElement Pokemod::Sound::save() const { SAVE_CREATE(); SAVE(QString, name); @@ -69,27 +69,27 @@ QDomElement Sound::save() const return xml; } -void Sound::setName(const QString& name) +void Pokemod::Sound::setName(const QString& name) { CHECK(name); } -void Sound::setData(const QByteArray& data) +void Pokemod::Sound::setData(const QByteArray& data) { CHECK(data); } -QString Sound::name() const +QString Pokemod::Sound::name() const { return m_name; } -QByteArray Sound::data() const +QByteArray Pokemod::Sound::data() const { return m_data; } -Sound& Sound::operator=(const Sound& rhs) +Pokemod::Sound& Pokemod::Sound::operator=(const Sound& rhs) { if (this == &rhs) return *this; diff --git a/pokemod/Sound.h b/pokemod/Sound.h index 90253805..f35eac41 100644 --- a/pokemod/Sound.h +++ b/pokemod/Sound.h @@ -25,6 +25,8 @@ #include <QByteArray> #include <QString> +namespace Pokemod +{ // Forward declarations class Pokemod; @@ -54,5 +56,6 @@ class Sound : public Object QString m_name; QByteArray m_data; }; +} #endif diff --git a/pokemod/Species.cpp b/pokemod/Species.cpp index ce9ac1ff..415936a5 100644 --- a/pokemod/Species.cpp +++ b/pokemod/Species.cpp @@ -29,15 +29,15 @@ #include <QBuffer> #include <QSet> -const QStringList Species::StyleStr = QStringList() << "Fluctuating" << "Fading" << "Slow" << "Normal" << "Fast" << "Erratic"; +const QStringList Pokemod::Species::StyleStr = QStringList() << "Fluctuating" << "Fading" << "Slow" << "Normal" << "Fast" << "Erratic"; -Species::Species(const Species& species) : +Pokemod::Species::Species(const Species& species) : Object("Species", species.parent(), species.id()) { *this = species; } -Species::Species(const Pokemod* parent, const int id) : +Pokemod::Species::Species(const Pokemod* parent, const int id) : Object("Species", parent, id), m_name(""), m_growth(INT_MAX), @@ -61,35 +61,35 @@ Species::Species(const Pokemod* parent, const int id) : m_nidoranGroup(INT_MAX), m_evolution("", "") { - for (int i = 0; i < Pokemod::ST_End_GSC; ++i) + for (int i = 0; i < ST_End_GSC; ++i) { m_baseStat[i] = 0; m_effortValue[i] = 0; } } -Species::Species(const Species& species, const Pokemod* parent, const int id) : +Pokemod::Species::Species(const Species& species, const Pokemod* parent, const int id) : Object("Species", parent, id) { *this = species; } -Species::Species(const QDomElement& xml, const Pokemod* parent, const int id) : +Pokemod::Species::Species(const QDomElement& xml, const Pokemod* parent, const int id) : Object("Species", parent, id) { load(xml, id); } -Species::~Species() +Pokemod::Species::~Species() { clear(); } -void Species::validate() +void Pokemod::Species::validate() { if (m_name.isEmpty()) emit(error("Name is empty")); - TEST_ARRAY(setBaseStat, baseStat, static_cast<const Pokemod*>(pokemod())->rules()->specialSplit() ? Pokemod::ST_End_GSC : Pokemod::ST_End_RBY); + TEST_ARRAY(setBaseStat, baseStat, static_cast<const Pokemod*>(pokemod())->rules()->specialSplit() ? ST_End_GSC : ST_End_RBY); TEST(setGrowth, growth); TEST(setRunChance, runChance); TEST(setFleeChance, fleeChance); @@ -158,12 +158,12 @@ void Species::validate() } } -void Species::load(const QDomElement& xml, int id) +void Pokemod::Species::load(const QDomElement& xml, int id) { LOAD_ID(); LOAD(QString, name); - LOAD_ARRAY(int, baseStat, Pokemod::ST_End_GSC); - LOAD_ARRAY(int, effortValue, Pokemod::ST_End_GSC); + LOAD_ARRAY(int, baseStat, ST_End_GSC); + LOAD_ARRAY(int, effortValue, ST_End_GSC); LOAD(int, growth); LOAD(int, experienceValue); LOAD(int, catchValue); @@ -187,12 +187,12 @@ void Species::load(const QDomElement& xml, int id) LOAD_SUB(newMove, SpeciesMove); } -QDomElement Species::save() const +QDomElement Pokemod::Species::save() const { SAVE_CREATE(); SAVE(QString, name); - SAVE_ARRAY(int, baseStat, Pokemod::ST_End_GSC); - SAVE_ARRAY(int, effortValue, Pokemod::ST_End_GSC); + SAVE_ARRAY(int, baseStat, ST_End_GSC); + SAVE_ARRAY(int, effortValue, ST_End_GSC); SAVE(int, growth); SAVE(int, experienceValue); SAVE(int, catchValue); @@ -217,14 +217,14 @@ QDomElement Species::save() const return xml; } -void Species::setName(const QString& name) +void Pokemod::Species::setName(const QString& name) { CHECK(name); } -void Species::setBaseStat(const int stat, const int baseStat) +void Pokemod::Species::setBaseStat(const int stat, const int baseStat) { - if ((static_cast<const Pokemod*>(pokemod())->rules()->specialSplit() ? Pokemod::ST_End_GSC : Pokemod::ST_End_RBY) <= stat) + if ((static_cast<const Pokemod*>(pokemod())->rules()->specialSplit() ? ST_End_GSC : ST_End_RBY) <= stat) { emit(error(bounds("stat"))); return; @@ -232,7 +232,7 @@ void Species::setBaseStat(const int stat, const int baseStat) CHECK_ARRAY(baseStat[stat], baseStat); } -void Species::setEffortValue(const int stat, const int effortValue) +void Pokemod::Species::setEffortValue(const int stat, const int effortValue) { if (!static_cast<const Pokemod*>(pokemod())->rules()->effortValuesAllowed()) { @@ -244,7 +244,7 @@ void Species::setEffortValue(const int stat, const int effortValue) emit(error(bounds("effortValue"))); return; } - if ((static_cast<const Pokemod*>(pokemod())->rules()->specialSplit() ? Pokemod::ST_End_GSC : Pokemod::ST_End_RBY) <= stat) + if ((static_cast<const Pokemod*>(pokemod())->rules()->specialSplit() ? ST_End_GSC : ST_End_RBY) <= stat) { emit(error(bounds("stat"))); return; @@ -252,7 +252,7 @@ void Species::setEffortValue(const int stat, const int effortValue) CHECK_ARRAY(effortValue[stat], effortValue); } -void Species::setGrowth(const int growth) +void Pokemod::Species::setGrowth(const int growth) { if (End <= growth) { @@ -262,12 +262,12 @@ void Species::setGrowth(const int growth) CHECK(growth); } -void Species::setExperienceValue(const int experienceValue) +void Pokemod::Species::setExperienceValue(const int experienceValue) { CHECK(experienceValue); } -void Species::setCatchValue(const int catchValue) +void Pokemod::Species::setCatchValue(const int catchValue) { if (255 < catchValue) { @@ -277,7 +277,7 @@ void Species::setCatchValue(const int catchValue) CHECK(catchValue); } -void Species::setRunChance(const Fraction& runChance) +void Pokemod::Species::setRunChance(const Fraction& runChance) { if (1 < runChance) { @@ -287,7 +287,7 @@ void Species::setRunChance(const Fraction& runChance) CHECK(runChance); } -void Species::setFleeChance(const Fraction& fleeChance) +void Pokemod::Species::setFleeChance(const Fraction& fleeChance) { if (1 < fleeChance) { @@ -297,7 +297,7 @@ void Species::setFleeChance(const Fraction& fleeChance) CHECK(fleeChance); } -void Species::setItemChance(const Fraction& itemChance) +void Pokemod::Species::setItemChance(const Fraction& itemChance) { if (1 < itemChance) { @@ -307,22 +307,22 @@ void Species::setItemChance(const Fraction& itemChance) CHECK(itemChance); } -void Species::setPokedexNumber(const int pokedexNumber) +void Pokemod::Species::setPokedexNumber(const int pokedexNumber) { CHECK(pokedexNumber); } -void Species::setWeight(const int weight) +void Pokemod::Species::setWeight(const int weight) { CHECK(weight); } -void Species::setHeightFeet(const int heightFeet) +void Pokemod::Species::setHeightFeet(const int heightFeet) { CHECK(heightFeet); } -void Species::setHeightInches(const int heightInches) +void Pokemod::Species::setHeightInches(const int heightInches) { if (12 <= heightInches) { @@ -332,12 +332,12 @@ void Species::setHeightInches(const int heightInches) CHECK(heightInches); } -void Species::setPokedexEntry(const QString& pokedexEntry) +void Pokemod::Species::setPokedexEntry(const QString& pokedexEntry) { CHECK(pokedexEntry); } -void Species::setFrontMaleSprite(const QPixmap& frontMaleSprite) +void Pokemod::Species::setFrontMaleSprite(const QPixmap& frontMaleSprite) { if (m_genderFactor.numerator() == m_genderFactor.denominator()) { @@ -353,7 +353,7 @@ void Species::setFrontMaleSprite(const QPixmap& frontMaleSprite) emit(changed()); } -void Species::setBackMaleSprite(const QPixmap& backMaleSprite) +void Pokemod::Species::setBackMaleSprite(const QPixmap& backMaleSprite) { if (m_genderFactor.numerator() == m_genderFactor.denominator()) { @@ -369,7 +369,7 @@ void Species::setBackMaleSprite(const QPixmap& backMaleSprite) emit(changed()); } -void Species::setFrontFemaleSprite(const QPixmap& frontFemaleSprite) +void Pokemod::Species::setFrontFemaleSprite(const QPixmap& frontFemaleSprite) { if (!static_cast<const Pokemod*>(pokemod())->rules()->genderAllowed()) { @@ -395,7 +395,7 @@ void Species::setFrontFemaleSprite(const QPixmap& frontFemaleSprite) emit(changed()); } -void Species::setBackFemaleSprite(const QPixmap& backFemaleSprite) +void Pokemod::Species::setBackFemaleSprite(const QPixmap& backFemaleSprite) { if (!static_cast<const Pokemod*>(pokemod())->rules()->genderAllowed()) { @@ -421,7 +421,7 @@ void Species::setBackFemaleSprite(const QPixmap& backFemaleSprite) emit(changed()); } -void Species::setListSprite(const QPixmap& listSprite) +void Pokemod::Species::setListSprite(const QPixmap& listSprite) { if (listSprite.size() != QSize(64, 128)) { @@ -432,12 +432,12 @@ void Species::setListSprite(const QPixmap& listSprite) emit(changed()); } -void Species::setGenderFactor(const Fraction& genderFactor) +void Pokemod::Species::setGenderFactor(const Fraction& genderFactor) { CHECK(genderFactor); } -void Species::setEggSpecies(const int eggSpecies) +void Pokemod::Species::setEggSpecies(const int eggSpecies) { if (static_cast<const Pokemod*>(pokemod())->speciesIndex(eggSpecies) == INT_MAX) { @@ -447,17 +447,17 @@ void Species::setEggSpecies(const int eggSpecies) CHECK(eggSpecies); } -void Species::setEggSteps(const int eggSteps) +void Pokemod::Species::setEggSteps(const int eggSteps) { CHECK(eggSteps); } -void Species::setNidoranGroup(const int nidoranGroup) +void Pokemod::Species::setNidoranGroup(const int nidoranGroup) { CHECK(nidoranGroup); } -void Species::setType(const int type, const bool state) +void Pokemod::Species::setType(const int type, const bool state) { if (static_cast<const Pokemod*>(pokemod())->typeIndex(type) == INT_MAX) { @@ -476,7 +476,7 @@ void Species::setType(const int type, const bool state) } } -void Species::setEggGroup(const int eggGroup, const bool state) +void Pokemod::Species::setEggGroup(const int eggGroup, const bool state) { if (static_cast<const Pokemod*>(pokemod())->eggGroupIndex(eggGroup) == INT_MAX) { @@ -495,19 +495,19 @@ void Species::setEggGroup(const int eggGroup, const bool state) } } -void Species::setEvolution(const Script& evolution) +void Pokemod::Species::setEvolution(const Script& evolution) { CHECK(evolution); } -QString Species::name() const +QString Pokemod::Species::name() const { return m_name; } -int Species::baseStat(const int stat) const +int Pokemod::Species::baseStat(const int stat) const { - if (Pokemod::ST_End_GSC <= stat) + if (ST_End_GSC <= stat) { emit(warning(bounds("base stat"))); return 0; @@ -515,9 +515,9 @@ int Species::baseStat(const int stat) const return m_baseStat[stat]; } -int Species::effortValue(const int stat) const +int Pokemod::Species::effortValue(const int stat) const { - if (Pokemod::ST_End_GSC <= stat) + if (ST_End_GSC <= stat) { emit(warning(bounds("effort calue stat"))); return 0; @@ -525,144 +525,144 @@ int Species::effortValue(const int stat) const return m_effortValue[stat]; } -int Species::growth() const +int Pokemod::Species::growth() const { return m_growth; } -int Species::experienceValue() const +int Pokemod::Species::experienceValue() const { return m_experienceValue; } -int Species::catchValue() const +int Pokemod::Species::catchValue() const { return m_catchValue; } -Fraction Species::runChance() const +Pokemod::Fraction Pokemod::Species::runChance() const { return m_runChance; } -Fraction Species::fleeChance() const +Pokemod::Fraction Pokemod::Species::fleeChance() const { return m_fleeChance; } -Fraction Species::itemChance() const +Pokemod::Fraction Pokemod::Species::itemChance() const { return m_itemChance; } -int Species::pokedexNumber() const +int Pokemod::Species::pokedexNumber() const { return m_pokedexNumber; } -int Species::weight() const +int Pokemod::Species::weight() const { return m_weight; } -int Species::heightFeet() const +int Pokemod::Species::heightFeet() const { return m_heightFeet; } -int Species::heightInches() const +int Pokemod::Species::heightInches() const { return m_heightInches; } -QString Species::pokedexEntry() const +QString Pokemod::Species::pokedexEntry() const { return m_pokedexEntry; } -QPixmap Species::frontMaleSprite() const +QPixmap Pokemod::Species::frontMaleSprite() const { return m_frontMaleSprite; } -QPixmap Species::backMaleSprite() const +QPixmap Pokemod::Species::backMaleSprite() const { return m_backMaleSprite; } -QPixmap Species::frontFemaleSprite() const +QPixmap Pokemod::Species::frontFemaleSprite() const { return m_frontFemaleSprite; } -QPixmap Species::backFemaleSprite() const +QPixmap Pokemod::Species::backFemaleSprite() const { return m_backFemaleSprite; } -QPixmap Species::listSprite() const +QPixmap Pokemod::Species::listSprite() const { return m_listSprite; } -Fraction Species::genderFactor() const +Pokemod::Fraction Pokemod::Species::genderFactor() const { return m_genderFactor; } -int Species::eggSpecies() const +int Pokemod::Species::eggSpecies() const { return m_eggSpecies; } -int Species::eggSteps() const +int Pokemod::Species::eggSteps() const { return m_eggSteps; } -int Species::nidoranGroup() const +int Pokemod::Species::nidoranGroup() const { return m_nidoranGroup; } -bool Species::type(const int type) const +bool Pokemod::Species::type(const int type) const { return m_type.contains(type); } -bool Species::eggGroup(const int eggGroup) const +bool Pokemod::Species::eggGroup(const int eggGroup) const { return m_eggGroup.contains(eggGroup); } -Script Species::evolution() const +Pokemod::Script Pokemod::Species::evolution() const { return m_evolution; } -const SpeciesAbility* Species::ability(const int index) const +const Pokemod::SpeciesAbility* Pokemod::Species::ability(const int index) const { Q_ASSERT(index < abilityCount()); return m_abilities.at(index); } -SpeciesAbility* Species::ability(const int index) +Pokemod::SpeciesAbility* Pokemod::Species::ability(const int index) { Q_ASSERT(index < abilityCount()); return m_abilities[index]; } -const SpeciesAbility* Species::abilityById(const int id) const +const Pokemod::SpeciesAbility* Pokemod::Species::abilityById(const int id) const { return ability(abilityIndex(id)); } -SpeciesAbility* Species::abilityById(const int id) +Pokemod::SpeciesAbility* Pokemod::Species::abilityById(const int id) { return ability(abilityIndex(id)); } -int Species::abilityIndex(const int id) const +int Pokemod::Species::abilityIndex(const int id) const { for (int i = 0; i < abilityCount(); ++i) { @@ -672,45 +672,45 @@ int Species::abilityIndex(const int id) const return INT_MAX; } -int Species::abilityCount() const +int Pokemod::Species::abilityCount() const { return m_abilities.size(); } -SpeciesAbility* Species::newAbility() +Pokemod::SpeciesAbility* Pokemod::Species::newAbility() { return newAbility(new SpeciesAbility(this, newAbilityId())); } -SpeciesAbility* Species::newAbility(const QDomElement& xml) +Pokemod::SpeciesAbility* Pokemod::Species::newAbility(const QDomElement& xml) { return newAbility(new SpeciesAbility(xml, this, newAbilityId())); } -SpeciesAbility* Species::newAbility(const SpeciesAbility& ability) +Pokemod::SpeciesAbility* Pokemod::Species::newAbility(const SpeciesAbility& ability) { return newAbility(new SpeciesAbility(ability, this, newAbilityId())); } -SpeciesAbility* Species::newAbility(SpeciesAbility* ability) +Pokemod::SpeciesAbility* Pokemod::Species::newAbility(SpeciesAbility* ability) { m_abilities.append(ability); return ability; } -void Species::deleteAbility(const int index) +void Pokemod::Species::deleteAbility(const int index) { Q_ASSERT(index < abilityCount()); delete m_abilities[index]; m_abilities.removeAt(index); } -void Species::deleteAbilityById(const int id) +void Pokemod::Species::deleteAbilityById(const int id) { deleteAbility(abilityIndex(id)); } -int Species::newAbilityId() const +int Pokemod::Species::newAbilityId() const { int i = 0; while ((i < abilityCount()) && (abilityIndex(i) != INT_MAX)) @@ -718,29 +718,29 @@ int Species::newAbilityId() const return i; } -const SpeciesItem* Species::item(const int index) const +const Pokemod::SpeciesItem* Pokemod::Species::item(const int index) const { Q_ASSERT(index < itemCount()); return m_items.at(index); } -SpeciesItem* Species::item(const int index) +Pokemod::SpeciesItem* Pokemod::Species::item(const int index) { Q_ASSERT(index < itemCount()); return m_items[index]; } -const SpeciesItem* Species::itemById(const int id) const +const Pokemod::SpeciesItem* Pokemod::Species::itemById(const int id) const { return item(itemIndex(id)); } -SpeciesItem* Species::itemById(const int id) +Pokemod::SpeciesItem* Pokemod::Species::itemById(const int id) { return item(itemIndex(id)); } -int Species::itemIndex(const int id) const +int Pokemod::Species::itemIndex(const int id) const { for (int i = 0; i < itemCount(); ++i) { @@ -750,45 +750,45 @@ int Species::itemIndex(const int id) const return INT_MAX; } -int Species::itemCount() const +int Pokemod::Species::itemCount() const { return m_items.size(); } -SpeciesItem* Species::newItem() +Pokemod::SpeciesItem* Pokemod::Species::newItem() { return newItem(new SpeciesItem(this, newItemId())); } -SpeciesItem* Species::newItem(const QDomElement& xml) +Pokemod::SpeciesItem* Pokemod::Species::newItem(const QDomElement& xml) { return newItem(new SpeciesItem(xml, this, newItemId())); } -SpeciesItem* Species::newItem(const SpeciesItem& item) +Pokemod::SpeciesItem* Pokemod::Species::newItem(const SpeciesItem& item) { return newItem(new SpeciesItem(item, this, newItemId())); } -SpeciesItem* Species::newItem(SpeciesItem* item) +Pokemod::SpeciesItem* Pokemod::Species::newItem(SpeciesItem* item) { m_items.append(item); return item; } -void Species::deleteItem(const int index) +void Pokemod::Species::deleteItem(const int index) { Q_ASSERT(index < itemCount()); delete m_items[index]; m_items.removeAt(index); } -void Species::deleteItemById(const int id) +void Pokemod::Species::deleteItemById(const int id) { deleteItem(itemIndex(id)); } -int Species::newItemId() const +int Pokemod::Species::newItemId() const { int i = 0; while ((i < itemCount()) && (itemIndex(i) != INT_MAX)) @@ -796,29 +796,29 @@ int Species::newItemId() const return i; } -const SpeciesMove* Species::move(const int index) const +const Pokemod::SpeciesMove* Pokemod::Species::move(const int index) const { Q_ASSERT(index < moveCount()); return m_moves.at(index); } -SpeciesMove* Species::move(const int index) +Pokemod::SpeciesMove* Pokemod::Species::move(const int index) { Q_ASSERT(index < moveCount()); return m_moves[index]; } -const SpeciesMove* Species::moveById(const int id) const +const Pokemod::SpeciesMove* Pokemod::Species::moveById(const int id) const { return move(moveIndex(id)); } -SpeciesMove* Species::moveById(const int id) +Pokemod::SpeciesMove* Pokemod::Species::moveById(const int id) { return move(moveIndex(id)); } -int Species::moveIndex(const int id) const +int Pokemod::Species::moveIndex(const int id) const { for (int i = 0; i < moveCount(); ++i) { @@ -828,45 +828,45 @@ int Species::moveIndex(const int id) const return INT_MAX; } -int Species::moveCount() const +int Pokemod::Species::moveCount() const { return m_moves.size(); } -SpeciesMove* Species::newMove() +Pokemod::SpeciesMove* Pokemod::Species::newMove() { return newMove(new SpeciesMove(this, newMoveId())); } -SpeciesMove* Species::newMove(const QDomElement& xml) +Pokemod::SpeciesMove* Pokemod::Species::newMove(const QDomElement& xml) { return newMove(new SpeciesMove(xml, this, newMoveId())); } -SpeciesMove* Species::newMove(const SpeciesMove& move) +Pokemod::SpeciesMove* Pokemod::Species::newMove(const SpeciesMove& move) { return newMove(new SpeciesMove(move, this, newMoveId())); } -SpeciesMove* Species::newMove(SpeciesMove* move) +Pokemod::SpeciesMove* Pokemod::Species::newMove(SpeciesMove* move) { m_moves.append(move); return move; } -void Species::deleteMove(const int index) +void Pokemod::Species::deleteMove(const int index) { Q_ASSERT(index < moveCount()); delete m_moves[index]; m_moves.removeAt(index); } -void Species::deleteMoveById(const int id) +void Pokemod::Species::deleteMoveById(const int id) { deleteMove(moveIndex(id)); } -int Species::newMoveId() const +int Pokemod::Species::newMoveId() const { int i = 0; while ((i < moveCount()) && (moveIndex(i) != INT_MAX)) @@ -874,14 +874,14 @@ int Species::newMoveId() const return i; } -Species& Species::operator=(const Species& rhs) +Pokemod::Species& Pokemod::Species::operator=(const Species& rhs) { if (this == &rhs) return *this; clear(); COPY(name); - COPY_ARRAY(baseStat, Pokemod::ST_End_GSC); - COPY_ARRAY(effortValue, Pokemod::ST_End_GSC); + COPY_ARRAY(baseStat, ST_End_GSC); + COPY_ARRAY(effortValue, ST_End_GSC); COPY(growth); COPY(experienceValue); COPY(catchValue); @@ -906,7 +906,7 @@ Species& Species::operator=(const Species& rhs) return *this; } -void Species::clear() +void Pokemod::Species::clear() { while (abilityCount()) deleteAbility(0); diff --git a/pokemod/Species.h b/pokemod/Species.h index 5c808117..e731d141 100644 --- a/pokemod/Species.h +++ b/pokemod/Species.h @@ -21,13 +21,16 @@ // Pokemod includes #include "Fraction.h" #include "Object.h" -#include "Pokemod.h" #include "Script.h" // Qt includes #include <QList> +#include <QPixmap> +namespace Pokemod +{ // Forward declarations +class Pokemod; class SpeciesAbility; class SpeciesItem; class SpeciesMove; @@ -164,8 +167,8 @@ class Species : public Object void clear(); QString m_name; - bool m_baseStat[Pokemod::ST_End_GSC]; - bool m_effortValue[Pokemod::ST_End_GSC]; + bool m_baseStat[ST_End_GSC]; + bool m_effortValue[ST_End_GSC]; int m_growth; int m_experienceValue; int m_catchValue; @@ -193,5 +196,6 @@ class Species : public Object QList<SpeciesItem*> m_items; QList<SpeciesMove*> m_moves; }; +} #endif diff --git a/pokemod/SpeciesAbility.cpp b/pokemod/SpeciesAbility.cpp index 387dfd3f..9a230fb0 100644 --- a/pokemod/SpeciesAbility.cpp +++ b/pokemod/SpeciesAbility.cpp @@ -22,45 +22,45 @@ #include "Pokemod.h" #include "Species.h" -SpeciesAbility::SpeciesAbility(const SpeciesAbility& ability) : +Pokemod::SpeciesAbility::SpeciesAbility(const SpeciesAbility& ability) : Object("SpeciesAbility", ability.parent(), ability.id()) { *this = ability; } -SpeciesAbility::SpeciesAbility(const Species* parent, const int id) : +Pokemod::SpeciesAbility::SpeciesAbility(const Species* parent, const int id) : Object("SpeciesAbility", parent, id), m_ability(INT_MAX), m_weight(1) { } -SpeciesAbility::SpeciesAbility(const SpeciesAbility& ability, const Species* parent, const int id) : +Pokemod::SpeciesAbility::SpeciesAbility(const SpeciesAbility& ability, const Species* parent, const int id) : Object("SpeciesAbility", parent, id) { *this = ability; } -SpeciesAbility::SpeciesAbility(const QDomElement& xml, const Species* parent, const int id) : +Pokemod::SpeciesAbility::SpeciesAbility(const QDomElement& xml, const Species* parent, const int id) : Object("SpeciesAbility", parent, id) { load(xml, id); } -void SpeciesAbility::validate() +void Pokemod::SpeciesAbility::validate() { TEST(setAbility, ability); TEST(setWeight, weight); } -void SpeciesAbility::load(const QDomElement& xml, int id) +void Pokemod::SpeciesAbility::load(const QDomElement& xml, int id) { LOAD_ID(); LOAD(int, ability); LOAD(int, weight); } -QDomElement SpeciesAbility::save() const +QDomElement Pokemod::SpeciesAbility::save() const { SAVE_CREATE(); SAVE(int, ability); @@ -68,7 +68,7 @@ QDomElement SpeciesAbility::save() const return xml; } -void SpeciesAbility::setAbility(const int ability) +void Pokemod::SpeciesAbility::setAbility(const int ability) { if (static_cast<const Pokemod*>(pokemod())->abilityIndex(ability) == INT_MAX) { @@ -78,7 +78,7 @@ void SpeciesAbility::setAbility(const int ability) CHECK(ability); } -void SpeciesAbility::setWeight(const int weight) +void Pokemod::SpeciesAbility::setWeight(const int weight) { if (!weight) { @@ -88,17 +88,17 @@ void SpeciesAbility::setWeight(const int weight) CHECK(weight); } -int SpeciesAbility::ability() const +int Pokemod::SpeciesAbility::ability() const { return m_ability; } -int SpeciesAbility::weight() const +int Pokemod::SpeciesAbility::weight() const { return m_weight; } -SpeciesAbility& SpeciesAbility::operator=(const SpeciesAbility& rhs) +Pokemod::SpeciesAbility& Pokemod::SpeciesAbility::operator=(const SpeciesAbility& rhs) { if (this == &rhs) return *this; diff --git a/pokemod/SpeciesAbility.h b/pokemod/SpeciesAbility.h index 21c68bb4..5098ba64 100644 --- a/pokemod/SpeciesAbility.h +++ b/pokemod/SpeciesAbility.h @@ -21,6 +21,8 @@ // Pokemod includes #include "Object.h" +namespace Pokemod +{ // Forward declarations class Species; @@ -50,5 +52,6 @@ class SpeciesAbility : public Object int m_ability; int m_weight; }; +} #endif diff --git a/pokemod/SpeciesItem.cpp b/pokemod/SpeciesItem.cpp index 9f1a799a..16682aae 100644 --- a/pokemod/SpeciesItem.cpp +++ b/pokemod/SpeciesItem.cpp @@ -22,45 +22,45 @@ #include "Pokemod.h" #include "Species.h" -SpeciesItem::SpeciesItem(const SpeciesItem& item) : +Pokemod::SpeciesItem::SpeciesItem(const SpeciesItem& item) : Object("SpeciesItem", item.parent(), item.id()) { *this = item; } -SpeciesItem::SpeciesItem(const Species* parent, const int id) : +Pokemod::SpeciesItem::SpeciesItem(const Species* parent, const int id) : Object("SpeciesItem", parent, id), m_item(INT_MAX), m_weight(1) { } -SpeciesItem::SpeciesItem(const SpeciesItem& item, const Species* parent, const int id) : +Pokemod::SpeciesItem::SpeciesItem(const SpeciesItem& item, const Species* parent, const int id) : Object("SpeciesItem", parent, id) { *this = item; } -SpeciesItem::SpeciesItem(const QDomElement& xml, const Species* parent, const int id) : +Pokemod::SpeciesItem::SpeciesItem(const QDomElement& xml, const Species* parent, const int id) : Object("SpeciesItem", parent, id) { load(xml, id); } -void SpeciesItem::validate() +void Pokemod::SpeciesItem::validate() { TEST(setItem, item); TEST(setWeight, weight); } -void SpeciesItem::load(const QDomElement& xml, int id) +void Pokemod::SpeciesItem::load(const QDomElement& xml, int id) { LOAD_ID(); LOAD(int, item); LOAD(int, weight); } -QDomElement SpeciesItem::save() const +QDomElement Pokemod::SpeciesItem::save() const { SAVE_CREATE(); SAVE(int, item); @@ -68,7 +68,7 @@ QDomElement SpeciesItem::save() const return xml; } -void SpeciesItem::setItem(const int item) +void Pokemod::SpeciesItem::setItem(const int item) { if (static_cast<const Pokemod*>(pokemod())->itemIndex(item) == INT_MAX) { @@ -78,7 +78,7 @@ void SpeciesItem::setItem(const int item) CHECK(item); } -void SpeciesItem::setWeight(const int weight) +void Pokemod::SpeciesItem::setWeight(const int weight) { if (!weight) { @@ -88,17 +88,17 @@ void SpeciesItem::setWeight(const int weight) CHECK(weight); } -int SpeciesItem::item() const +int Pokemod::SpeciesItem::item() const { return m_item; } -int SpeciesItem::weight() const +int Pokemod::SpeciesItem::weight() const { return m_weight; } -SpeciesItem& SpeciesItem::operator=(const SpeciesItem& rhs) +Pokemod::SpeciesItem& Pokemod::SpeciesItem::operator=(const SpeciesItem& rhs) { if (this == &rhs) return *this; diff --git a/pokemod/SpeciesItem.h b/pokemod/SpeciesItem.h index 6945eb5a..b5b7e00c 100644 --- a/pokemod/SpeciesItem.h +++ b/pokemod/SpeciesItem.h @@ -21,6 +21,8 @@ // Pokemod includes #include "Object.h" +namespace Pokemod +{ // Forward declarations class Species; @@ -50,5 +52,6 @@ class SpeciesItem : public Object int m_item; int m_weight; }; +} #endif diff --git a/pokemod/SpeciesMove.cpp b/pokemod/SpeciesMove.cpp index 89c10445..e914b2eb 100644 --- a/pokemod/SpeciesMove.cpp +++ b/pokemod/SpeciesMove.cpp @@ -23,13 +23,13 @@ #include "Rules.h" #include "Species.h" -SpeciesMove::SpeciesMove(const SpeciesMove& move) : +Pokemod::SpeciesMove::SpeciesMove(const SpeciesMove& move) : Object("SpeciesMove", move.parent(), move.id()) { *this = move; } -SpeciesMove::SpeciesMove(const Species* parent, const int id) : +Pokemod::SpeciesMove::SpeciesMove(const Species* parent, const int id) : Object("SpeciesMove", parent, id), m_move(INT_MAX), m_level(0), @@ -37,26 +37,26 @@ SpeciesMove::SpeciesMove(const Species* parent, const int id) : { } -SpeciesMove::SpeciesMove(const SpeciesMove& move, const Species* parent, const int id) : +Pokemod::SpeciesMove::SpeciesMove(const SpeciesMove& move, const Species* parent, const int id) : Object("SpeciesMove", parent, id) { *this = move; } -SpeciesMove::SpeciesMove(const QDomElement& xml, const Species* parent, const int id) : +Pokemod::SpeciesMove::SpeciesMove(const QDomElement& xml, const Species* parent, const int id) : Object("SpeciesMove", parent, id) { load(xml, id); } -void SpeciesMove::validate() +void Pokemod::SpeciesMove::validate() { TEST(setMove, move); TEST(setLevel, level); TEST(setWild, wild); } -void SpeciesMove::load(const QDomElement& xml, int id) +void Pokemod::SpeciesMove::load(const QDomElement& xml, int id) { LOAD_ID(); LOAD(int, move); @@ -64,7 +64,7 @@ void SpeciesMove::load(const QDomElement& xml, int id) LOAD(int, wild); } -QDomElement SpeciesMove::save() const +QDomElement Pokemod::SpeciesMove::save() const { SAVE_CREATE(); SAVE(int, move); @@ -73,7 +73,7 @@ QDomElement SpeciesMove::save() const return xml; } -void SpeciesMove::setMove(const int move) +void Pokemod::SpeciesMove::setMove(const int move) { if (static_cast<const Pokemod*>(pokemod())->moveIndex(move) == INT_MAX) { @@ -83,7 +83,7 @@ void SpeciesMove::setMove(const int move) CHECK(move); } -void SpeciesMove::setLevel(const int level) +void Pokemod::SpeciesMove::setLevel(const int level) { if (static_cast<const Pokemod*>(pokemod())->rules()->maxLevel() <= level) { @@ -93,7 +93,7 @@ void SpeciesMove::setLevel(const int level) CHECK(level); } -void SpeciesMove::setWild(const int wild) +void Pokemod::SpeciesMove::setWild(const int wild) { if (static_cast<const Pokemod*>(pokemod())->rules()->maxLevel() <= wild) { @@ -103,22 +103,22 @@ void SpeciesMove::setWild(const int wild) CHECK(wild); } -int SpeciesMove::move() const +int Pokemod::SpeciesMove::move() const { return m_move; } -int SpeciesMove::level() const +int Pokemod::SpeciesMove::level() const { return m_level; } -int SpeciesMove::wild() const +int Pokemod::SpeciesMove::wild() const { return m_wild; } -SpeciesMove& SpeciesMove::operator=(const SpeciesMove& rhs) +Pokemod::SpeciesMove& Pokemod::SpeciesMove::operator=(const SpeciesMove& rhs) { if (this == &rhs) return *this; diff --git a/pokemod/SpeciesMove.h b/pokemod/SpeciesMove.h index 69f0a7f0..774e3763 100644 --- a/pokemod/SpeciesMove.h +++ b/pokemod/SpeciesMove.h @@ -21,6 +21,8 @@ // Pokemod includes #include "Object.h" +namespace Pokemod +{ // Forward declarations class Species; @@ -53,5 +55,6 @@ class SpeciesMove : public Object int m_level; int m_wild; }; +} #endif diff --git a/pokemod/Sprite.cpp b/pokemod/Sprite.cpp index df3c5bd5..5b73577f 100644 --- a/pokemod/Sprite.cpp +++ b/pokemod/Sprite.cpp @@ -24,49 +24,49 @@ // Qt includes #include <QBuffer> -Sprite::Sprite(const Sprite& sprite) : +Pokemod::Sprite::Sprite(const Sprite& sprite) : Object("Sprite", sprite.parent(), sprite.id()) { *this = sprite; } -Sprite::Sprite(const Pokemod* parent, const int id) : +Pokemod::Sprite::Sprite(const Pokemod* parent, const int id) : Object("Sprite", parent, id), m_name(""), m_sprite() { } -Sprite::Sprite(const Sprite& sprite, const Pokemod* parent, const int id) : +Pokemod::Sprite::Sprite(const Sprite& sprite, const Pokemod* parent, const int id) : Object("Sprite", parent, id) { *this = sprite; } -Sprite::Sprite(const QDomElement& xml, const Pokemod* parent, const int id) : +Pokemod::Sprite::Sprite(const QDomElement& xml, const Pokemod* parent, const int id) : Object("Sprite", parent, id) { load(xml, id); } -Sprite::~Sprite() +Pokemod::Sprite::~Sprite() { } -void Sprite::validate() +void Pokemod::Sprite::validate() { if (m_name.isEmpty()) emit(error("Name is empty")); } -void Sprite::load(const QDomElement& xml, int id) +void Pokemod::Sprite::load(const QDomElement& xml, int id) { LOAD_ID(); LOAD(QString, name); LOAD(QPixmap, sprite); } -QDomElement Sprite::save() const +QDomElement Pokemod::Sprite::save() const { SAVE_CREATE(); SAVE(QString, name); @@ -74,28 +74,28 @@ QDomElement Sprite::save() const return xml; } -void Sprite::setName(const QString& name) +void Pokemod::Sprite::setName(const QString& name) { CHECK(name); } -void Sprite::setSprite(const QPixmap& sprite) +void Pokemod::Sprite::setSprite(const QPixmap& sprite) { m_sprite = sprite; emit(changed()); } -QString Sprite::name() const +QString Pokemod::Sprite::name() const { return m_name; } -QPixmap Sprite::sprite() const +QPixmap Pokemod::Sprite::sprite() const { return m_sprite; } -Sprite& Sprite::operator=(const Sprite& rhs) +Pokemod::Sprite& Pokemod::Sprite::operator=(const Sprite& rhs) { if (this == &rhs) return *this; diff --git a/pokemod/Sprite.h b/pokemod/Sprite.h index b5d58100..4bea1293 100644 --- a/pokemod/Sprite.h +++ b/pokemod/Sprite.h @@ -24,6 +24,8 @@ // Qt includes #include <QPixmap> +namespace Pokemod +{ // Forward declarations class Pokemod; @@ -54,5 +56,6 @@ class Sprite : public Object QString m_name; QPixmap m_sprite; }; +} #endif diff --git a/pokemod/Status.cpp b/pokemod/Status.cpp index 8c9922d2..86a3ae21 100644 --- a/pokemod/Status.cpp +++ b/pokemod/Status.cpp @@ -22,49 +22,49 @@ #include "Pokemod.h" #include "Script.h" -Status::Status(const Status& status) : +Pokemod::Status::Status(const Status& status) : Object("Status", status.parent(), status.id()) { *this = status; } -Status::Status(const Pokemod* parent, const int id) : +Pokemod::Status::Status(const Pokemod* parent, const int id) : Object("Status", parent, id), m_name(""), m_script("", "") { } -Status::Status(const Status& status, const Pokemod* parent, const int id) : +Pokemod::Status::Status(const Status& status, const Pokemod* parent, const int id) : Object("Status", parent, id) { *this = status; } -Status::Status(const QDomElement& xml, const Pokemod* parent, const int id) : +Pokemod::Status::Status(const QDomElement& xml, const Pokemod* parent, const int id) : Object("Status", parent, id) { load(xml, id); } -Status::~Status() +Pokemod::Status::~Status() { } -void Status::validate() +void Pokemod::Status::validate() { if (m_name.isEmpty()) emit(error("Name is empty")); } -void Status::load(const QDomElement& xml, int id) +void Pokemod::Status::load(const QDomElement& xml, int id) { LOAD_ID(); LOAD(QString, name); LOAD(Script, script); } -QDomElement Status::save() const +QDomElement Pokemod::Status::save() const { SAVE_CREATE(); SAVE(QString, name); @@ -72,27 +72,27 @@ QDomElement Status::save() const return xml; } -void Status::setName(const QString& name) +void Pokemod::Status::setName(const QString& name) { CHECK(name); } -void Status::setScript(const Script& script) +void Pokemod::Status::setScript(const Script& script) { CHECK(script); } -QString Status::name() const +QString Pokemod::Status::name() const { return m_name; } -Script Status::script() const +Pokemod::Script Pokemod::Status::script() const { return m_script; } -Status& Status::operator=(const Status& rhs) +Pokemod::Status& Pokemod::Status::operator=(const Status& rhs) { if (this == &rhs) return *this; diff --git a/pokemod/Status.h b/pokemod/Status.h index 3b8ab7f4..2288486a 100644 --- a/pokemod/Status.h +++ b/pokemod/Status.h @@ -22,6 +22,8 @@ #include "Object.h" #include "Script.h" +namespace Pokemod +{ // Forward declarations class Pokemod; @@ -52,5 +54,6 @@ class Status : public Object QString m_name; Script m_script; }; +} #endif diff --git a/pokemod/Store.cpp b/pokemod/Store.cpp index 10c40dbd..4fb10abe 100644 --- a/pokemod/Store.cpp +++ b/pokemod/Store.cpp @@ -21,31 +21,31 @@ // Pokemod includes #include "Pokemod.h" -Store::Store(const Store& store) : +Pokemod::Store::Store(const Store& store) : Object("Store", store.parent(), store.id()) { *this = store; } -Store::Store(const Pokemod* parent, const int id) : +Pokemod::Store::Store(const Pokemod* parent, const int id) : Object("Store", parent, id), m_name("") { } -Store::Store(const Store& store, const Pokemod* parent, const int id) : +Pokemod::Store::Store(const Store& store, const Pokemod* parent, const int id) : Object("Store", parent, id) { *this = store; } -Store::Store(const QDomElement& xml, const Pokemod* parent, const int id) : +Pokemod::Store::Store(const QDomElement& xml, const Pokemod* parent, const int id) : Object("Store", parent, id) { load(xml, id); } -void Store::validate() +void Pokemod::Store::validate() { if (m_name.isEmpty()) emit(error("Name is empty")); @@ -57,25 +57,25 @@ void Store::validate() emit(error("No items in the store")); } -void Store::load(const QDomElement& xml, int id) +void Pokemod::Store::load(const QDomElement& xml, int id) { LOAD_ID(); LOAD_LIST(int, item); } -QDomElement Store::save() const +QDomElement Pokemod::Store::save() const { SAVE_CREATE(); SAVE_LIST(int, item); return xml; } -void Store::setName(const QString& name) +void Pokemod::Store::setName(const QString& name) { CHECK(name); } -void Store::setItem(const int item, const bool state) +void Pokemod::Store::setItem(const int item, const bool state) { if (static_cast<const Pokemod*>(pokemod())->itemIndex(item) == INT_MAX) { @@ -94,17 +94,17 @@ void Store::setItem(const int item, const bool state) } } -QString Store::name() const +QString Pokemod::Store::name() const { return m_name; } -bool Store::item(const int item) const +bool Pokemod::Store::item(const int item) const { return m_item.contains(item); } -Store& Store::operator=(const Store& rhs) +Pokemod::Store& Pokemod::Store::operator=(const Store& rhs) { if (this == &rhs) return *this; diff --git a/pokemod/Store.h b/pokemod/Store.h index 9e487d1c..9255247c 100644 --- a/pokemod/Store.h +++ b/pokemod/Store.h @@ -24,6 +24,8 @@ // Qt includes #include <QList> +namespace Pokemod +{ // Forward declarations class Pokemod; @@ -53,5 +55,6 @@ class Store : public Object QString m_name; QList<int> m_item; }; +} #endif diff --git a/pokemod/TODO b/pokemod/TODO index 12627114..49d77170 100644 --- a/pokemod/TODO +++ b/pokemod/TODO @@ -1,3 +1,6 @@ +Wrap up in a Pokemod namespace
+Properly inline methods (http://www.parashift.com/c++-faq-lite/inline-functions.html#faq-9.9)
+
Figure out what makes 2 PokéMods incompatable
Trainer AI stuff
diff --git a/pokemod/Tile.cpp b/pokemod/Tile.cpp index b59737e7..4ddb2632 100644 --- a/pokemod/Tile.cpp +++ b/pokemod/Tile.cpp @@ -24,66 +24,66 @@ // Qt includes #include <QBuffer> -Tile::Tile(const Tile& tile) : +Pokemod::Tile::Tile(const Tile& tile) : Object("Tile", tile.parent(), tile.id()) { *this = tile; } -Tile::Tile(const Pokemod* parent, const int id) : +Pokemod::Tile::Tile(const Pokemod* parent, const int id) : Object("Tile", parent, id), m_name(""), m_sprite(64, 64), m_script("", "") { - for (int i = 0; i < Pokemod::D_End; ++i) + for (int i = 0; i < D_End; ++i) m_from[i] = false; } -Tile::Tile(const Tile& tile, const Pokemod* parent, const int id) : +Pokemod::Tile::Tile(const Tile& tile, const Pokemod* parent, const int id) : Object("Tile", parent, id) { *this = tile; } -Tile::Tile(const QDomElement& xml, const Pokemod* parent, const int id) : +Pokemod::Tile::Tile(const QDomElement& xml, const Pokemod* parent, const int id) : Object("Tile", parent, id) { load(xml, id); } -void Tile::validate() +void Pokemod::Tile::validate() { if (m_name.isEmpty()) emit(error("Name is empty")); TEST(setSprite, sprite); } -void Tile::load(const QDomElement& xml, int id) +void Pokemod::Tile::load(const QDomElement& xml, int id) { LOAD_ID(); LOAD(QString, name); LOAD(QPixmap, sprite); - LOAD_ARRAY(bool, from, Pokemod::D_End); + LOAD_ARRAY(bool, from, D_End); LOAD(Script, script); } -QDomElement Tile::save() const +QDomElement Pokemod::Tile::save() const { SAVE_CREATE(); SAVE(QString, name); SAVE(QPixmap, sprite); - SAVE_ARRAY(bool, from, Pokemod::D_End); + SAVE_ARRAY(bool, from, D_End); SAVE(Script, script); return xml; } -void Tile::setName(const QString& name) +void Pokemod::Tile::setName(const QString& name) { CHECK(name); } -void Tile::setSprite(const QPixmap& sprite) +void Pokemod::Tile::setSprite(const QPixmap& sprite) { if (sprite.size() != QSize(64, 64)) { @@ -94,9 +94,9 @@ void Tile::setSprite(const QPixmap& sprite) emit(changed()); } -void Tile::setFrom(const int direction, const bool state) +void Pokemod::Tile::setFrom(const int direction, const bool state) { - if (Pokemod::D_End <= direction) + if (D_End <= direction) { emit(error(bounds("direction"))); return; @@ -104,24 +104,24 @@ void Tile::setFrom(const int direction, const bool state) CHECK_ARRAY(from[direction], state); } -void Tile::setScript(const Script& script) +void Pokemod::Tile::setScript(const Script& script) { CHECK(script); } -QString Tile::name() const +QString Pokemod::Tile::name() const { return m_name; } -QPixmap Tile::sprite() const +QPixmap Pokemod::Tile::sprite() const { return m_sprite; } -bool Tile::from(const int direction) const +bool Pokemod::Tile::from(const int direction) const { - if (Pokemod::D_End <= direction) + if (D_End <= direction) { emit(warning(bounds("direction"))); return false; @@ -129,17 +129,17 @@ bool Tile::from(const int direction) const return m_from[direction]; } -Script Tile::script() const +Pokemod::Script Pokemod::Tile::script() const { return m_script; } -Tile& Tile::operator=(const Tile& rhs) +Pokemod::Tile& Pokemod::Tile::operator=(const Tile& rhs) { if (this == &rhs) return *this; COPY(name); - COPY_ARRAY(from, Pokemod::D_End); + COPY_ARRAY(from, D_End); COPY(script); return *this; } diff --git a/pokemod/Tile.h b/pokemod/Tile.h index 08818100..0dc2de50 100644 --- a/pokemod/Tile.h +++ b/pokemod/Tile.h @@ -20,9 +20,13 @@ // Pokemod includes #include "Object.h" -#include "Pokemod.h" #include "Script.h" +// Qt includes +#include <QPixmap> + +namespace Pokemod +{ // Forward declarations class Pokemod; @@ -55,8 +59,9 @@ class Tile : public Object private: QString m_name; QPixmap m_sprite; - bool m_from[Pokemod::D_End]; + bool m_from[D_End]; Script m_script; }; +} #endif diff --git a/pokemod/Time.cpp b/pokemod/Time.cpp index 091a22f9..0c2f3fab 100644 --- a/pokemod/Time.cpp +++ b/pokemod/Time.cpp @@ -21,13 +21,13 @@ // Pokemod includes #include "Pokemod.h" -Time::Time(const Time& time) : +Pokemod::Time::Time(const Time& time) : Object("Time", time.parent(), time.id()) { *this = time; } -Time::Time(const Pokemod* parent, const int id) : +Pokemod::Time::Time(const Pokemod* parent, const int id) : Object("Time", parent, id), m_name(""), m_hour(0), @@ -35,19 +35,19 @@ Time::Time(const Pokemod* parent, const int id) : { } -Time::Time(const Time& time, const Pokemod* parent, const int id) : +Pokemod::Time::Time(const Time& time, const Pokemod* parent, const int id) : Object("Time", parent, id) { *this = time; } -Time::Time(const QDomElement& xml, const Pokemod* parent, const int id) : +Pokemod::Time::Time(const QDomElement& xml, const Pokemod* parent, const int id) : Object("Time", parent, id) { load(xml, id); } -void Time::validate() +void Pokemod::Time::validate() { if (m_name.isEmpty()) emit(error("Name is empty")); @@ -55,7 +55,7 @@ void Time::validate() TEST(setMinute, minute); } -void Time::load(const QDomElement& xml, int id) +void Pokemod::Time::load(const QDomElement& xml, int id) { LOAD_ID(); LOAD(QString, name); @@ -63,7 +63,7 @@ void Time::load(const QDomElement& xml, int id) LOAD(int, minute); } -QDomElement Time::save() const +QDomElement Pokemod::Time::save() const { SAVE_CREATE(); SAVE(QString, name); @@ -72,12 +72,12 @@ QDomElement Time::save() const return xml; } -void Time::setName(const QString& name) +void Pokemod::Time::setName(const QString& name) { CHECK(name); } -void Time::setHour(const int hour) +void Pokemod::Time::setHour(const int hour) { if (24 <= hour) { @@ -87,7 +87,7 @@ void Time::setHour(const int hour) CHECK(hour); } -void Time::setMinute(const int minute) +void Pokemod::Time::setMinute(const int minute) { if (60 <= minute) { @@ -97,22 +97,22 @@ void Time::setMinute(const int minute) CHECK(minute); } -QString Time::name() const +QString Pokemod::Time::name() const { return m_name; } -int Time::hour() const +int Pokemod::Time::hour() const { return m_hour; } -int Time::minute() const +int Pokemod::Time::minute() const { return m_minute; } -Time& Time::operator=(const Time& rhs) +Pokemod::Time& Pokemod::Time::operator=(const Time& rhs) { if (this == &rhs) return *this; diff --git a/pokemod/Time.h b/pokemod/Time.h index 39bd746d..91a15a0e 100644 --- a/pokemod/Time.h +++ b/pokemod/Time.h @@ -21,6 +21,8 @@ // Pokemod includes #include "Object.h" +namespace Pokemod +{ // Forward declarations class Pokemod; @@ -53,5 +55,6 @@ class Time : public Object int m_hour; int m_minute; }; +} #endif diff --git a/pokemod/Trainer.cpp b/pokemod/Trainer.cpp index c9413005..f5a6ecda 100644 --- a/pokemod/Trainer.cpp +++ b/pokemod/Trainer.cpp @@ -24,15 +24,15 @@ // Qt includes #include <QBuffer> -const QStringList Trainer::IntelligenceStr = QStringList() << "Ignorant" << "Remember" << "Deduce" << "Cheating"; +const QStringList Pokemod::Trainer::IntelligenceStr = QStringList() << "Ignorant" << "Remember" << "Deduce" << "Cheating"; -Trainer::Trainer(const Trainer& trainer) : +Pokemod::Trainer::Trainer(const Trainer& trainer) : Object("Trainer", trainer.parent(), trainer.id()) { *this = trainer; } -Trainer::Trainer(const Pokemod* parent, const int id) : +Pokemod::Trainer::Trainer(const Pokemod* parent, const int id) : Object("Trainer", parent, id), m_name(""), m_moneyFactor(0), @@ -40,19 +40,19 @@ Trainer::Trainer(const Pokemod* parent, const int id) : { } -Trainer::Trainer(const Trainer& trainer, const Pokemod* parent, const int id) : +Pokemod::Trainer::Trainer(const Trainer& trainer, const Pokemod* parent, const int id) : Object("Trainer", parent, id) { *this = trainer; } -Trainer::Trainer(const QDomElement& xml, const Pokemod* parent, const int id) : +Pokemod::Trainer::Trainer(const QDomElement& xml, const Pokemod* parent, const int id) : Object("Trainer", parent, id) { load(xml, id); } -void Trainer::validate() +void Pokemod::Trainer::validate() { if (m_name.isEmpty()) emit(error("Name is empty")); @@ -60,7 +60,7 @@ void Trainer::validate() TEST(setSkin, skin); } -void Trainer::load(const QDomElement& xml, int id) +void Pokemod::Trainer::load(const QDomElement& xml, int id) { LOAD_ID(); LOAD(QString, name); @@ -68,7 +68,7 @@ void Trainer::load(const QDomElement& xml, int id) LOAD(QPixmap, skin); } -QDomElement Trainer::save() const +QDomElement Pokemod::Trainer::save() const { SAVE_CREATE(); SAVE(QString, name); @@ -77,12 +77,12 @@ QDomElement Trainer::save() const return xml; } -void Trainer::setName(const QString& name) +void Pokemod::Trainer::setName(const QString& name) { CHECK(name); } -void Trainer::setMoneyFactor(const int moneyFactor) +void Pokemod::Trainer::setMoneyFactor(const int moneyFactor) { if (moneyFactor < 0) { @@ -92,7 +92,7 @@ void Trainer::setMoneyFactor(const int moneyFactor) CHECK(moneyFactor); } -void Trainer::setSkin(const QPixmap& skin) +void Pokemod::Trainer::setSkin(const QPixmap& skin) { if (skin.size() != QSize(192, 128)) { @@ -103,22 +103,22 @@ void Trainer::setSkin(const QPixmap& skin) emit(changed()); } -QString Trainer::name() const +QString Pokemod::Trainer::name() const { return m_name; } -int Trainer::moneyFactor() const +int Pokemod::Trainer::moneyFactor() const { return m_moneyFactor; } -QPixmap Trainer::skin() const +QPixmap Pokemod::Trainer::skin() const { return m_skin; } -Trainer& Trainer::operator=(const Trainer& rhs) +Pokemod::Trainer& Pokemod::Trainer::operator=(const Trainer& rhs) { if (this == &rhs) return *this; diff --git a/pokemod/Trainer.h b/pokemod/Trainer.h index 5e16be9f..7da08bdc 100644 --- a/pokemod/Trainer.h +++ b/pokemod/Trainer.h @@ -25,6 +25,8 @@ #include <QPixmap> #include <QStringList> +namespace Pokemod +{ // Forward declarations class Pokemod; @@ -67,5 +69,6 @@ class Trainer : public Object int m_moneyFactor; QPixmap m_skin; }; +} #endif diff --git a/pokemod/Type.cpp b/pokemod/Type.cpp index 7f138bc2..c6873de1 100644 --- a/pokemod/Type.cpp +++ b/pokemod/Type.cpp @@ -21,45 +21,45 @@ // Pokemod includes #include "Pokemod.h" -Type::Type(const Type& type) : +Pokemod::Type::Type(const Type& type) : Object("Type", type.parent(), type.id()) { *this = type; } -Type::Type(const Pokemod* parent, const int id) : +Pokemod::Type::Type(const Pokemod* parent, const int id) : Object("Type", parent, id), m_name(""), m_stab(1, 1) { } -Type::Type(const Type& type, const Pokemod* parent, const int id) : +Pokemod::Type::Type(const Type& type, const Pokemod* parent, const int id) : Object("Type", parent, id) { *this = type; } -Type::Type(const QDomElement& xml, const Pokemod* parent, const int id) : +Pokemod::Type::Type(const QDomElement& xml, const Pokemod* parent, const int id) : Object("Type", parent, id) { load(xml, id); } -void Type::validate() +void Pokemod::Type::validate() { if (m_name.isEmpty()) emit(error("Name is empty")); } -void Type::load(const QDomElement& xml, int id) +void Pokemod::Type::load(const QDomElement& xml, int id) { LOAD_ID(); LOAD(QString, name); LOAD(Fraction, stab); } -QDomElement Type::save() const +QDomElement Pokemod::Type::save() const { SAVE_CREATE(); SAVE(QString, name); @@ -67,12 +67,12 @@ QDomElement Type::save() const return xml; } -void Type::setName(const QString& name) +void Pokemod::Type::setName(const QString& name) { CHECK(name); } -void Type::setStab(const Fraction& stab) +void Pokemod::Type::setStab(const Fraction& stab) { if (stab < 1) { @@ -82,17 +82,17 @@ void Type::setStab(const Fraction& stab) CHECK(stab); } -QString Type::name() const +QString Pokemod::Type::name() const { return m_name; } -Fraction Type::stab() const +Pokemod::Fraction Pokemod::Type::stab() const { return m_stab; } -Type& Type::operator=(const Type& rhs) +Pokemod::Type& Pokemod::Type::operator=(const Type& rhs) { if (this == &rhs) return *this; diff --git a/pokemod/Type.h b/pokemod/Type.h index 6c9a0cdf..5596f6e7 100644 --- a/pokemod/Type.h +++ b/pokemod/Type.h @@ -22,6 +22,8 @@ #include "Fraction.h" #include "Object.h" +namespace Pokemod +{ // Forward declarations class Pokemod; @@ -51,5 +53,6 @@ class Type : public Object QString m_name; Fraction m_stab; }; +} #endif diff --git a/pokemod/Weather.cpp b/pokemod/Weather.cpp index 59ff9135..49cd119a 100644 --- a/pokemod/Weather.cpp +++ b/pokemod/Weather.cpp @@ -22,49 +22,49 @@ #include "Pokemod.h" #include "Script.h" -Weather::Weather(const Weather& weather) : +Pokemod::Weather::Weather(const Weather& weather) : Object("Weather", weather.parent(), weather.id()) { *this = weather; } -Weather::Weather(const Pokemod* parent, const int id) : +Pokemod::Weather::Weather(const Pokemod* parent, const int id) : Object("Weather", parent, id), m_name(""), m_script("", "") { } -Weather::Weather(const Weather& weather, const Pokemod* parent, const int id) : +Pokemod::Weather::Weather(const Weather& weather, const Pokemod* parent, const int id) : Object("Weather", parent, id) { *this = weather; } -Weather::Weather(const QDomElement& xml, const Pokemod* parent, const int id) : +Pokemod::Weather::Weather(const QDomElement& xml, const Pokemod* parent, const int id) : Object("Weather", parent, id) { load(xml, id); } -Weather::~Weather() +Pokemod::Weather::~Weather() { } -void Weather::validate() +void Pokemod::Weather::validate() { if (m_name.isEmpty()) emit(error("Name is empty")); } -void Weather::load(const QDomElement& xml, int id) +void Pokemod::Weather::load(const QDomElement& xml, int id) { LOAD_ID(); LOAD(QString, name); LOAD(Script, script); } -QDomElement Weather::save() const +QDomElement Pokemod::Weather::save() const { SAVE_CREATE(); SAVE(QString, name); @@ -72,27 +72,27 @@ QDomElement Weather::save() const return xml; } -void Weather::setName(const QString& name) +void Pokemod::Weather::setName(const QString& name) { CHECK(name); } -void Weather::setScript(const Script& script) +void Pokemod::Weather::setScript(const Script& script) { CHECK(script); } -QString Weather::name() const +QString Pokemod::Weather::name() const { return m_name; } -Script Weather::script() const +Pokemod::Script Pokemod::Weather::script() const { return m_script; } -Weather& Weather::operator=(const Weather& rhs) +Pokemod::Weather& Pokemod::Weather::operator=(const Weather& rhs) { if (this == &rhs) return *this; diff --git a/pokemod/Weather.h b/pokemod/Weather.h index da727344..3a1e6734 100644 --- a/pokemod/Weather.h +++ b/pokemod/Weather.h @@ -22,6 +22,8 @@ #include "Object.h" #include "Script.h" +namespace Pokemod +{ // Forward declarations class Pokemod; @@ -52,5 +54,6 @@ class Weather : public Object QString m_name; Script m_script; }; +} #endif diff --git a/pokemodr/AbilityUI.cpp b/pokemodr/AbilityUI.cpp index ff7d76c6..1768a83e 100644 --- a/pokemodr/AbilityUI.cpp +++ b/pokemodr/AbilityUI.cpp @@ -21,50 +21,50 @@ // Pokemod includes #include "../pokemod/Ability.h" -AbilityUI::AbilityUI(Ability* ability, QWidget* parent) : +Pokemodr::AbilityUI::AbilityUI(Pokemod::Ability* ability, QWidget* parent) : ObjectUI(parent) { setupUi(this); - setObjects(ability, new Ability(*ability)); + setObjects(ability, new Pokemod::Ability(*ability)); } -AbilityUI::~AbilityUI() +Pokemodr::AbilityUI::~AbilityUI() { } -void AbilityUI::setGui() +void Pokemodr::AbilityUI::setGui() { - varName->setText(static_cast<Ability*>(modified())->name()); - varDescription->setText(static_cast<Ability*>(modified())->description()); - varScript->setValue(static_cast<Ability*>(modified())->script()); + varName->setText(static_cast<Pokemod::Ability*>(modified())->name()); + varDescription->setText(static_cast<Pokemod::Ability*>(modified())->description()); + varScript->setValue(static_cast<Pokemod::Ability*>(modified())->script()); } -void AbilityUI::apply() +void Pokemodr::AbilityUI::apply() { - *static_cast<Ability*>(original()) = *static_cast<Ability*>(modified()); + *static_cast<Pokemod::Ability*>(original()) = *static_cast<Pokemod::Ability*>(modified()); emit(changed(false)); } -void AbilityUI::discard() +void Pokemodr::AbilityUI::discard() { - *static_cast<Ability*>(modified()) = *static_cast<Ability*>(original()); + *static_cast<Pokemod::Ability*>(modified()) = *static_cast<Pokemod::Ability*>(original()); setGui(); emit(changed(false)); } -void AbilityUI::on_varName_textChanged(const QString& name) +void Pokemodr::AbilityUI::on_varName_textChanged(const QString& name) { const int cursor = varName->cursorPosition(); - static_cast<Ability*>(modified())->setName(name); + static_cast<Pokemod::Ability*>(modified())->setName(name); varName->setCursorPosition(cursor); } -void AbilityUI::on_varDescription_textChanged(const QString& description) +void Pokemodr::AbilityUI::on_varDescription_textChanged(const QString& description) { - static_cast<Ability*>(modified())->setDescription(description); + static_cast<Pokemod::Ability*>(modified())->setDescription(description); } -void AbilityUI::on_varScript_valueChanged(const Script& script) +void Pokemodr::AbilityUI::on_varScript_valueChanged(const Pokemod::Script& script) { - static_cast<Ability*>(modified())->setScript(script); + static_cast<Pokemod::Ability*>(modified())->setScript(script); } diff --git a/pokemodr/AbilityUI.h b/pokemodr/AbilityUI.h index 5825e1b2..e4275cc9 100644 --- a/pokemodr/AbilityUI.h +++ b/pokemodr/AbilityUI.h @@ -18,21 +18,26 @@ #ifndef __POKEMODR_ABILITYUI__ #define __POKEMODR_ABILITYUI__ -// PokeModr includes +// Pokemodr includes #include "ObjectUI.h" // Form include #include "ui_ability.h" // Forward declarations +namespace Pokemod +{ class Ability; +} +namespace Pokemodr +{ class AbilityUI : public ObjectUI, private Ui::formAbility { Q_OBJECT public: - AbilityUI(Ability* ability, QWidget* parent); + AbilityUI(Pokemod::Ability* ability, QWidget* parent); ~AbilityUI(); public slots: void apply(); @@ -40,9 +45,10 @@ class AbilityUI : public ObjectUI, private Ui::formAbility protected slots: void on_varName_textChanged(const QString& name); void on_varDescription_textChanged(const QString& description); - void on_varScript_valueChanged(const Script& script); + void on_varScript_valueChanged(const Pokemod::Script& script); private slots: void setGui(); }; +} #endif diff --git a/pokemodr/AuthorUI.cpp b/pokemodr/AuthorUI.cpp index aa4772da..c051b288 100644 --- a/pokemodr/AuthorUI.cpp +++ b/pokemodr/AuthorUI.cpp @@ -21,54 +21,54 @@ // Pokemod includes #include "../pokemod/Author.h" -AuthorUI::AuthorUI(Author* author, QWidget* parent) : +Pokemodr::AuthorUI::AuthorUI(Pokemod::Author* author, QWidget* parent) : ObjectUI(parent) { setupUi(this); - setObjects(author, new Author(*author)); + setObjects(author, new Pokemod::Author(*author)); } -AuthorUI::~AuthorUI() +Pokemodr::AuthorUI::~AuthorUI() { } -void AuthorUI::setGui() +void Pokemodr::AuthorUI::setGui() { - varName->setText(static_cast<Author*>(modified())->name()); - varEmail->setText(static_cast<Author*>(modified())->email()); - varRole->setText(static_cast<Author*>(modified())->role()); + varName->setText(static_cast<Pokemod::Author*>(modified())->name()); + varEmail->setText(static_cast<Pokemod::Author*>(modified())->email()); + varRole->setText(static_cast<Pokemod::Author*>(modified())->role()); } -void AuthorUI::apply() +void Pokemodr::AuthorUI::apply() { - *static_cast<Author*>(original()) = *static_cast<Author*>(modified()); + *static_cast<Pokemod::Author*>(original()) = *static_cast<Pokemod::Author*>(modified()); emit(changed(false)); } -void AuthorUI::discard() +void Pokemodr::AuthorUI::discard() { - *static_cast<Author*>(modified()) = *static_cast<Author*>(original()); + *static_cast<Pokemod::Author*>(modified()) = *static_cast<Pokemod::Author*>(original()); setGui(); emit(changed(false)); } -void AuthorUI::on_varName_textChanged(const QString& name) +void Pokemodr::AuthorUI::on_varName_textChanged(const QString& name) { const int cursor = varName->cursorPosition(); - static_cast<Author*>(modified())->setName(name); + static_cast<Pokemod::Author*>(modified())->setName(name); varName->setCursorPosition(cursor); } -void AuthorUI::on_varEmail_textChanged(const QString& email) +void Pokemodr::AuthorUI::on_varEmail_textChanged(const QString& email) { const int cursor = varEmail->cursorPosition(); - static_cast<Author*>(modified())->setEmail(email); + static_cast<Pokemod::Author*>(modified())->setEmail(email); varEmail->setCursorPosition(cursor); } -void AuthorUI::on_varRole_textChanged(const QString& role) +void Pokemodr::AuthorUI::on_varRole_textChanged(const QString& role) { const int cursor = varRole->cursorPosition(); - static_cast<Author*>(modified())->setRole(role); + static_cast<Pokemod::Author*>(modified())->setRole(role); varRole->setCursorPosition(cursor); } diff --git a/pokemodr/AuthorUI.h b/pokemodr/AuthorUI.h index 9d8cf8aa..90b95295 100644 --- a/pokemodr/AuthorUI.h +++ b/pokemodr/AuthorUI.h @@ -18,21 +18,26 @@ #ifndef __POKEMODR_AUTHORUI__ #define __POKEMODR_AUTHORUI__ -// PokeModr includes +// Pokemodr includes #include "ObjectUI.h" // Form include #include "ui_author.h" // Forward declarations +namespace Pokemod +{ class Author; +} +namespace Pokemodr +{ class AuthorUI : public ObjectUI, private Ui::formAuthor { Q_OBJECT public: - AuthorUI(Author* author, QWidget* parent); + AuthorUI(Pokemod::Author* author, QWidget* parent); ~AuthorUI(); public slots: void apply(); @@ -44,5 +49,6 @@ class AuthorUI : public ObjectUI, private Ui::formAuthor private slots: void setGui(); }; +} #endif diff --git a/pokemodr/BadgeUI.cpp b/pokemodr/BadgeUI.cpp index d36b0b4b..9bda11a3 100644 --- a/pokemodr/BadgeUI.cpp +++ b/pokemodr/BadgeUI.cpp @@ -18,7 +18,7 @@ // Header include #include "BadgeUI.h" -// PokeModr includes +// Pokemodr includes #include "FileDialog.h" // Pokemod includes @@ -26,23 +26,23 @@ #include "../pokemod/Pokemod.h" #include "../pokemod/Rules.h" -BadgeUI::BadgeUI(Badge* badge, QWidget* parent) : +Pokemodr::BadgeUI::BadgeUI(Pokemod::Badge* badge, QWidget* parent) : ObjectUI(parent) { setupUi(this); - setObjects(badge, new Badge(*badge)); + setObjects(badge, new Pokemod::Badge(*badge)); } -BadgeUI::~BadgeUI() +Pokemodr::BadgeUI::~BadgeUI() { } -void BadgeUI::initGui() +void Pokemodr::BadgeUI::initGui() { connect(varStat, SIGNAL(activated(const int)), this, SLOT(setGui())); } -void BadgeUI::refreshGui() +void Pokemodr::BadgeUI::refreshGui() { varStat->clear(); const bool isSplit = pokemod()->rules()->specialSplit(); @@ -50,63 +50,63 @@ void BadgeUI::refreshGui() varObey->setMaximum(pokemod()->rules()->maxLevel()); } -void BadgeUI::setGui() +void Pokemodr::BadgeUI::setGui() { - varName->setText(static_cast<Badge*>(modified())->name()); - varObey->setValue(static_cast<Badge*>(modified())->obey()); - varFace->setIcon(static_cast<Badge*>(modified())->face()); - varBadge->setIcon(static_cast<Badge*>(modified())->badge()); - varStatMultiplier->setValue(static_cast<Badge*>(modified())->stat(varStat->currentIndex())); + varName->setText(static_cast<Pokemod::Badge*>(modified())->name()); + varObey->setValue(static_cast<Pokemod::Badge*>(modified())->obey()); + varFace->setIcon(static_cast<Pokemod::Badge*>(modified())->face()); + varBadge->setIcon(static_cast<Pokemod::Badge*>(modified())->badge()); + varStatMultiplier->setValue(static_cast<Pokemod::Badge*>(modified())->stat(varStat->currentIndex())); } -void BadgeUI::apply() +void Pokemodr::BadgeUI::apply() { - *static_cast<Badge*>(original()) = *static_cast<Badge*>(modified()); + *static_cast<Pokemod::Badge*>(original()) = *static_cast<Pokemod::Badge*>(modified()); emit(changed(false)); } -void BadgeUI::discard() +void Pokemodr::BadgeUI::discard() { - *static_cast<Badge*>(modified()) = *static_cast<Badge*>(original()); + *static_cast<Pokemod::Badge*>(modified()) = *static_cast<Pokemod::Badge*>(original()); setGui(); emit(changed(false)); } -void BadgeUI::on_varName_textChanged(const QString& name) +void Pokemodr::BadgeUI::on_varName_textChanged(const QString& name) { const int cursor = varName->cursorPosition(); - static_cast<Badge*>(modified())->setName(name); + static_cast<Pokemod::Badge*>(modified())->setName(name); varName->setCursorPosition(cursor); } -void BadgeUI::on_varObey_valueChanged(const int obey) +void Pokemodr::BadgeUI::on_varObey_valueChanged(const int obey) { - static_cast<Badge*>(modified())->setObey(obey); + static_cast<Pokemod::Badge*>(modified())->setObey(obey); } -void BadgeUI::on_varFace_pressed() +void Pokemodr::BadgeUI::on_varFace_pressed() { FileDialog* dialog = new FileDialog(QSize(64, 64)); if (dialog->exec() == QDialog::Accepted) { - static_cast<Badge*>(modified())->setFace(QPixmap(dialog->selectedFile())); + static_cast<Pokemod::Badge*>(modified())->setFace(QPixmap(dialog->selectedFile())); setGui(); } delete dialog; } -void BadgeUI::on_varBadge_pressed() +void Pokemodr::BadgeUI::on_varBadge_pressed() { FileDialog* dialog = new FileDialog(QSize(64, 64)); if (dialog->exec() == QDialog::Accepted) { - static_cast<Badge*>(modified())->setBadge(QPixmap(dialog->selectedFile())); + static_cast<Pokemod::Badge*>(modified())->setBadge(QPixmap(dialog->selectedFile())); setGui(); } delete dialog; } -void BadgeUI::on_varStatMultiplier_valueChanged(const Fraction& multiplier) +void Pokemodr::BadgeUI::on_varStatMultiplier_valueChanged(const Pokemod::Fraction& multiplier) { - static_cast<Badge*>(modified())->setStat(varStat->currentIndex(), multiplier); + static_cast<Pokemod::Badge*>(modified())->setStat(varStat->currentIndex(), multiplier); } diff --git a/pokemodr/BadgeUI.h b/pokemodr/BadgeUI.h index 7820ad06..e20e4a87 100644 --- a/pokemodr/BadgeUI.h +++ b/pokemodr/BadgeUI.h @@ -18,21 +18,26 @@ #ifndef __POKEMODR_BADGEUI__ #define __POKEMODR_BADGEUI__ -// PokeModr includes +// Pokemodr includes #include "ObjectUI.h" // Form include #include "ui_badge.h" // Forward declarations +namespace Pokemod +{ class Badge; +} +namespace Pokemodr +{ class BadgeUI : public ObjectUI, private Ui::formBadge { Q_OBJECT public: - BadgeUI(Badge* badge, QWidget* parent); + BadgeUI(Pokemod::Badge* badge, QWidget* parent); ~BadgeUI(); public slots: void apply(); @@ -42,11 +47,12 @@ class BadgeUI : public ObjectUI, private Ui::formBadge void on_varObey_valueChanged(const int obey); void on_varFace_pressed(); void on_varBadge_pressed(); - void on_varStatMultiplier_valueChanged(const Fraction& multiplier); + void on_varStatMultiplier_valueChanged(const Pokemod::Fraction& multiplier); private slots: void initGui(); void refreshGui(); void setGui(); }; +} #endif diff --git a/pokemodr/CoinListObjectUI.cpp b/pokemodr/CoinListObjectUI.cpp index cb7542c1..91e6d4f3 100644 --- a/pokemodr/CoinListObjectUI.cpp +++ b/pokemodr/CoinListObjectUI.cpp @@ -24,37 +24,37 @@ #include "../pokemod/Pokemod.h" #include "../pokemod/Species.h" -CoinListObjectUI::CoinListObjectUI(CoinListObject* object, QWidget* parent) : +Pokemodr::CoinListObjectUI::CoinListObjectUI(Pokemod::CoinListObject* object, QWidget* parent) : ObjectUI(parent), m_lastType(-1) { setupUi(this); - setObjects(object, new CoinListObject(*object)); + setObjects(object, new Pokemod::CoinListObject(*object)); } -CoinListObjectUI::~CoinListObjectUI() +Pokemodr::CoinListObjectUI::~CoinListObjectUI() { } -void CoinListObjectUI::initGui() +void Pokemodr::CoinListObjectUI::initGui() { connect(varType, SIGNAL(activated(const int)), this, SLOT(setGui())); - varType->addItems(CoinListObject::TypeStr); + varType->addItems(Pokemod::CoinListObject::TypeStr); } -void CoinListObjectUI::setGui() +void Pokemodr::CoinListObjectUI::setGui() { - bool resetObjects = (static_cast<CoinListObject*>(modified())->type() != m_lastType); - varType->setCurrentIndex(static_cast<CoinListObject*>(modified())->type()); - m_lastType = static_cast<CoinListObject*>(modified())->type(); + bool resetObjects = (static_cast<Pokemod::CoinListObject*>(modified())->type() != m_lastType); + varType->setCurrentIndex(static_cast<Pokemod::CoinListObject*>(modified())->type()); + m_lastType = static_cast<Pokemod::CoinListObject*>(modified())->type(); if (resetObjects) { varObject->clear(); - if (static_cast<CoinListObject*>(modified())->type() == CoinListObject::Item) + if (static_cast<Pokemod::CoinListObject*>(modified())->type() == Pokemod::CoinListObject::Item) { for (int i = 0; i < pokemod()->itemCount(); ++i) { - const Item* item = pokemod()->item(i); + const Pokemod::Item* item = pokemod()->item(i); varObject->addItem(item->name(), item->id()); } varAmount->setMaximum(INT_MAX); @@ -63,46 +63,46 @@ void CoinListObjectUI::setGui() { for (int i = 0; i < pokemod()->speciesCount(); ++i) { - const Species* species = pokemod()->species(i); + const Pokemod::Species* species = pokemod()->species(i); varObject->addItem(species->name(), species->id()); } varAmount->setMaximum(1); } } - varObject->setCurrentIndex(varObject->findData(static_cast<CoinListObject*>(modified())->object())); - varAmount->setValue(static_cast<CoinListObject*>(modified())->amount()); - varCost->setValue(static_cast<CoinListObject*>(modified())->cost()); + varObject->setCurrentIndex(varObject->findData(static_cast<Pokemod::CoinListObject*>(modified())->object())); + varAmount->setValue(static_cast<Pokemod::CoinListObject*>(modified())->amount()); + varCost->setValue(static_cast<Pokemod::CoinListObject*>(modified())->cost()); } -void CoinListObjectUI::apply() +void Pokemodr::CoinListObjectUI::apply() { - *static_cast<CoinListObject*>(original()) = *static_cast<CoinListObject*>(modified()); + *static_cast<Pokemod::CoinListObject*>(original()) = *static_cast<Pokemod::CoinListObject*>(modified()); emit(changed(false)); } -void CoinListObjectUI::discard() +void Pokemodr::CoinListObjectUI::discard() { - *static_cast<CoinListObject*>(modified()) = *static_cast<CoinListObject*>(original()); + *static_cast<Pokemod::CoinListObject*>(modified()) = *static_cast<Pokemod::CoinListObject*>(original()); setGui(); emit(changed(false)); } -void CoinListObjectUI::on_varType_activated(const int type) +void Pokemodr::CoinListObjectUI::on_varType_activated(const int type) { - static_cast<CoinListObject*>(modified())->setType(type); + static_cast<Pokemod::CoinListObject*>(modified())->setType(type); } -void CoinListObjectUI::on_varObject_activated(const int obey) +void Pokemodr::CoinListObjectUI::on_varObject_activated(const int obey) { - static_cast<CoinListObject*>(modified())->setObject(varObject->itemData(obey).toInt()); + static_cast<Pokemod::CoinListObject*>(modified())->setObject(varObject->itemData(obey).toInt()); } -void CoinListObjectUI::on_varAmount_valueChanged(const int amount) +void Pokemodr::CoinListObjectUI::on_varAmount_valueChanged(const int amount) { - static_cast<CoinListObject*>(modified())->setAmount(amount); + static_cast<Pokemod::CoinListObject*>(modified())->setAmount(amount); } -void CoinListObjectUI::on_varCost_valueChanged(const int cost) +void Pokemodr::CoinListObjectUI::on_varCost_valueChanged(const int cost) { - static_cast<CoinListObject*>(modified())->setCost(cost); + static_cast<Pokemod::CoinListObject*>(modified())->setCost(cost); } diff --git a/pokemodr/CoinListObjectUI.h b/pokemodr/CoinListObjectUI.h index 459a05e7..d71f465a 100644 --- a/pokemodr/CoinListObjectUI.h +++ b/pokemodr/CoinListObjectUI.h @@ -18,21 +18,26 @@ #ifndef __POKEMODR_COINLISTOBJECTUI__ #define __POKEMODR_COINLISTOBJECTUI__ -// PokeModr includes +// Pokemodr includes #include "ObjectUI.h" // Form include #include "ui_coinlistobject.h" // Forward declarations +namespace Pokemod +{ class CoinListObject; +} +namespace Pokemodr +{ class CoinListObjectUI : public ObjectUI, private Ui::formCoinListObject { Q_OBJECT public: - CoinListObjectUI(CoinListObject* object, QWidget* parent); + CoinListObjectUI(Pokemod::CoinListObject* object, QWidget* parent); ~CoinListObjectUI(); public slots: void apply(); @@ -48,5 +53,6 @@ class CoinListObjectUI : public ObjectUI, private Ui::formCoinListObject private: bool m_lastType; }; +} #endif diff --git a/pokemodr/CoinListUI.cpp b/pokemodr/CoinListUI.cpp index 72450e5a..52039433 100644 --- a/pokemodr/CoinListUI.cpp +++ b/pokemodr/CoinListUI.cpp @@ -22,44 +22,44 @@ #include "../pokemod/CoinList.h" #include "../pokemod/Pokemod.h" -CoinListUI::CoinListUI(CoinList* coinList, QWidget* parent) : +Pokemodr::CoinListUI::CoinListUI(Pokemod::CoinList* coinList, QWidget* parent) : ObjectUI(parent) { setupUi(this); - setObjects(coinList, new CoinList(*coinList)); + setObjects(coinList, new Pokemod::CoinList(*coinList)); } -CoinListUI::~CoinListUI() +Pokemodr::CoinListUI::~CoinListUI() { } -void CoinListUI::setGui() +void Pokemodr::CoinListUI::setGui() { - varName->setText(static_cast<CoinList*>(modified())->name()); - varScript->setValue(static_cast<CoinList*>(modified())->script()); + varName->setText(static_cast<Pokemod::CoinList*>(modified())->name()); + varScript->setValue(static_cast<Pokemod::CoinList*>(modified())->script()); } -void CoinListUI::apply() +void Pokemodr::CoinListUI::apply() { - *static_cast<CoinList*>(original()) = *static_cast<CoinList*>(modified()); + *static_cast<Pokemod::CoinList*>(original()) = *static_cast<Pokemod::CoinList*>(modified()); emit(changed(false)); } -void CoinListUI::discard() +void Pokemodr::CoinListUI::discard() { - *static_cast<CoinList*>(modified()) = *static_cast<CoinList*>(original()); + *static_cast<Pokemod::CoinList*>(modified()) = *static_cast<Pokemod::CoinList*>(original()); setGui(); emit(changed(false)); } -void CoinListUI::on_varName_textChanged(const QString& name) +void Pokemodr::CoinListUI::on_varName_textChanged(const QString& name) { const int cursor = varName->cursorPosition(); - static_cast<CoinList*>(modified())->setName(name); + static_cast<Pokemod::CoinList*>(modified())->setName(name); varName->setCursorPosition(cursor); } -void CoinListUI::on_varScript_valueChanged(const Script& script) +void Pokemodr::CoinListUI::on_varScript_valueChanged(const Pokemod::Script& script) { - static_cast<CoinList*>(modified())->setScript(script); + static_cast<Pokemod::CoinList*>(modified())->setScript(script); } diff --git a/pokemodr/CoinListUI.h b/pokemodr/CoinListUI.h index 1c82799b..46b9c946 100644 --- a/pokemodr/CoinListUI.h +++ b/pokemodr/CoinListUI.h @@ -18,30 +18,36 @@ #ifndef __POKEMODR_COINLISTUI__ #define __POKEMODR_COINLISTUI__ -// PokeModr includes +// Pokemodr includes #include "ObjectUI.h" // Form include #include "ui_coinlist.h" // Forward declarations +namespace Pokemod +{ class CoinList; +} +namespace Pokemodr +{ class CoinListUI : public ObjectUI, private Ui::formCoinList { Q_OBJECT public: - CoinListUI(CoinList* coinList, QWidget* parent); + CoinListUI(Pokemod::CoinList* coinList, QWidget* parent); ~CoinListUI(); public slots: void apply(); void discard(); protected slots: void on_varName_textChanged(const QString& name); - void on_varScript_valueChanged(const Script& script); + void on_varScript_valueChanged(const Pokemod::Script& script); private slots: void setGui(); }; +} #endif diff --git a/pokemodr/EggGroupUI.cpp b/pokemodr/EggGroupUI.cpp index 991dfc8c..2e38c802 100644 --- a/pokemodr/EggGroupUI.cpp +++ b/pokemodr/EggGroupUI.cpp @@ -21,38 +21,38 @@ // Pokemod includes #include "../pokemod/EggGroup.h" -EggGroupUI::EggGroupUI(EggGroup* eggGroup, QWidget* parent) : +Pokemodr::EggGroupUI::EggGroupUI(Pokemod::EggGroup* eggGroup, QWidget* parent) : ObjectUI(parent) { setupUi(this); - setObjects(eggGroup, new EggGroup(*eggGroup)); + setObjects(eggGroup, new Pokemod::EggGroup(*eggGroup)); } -EggGroupUI::~EggGroupUI() +Pokemodr::EggGroupUI::~EggGroupUI() { } -void EggGroupUI::setGui() +void Pokemodr::EggGroupUI::setGui() { - varName->setText(static_cast<EggGroup*>(modified())->name()); + varName->setText(static_cast<Pokemod::EggGroup*>(modified())->name()); } -void EggGroupUI::apply() +void Pokemodr::EggGroupUI::apply() { - *static_cast<EggGroup*>(original()) = *static_cast<EggGroup*>(modified()); + *static_cast<Pokemod::EggGroup*>(original()) = *static_cast<Pokemod::EggGroup*>(modified()); emit(changed(false)); } -void EggGroupUI::discard() +void Pokemodr::EggGroupUI::discard() { - *static_cast<EggGroup*>(modified()) = *static_cast<EggGroup*>(original()); + *static_cast<Pokemod::EggGroup*>(modified()) = *static_cast<Pokemod::EggGroup*>(original()); setGui(); emit(changed(false)); } -void EggGroupUI::on_varName_textChanged(const QString& name) +void Pokemodr::EggGroupUI::on_varName_textChanged(const QString& name) { const int cursor = varName->cursorPosition(); - static_cast<EggGroup*>(modified())->setName(name); + static_cast<Pokemod::EggGroup*>(modified())->setName(name); varName->setCursorPosition(cursor); } diff --git a/pokemodr/EggGroupUI.h b/pokemodr/EggGroupUI.h index b46812a7..193f44ca 100644 --- a/pokemodr/EggGroupUI.h +++ b/pokemodr/EggGroupUI.h @@ -18,21 +18,26 @@ #ifndef __POKEMODR_EGGGROUPUI__ #define __POKEMODR_EGGGROUPUI__ -// PokeModr includes +// Pokemodr includes #include "ObjectUI.h" // Form include #include "ui_egggroup.h" // Forward declarations +namespace Pokemod +{ class EggGroup; +} +namespace Pokemodr +{ class EggGroupUI : public ObjectUI, private Ui::formEggGroup { Q_OBJECT public: - EggGroupUI(EggGroup* eggGroup, QWidget* parent); + EggGroupUI(Pokemod::EggGroup* eggGroup, QWidget* parent); ~EggGroupUI(); public slots: void apply(); @@ -42,5 +47,6 @@ class EggGroupUI : public ObjectUI, private Ui::formEggGroup private slots: void setGui(); }; +} #endif diff --git a/pokemodr/FileDialog.cpp b/pokemodr/FileDialog.cpp index 7d0d12b7..d588c541 100644 --- a/pokemodr/FileDialog.cpp +++ b/pokemodr/FileDialog.cpp @@ -28,7 +28,7 @@ #include <KFileDialog> #include <KImageFilePreview> -FileDialog::FileDialog(const QSize& size) : +Pokemodr::FileDialog::FileDialog(const QSize& size) : KFileDialog(KUrl("kfiledialog:///image"), "", NULL) { m_size = size; @@ -40,7 +40,7 @@ FileDialog::FileDialog(const QSize& size) : } } -void FileDialog::sizeFilter(const KFileItem& item) +void Pokemodr::FileDialog::sizeFilter(const KFileItem& item) { QString filter; QStringList files(QDir(item.url().path()).entryList(QStringList() << "*.png" << "*.jpg" << "*.jpeg", QDir::Files)); diff --git a/pokemodr/FileDialog.h b/pokemodr/FileDialog.h index 6789f81e..320abff6 100644 --- a/pokemodr/FileDialog.h +++ b/pokemodr/FileDialog.h @@ -25,6 +25,8 @@ #include <KFileDialog> #include <KFileItem> +namespace Pokemodr +{ class FileDialog : public KFileDialog { Q_OBJECT @@ -36,5 +38,6 @@ class FileDialog : public KFileDialog private: QSize m_size; }; +} #endif diff --git a/pokemodr/FractionWidget.cpp b/pokemodr/FractionWidget.cpp index cc6b8627..f4df8a9a 100644 --- a/pokemodr/FractionWidget.cpp +++ b/pokemodr/FractionWidget.cpp @@ -18,32 +18,32 @@ // Header include #include "FractionWidget.h" -FractionWidget::FractionWidget(QWidget* parent, const Fraction& value) : +Pokemodr::FractionWidget::FractionWidget(QWidget* parent, const Pokemod::Fraction& value) : QWidget(parent) { setupUi(this); - connect(this, SIGNAL(valueChanged(const Fraction&)), SLOT(updateValue())); - connect(this, SIGNAL(valueChanged(const Fraction&)), SLOT(resetRanges())); + connect(this, SIGNAL(valueChanged(const Pokemod::Fraction&)), SLOT(updateValue())); + connect(this, SIGNAL(valueChanged(const Pokemod::Fraction&)), SLOT(resetRanges())); setValue(value); } -int FractionWidget::behavior() const +int Pokemodr::FractionWidget::behavior() const { return m_behavior; } -Fraction FractionWidget::value() const +Pokemod::Fraction Pokemodr::FractionWidget::value() const { return m_value; } -void FractionWidget::setBehavior(const int behavior) +void Pokemodr::FractionWidget::setBehavior(const int behavior) { m_behavior = behavior; emit(valueChanged(m_value)); } -void FractionWidget::setValue(const Fraction& value) +void Pokemodr::FractionWidget::setValue(const Pokemod::Fraction& value) { if ((m_value == value) && !varValue->text().isEmpty()) return; @@ -51,24 +51,24 @@ void FractionWidget::setValue(const Fraction& value) emit(valueChanged(m_value)); } -void FractionWidget::updateValue() +void Pokemodr::FractionWidget::updateValue() { varValue->setText(QString::number(m_value, 'g', 7)); } -void FractionWidget::on_varNumerator_valueChanged(const int numerator) +void Pokemodr::FractionWidget::on_varNumerator_valueChanged(const int numerator) { m_value.setNumerator(numerator); emit(valueChanged(m_value)); } -void FractionWidget::on_varDenominator_valueChanged(const int denominator) +void Pokemodr::FractionWidget::on_varDenominator_valueChanged(const int denominator) { m_value.setDenominator(denominator); emit(valueChanged(m_value)); } -void FractionWidget::resetRanges() +void Pokemodr::FractionWidget::resetRanges() { varNumerator->setValue(m_value.numerator()); if (-1 < m_behavior) diff --git a/pokemodr/FractionWidget.h b/pokemodr/FractionWidget.h index b989d1c3..d839f41e 100644 --- a/pokemodr/FractionWidget.h +++ b/pokemodr/FractionWidget.h @@ -27,21 +27,23 @@ // Form include #include "ui_fraction.h" +namespace Pokemodr +{ class FractionWidget : public QWidget, private Ui::formFraction { Q_OBJECT Q_PROPERTY(int behavior READ behavior WRITE setBehavior) public: - FractionWidget(QWidget* parent, const Fraction& value = Fraction(1, 1)); + FractionWidget(QWidget* parent, const Pokemod::Fraction& value = Pokemod::Fraction(1, 1)); int behavior() const; - Fraction value() const; + Pokemod::Fraction value() const; signals: - void valueChanged(const Fraction&); + void valueChanged(const Pokemod::Fraction&); public slots: void setBehavior(const int behavior); - void setValue(const Fraction& value); + void setValue(const Pokemod::Fraction& value); void updateValue(); protected slots: @@ -51,7 +53,8 @@ class FractionWidget : public QWidget, private Ui::formFraction void resetRanges(); private: int m_behavior; - Fraction m_value; + Pokemod::Fraction m_value; }; +} #endif diff --git a/pokemodr/GlobalScriptUI.cpp b/pokemodr/GlobalScriptUI.cpp index 2569b347..3382b997 100644 --- a/pokemodr/GlobalScriptUI.cpp +++ b/pokemodr/GlobalScriptUI.cpp @@ -21,44 +21,44 @@ // Pokemod includes #include "../pokemod/GlobalScript.h" -GlobalScriptUI::GlobalScriptUI(GlobalScript* globalScript, QWidget* parent) : +Pokemodr::GlobalScriptUI::GlobalScriptUI(Pokemod::GlobalScript* globalScript, QWidget* parent) : ObjectUI(parent) { setupUi(this); - setObjects(globalScript, new GlobalScript(*globalScript)); + setObjects(globalScript, new Pokemod::GlobalScript(*globalScript)); } -GlobalScriptUI::~GlobalScriptUI() +Pokemodr::GlobalScriptUI::~GlobalScriptUI() { } -void GlobalScriptUI::setGui() +void Pokemodr::GlobalScriptUI::setGui() { - varName->setText(static_cast<GlobalScript*>(modified())->name()); - varScript->setValue(static_cast<GlobalScript*>(modified())->script()); + varName->setText(static_cast<Pokemod::GlobalScript*>(modified())->name()); + varScript->setValue(static_cast<Pokemod::GlobalScript*>(modified())->script()); } -void GlobalScriptUI::apply() +void Pokemodr::GlobalScriptUI::apply() { - *static_cast<GlobalScript*>(original()) = *static_cast<GlobalScript*>(modified()); + *static_cast<Pokemod::GlobalScript*>(original()) = *static_cast<Pokemod::GlobalScript*>(modified()); emit(changed(false)); } -void GlobalScriptUI::discard() +void Pokemodr::GlobalScriptUI::discard() { - *static_cast<GlobalScript*>(modified()) = *static_cast<GlobalScript*>(original()); + *static_cast<Pokemod::GlobalScript*>(modified()) = *static_cast<Pokemod::GlobalScript*>(original()); setGui(); emit(changed(false)); } -void GlobalScriptUI::on_varName_textChanged(const QString& name) +void Pokemodr::GlobalScriptUI::on_varName_textChanged(const QString& name) { const int cursor = varName->cursorPosition(); - static_cast<GlobalScript*>(modified())->setName(name); + static_cast<Pokemod::GlobalScript*>(modified())->setName(name); varName->setCursorPosition(cursor); } -void GlobalScriptUI::on_varScript_valueChanged(const Script& script) +void Pokemodr::GlobalScriptUI::on_varScript_valueChanged(const Pokemod::Script& script) { - static_cast<GlobalScript*>(modified())->setScript(script); + static_cast<Pokemod::GlobalScript*>(modified())->setScript(script); } diff --git a/pokemodr/GlobalScriptUI.h b/pokemodr/GlobalScriptUI.h index 3ca6acca..02b57551 100644 --- a/pokemodr/GlobalScriptUI.h +++ b/pokemodr/GlobalScriptUI.h @@ -18,30 +18,36 @@ #ifndef __POKEMODR_GLOBALSCRIPTUI__ #define __POKEMODR_GLOBALSCRIPTUI__ -// PokeModr includes +// Pokemodr includes #include "ObjectUI.h" // Form include #include "ui_globalscript.h" // Forward declarations +namespace Pokemod +{ class GlobalScript; +} +namespace Pokemodr +{ class GlobalScriptUI : public ObjectUI, private Ui::formGlobalScript { Q_OBJECT public: - GlobalScriptUI(GlobalScript* globalScript, QWidget* parent); + GlobalScriptUI(Pokemod::GlobalScript* globalScript, QWidget* parent); ~GlobalScriptUI(); public slots: void apply(); void discard(); protected slots: void on_varName_textChanged(const QString& name); - void on_varScript_valueChanged(const Script& script); + void on_varScript_valueChanged(const Pokemod::Script& script); private slots: void setGui(); }; +} #endif diff --git a/pokemodr/ItemTypeUI.cpp b/pokemodr/ItemTypeUI.cpp index 3c2cdf0e..9a2b9c02 100644 --- a/pokemodr/ItemTypeUI.cpp +++ b/pokemodr/ItemTypeUI.cpp @@ -21,61 +21,61 @@ // Pokemod includes #include "../pokemod/ItemType.h" -ItemTypeUI::ItemTypeUI(ItemType* itemType, QWidget* parent) : +Pokemodr::ItemTypeUI::ItemTypeUI(Pokemod::ItemType* itemType, QWidget* parent) : ObjectUI(parent) { setupUi(this); - setObjects(itemType, new ItemType(*itemType)); + setObjects(itemType, new Pokemod::ItemType(*itemType)); } -ItemTypeUI::~ItemTypeUI() +Pokemodr::ItemTypeUI::~ItemTypeUI() { } -void ItemTypeUI::initGui() +void Pokemodr::ItemTypeUI::initGui() { - varCount->addItems(ItemType::CountStr); + varCount->addItems(Pokemod::ItemType::CountStr); } -void ItemTypeUI::setGui() +void Pokemodr::ItemTypeUI::setGui() { - varName->setText(static_cast<ItemType*>(modified())->name()); - varComputer->setValue(static_cast<ItemType*>(modified())->computer()); - varPlayer->setValue(static_cast<ItemType*>(modified())->player()); - varCount->setCurrentIndex(static_cast<ItemType*>(modified())->count()); + varName->setText(static_cast<Pokemod::ItemType*>(modified())->name()); + varComputer->setValue(static_cast<Pokemod::ItemType*>(modified())->computer()); + varPlayer->setValue(static_cast<Pokemod::ItemType*>(modified())->player()); + varCount->setCurrentIndex(static_cast<Pokemod::ItemType*>(modified())->count()); } -void ItemTypeUI::apply() +void Pokemodr::ItemTypeUI::apply() { - *static_cast<ItemType*>(original()) = *static_cast<ItemType*>(modified()); + *static_cast<Pokemod::ItemType*>(original()) = *static_cast<Pokemod::ItemType*>(modified()); emit(changed(false)); } -void ItemTypeUI::discard() +void Pokemodr::ItemTypeUI::discard() { - *static_cast<ItemType*>(modified()) = *static_cast<ItemType*>(original()); + *static_cast<Pokemod::ItemType*>(modified()) = *static_cast<Pokemod::ItemType*>(original()); setGui(); emit(changed(false)); } -void ItemTypeUI::on_varName_textChanged(const QString& name) +void Pokemodr::ItemTypeUI::on_varName_textChanged(const QString& name) { const int cursor = varName->cursorPosition(); - static_cast<ItemType*>(modified())->setName(name); + static_cast<Pokemod::ItemType*>(modified())->setName(name); varName->setCursorPosition(cursor); } -void ItemTypeUI::on_varComputer_valueChanged(const int computer) +void Pokemodr::ItemTypeUI::on_varComputer_valueChanged(const int computer) { - static_cast<ItemType*>(modified())->setComputer(computer); + static_cast<Pokemod::ItemType*>(modified())->setComputer(computer); } -void ItemTypeUI::on_varPlayer_valueChanged(const int player) +void Pokemodr::ItemTypeUI::on_varPlayer_valueChanged(const int player) { - static_cast<ItemType*>(modified())->setPlayer(player); + static_cast<Pokemod::ItemType*>(modified())->setPlayer(player); } -void ItemTypeUI::on_varCount_currentIndexChanged(const int count) +void Pokemodr::ItemTypeUI::on_varCount_currentIndexChanged(const int count) { - static_cast<ItemType*>(modified())->setCount(count); + static_cast<Pokemod::ItemType*>(modified())->setCount(count); } diff --git a/pokemodr/ItemTypeUI.h b/pokemodr/ItemTypeUI.h index aefc3c5b..04eede5d 100644 --- a/pokemodr/ItemTypeUI.h +++ b/pokemodr/ItemTypeUI.h @@ -18,21 +18,26 @@ #ifndef __POKEMODR_ITEMTYPEUI__ #define __POKEMODR_ITEMTYPEUI__ -// PokeModr includes +// Pokemodr includes #include "ObjectUI.h" // Form include #include "ui_itemtype.h" // Forward declarations +namespace Pokemod +{ class ItemType; +} +namespace Pokemodr +{ class ItemTypeUI : public ObjectUI, private Ui::formItemType { Q_OBJECT public: - ItemTypeUI(ItemType* itemType, QWidget* parent); + ItemTypeUI(Pokemod::ItemType* itemType, QWidget* parent); ~ItemTypeUI(); public slots: void apply(); @@ -46,5 +51,6 @@ class ItemTypeUI : public ObjectUI, private Ui::formItemType void initGui(); void setGui(); }; +} #endif diff --git a/pokemodr/ItemUI.cpp b/pokemodr/ItemUI.cpp index ceac9c03..d9bc92fb 100644 --- a/pokemodr/ItemUI.cpp +++ b/pokemodr/ItemUI.cpp @@ -24,79 +24,79 @@ #include "../pokemod/Pokemod.h" #include "../pokemod/Rules.h" -ItemUI::ItemUI(Item* item, QWidget* parent) : +Pokemodr::ItemUI::ItemUI(Pokemod::Item* item, QWidget* parent) : ObjectUI(parent) { setupUi(this); - setObjects(item, new Item(*item)); + setObjects(item, new Pokemod::Item(*item)); } -ItemUI::~ItemUI() +Pokemodr::ItemUI::~ItemUI() { } -void ItemUI::refreshGui() +void Pokemodr::ItemUI::refreshGui() { varType->clear(); for (int i = 0; i < pokemod()->itemTypeCount(); ++i) { - const ItemType* itemType = pokemod()->itemType(i); + const Pokemod::ItemType* itemType = pokemod()->itemType(i); varType->addItem(itemType->name(), itemType->id()); } varPrice->setMaximum(pokemod()->rules()->maxMoney()); } -void ItemUI::setGui() +void Pokemodr::ItemUI::setGui() { - varName->setText(static_cast<Item*>(modified())->name()); - boxSellable->setChecked(static_cast<Item*>(modified())->sellable() ? Qt::Checked : Qt::Unchecked); - varType->setCurrentIndex(varType->findData(static_cast<Item*>(modified())->type())); - varPrice->setValue(static_cast<Item*>(modified())->price()); - varDescription->setText(static_cast<Item*>(modified())->description()); - varScript->setValue(static_cast<Item*>(modified())->script()); + varName->setText(static_cast<Pokemod::Item*>(modified())->name()); + boxSellable->setChecked(static_cast<Pokemod::Item*>(modified())->sellable() ? Qt::Checked : Qt::Unchecked); + varType->setCurrentIndex(varType->findData(static_cast<Pokemod::Item*>(modified())->type())); + varPrice->setValue(static_cast<Pokemod::Item*>(modified())->price()); + varDescription->setText(static_cast<Pokemod::Item*>(modified())->description()); + varScript->setValue(static_cast<Pokemod::Item*>(modified())->script()); } -void ItemUI::apply() +void Pokemodr::ItemUI::apply() { - *static_cast<Item*>(original()) = *static_cast<Item*>(modified()); + *static_cast<Pokemod::Item*>(original()) = *static_cast<Pokemod::Item*>(modified()); emit(changed(false)); } -void ItemUI::discard() +void Pokemodr::ItemUI::discard() { - *static_cast<Item*>(modified()) = *static_cast<Item*>(original()); + *static_cast<Pokemod::Item*>(modified()) = *static_cast<Pokemod::Item*>(original()); setGui(); emit(changed(false)); } -void ItemUI::on_varName_textChanged(const QString& name) +void Pokemodr::ItemUI::on_varName_textChanged(const QString& name) { const int cursor = varName->cursorPosition(); - static_cast<Item*>(modified())->setName(name); + static_cast<Pokemod::Item*>(modified())->setName(name); varName->setCursorPosition(cursor); } -void ItemUI::on_boxSellable_toggled(const bool sellable) +void Pokemodr::ItemUI::on_boxSellable_toggled(const bool sellable) { - static_cast<Item*>(modified())->setSellable(sellable); + static_cast<Pokemod::Item*>(modified())->setSellable(sellable); } -void ItemUI::on_varType_activated(const int type) +void Pokemodr::ItemUI::on_varType_activated(const int type) { - static_cast<Item*>(modified())->setType(varType->itemData(type).toInt()); + static_cast<Pokemod::Item*>(modified())->setType(varType->itemData(type).toInt()); } -void ItemUI::on_varPrice_valueChanged(const int price) +void Pokemodr::ItemUI::on_varPrice_valueChanged(const int price) { - static_cast<Item*>(modified())->setPrice(price); + static_cast<Pokemod::Item*>(modified())->setPrice(price); } -void ItemUI::on_varDescription_textChanged(const QString& description) +void Pokemodr::ItemUI::on_varDescription_textChanged(const QString& description) { - static_cast<Item*>(modified())->setDescription(description); + static_cast<Pokemod::Item*>(modified())->setDescription(description); } -void ItemUI::on_varScript_valueChanged(const Script& script) +void Pokemodr::ItemUI::on_varScript_valueChanged(const Pokemod::Script& script) { - static_cast<Item*>(modified())->setScript(script); + static_cast<Pokemod::Item*>(modified())->setScript(script); } diff --git a/pokemodr/ItemUI.h b/pokemodr/ItemUI.h index 2a7ad62e..93973ede 100644 --- a/pokemodr/ItemUI.h +++ b/pokemodr/ItemUI.h @@ -18,21 +18,26 @@ #ifndef __POKEMODR_ITEMUI__ #define __POKEMODR_ITEMUI__ -// PokeModr includes +// Pokemodr includes #include "ObjectUI.h" // Form include #include "ui_item.h" // Forward declarations +namespace Pokemod +{ class Item; +} +namespace Pokemodr +{ class ItemUI : public ObjectUI, private Ui::formItem { Q_OBJECT public: - ItemUI(Item* item, QWidget* parent); + ItemUI(Pokemod::Item* item, QWidget* parent); ~ItemUI(); public slots: void apply(); @@ -43,12 +48,13 @@ class ItemUI : public ObjectUI, private Ui::formItem void on_varType_activated(const int type); void on_varPrice_valueChanged(const int price); void on_varDescription_textChanged(const QString& description); - void on_varScript_valueChanged(const Script& script); + void on_varScript_valueChanged(const Pokemod::Script& script); private slots: void refreshGui(); void setGui(); private: QTextCursor m_cursor; }; +} #endif diff --git a/pokemodr/MapEffectUI.cpp b/pokemodr/MapEffectUI.cpp index f0057374..ad3585de 100644 --- a/pokemodr/MapEffectUI.cpp +++ b/pokemodr/MapEffectUI.cpp @@ -18,7 +18,7 @@ // Header include #include "MapEffectUI.h" -// PokeModr includes +// Pokemodr includes #include "FileDialog.h" // Pokemod includes @@ -27,73 +27,73 @@ #include "../pokemod/MapEffect.h" #include "../pokemod/Pokemod.h" -MapEffectUI::MapEffectUI(MapEffect* effect, QWidget* parent) : +Pokemodr::MapEffectUI::MapEffectUI(Pokemod::MapEffect* effect, QWidget* parent) : ObjectUI(parent) { setupUi(this); - setObjects(effect, new MapEffect(*effect)); + setObjects(effect, new Pokemod::MapEffect(*effect)); } -MapEffectUI::~MapEffectUI() +Pokemodr::MapEffectUI::~MapEffectUI() { } -void MapEffectUI::refreshGui() +void Pokemodr::MapEffectUI::refreshGui() { - varCoordinate->setMaximum(static_cast<const Map*>(original()->parent())->size()); + varCoordinate->setMaximum(static_cast<const Pokemod::Map*>(original()->parent())->size()); } -void MapEffectUI::setGui() +void Pokemodr::MapEffectUI::setGui() { - varName->setText(static_cast<MapEffect*>(modified())->name()); - varCoordinate->setValue(static_cast<MapEffect*>(modified())->coordinate()); - varSkin->setIcon(static_cast<MapEffect*>(modified())->skin()); - varScript->setValue(static_cast<MapEffect*>(modified())->script()); - varIsGhost->setChecked(static_cast<MapEffect*>(modified())->isGhost() ? Qt::Checked : Qt::Unchecked); + varName->setText(static_cast<Pokemod::MapEffect*>(modified())->name()); + varCoordinate->setValue(static_cast<Pokemod::MapEffect*>(modified())->coordinate()); + varSkin->setIcon(static_cast<Pokemod::MapEffect*>(modified())->skin()); + varScript->setValue(static_cast<Pokemod::MapEffect*>(modified())->script()); + varIsGhost->setChecked(static_cast<Pokemod::MapEffect*>(modified())->isGhost() ? Qt::Checked : Qt::Unchecked); } -void MapEffectUI::apply() +void Pokemodr::MapEffectUI::apply() { - *static_cast<MapEffect*>(original()) = *static_cast<MapEffect*>(modified()); + *static_cast<Pokemod::MapEffect*>(original()) = *static_cast<Pokemod::MapEffect*>(modified()); emit(changed(false)); } -void MapEffectUI::discard() +void Pokemodr::MapEffectUI::discard() { - *static_cast<MapEffect*>(modified()) = *static_cast<MapEffect*>(original()); + *static_cast<Pokemod::MapEffect*>(modified()) = *static_cast<Pokemod::MapEffect*>(original()); setGui(); emit(changed(false)); } -void MapEffectUI::on_varName_textChanged(const QString& name) +void Pokemodr::MapEffectUI::on_varName_textChanged(const QString& name) { const int cursor = varName->cursorPosition(); - static_cast<MapEffect*>(modified())->setName(name); + static_cast<Pokemod::MapEffect*>(modified())->setName(name); varName->setCursorPosition(cursor); } -void MapEffectUI::on_varCoordinate_valueChanged(const Point& coordinate) +void Pokemodr::MapEffectUI::on_varCoordinate_valueChanged(const Pokemod::Point& coordinate) { - static_cast<MapEffect*>(modified())->setCoordinate(coordinate); + static_cast<Pokemod::MapEffect*>(modified())->setCoordinate(coordinate); } -void MapEffectUI::on_varSkin_pressed() +void Pokemodr::MapEffectUI::on_varSkin_pressed() { FileDialog* dialog = new FileDialog(QSize(192, 128)); if (dialog->exec() == QDialog::Accepted) { - static_cast<MapEffect*>(modified())->setSkin(QPixmap(dialog->selectedFile())); + static_cast<Pokemod::MapEffect*>(modified())->setSkin(QPixmap(dialog->selectedFile())); setGui(); } delete dialog; } -void MapEffectUI::on_varScript_valueChanged(const Script& script) +void Pokemodr::MapEffectUI::on_varScript_valueChanged(const Pokemod::Script& script) { - static_cast<MapEffect*>(modified())->setScript(script); + static_cast<Pokemod::MapEffect*>(modified())->setScript(script); } -void MapEffectUI::on_varIsGhost_clicked(const bool isGhost) +void Pokemodr::MapEffectUI::on_varIsGhost_clicked(const bool isGhost) { - static_cast<MapEffect*>(modified())->setIsGhost(isGhost); + static_cast<Pokemod::MapEffect*>(modified())->setIsGhost(isGhost); } diff --git a/pokemodr/MapEffectUI.h b/pokemodr/MapEffectUI.h index 1e4feb00..79fbd1ce 100644 --- a/pokemodr/MapEffectUI.h +++ b/pokemodr/MapEffectUI.h @@ -18,34 +18,40 @@ #ifndef __POKEMODR_MAPEFFECTUI__ #define __POKEMODR_MAPEFFECTUI__ -// PokeModr includes +// Pokemodr includes #include "ObjectUI.h" // Form include #include "ui_mapeffect.h" // Forward declarations +namespace Pokemod +{ class MapEffect; +} +namespace Pokemodr +{ class MapEffectUI : public ObjectUI, private Ui::formMapEffect { Q_OBJECT public: - MapEffectUI(MapEffect* effect, QWidget* parent); + MapEffectUI(Pokemod::MapEffect* effect, QWidget* parent); ~MapEffectUI(); public slots: void apply(); void discard(); protected slots: void on_varName_textChanged(const QString& name); - void on_varCoordinate_valueChanged(const Point& coordinate); + void on_varCoordinate_valueChanged(const Pokemod::Point& coordinate); void on_varSkin_pressed(); - void on_varScript_valueChanged(const Script& script); + void on_varScript_valueChanged(const Pokemod::Script& script); void on_varIsGhost_clicked(const bool isGhost); private slots: void refreshGui(); void setGui(); }; +} #endif diff --git a/pokemodr/MapTrainerTeamMemberUI.cpp b/pokemodr/MapTrainerTeamMemberUI.cpp index 45b2fc46..c3f0972a 100644 --- a/pokemodr/MapTrainerTeamMemberUI.cpp +++ b/pokemodr/MapTrainerTeamMemberUI.cpp @@ -28,30 +28,30 @@ #include "../pokemod/Rules.h" #include "../pokemod/Species.h" -MapTrainerTeamMemberUI::MapTrainerTeamMemberUI(MapTrainerTeamMember* teamMember, QWidget* parent) : +Pokemodr::MapTrainerTeamMemberUI::MapTrainerTeamMemberUI(Pokemod::MapTrainerTeamMember* teamMember, QWidget* parent) : ObjectUI(parent) { setupUi(this); - setObjects(teamMember, new MapTrainerTeamMember(*teamMember)); + setObjects(teamMember, new Pokemod::MapTrainerTeamMember(*teamMember)); } -MapTrainerTeamMemberUI::~MapTrainerTeamMemberUI() +Pokemodr::MapTrainerTeamMemberUI::~MapTrainerTeamMemberUI() { } -void MapTrainerTeamMemberUI::refreshGui() +void Pokemodr::MapTrainerTeamMemberUI::refreshGui() { varSpecies->clear(); for (int i = 0; i < pokemod()->speciesCount(); ++i) { - const Species* species = pokemod()->species(i); + const Pokemod::Species* species = pokemod()->species(i); varSpecies->addItem(species->name(), species->id()); } varLevel->setMaximum(pokemod()->rules()->maxLevel()); varAbilities->clear(); for (int i = 0; i < pokemod()->abilityCount(); ++i) { - const Ability* ability = pokemod()->ability(i); + const Pokemod::Ability* ability = pokemod()->ability(i); QListWidgetItem* widgetItem = new QListWidgetItem(ability->name(), varAbilities); widgetItem->setData(Qt::UserRole, ability->id()); } @@ -59,7 +59,7 @@ void MapTrainerTeamMemberUI::refreshGui() varItems->clear(); for (int i = 0; i < pokemod()->itemCount(); ++i) { - const Item* item = pokemod()->item(i); + const Pokemod::Item* item = pokemod()->item(i); QListWidgetItem* widgetItem = new QListWidgetItem(item->name(), varItems); widgetItem->setData(Qt::UserRole, item->id()); } @@ -67,85 +67,85 @@ void MapTrainerTeamMemberUI::refreshGui() varMoves->clear(); for (int i = 0; i < pokemod()->abilityCount(); ++i) { - const Move* move = pokemod()->move(i); + const Pokemod::Move* move = pokemod()->move(i); QListWidgetItem* widgetItem = new QListWidgetItem(move->name(), varMoves); widgetItem->setData(Qt::UserRole, move->id()); } varNatures->clear(); for (int i = 0; i < pokemod()->natureCount(); ++i) { - const Nature* nature = pokemod()->nature(i); + const Pokemod::Nature* nature = pokemod()->nature(i); QListWidgetItem* widgetItem = new QListWidgetItem(nature->name(), varNatures); widgetItem->setData(Qt::UserRole, nature->id()); } boxNatures->setEnabled(pokemod()->rules()->maxNatures()); } -void MapTrainerTeamMemberUI::setGui() +void Pokemodr::MapTrainerTeamMemberUI::setGui() { - varSpecies->setCurrentIndex(varSpecies->findData(static_cast<MapTrainerTeamMember*>(modified())->species())); - varLevel->setValue(static_cast<MapTrainerTeamMember*>(modified())->level()); + varSpecies->setCurrentIndex(varSpecies->findData(static_cast<Pokemod::MapTrainerTeamMember*>(modified())->species())); + varLevel->setValue(static_cast<Pokemod::MapTrainerTeamMember*>(modified())->level()); for (int i = 0; i < varAbilities->count(); ++i) { QListWidgetItem* widgetItem = varAbilities->item(i); - widgetItem->setSelected(static_cast<MapTrainerTeamMember*>(modified())->ability(widgetItem->data(Qt::UserRole).toInt())); + widgetItem->setSelected(static_cast<Pokemod::MapTrainerTeamMember*>(modified())->ability(widgetItem->data(Qt::UserRole).toInt())); } for (int i = 0; i < varItems->count(); ++i) { QListWidgetItem* widgetItem = varItems->item(i); - widgetItem->setSelected(static_cast<MapTrainerTeamMember*>(modified())->item(widgetItem->data(Qt::UserRole).toInt())); + widgetItem->setSelected(static_cast<Pokemod::MapTrainerTeamMember*>(modified())->item(widgetItem->data(Qt::UserRole).toInt())); } for (int i = 0; i < varMoves->count(); ++i) { QListWidgetItem* widgetItem = varMoves->item(i); - widgetItem->setSelected(static_cast<MapTrainerTeamMember*>(modified())->move(widgetItem->data(Qt::UserRole).toInt())); + widgetItem->setSelected(static_cast<Pokemod::MapTrainerTeamMember*>(modified())->move(widgetItem->data(Qt::UserRole).toInt())); } for (int i = 0; i < varNatures->count(); ++i) { QListWidgetItem* widgetItem = varNatures->item(i); - widgetItem->setSelected(static_cast<MapTrainerTeamMember*>(modified())->nature(widgetItem->data(Qt::UserRole).toInt())); + widgetItem->setSelected(static_cast<Pokemod::MapTrainerTeamMember*>(modified())->nature(widgetItem->data(Qt::UserRole).toInt())); } } -void MapTrainerTeamMemberUI::apply() +void Pokemodr::MapTrainerTeamMemberUI::apply() { - *static_cast<MapTrainerTeamMember*>(original()) = *static_cast<MapTrainerTeamMember*>(modified()); + *static_cast<Pokemod::MapTrainerTeamMember*>(original()) = *static_cast<Pokemod::MapTrainerTeamMember*>(modified()); emit(changed(false)); } -void MapTrainerTeamMemberUI::discard() +void Pokemodr::MapTrainerTeamMemberUI::discard() { - *static_cast<MapTrainerTeamMember*>(modified()) = *static_cast<MapTrainerTeamMember*>(original()); + *static_cast<Pokemod::MapTrainerTeamMember*>(modified()) = *static_cast<Pokemod::MapTrainerTeamMember*>(original()); setGui(); emit(changed(false)); } -void MapTrainerTeamMemberUI::on_varSpecies_activated(const int species) +void Pokemodr::MapTrainerTeamMemberUI::on_varSpecies_activated(const int species) { - static_cast<MapTrainerTeamMember*>(modified())->setSpecies(varSpecies->itemData(species).toInt()); + static_cast<Pokemod::MapTrainerTeamMember*>(modified())->setSpecies(varSpecies->itemData(species).toInt()); } -void MapTrainerTeamMemberUI::on_varLevel_valueChanged(const int level) +void Pokemodr::MapTrainerTeamMemberUI::on_varLevel_valueChanged(const int level) { - static_cast<MapTrainerTeamMember*>(modified())->setLevel(level); + static_cast<Pokemod::MapTrainerTeamMember*>(modified())->setLevel(level); } -void MapTrainerTeamMemberUI::on_varAbilities_itemClicked(QListWidgetItem* item) +void Pokemodr::MapTrainerTeamMemberUI::on_varAbilities_itemClicked(QListWidgetItem* item) { - static_cast<MapTrainerTeamMember*>(modified())->setAbility(item->data(Qt::UserRole).toInt(), item->isSelected()); + static_cast<Pokemod::MapTrainerTeamMember*>(modified())->setAbility(item->data(Qt::UserRole).toInt(), item->isSelected()); } -void MapTrainerTeamMemberUI::on_varItems_itemClicked(QListWidgetItem* item) +void Pokemodr::MapTrainerTeamMemberUI::on_varItems_itemClicked(QListWidgetItem* item) { - static_cast<MapTrainerTeamMember*>(modified())->setItem(item->data(Qt::UserRole).toInt(), item->isSelected()); + static_cast<Pokemod::MapTrainerTeamMember*>(modified())->setItem(item->data(Qt::UserRole).toInt(), item->isSelected()); } -void MapTrainerTeamMemberUI::on_varMoves_itemClicked(QListWidgetItem* item) +void Pokemodr::MapTrainerTeamMemberUI::on_varMoves_itemClicked(QListWidgetItem* item) { - static_cast<MapTrainerTeamMember*>(modified())->setMove(item->data(Qt::UserRole).toInt(), item->isSelected()); + static_cast<Pokemod::MapTrainerTeamMember*>(modified())->setMove(item->data(Qt::UserRole).toInt(), item->isSelected()); } -void MapTrainerTeamMemberUI::on_varNatures_itemClicked(QListWidgetItem* item) +void Pokemodr::MapTrainerTeamMemberUI::on_varNatures_itemClicked(QListWidgetItem* item) { - static_cast<MapTrainerTeamMember*>(modified())->setNature(item->data(Qt::UserRole).toInt(), item->isSelected()); + static_cast<Pokemod::MapTrainerTeamMember*>(modified())->setNature(item->data(Qt::UserRole).toInt(), item->isSelected()); } diff --git a/pokemodr/MapTrainerTeamMemberUI.h b/pokemodr/MapTrainerTeamMemberUI.h index 567bde89..b3c1949b 100644 --- a/pokemodr/MapTrainerTeamMemberUI.h +++ b/pokemodr/MapTrainerTeamMemberUI.h @@ -18,21 +18,26 @@ #ifndef __POKEMODR_MAPTRAINERTEAMMEMBERUI__ #define __POKEMODR_MAPTRAINERTEAMMEMBERUI__ -// PokeModr includes +// Pokemodr includes #include "ObjectUI.h" // Form include #include "ui_maptrainerteammember.h" // Forward declarations +namespace Pokemod +{ class MapTrainerTeamMember; +} +namespace Pokemodr +{ class MapTrainerTeamMemberUI : public ObjectUI, private Ui::formMapTrainerTeamMember { Q_OBJECT public: - MapTrainerTeamMemberUI(MapTrainerTeamMember* teamMember, QWidget* parent); + MapTrainerTeamMemberUI(Pokemod::MapTrainerTeamMember* teamMember, QWidget* parent); ~MapTrainerTeamMemberUI(); public slots: void apply(); @@ -48,5 +53,6 @@ class MapTrainerTeamMemberUI : public ObjectUI, private Ui::formMapTrainerTeamMe void refreshGui(); void setGui(); }; +} #endif diff --git a/pokemodr/MapTrainerUI.cpp b/pokemodr/MapTrainerUI.cpp index 19881bd2..7111d155 100644 --- a/pokemodr/MapTrainerUI.cpp +++ b/pokemodr/MapTrainerUI.cpp @@ -27,32 +27,32 @@ #include "../pokemod/Species.h" #include "../pokemod/Trainer.h" -MapTrainerUI::MapTrainerUI(MapTrainer* trainer, QWidget* parent) : +Pokemodr::MapTrainerUI::MapTrainerUI(Pokemod::MapTrainer* trainer, QWidget* parent) : ObjectUI(parent) { setupUi(this); - setObjects(trainer, new MapTrainer(*trainer)); + setObjects(trainer, new Pokemod::MapTrainer(*trainer)); } -MapTrainerUI::~MapTrainerUI() +Pokemodr::MapTrainerUI::~MapTrainerUI() { } -void MapTrainerUI::refreshGui() +void Pokemodr::MapTrainerUI::refreshGui() { varTrainerClass->clear(); for (int i = 0; i < pokemod()->trainerCount(); ++i) { - const Trainer* trainer = pokemod()->trainer(i); + const Pokemod::Trainer* trainer = pokemod()->trainer(i); varTrainerClass->addItem(trainer->name(), trainer->id()); } - varCoordinate->setMaximum(static_cast<const Map*>(original()->parent())->size()); + varCoordinate->setMaximum(static_cast<const Pokemod::Map*>(original()->parent())->size()); varNumberFight->setMaximum(pokemod()->rules()->maxFight()); varLeadTeamMember->clear(); - for (int i = 0; i < static_cast<MapTrainer*>(original())->teamMemberCount(); ++i) + for (int i = 0; i < static_cast<Pokemod::MapTrainer*>(original())->teamMemberCount(); ++i) { - const MapTrainerTeamMember* teamMember = static_cast<MapTrainer*>(original())->teamMember(i); - const Species* species = pokemod()->species(teamMember->species()); + const Pokemod::MapTrainerTeamMember* teamMember = static_cast<Pokemod::MapTrainer*>(original())->teamMember(i); + const Pokemod::Species* species = pokemod()->species(teamMember->species()); if (species) varLeadTeamMember->addItem(species->name(), teamMember->id()); else @@ -60,57 +60,57 @@ void MapTrainerUI::refreshGui() } } -void MapTrainerUI::setGui() +void Pokemodr::MapTrainerUI::setGui() { - varName->setText(static_cast<MapTrainer*>(modified())->name()); - varTrainerClass->setCurrentIndex(varTrainerClass->findData(static_cast<MapTrainer*>(modified())->trainerClass())); - varCoordinate->setValue(static_cast<MapTrainer*>(modified())->coordinate()); - varNumberFight->setValue(static_cast<MapTrainer*>(modified())->numberFight()); - varScript->setValue(static_cast<MapTrainer*>(modified())->script()); - varLeadTeamMember->setCurrentIndex(varLeadTeamMember->findData(static_cast<MapTrainer*>(modified())->leadTeamMember())); + varName->setText(static_cast<Pokemod::MapTrainer*>(modified())->name()); + varTrainerClass->setCurrentIndex(varTrainerClass->findData(static_cast<Pokemod::MapTrainer*>(modified())->trainerClass())); + varCoordinate->setValue(static_cast<Pokemod::MapTrainer*>(modified())->coordinate()); + varNumberFight->setValue(static_cast<Pokemod::MapTrainer*>(modified())->numberFight()); + varScript->setValue(static_cast<Pokemod::MapTrainer*>(modified())->script()); + varLeadTeamMember->setCurrentIndex(varLeadTeamMember->findData(static_cast<Pokemod::MapTrainer*>(modified())->leadTeamMember())); } -void MapTrainerUI::apply() +void Pokemodr::MapTrainerUI::apply() { - *static_cast<MapTrainer*>(original()) = *static_cast<MapTrainer*>(modified()); + *static_cast<Pokemod::MapTrainer*>(original()) = *static_cast<Pokemod::MapTrainer*>(modified()); emit(changed(false)); } -void MapTrainerUI::discard() +void Pokemodr::MapTrainerUI::discard() { - *static_cast<MapTrainer*>(modified()) = *static_cast<MapTrainer*>(original()); + *static_cast<Pokemod::MapTrainer*>(modified()) = *static_cast<Pokemod::MapTrainer*>(original()); setGui(); emit(changed(false)); } -void MapTrainerUI::on_varName_textChanged(const QString& name) +void Pokemodr::MapTrainerUI::on_varName_textChanged(const QString& name) { const int cursor = varName->cursorPosition(); - static_cast<MapTrainer*>(modified())->setName(name); + static_cast<Pokemod::MapTrainer*>(modified())->setName(name); varName->setCursorPosition(cursor); } -void MapTrainerUI::on_varTrainerClass_activated(const int trainerClass) +void Pokemodr::MapTrainerUI::on_varTrainerClass_activated(const int trainerClass) { - static_cast<MapTrainer*>(modified())->setTrainerClass(varTrainerClass->itemData(trainerClass).toInt()); + static_cast<Pokemod::MapTrainer*>(modified())->setTrainerClass(varTrainerClass->itemData(trainerClass).toInt()); } -void MapTrainerUI::on_varCoordinate_valueChanged(const Point& coordinate) +void Pokemodr::MapTrainerUI::on_varCoordinate_valueChanged(const Pokemod::Point& coordinate) { - static_cast<MapTrainer*>(modified())->setCoordinate(coordinate); + static_cast<Pokemod::MapTrainer*>(modified())->setCoordinate(coordinate); } -void MapTrainerUI::on_varNumberFight_valueChanged(const int numberFight) +void Pokemodr::MapTrainerUI::on_varNumberFight_valueChanged(const int numberFight) { - static_cast<MapTrainer*>(modified())->setNumberFight(numberFight); + static_cast<Pokemod::MapTrainer*>(modified())->setNumberFight(numberFight); } -void MapTrainerUI::on_varScript_valueChanged(const Script& script) +void Pokemodr::MapTrainerUI::on_varScript_valueChanged(const Pokemod::Script& script) { - static_cast<MapTrainer*>(modified())->setScript(script); + static_cast<Pokemod::MapTrainer*>(modified())->setScript(script); } -void MapTrainerUI::on_varLeadTeamMember_activated(const int leadTeamMember) +void Pokemodr::MapTrainerUI::on_varLeadTeamMember_activated(const int leadTeamMember) { - static_cast<MapTrainer*>(modified())->setLeadTeamMember(leadTeamMember); + static_cast<Pokemod::MapTrainer*>(modified())->setLeadTeamMember(leadTeamMember); } diff --git a/pokemodr/MapTrainerUI.h b/pokemodr/MapTrainerUI.h index 43f4f92f..ab1e052c 100644 --- a/pokemodr/MapTrainerUI.h +++ b/pokemodr/MapTrainerUI.h @@ -18,21 +18,26 @@ #ifndef __POKEMODR_MAPTRAINERUI__ #define __POKEMODR_MAPTRAINERUI__ -// PokeModr includes +// Pokemodr includes #include "ObjectUI.h" // Form include #include "ui_maptrainer.h" // Forward declarations +namespace Pokemod +{ class MapTrainer; +} +namespace Pokemodr +{ class MapTrainerUI : public ObjectUI, private Ui::formMapTrainer { Q_OBJECT public: - MapTrainerUI(MapTrainer* trainer, QWidget* parent); + MapTrainerUI(Pokemod::MapTrainer* trainer, QWidget* parent); ~MapTrainerUI(); public slots: void apply(); @@ -40,13 +45,14 @@ class MapTrainerUI : public ObjectUI, private Ui::formMapTrainer protected slots: void on_varName_textChanged(const QString& name); void on_varTrainerClass_activated(const int trainerClass); - void on_varCoordinate_valueChanged(const Point& coordinate); + void on_varCoordinate_valueChanged(const Pokemod::Point& coordinate); void on_varNumberFight_valueChanged(const int numberFight); - void on_varScript_valueChanged(const Script& script); + void on_varScript_valueChanged(const Pokemod::Script& script); void on_varLeadTeamMember_activated(const int leadTeamMember); private slots: void refreshGui(); void setGui(); }; +} #endif diff --git a/pokemodr/MapUI.cpp b/pokemodr/MapUI.cpp index df05db97..1d09bce0 100644 --- a/pokemodr/MapUI.cpp +++ b/pokemodr/MapUI.cpp @@ -18,7 +18,7 @@ // Header include #include "MapUI.h" -// PokeModr includes +// Pokemodr includes #include "TilemapModel.h" // Pokemod includes @@ -30,133 +30,133 @@ // Qt includes #include <QHeaderView> -MapUI::MapUI(Map* map, QWidget* parent) : +Pokemodr::MapUI::MapUI(Pokemod::Map* map, QWidget* parent) : ObjectUI(parent) { setupUi(this); - setObjects(map, new Map(*map)); + setObjects(map, new Pokemod::Map(*map)); } -MapUI::~MapUI() +Pokemodr::MapUI::~MapUI() { } -void MapUI::initGui() +void Pokemodr::MapUI::initGui() { - varType->addItems(Map::TypeStr); + varType->addItems(Pokemod::Map::TypeStr); varTilemap->horizontalHeader()->setResizeMode(QHeaderView::Fixed); varTilemap->verticalHeader()->setResizeMode(QHeaderView::Fixed); varTilemap->horizontalHeader()->setDefaultSectionSize(64); varTilemap->verticalHeader()->setDefaultSectionSize(64); - varTilemap->setModel(new TilemapModel(static_cast<Map*>(modified())->map(), pokemod())); + varTilemap->setModel(new TilemapModel(static_cast<Pokemod::Map*>(modified())->map(), pokemod())); } -void MapUI::refreshGui() +void Pokemodr::MapUI::refreshGui() { varFlyWarp->clear(); - for (int i = 0; i < static_cast<Map*>(original())->warpCount(); ++i) + for (int i = 0; i < static_cast<Pokemod::Map*>(original())->warpCount(); ++i) { - const MapWarp* warp = static_cast<Map*>(original())->warp(i); + const Pokemod::MapWarp* warp = static_cast<Pokemod::Map*>(original())->warp(i); varFlyWarp->addItem(warp->name(), warp->id()); } varTile->clear(); for (int i = 0; i < pokemod()->tileCount(); ++i) { - const Tile* tile = pokemod()->tile(i); + const Pokemod::Tile* tile = pokemod()->tile(i); varTile->addItem(tile->sprite(), tile->name(), tile->id()); } varTile->setEnabled(false); } -void MapUI::setGui() +void Pokemodr::MapUI::setGui() { - varName->setText(static_cast<Map*>(modified())->name()); - boxFlyWarp->setChecked((static_cast<Map*>(modified())->flyWarp() == INT_MAX) ? Qt::Unchecked : Qt::Checked); -// varFlyWarp->setCurrentIndex(varFlyWarp->findData(static_cast<Map*>(modified())->flyWarp())); - varType->setCurrentIndex(static_cast<Map*>(modified())->type()); + varName->setText(static_cast<Pokemod::Map*>(modified())->name()); + boxFlyWarp->setChecked((static_cast<Pokemod::Map*>(modified())->flyWarp() == INT_MAX) ? Qt::Unchecked : Qt::Checked); +// varFlyWarp->setCurrentIndex(varFlyWarp->findData(static_cast<Pokemod::Map*>(modified())->flyWarp())); + varType->setCurrentIndex(static_cast<Pokemod::Map*>(modified())->type()); // buttonDeleteColumn->setEnabled(0 < m_model->columnCount()); // buttonDeleteRow->setEnabled(0 < m_model->rowCount()); } -void MapUI::apply() +void Pokemodr::MapUI::apply() { - *static_cast<Map*>(original()) = *static_cast<Map*>(modified()); + *static_cast<Pokemod::Map*>(original()) = *static_cast<Pokemod::Map*>(modified()); emit(changed(false)); } -void MapUI::discard() +void Pokemodr::MapUI::discard() { - *static_cast<Map*>(modified()) = *static_cast<Map*>(original()); + *static_cast<Pokemod::Map*>(modified()) = *static_cast<Pokemod::Map*>(original()); setGui(); emit(changed(false)); } -void MapUI::on_varName_textChanged(const QString& name) +void Pokemodr::MapUI::on_varName_textChanged(const QString& name) { const int cursor = varName->cursorPosition(); - static_cast<Map*>(modified())->setName(name); + static_cast<Pokemod::Map*>(modified())->setName(name); varName->setCursorPosition(cursor); } -void MapUI::on_boxFlyWarp_toggled() +void Pokemodr::MapUI::on_boxFlyWarp_toggled() { - static_cast<Map*>(modified())->setFlyWarp(-1); + static_cast<Pokemod::Map*>(modified())->setFlyWarp(-1); } -void MapUI::on_varFlyWarp_activated(const int flyWarp) +void Pokemodr::MapUI::on_varFlyWarp_activated(const int flyWarp) { - static_cast<Map*>(modified())->setFlyWarp(varFlyWarp->itemData(flyWarp).toInt()); + static_cast<Pokemod::Map*>(modified())->setFlyWarp(varFlyWarp->itemData(flyWarp).toInt()); } -void MapUI::on_varType_activated(const int type) +void Pokemodr::MapUI::on_varType_activated(const int type) { - static_cast<Map*>(modified())->setType(type); + static_cast<Pokemod::Map*>(modified())->setType(type); } -void MapUI::on_varTilemap_clicked(const QModelIndex& index) +void Pokemodr::MapUI::on_varTilemap_clicked(const QModelIndex& index) { m_index = index; varTile->setEnabled(true); varTile->setCurrentIndex(varTile->findData(varTilemap->model()->data(m_index, Qt::EditRole))); } -void MapUI::on_buttonAddColumn_pressed() +void Pokemodr::MapUI::on_buttonAddColumn_pressed() { varTilemap->model()->insertColumns(varTilemap->model()->columnCount(), 1); emit(changed(true)); } -void MapUI::on_buttonAddRow_pressed() +void Pokemodr::MapUI::on_buttonAddRow_pressed() { varTilemap->model()->insertRows(varTilemap->model()->rowCount(), 1); emit(changed(true)); } -void MapUI::on_buttonDeleteColumn_pressed() +void Pokemodr::MapUI::on_buttonDeleteColumn_pressed() { varTilemap->model()->removeColumns(m_index.column(), 1); emit(changed(true)); } -void MapUI::on_buttonDeleteRow_pressed() +void Pokemodr::MapUI::on_buttonDeleteRow_pressed() { varTilemap->model()->removeRows(m_index.row(), 1); emit(changed(true)); } -void MapUI::on_buttonInsertColumn_pressed() +void Pokemodr::MapUI::on_buttonInsertColumn_pressed() { varTilemap->model()->insertColumns(m_index.column(), 1); emit(changed(true)); } -void MapUI::on_buttonInsertRow_pressed() +void Pokemodr::MapUI::on_buttonInsertRow_pressed() { varTilemap->model()->insertRows(m_index.row(), 1); emit(changed(true)); } -void MapUI::on_varTile_activated(const int tile) +void Pokemodr::MapUI::on_varTile_activated(const int tile) { varTilemap->model()->setData(m_index, varTile->itemData(tile), Qt::EditRole); emit(changed(true)); diff --git a/pokemodr/MapUI.h b/pokemodr/MapUI.h index d57995fd..2e30e301 100644 --- a/pokemodr/MapUI.h +++ b/pokemodr/MapUI.h @@ -18,14 +18,19 @@ #ifndef __POKEMODR_MAPUI__ #define __POKEMODR_MAPUI__ -// PokeModr includes +// Pokemodr includes #include "ObjectUI.h" // Form include #include "ui_map.h" // Forward declarations +namespace Pokemod +{ class Map; +} +namespace Pokemodr +{ class TilemapModel; class TileDelegate; @@ -34,7 +39,7 @@ class MapUI : public ObjectUI, private Ui::formMap Q_OBJECT public: - MapUI(Map* map, QWidget* parent); + MapUI(Pokemod::Map* map, QWidget* parent); ~MapUI(); public slots: void apply(); @@ -59,5 +64,6 @@ class MapUI : public ObjectUI, private Ui::formMap private: QModelIndex m_index; }; +} #endif diff --git a/pokemodr/MapWarpUI.cpp b/pokemodr/MapWarpUI.cpp index 4bc2654b..33c4e070 100644 --- a/pokemodr/MapWarpUI.cpp +++ b/pokemodr/MapWarpUI.cpp @@ -23,100 +23,100 @@ #include "../pokemod/MapWarp.h" #include "../pokemod/Pokemod.h" -MapWarpUI::MapWarpUI(MapWarp* warp, QWidget* parent) : +Pokemodr::MapWarpUI::MapWarpUI(Pokemod::MapWarp* warp, QWidget* parent) : ObjectUI(parent), m_lastMap(-1) { setupUi(this); - setObjects(warp, new MapWarp(*warp)); + setObjects(warp, new Pokemod::MapWarp(*warp)); } -MapWarpUI::~MapWarpUI() +Pokemodr::MapWarpUI::~MapWarpUI() { } -void MapWarpUI::initGui() +void Pokemodr::MapWarpUI::initGui() { - varType->addItems(MapWarp::TypeStr); + varType->addItems(Pokemod::MapWarp::TypeStr); } -void MapWarpUI::refreshGui() +void Pokemodr::MapWarpUI::refreshGui() { - varCoordinate->setMaximum(static_cast<const Map*>(original()->parent())->size()); + varCoordinate->setMaximum(static_cast<const Pokemod::Map*>(original()->parent())->size()); varToMap->clear(); for (int i = 0; i < pokemod()->mapCount(); ++i) { - const Map* map = pokemod()->map(i); + const Pokemod::Map* map = pokemod()->map(i); varToMap->addItem(map->name(), map->id()); } } -void MapWarpUI::setGui() +void Pokemodr::MapWarpUI::setGui() { - const bool resetWarps = (static_cast<MapWarp*>(modified())->toMap() != m_lastMap); - varName->setText(static_cast<MapWarp*>(modified())->name()); - varCoordinate->setValue(static_cast<MapWarp*>(modified())->coordinate()); - varType->setCurrentIndex(static_cast<MapWarp*>(modified())->type()); - varToMap->setCurrentIndex(varToMap->findData(static_cast<MapWarp*>(modified())->toMap())); - m_lastMap = static_cast<MapWarp*>(modified())->toMap(); + const bool resetWarps = (static_cast<Pokemod::MapWarp*>(modified())->toMap() != m_lastMap); + varName->setText(static_cast<Pokemod::MapWarp*>(modified())->name()); + varCoordinate->setValue(static_cast<Pokemod::MapWarp*>(modified())->coordinate()); + varType->setCurrentIndex(static_cast<Pokemod::MapWarp*>(modified())->type()); + varToMap->setCurrentIndex(varToMap->findData(static_cast<Pokemod::MapWarp*>(modified())->toMap())); + m_lastMap = static_cast<Pokemod::MapWarp*>(modified())->toMap(); if (resetWarps) { varToWarp->clear(); - const Map* map = pokemod()->mapById(static_cast<MapWarp*>(modified())->toMap()); + const Pokemod::Map* map = pokemod()->mapById(static_cast<Pokemod::MapWarp*>(modified())->toMap()); if (map) { for (int i = 0; i < map->warpCount(); ++i) { - const MapWarp* warp = map->warp(i); + const Pokemod::MapWarp* warp = map->warp(i); varToWarp->addItem(warp->name(), warp->id()); } } } - varToWarp->setCurrentIndex(varToMap->findData(static_cast<MapWarp*>(modified())->toWarp())); - varScript->setValue(static_cast<MapWarp*>(modified())->script()); + varToWarp->setCurrentIndex(varToMap->findData(static_cast<Pokemod::MapWarp*>(modified())->toWarp())); + varScript->setValue(static_cast<Pokemod::MapWarp*>(modified())->script()); } -void MapWarpUI::apply() +void Pokemodr::MapWarpUI::apply() { - *static_cast<MapWarp*>(original()) = *static_cast<MapWarp*>(modified()); + *static_cast<Pokemod::MapWarp*>(original()) = *static_cast<Pokemod::MapWarp*>(modified()); emit(changed(false)); } -void MapWarpUI::discard() +void Pokemodr::MapWarpUI::discard() { - *static_cast<MapWarp*>(modified()) = *static_cast<MapWarp*>(original()); + *static_cast<Pokemod::MapWarp*>(modified()) = *static_cast<Pokemod::MapWarp*>(original()); setGui(); emit(changed(false)); } -void MapWarpUI::on_varName_textChanged(const QString& name) +void Pokemodr::MapWarpUI::on_varName_textChanged(const QString& name) { const int cursor = varName->cursorPosition(); - static_cast<MapWarp*>(modified())->setName(name); + static_cast<Pokemod::MapWarp*>(modified())->setName(name); varName->setCursorPosition(cursor); } -void MapWarpUI::on_varCoordinate_valueChanged(const Point& coordinate) +void Pokemodr::MapWarpUI::on_varCoordinate_valueChanged(const Pokemod::Point& coordinate) { - static_cast<MapWarp*>(modified())->setCoordinate(coordinate); + static_cast<Pokemod::MapWarp*>(modified())->setCoordinate(coordinate); } -void MapWarpUI::on_varType_activated(const int type) +void Pokemodr::MapWarpUI::on_varType_activated(const int type) { - static_cast<MapWarp*>(modified())->setType(type); + static_cast<Pokemod::MapWarp*>(modified())->setType(type); } -void MapWarpUI::on_varToMap_activated(const int toMap) +void Pokemodr::MapWarpUI::on_varToMap_activated(const int toMap) { - static_cast<MapWarp*>(modified())->setToMap(toMap); + static_cast<Pokemod::MapWarp*>(modified())->setToMap(toMap); } -void MapWarpUI::on_varToWarp_activated(const int toWarp) +void Pokemodr::MapWarpUI::on_varToWarp_activated(const int toWarp) { - static_cast<MapWarp*>(modified())->setToWarp(toWarp); + static_cast<Pokemod::MapWarp*>(modified())->setToWarp(toWarp); } -void MapWarpUI::on_varScript_valueChanged(const Script& script) +void Pokemodr::MapWarpUI::on_varScript_valueChanged(const Pokemod::Script& script) { - static_cast<MapWarp*>(modified())->setScript(script); + static_cast<Pokemod::MapWarp*>(modified())->setScript(script); } diff --git a/pokemodr/MapWarpUI.h b/pokemodr/MapWarpUI.h index d5d0846f..69159603 100644 --- a/pokemodr/MapWarpUI.h +++ b/pokemodr/MapWarpUI.h @@ -18,32 +18,37 @@ #ifndef __POKEMODR_MAPWARPUI__ #define __POKEMODR_MAPWARPUI__ -// PokeModr includes +// Pokemodr includes #include "ObjectUI.h" // Form include #include "ui_mapwarp.h" // Forward declarations +namespace Pokemod +{ class MapWarp; +} +namespace Pokemodr +{ class MapWarpUI : public ObjectUI, private Ui::formMapWarp { Q_OBJECT public: - MapWarpUI(MapWarp* warp, QWidget* parent); + MapWarpUI(Pokemod::MapWarp* warp, QWidget* parent); ~MapWarpUI(); public slots: void apply(); void discard(); protected slots: void on_varName_textChanged(const QString& name); - void on_varCoordinate_valueChanged(const Point& coordinate); + void on_varCoordinate_valueChanged(const Pokemod::Point& coordinate); void on_varType_activated(const int type); void on_varToMap_activated(const int toMap); void on_varToWarp_activated(const int toWarp); - void on_varScript_valueChanged(const Script& script); + void on_varScript_valueChanged(const Pokemod::Script& script); private slots: void initGui(); void refreshGui(); @@ -51,5 +56,6 @@ class MapWarpUI : public ObjectUI, private Ui::formMapWarp private: int m_lastMap; }; +} #endif diff --git a/pokemodr/MapWildListEncounterUI.cpp b/pokemodr/MapWildListEncounterUI.cpp index 6e30da05..e4fb9a29 100644 --- a/pokemodr/MapWildListEncounterUI.cpp +++ b/pokemodr/MapWildListEncounterUI.cpp @@ -24,59 +24,59 @@ #include "../pokemod/Rules.h" #include "../pokemod/Species.h" -MapWildListEncounterUI::MapWildListEncounterUI(MapWildListEncounter* encounter, QWidget* parent) : +Pokemodr::MapWildListEncounterUI::MapWildListEncounterUI(Pokemod::MapWildListEncounter* encounter, QWidget* parent) : ObjectUI(parent) { setupUi(this); - setObjects(encounter, new MapWildListEncounter(*encounter)); + setObjects(encounter, new Pokemod::MapWildListEncounter(*encounter)); } -MapWildListEncounterUI::~MapWildListEncounterUI() +Pokemodr::MapWildListEncounterUI::~MapWildListEncounterUI() { } -void MapWildListEncounterUI::refreshGui() +void Pokemodr::MapWildListEncounterUI::refreshGui() { varSpecies->clear(); for (int i = 0; i < pokemod()->speciesCount(); ++i) { - const Species* species = pokemod()->species(i); + const Pokemod::Species* species = pokemod()->species(i); varSpecies->addItem(species->name(), species->id()); } varLevel->setMaximum(pokemod()->rules()->maxLevel()); } -void MapWildListEncounterUI::setGui() +void Pokemodr::MapWildListEncounterUI::setGui() { - varSpecies->setCurrentIndex(varSpecies->findData(static_cast<MapWildListEncounter*>(modified())->species())); - varLevel->setValue(static_cast<MapWildListEncounter*>(modified())->level()); - varWeight->setValue(static_cast<MapWildListEncounter*>(modified())->weight()); + varSpecies->setCurrentIndex(varSpecies->findData(static_cast<Pokemod::MapWildListEncounter*>(modified())->species())); + varLevel->setValue(static_cast<Pokemod::MapWildListEncounter*>(modified())->level()); + varWeight->setValue(static_cast<Pokemod::MapWildListEncounter*>(modified())->weight()); } -void MapWildListEncounterUI::apply() +void Pokemodr::MapWildListEncounterUI::apply() { - *static_cast<MapWildListEncounter*>(original()) = *static_cast<MapWildListEncounter*>(modified()); + *static_cast<Pokemod::MapWildListEncounter*>(original()) = *static_cast<Pokemod::MapWildListEncounter*>(modified()); emit(changed(false)); } -void MapWildListEncounterUI::discard() +void Pokemodr::MapWildListEncounterUI::discard() { - *static_cast<MapWildListEncounter*>(modified()) = *static_cast<MapWildListEncounter*>(original()); + *static_cast<Pokemod::MapWildListEncounter*>(modified()) = *static_cast<Pokemod::MapWildListEncounter*>(original()); setGui(); emit(changed(false)); } -void MapWildListEncounterUI::on_varSpecies_activated(const int species) +void Pokemodr::MapWildListEncounterUI::on_varSpecies_activated(const int species) { - static_cast<MapWildListEncounter*>(modified())->setSpecies(varSpecies->itemData(species).toInt()); + static_cast<Pokemod::MapWildListEncounter*>(modified())->setSpecies(varSpecies->itemData(species).toInt()); } -void MapWildListEncounterUI::on_varLevel_valueChanged(const int level) +void Pokemodr::MapWildListEncounterUI::on_varLevel_valueChanged(const int level) { - static_cast<MapWildListEncounter*>(modified())->setLevel(level); + static_cast<Pokemod::MapWildListEncounter*>(modified())->setLevel(level); } -void MapWildListEncounterUI::on_varWeight_valueChanged(const int weight) +void Pokemodr::MapWildListEncounterUI::on_varWeight_valueChanged(const int weight) { - static_cast<MapWildListEncounter*>(modified())->setWeight(weight); + static_cast<Pokemod::MapWildListEncounter*>(modified())->setWeight(weight); } diff --git a/pokemodr/MapWildListEncounterUI.h b/pokemodr/MapWildListEncounterUI.h index 6fbe2de2..1efbba27 100644 --- a/pokemodr/MapWildListEncounterUI.h +++ b/pokemodr/MapWildListEncounterUI.h @@ -18,21 +18,26 @@ #ifndef __POKEMODR_MAPWILDLISTENCOUNTERUI__ #define __POKEMODR_MAPWILDLISTENCOUNTERUI__ -// PokeModr includes +// Pokemodr includes #include "ObjectUI.h" // Form include #include "ui_mapwildlistencounter.h" // Forward declarations +namespace Pokemod +{ class MapWildListEncounter; +} +namespace Pokemodr +{ class MapWildListEncounterUI : public ObjectUI, private Ui::formMapWildListEncounter { Q_OBJECT public: - MapWildListEncounterUI(MapWildListEncounter* encounter, QWidget* parent); + MapWildListEncounterUI(Pokemod::MapWildListEncounter* encounter, QWidget* parent); ~MapWildListEncounterUI(); public slots: void apply(); @@ -45,5 +50,6 @@ class MapWildListEncounterUI : public ObjectUI, private Ui::formMapWildListEncou void refreshGui(); void setGui(); }; +} #endif diff --git a/pokemodr/MapWildListUI.cpp b/pokemodr/MapWildListUI.cpp index 462a1716..fd1b6e4d 100644 --- a/pokemodr/MapWildListUI.cpp +++ b/pokemodr/MapWildListUI.cpp @@ -21,36 +21,36 @@ // Pokemod includes #include "../pokemod/MapWildList.h" -MapWildListUI::MapWildListUI(MapWildList* wildList, QWidget* parent) : +Pokemodr::MapWildListUI::MapWildListUI(Pokemod::MapWildList* wildList, QWidget* parent) : ObjectUI(parent) { setupUi(this); - setObjects(wildList, new MapWildList(*wildList)); + setObjects(wildList, new Pokemod::MapWildList(*wildList)); } -MapWildListUI::~MapWildListUI() +Pokemodr::MapWildListUI::~MapWildListUI() { } -void MapWildListUI::setGui() +void Pokemodr::MapWildListUI::setGui() { - varName->setText(static_cast<MapWildList*>(modified())->name()); + varName->setText(static_cast<Pokemod::MapWildList*>(modified())->name()); } -void MapWildListUI::apply() +void Pokemodr::MapWildListUI::apply() { - *static_cast<MapWildList*>(original()) = *static_cast<MapWildList*>(modified()); + *static_cast<Pokemod::MapWildList*>(original()) = *static_cast<Pokemod::MapWildList*>(modified()); emit(changed(false)); } -void MapWildListUI::discard() +void Pokemodr::MapWildListUI::discard() { - *static_cast<MapWildList*>(modified()) = *static_cast<MapWildList*>(original()); + *static_cast<Pokemod::MapWildList*>(modified()) = *static_cast<Pokemod::MapWildList*>(original()); setGui(); emit(changed(false)); } -void MapWildListUI::on_varName_textChanged(const QString& name) +void Pokemodr::MapWildListUI::on_varName_textChanged(const QString& name) { - static_cast<MapWildList*>(modified())->setName(name); + static_cast<Pokemod::MapWildList*>(modified())->setName(name); } diff --git a/pokemodr/MapWildListUI.h b/pokemodr/MapWildListUI.h index 279329ec..d4b2cccc 100644 --- a/pokemodr/MapWildListUI.h +++ b/pokemodr/MapWildListUI.h @@ -18,21 +18,26 @@ #ifndef __POKEMODR_MAPWILDLISTUI__ #define __POKEMODR_MAPWILDLISTUI__ -// PokeModr includes +// Pokemodr includes #include "ObjectUI.h" // Form include #include "ui_mapwildlist.h" // Forward declarations +namespace Pokemod +{ class MapWildList; +} +namespace Pokemodr +{ class MapWildListUI : public ObjectUI, private Ui::formMapWildList { Q_OBJECT public: - MapWildListUI(MapWildList* wildList, QWidget* parent); + MapWildListUI(Pokemod::MapWildList* wildList, QWidget* parent); ~MapWildListUI(); public slots: void apply(); @@ -42,5 +47,6 @@ class MapWildListUI : public ObjectUI, private Ui::formMapWildList private slots: void setGui(); }; +} #endif diff --git a/pokemodr/MoveUI.cpp b/pokemodr/MoveUI.cpp index b51fecfd..97a9fd00 100644 --- a/pokemodr/MoveUI.cpp +++ b/pokemodr/MoveUI.cpp @@ -23,98 +23,98 @@ #include "../pokemod/Pokemod.h" #include "../pokemod/Type.h" -MoveUI::MoveUI(Move* move, QWidget* parent) : +Pokemodr::MoveUI::MoveUI(Pokemod::Move* move, QWidget* parent) : ObjectUI(parent) { setupUi(this); - setObjects(move, new Move(*move)); + setObjects(move, new Pokemod::Move(*move)); } -MoveUI::~MoveUI() +Pokemodr::MoveUI::~MoveUI() { } -void MoveUI::refreshGui() +void Pokemodr::MoveUI::refreshGui() { varType->clear(); for (int i = 0; i < pokemod()->typeCount(); ++i) { - const Type* type = pokemod()->type(i); + const Pokemod::Type* type = pokemod()->type(i); varType->addItem(type->name(), type->id()); } } -void MoveUI::setGui() +void Pokemodr::MoveUI::setGui() { - varName->setText(static_cast<Move*>(modified())->name()); - varAccuracy->setValue(static_cast<Move*>(modified())->accuracy()); - varPower->setValue(static_cast<Move*>(modified())->power()); - varType->setCurrentIndex(varType->findData(static_cast<Move*>(modified())->type())); - varPowerPoints->setValue(static_cast<Move*>(modified())->powerPoints()); - varSpecial->setChecked(static_cast<Move*>(modified())->special() ? Qt::Checked : Qt::Unchecked); - varOverworld->setChecked(static_cast<Move*>(modified())->overworld() ? Qt::Checked : Qt::Unchecked); - varDescription->setText(static_cast<Move*>(modified())->description()); - varScript->setValue(static_cast<Move*>(modified())->script()); + varName->setText(static_cast<Pokemod::Move*>(modified())->name()); + varAccuracy->setValue(static_cast<Pokemod::Move*>(modified())->accuracy()); + varPower->setValue(static_cast<Pokemod::Move*>(modified())->power()); + varType->setCurrentIndex(varType->findData(static_cast<Pokemod::Move*>(modified())->type())); + varPowerPoints->setValue(static_cast<Pokemod::Move*>(modified())->powerPoints()); + varSpecial->setChecked(static_cast<Pokemod::Move*>(modified())->special() ? Qt::Checked : Qt::Unchecked); + varOverworld->setChecked(static_cast<Pokemod::Move*>(modified())->overworld() ? Qt::Checked : Qt::Unchecked); + varDescription->setText(static_cast<Pokemod::Move*>(modified())->description()); + varScript->setValue(static_cast<Pokemod::Move*>(modified())->script()); } -void MoveUI::apply() +void Pokemodr::MoveUI::apply() { - *static_cast<Move*>(original()) = *static_cast<Move*>(modified()); + *static_cast<Pokemod::Move*>(original()) = *static_cast<Pokemod::Move*>(modified()); emit(changed(false)); } -void MoveUI::discard() +void Pokemodr::MoveUI::discard() { - *static_cast<Move*>(modified()) = *static_cast<Move*>(original()); + *static_cast<Pokemod::Move*>(modified()) = *static_cast<Pokemod::Move*>(original()); setGui(); emit(changed(false)); } -void MoveUI::on_varName_textChanged(const QString& name) +void Pokemodr::MoveUI::on_varName_textChanged(const QString& name) { const int cursor = varName->cursorPosition(); - static_cast<Move*>(modified())->setName(name); + static_cast<Pokemod::Move*>(modified())->setName(name); varName->setCursorPosition(cursor); } -void MoveUI::on_varAccuracy_valueChanged(const Fraction& accuracy) +void Pokemodr::MoveUI::on_varAccuracy_valueChanged(const Pokemod::Fraction& accuracy) { - static_cast<Move*>(modified())->setAccuracy(accuracy); + static_cast<Pokemod::Move*>(modified())->setAccuracy(accuracy); } -void MoveUI::on_varPower_valueChanged(const int power) +void Pokemodr::MoveUI::on_varPower_valueChanged(const int power) { - static_cast<Move*>(modified())->setPower(power); + static_cast<Pokemod::Move*>(modified())->setPower(power); } -void MoveUI::on_varType_activated(const int type) +void Pokemodr::MoveUI::on_varType_activated(const int type) { - static_cast<Move*>(modified())->setType(varType->itemData(type).toInt()); + static_cast<Pokemod::Move*>(modified())->setType(varType->itemData(type).toInt()); } -void MoveUI::on_varPowerPoints_valueChanged(const int powerPoints) +void Pokemodr::MoveUI::on_varPowerPoints_valueChanged(const int powerPoints) { - static_cast<Move*>(modified())->setPowerPoints(powerPoints); + static_cast<Pokemod::Move*>(modified())->setPowerPoints(powerPoints); } -void MoveUI::on_varSpecial_toggled(const bool special) +void Pokemodr::MoveUI::on_varSpecial_toggled(const bool special) { - static_cast<Move*>(modified())->setSpecial(special); + static_cast<Pokemod::Move*>(modified())->setSpecial(special); } -void MoveUI::on_varOverworld_toggled(const bool overworld) +void Pokemodr::MoveUI::on_varOverworld_toggled(const bool overworld) { - static_cast<Move*>(modified())->setOverworld(overworld); + static_cast<Pokemod::Move*>(modified())->setOverworld(overworld); } -void MoveUI::on_varDescription_textChanged(const QString& description) +void Pokemodr::MoveUI::on_varDescription_textChanged(const QString& description) { const int cursor = varDescription->cursorPosition(); - static_cast<Move*>(modified())->setDescription(description); + static_cast<Pokemod::Move*>(modified())->setDescription(description); varDescription->setCursorPosition(cursor); } -void MoveUI::on_varScript_valueChanged(const Script& script) +void Pokemodr::MoveUI::on_varScript_valueChanged(const Pokemod::Script& script) { - static_cast<Move*>(modified())->setScript(script); + static_cast<Pokemod::Move*>(modified())->setScript(script); } diff --git a/pokemodr/MoveUI.h b/pokemodr/MoveUI.h index 7a6669b3..95fc7806 100644 --- a/pokemodr/MoveUI.h +++ b/pokemodr/MoveUI.h @@ -18,38 +18,44 @@ #ifndef __POKEMODR_MOVEUI__ #define __POKEMODR_MOVEUI__ -// PokeModr includes +// Pokemodr includes #include "ObjectUI.h" // Form include #include "ui_move.h" // Forward declarations +namespace Pokemod +{ class Move; +} +namespace Pokemodr +{ class MoveUI : public ObjectUI, private Ui::formMove { Q_OBJECT public: - MoveUI(Move* move, QWidget* parent); + MoveUI(Pokemod::Move* move, QWidget* parent); ~MoveUI(); public slots: void apply(); void discard(); protected slots: void on_varName_textChanged(const QString& name); - void on_varAccuracy_valueChanged(const Fraction& accuracy); + void on_varAccuracy_valueChanged(const Pokemod::Fraction& accuracy); void on_varPower_valueChanged(const int power); void on_varType_activated(const int type); void on_varPowerPoints_valueChanged(const int powerPoints); void on_varSpecial_toggled(const bool special); void on_varOverworld_toggled(const bool overworld); void on_varDescription_textChanged(const QString& description); - void on_varScript_valueChanged(const Script& script); + void on_varScript_valueChanged(const Pokemod::Script& script); private slots: void refreshGui(); void setGui(); }; +} #endif diff --git a/pokemodr/NatureUI.cpp b/pokemodr/NatureUI.cpp index 7d1a2e88..67a0390c 100644 --- a/pokemodr/NatureUI.cpp +++ b/pokemodr/NatureUI.cpp @@ -23,62 +23,62 @@ #include "../pokemod/Pokemod.h" #include "../pokemod/Rules.h" -NatureUI::NatureUI(Nature* nature, QWidget* parent) : +Pokemodr::NatureUI::NatureUI(Pokemod::Nature* nature, QWidget* parent) : ObjectUI(parent) { setupUi(this); - setObjects(nature, new Nature(*nature)); + setObjects(nature, new Pokemod::Nature(*nature)); } -NatureUI::~NatureUI() +Pokemodr::NatureUI::~NatureUI() { } -void NatureUI::initGui() +void Pokemodr::NatureUI::initGui() { connect(varStat, SIGNAL(activated()), this, SLOT(setGui())); } -void NatureUI::refreshGui() +void Pokemodr::NatureUI::refreshGui() { varStat->clear(); const bool isSplit = pokemod()->rules()->specialSplit(); varStat->addItems((isSplit ? Pokemod::StatGSCStr : Pokemod::StatRBYStr).mid(0, isSplit ? Pokemod::ST_End_RBY : Pokemod::ST_End_GSC)); } -void NatureUI::setGui() +void Pokemodr::NatureUI::setGui() { - varName->setText(static_cast<Nature*>(modified())->name()); - varStatMultiplier->setValue(static_cast<Nature*>(modified())->stat(varStat->currentIndex())); - varWeight->setValue(static_cast<Nature*>(modified())->weight()); + varName->setText(static_cast<Pokemod::Nature*>(modified())->name()); + varStatMultiplier->setValue(static_cast<Pokemod::Nature*>(modified())->stat(varStat->currentIndex())); + varWeight->setValue(static_cast<Pokemod::Nature*>(modified())->weight()); } -void NatureUI::apply() +void Pokemodr::NatureUI::apply() { - *static_cast<Nature*>(original()) = *static_cast<Nature*>(modified()); + *static_cast<Pokemod::Nature*>(original()) = *static_cast<Pokemod::Nature*>(modified()); emit(changed(false)); } -void NatureUI::discard() +void Pokemodr::NatureUI::discard() { - *static_cast<Nature*>(modified()) = *static_cast<Nature*>(original()); + *static_cast<Pokemod::Nature*>(modified()) = *static_cast<Pokemod::Nature*>(original()); setGui(); emit(changed(false)); } -void NatureUI::on_varName_textChanged(const QString& name) +void Pokemodr::NatureUI::on_varName_textChanged(const QString& name) { const int cursor = varName->cursorPosition(); - static_cast<Nature*>(modified())->setName(name); + static_cast<Pokemod::Nature*>(modified())->setName(name); varName->setCursorPosition(cursor); } -void NatureUI::on_varStatMultiplier_valueChanged(const Fraction& statMultiplier) +void Pokemodr::NatureUI::on_varStatMultiplier_valueChanged(const Pokemod::Fraction& statMultiplier) { - static_cast<Nature*>(modified())->setStat(varStat->currentIndex(), statMultiplier); + static_cast<Pokemod::Nature*>(modified())->setStat(varStat->currentIndex(), statMultiplier); } -void NatureUI::on_varWeight_valueChanged(const int weight) +void Pokemodr::NatureUI::on_varWeight_valueChanged(const int weight) { - static_cast<Nature*>(modified())->setWeight(weight); + static_cast<Pokemod::Nature*>(modified())->setWeight(weight); } diff --git a/pokemodr/NatureUI.h b/pokemodr/NatureUI.h index 12493071..706843a2 100644 --- a/pokemodr/NatureUI.h +++ b/pokemodr/NatureUI.h @@ -18,33 +18,39 @@ #ifndef __POKEMODR_NATUREUI__ #define __POKEMODR_NATUREUI__ -// PokeModr includes +// Pokemodr includes #include "ObjectUI.h" // Form include #include "ui_nature.h" // Forward declarations +namespace Pokemod +{ class Nature; +} +namespace Pokemodr +{ class NatureUI : public ObjectUI, private Ui::formNature { Q_OBJECT public: - NatureUI(Nature* nature, QWidget* parent); + NatureUI(Pokemod::Nature* nature, QWidget* parent); ~NatureUI(); public slots: void apply(); void discard(); protected slots: void on_varName_textChanged(const QString& name); - void on_varStatMultiplier_valueChanged(const Fraction& statMultiplier); + void on_varStatMultiplier_valueChanged(const Pokemod::Fraction& statMultiplier); void on_varWeight_valueChanged(const int weight); private slots: void initGui(); void refreshGui(); void setGui(); }; +} #endif diff --git a/pokemodr/ObjectUI.cpp b/pokemodr/ObjectUI.cpp index 34ae36fa..caef8956 100644 --- a/pokemodr/ObjectUI.cpp +++ b/pokemodr/ObjectUI.cpp @@ -25,7 +25,7 @@ // KDE includes #include <KMessageBox> -ObjectUI::ObjectUI(QWidget* parent) : +Pokemodr::ObjectUI::ObjectUI(QWidget* parent) : QWidget(parent), m_changed(false), m_object(NULL), @@ -34,71 +34,71 @@ ObjectUI::ObjectUI(QWidget* parent) : connect(this, SIGNAL(changed(bool)), SLOT(setChanged(bool))); } -ObjectUI::~ObjectUI() +Pokemodr::ObjectUI::~ObjectUI() { delete m_object_mod; } -void ObjectUI::reload() +void Pokemodr::ObjectUI::reload() { refreshGui(); setGui(); } -bool ObjectUI::isChanged() const +bool Pokemodr::ObjectUI::isChanged() const { return m_changed; } -const Pokemod* ObjectUI::pokemod() const +const Pokemod::Pokemod* Pokemodr::ObjectUI::pokemod() const { - return static_cast<const Pokemod*>(m_object->pokemod()); + return static_cast<const Pokemod::Pokemod*>(m_object->pokemod()); } -const Object* ObjectUI::original() const +const Pokemod::Pokemod::Object* Pokemodr::ObjectUI::original() const { return m_object; } -Object* ObjectUI::original() +Pokemod::Object* Pokemodr::ObjectUI::original() { return m_object; } -const Object* ObjectUI::modified() const +const Pokemod::Object* Pokemodr::ObjectUI::modified() const { return m_object_mod; } -Object* ObjectUI::modified() +Pokemod::Object* Pokemodr::ObjectUI::modified() { return m_object_mod; } -void ObjectUI::setChanged(const bool changed) +void Pokemodr::ObjectUI::setChanged(const bool changed) { m_changed = changed; } -void ObjectUI::errorMessage(const QString& message) +void Pokemodr::ObjectUI::errorMessage(const QString& message) { KMessageBox::error(this, message, "Error"); } -void ObjectUI::warningMessage(const QString& message) +void Pokemodr::ObjectUI::warningMessage(const QString& message) { KMessageBox::warningContinueCancel(this, message, "Warning"); } -void ObjectUI::initGui() +void Pokemodr::ObjectUI::initGui() { } -void ObjectUI::refreshGui() +void Pokemodr::ObjectUI::refreshGui() { } -void ObjectUI::setObjects(Object* original, Object* modified) +void Pokemodr::ObjectUI::setObjects(Pokemod::Object* original, Pokemod::Object* modified) { m_object = original; m_object_mod = modified; @@ -110,7 +110,7 @@ void ObjectUI::setObjects(Object* original, Object* modified) init(); } -void ObjectUI::init() +void Pokemodr::ObjectUI::init() { initGui(); reload(); diff --git a/pokemodr/ObjectUI.h b/pokemodr/ObjectUI.h index 25920baa..fc952dcc 100644 --- a/pokemodr/ObjectUI.h +++ b/pokemodr/ObjectUI.h @@ -23,9 +23,14 @@ // Forward declarations class QCloseEvent; +namespace Pokemod +{ class Object; class Pokemod; +} +namespace Pokemodr +{ class ObjectUI : public QWidget { Q_OBJECT @@ -38,12 +43,12 @@ class ObjectUI : public QWidget bool isChanged() const; - const Pokemod* pokemod() const; + const Pokemod::Pokemod* pokemod() const; - const Object* original() const; - Object* original(); - const Object* modified() const; - Object* modified(); + const Pokemod::Object* original() const; + Pokemod::Object* original(); + const Pokemod::Object* modified() const; + Pokemod::Object* modified(); signals: void changed(bool = true); public slots: @@ -58,14 +63,15 @@ class ObjectUI : public QWidget virtual void refreshGui(); virtual void setGui() = 0; protected: - void setObjects(Object* original, Object* modified); + void setObjects(Pokemod::Object* original, Pokemod::Object* modified); void init(); private: bool m_changed; - Object* m_object; - Object* m_object_mod; + Pokemod::Object* m_object; + Pokemod::Object* m_object_mod; }; +} #endif diff --git a/pokemodr/PointWidget.cpp b/pokemodr/PointWidget.cpp index 0bcb7ad9..47209153 100644 --- a/pokemodr/PointWidget.cpp +++ b/pokemodr/PointWidget.cpp @@ -18,19 +18,19 @@ // Header include #include "PointWidget.h" -PointWidget::PointWidget(QWidget* parent, const Point& value) : +Pokemodr::PointWidget::PointWidget(QWidget* parent, const Pokemod::Point& value) : QWidget(parent), m_value(value) { setupUi(this); } -Point PointWidget::value() const +Pokemod::Point Pokemodr::PointWidget::value() const { return m_value; } -void PointWidget::setValue(const Point& value) +void Pokemodr::PointWidget::setValue(const Pokemod::Point& value) { if (m_value == value) return; @@ -40,19 +40,19 @@ void PointWidget::setValue(const Point& value) emit(valueChanged(true)); } -void PointWidget::setMaximum(const Point& maximum) +void Pokemodr::PointWidget::setMaximum(const Pokemod::Point& maximum) { varX->setMaximum(maximum.x()); varY->setMaximum(maximum.y()); } -void PointWidget::on_varX_valueChanged(const int& x) +void Pokemodr::PointWidget::on_varX_valueChanged(const int x) { m_value.setX(x); emit(valueChanged(true)); } -void PointWidget::on_varY_valueChanged(const int& y) +void Pokemodr::PointWidget::on_varY_valueChanged(const int y) { m_value.setY(y); emit(valueChanged(true)); diff --git a/pokemodr/PointWidget.h b/pokemodr/PointWidget.h index c8eac827..7706a9b7 100644 --- a/pokemodr/PointWidget.h +++ b/pokemodr/PointWidget.h @@ -27,24 +27,27 @@ // Form include #include "ui_point.h" +namespace Pokemodr +{ class PointWidget : public QWidget, private Ui::formPoint { Q_OBJECT public: - PointWidget(QWidget* parent, const Point& value = Point(0, 0)); + PointWidget(QWidget* parent, const Pokemod::Point& value = Pokemod::Point(0, 0)); - Point value() const; + Pokemod::Point value() const; signals: - void valueChanged(const Point&); + void valueChanged(const Pokemod::Point&); public slots: - void setValue(const Point& value); - void setMaximum(const Point& maximum); + void setValue(const Pokemod::Point& value); + void setMaximum(const Pokemod::Point& maximum); protected slots: - void on_varX_valueChanged(const int& x); - void on_varY_valueChanged(const int& y); + void on_varX_valueChanged(const int x); + void on_varY_valueChanged(const int y); private: - Point m_value; + Pokemod::Point m_value; }; +} #endif diff --git a/pokemodr/PokemodTree.cpp b/pokemodr/PokemodTree.cpp index 6593ce1b..5f92ab73 100644 --- a/pokemodr/PokemodTree.cpp +++ b/pokemodr/PokemodTree.cpp @@ -21,7 +21,7 @@ // Model includes #include "models/BaseModel.h" -// PokeModr includes +// Pokemodr includes #include "ObjectUI.h" #include "PokemodTreeModel.h" @@ -32,73 +32,73 @@ // Qt includes #include <QHeaderView> -PokemodTree::PokemodTree(QWidget* parent) : +Pokemodr::PokemodTree::PokemodTree(QWidget* parent) : QTreeView(parent) { header()->hide(); - setModel(new PokemodTreeModel(this)); + setModel(new Pokemodr::PokemodTreeModel(this)); setRootIndex(model()->index(-1, 0, QModelIndex())); } -QString PokemodTree::description(const QModelIndex& index) +QString Pokemodr::PokemodTree::description(const QModelIndex& index) { - return QString("%1: %2").arg(model()->data(index, BaseModel::TypeRole).toString(), model()->data(index, Qt::DisplayRole).toString()); + return QString("%1: %2").arg(model()->data(index, Pokemodr::BaseModel::TypeRole).toString(), model()->data(index, Qt::DisplayRole).toString()); } -ObjectUI* PokemodTree::editorWidget(const QModelIndex& index) +Pokemodr::ObjectUI* Pokemodr::PokemodTree::editorWidget(const QModelIndex& index) { - ObjectUI* widget = static_cast<ObjectUI*>(model()->data(index, BaseModel::WidgetRole).value<QWidget*>()); + Pokemodr::ObjectUI* widget = static_cast<Pokemodr::ObjectUI*>(model()->data(index, Pokemodr::BaseModel::WidgetRole).value<QWidget*>()); connect(widget, SIGNAL(changed(bool)), this, SLOT(setDirty())); return widget; } -KMenu* PokemodTree::contextMenu(const QModelIndex& index) +KMenu* Pokemodr::PokemodTree::contextMenu(const QModelIndex& index) { - return static_cast<KMenu*>(model()->data(index, BaseModel::ContextMenuRole).value<void*>()); + return static_cast<KMenu*>(model()->data(index, Pokemodr::BaseModel::ContextMenuRole).value<void*>()); } -const Pokemod* PokemodTree::currentPokemod() const +const Pokemod::Pokemod* Pokemodr::PokemodTree::currentPokemod() const { QModelIndex index = currentIndex(); if (index.isValid()) { - const Object* object = static_cast<BaseModel*>(index.internalPointer())->object(); + const Pokemod::Object* object = static_cast<BaseModel*>(index.internalPointer())->object(); if (object) - return static_cast<const Pokemod*>(object->pokemod()); + return static_cast<const Pokemod::Pokemod*>(object->pokemod()); } return NULL; } -QDomDocument PokemodTree::copy(const QModelIndex& index) +QDomDocument Pokemodr::PokemodTree::copy(const QModelIndex& index) { QDomDocument xml; - xml.setContent(model()->data(index, BaseModel::XmlRole).toString()); + xml.setContent(model()->data(index, Pokemodr::BaseModel::XmlRole).toString()); return xml; } -void PokemodTree::paste(const QModelIndex& index, const QDomDocument& data) +void Pokemodr::PokemodTree::paste(const QModelIndex& index, const QDomDocument& data) { - model()->setData(index, data.toString(), BaseModel::XmlRole); + model()->setData(index, data.toString(), Pokemodr::BaseModel::XmlRole); } -QList<const Pokemod*> PokemodTree::openedPokemods() const +QList<const Pokemod::Pokemod*> Pokemodr::PokemodTree::openedPokemods() const { return m_pokemods.keys(); } -void PokemodTree::addPokemod(Pokemod* pokemod) +void Pokemodr::PokemodTree::addPokemod(Pokemod::Pokemod* pokemod) { static_cast<PokemodTreeModel*>(model())->addPokemod(pokemod); m_pokemods[pokemod] = UrlDirty(KUrl(), false); } -void PokemodTree::addPokemod(Pokemod* pokemod, const KUrl& url) +void Pokemodr::PokemodTree::addPokemod(Pokemod::Pokemod* pokemod, const KUrl& url) { static_cast<PokemodTreeModel*>(model())->addPokemod(pokemod); m_pokemods[pokemod] = UrlDirty(url, false); } -void PokemodTree::deletePokemod(const Pokemod* pokemod) +void Pokemodr::PokemodTree::deletePokemod(const Pokemod::Pokemod* pokemod) { if (m_pokemods.contains(pokemod)) { @@ -107,7 +107,7 @@ void PokemodTree::deletePokemod(const Pokemod* pokemod) } } -bool PokemodTree::isOpen(const KUrl& url) const +bool Pokemodr::PokemodTree::isOpen(const KUrl& url) const { foreach (UrlDirty pair, m_pokemods.values()) { @@ -117,14 +117,14 @@ bool PokemodTree::isOpen(const KUrl& url) const return false; } -KUrl PokemodTree::url(const Pokemod* pokemod) const +KUrl Pokemodr::PokemodTree::url(const Pokemod::Pokemod* pokemod) const { if (m_pokemods.contains(pokemod)) return m_pokemods[pokemod].first; return KUrl(); } -QStringList PokemodTree::urls() const +QStringList Pokemodr::PokemodTree::urls() const { QStringList urls; foreach (UrlDirty pair, m_pokemods.values()) @@ -132,26 +132,26 @@ QStringList PokemodTree::urls() const return urls; } -void PokemodTree::setUrl(const Pokemod* pokemod, const KUrl& url) +void Pokemodr::PokemodTree::setUrl(const Pokemod::Pokemod* pokemod, const KUrl& url) { if (m_pokemods.contains(pokemod)) m_pokemods[pokemod] = UrlDirty(url, false); } -bool PokemodTree::dirty(const Pokemod* pokemod) const +bool Pokemodr::PokemodTree::dirty(const Pokemod::Pokemod* pokemod) const { if (m_pokemods.contains(pokemod)) return m_pokemods[pokemod].second; return false; } -void PokemodTree::setDirty(const Pokemod* pokemod, const bool dirty) +void Pokemodr::PokemodTree::setDirty(const Pokemod::Pokemod* pokemod, const bool dirty) { if (m_pokemods.contains(pokemod)) m_pokemods[pokemod].second = dirty; } -void PokemodTree::setDirty() +void Pokemodr::PokemodTree::setDirty() { setDirty(currentPokemod(), true); } diff --git a/pokemodr/PokemodTree.h b/pokemodr/PokemodTree.h index 80bc0a6e..9c3fdc18 100644 --- a/pokemodr/PokemodTree.h +++ b/pokemodr/PokemodTree.h @@ -28,8 +28,14 @@ // Forward declarations class KMenu; -class ObjectUI; +namespace Pokemod +{ class Pokemod; +} + +namespace Pokemodr +{ +class ObjectUI; class PokemodTree : public QTreeView { @@ -39,34 +45,35 @@ class PokemodTree : public QTreeView PokemodTree(QWidget* parent = 0); QString description(const QModelIndex& index); - ObjectUI* editorWidget(const QModelIndex& index); + Pokemodr::ObjectUI* editorWidget(const QModelIndex& index); KMenu* contextMenu(const QModelIndex& index); - const Pokemod* currentPokemod() const; + const Pokemod::Pokemod* currentPokemod() const; QDomDocument copy(const QModelIndex& index); void paste(const QModelIndex& index, const QDomDocument& data); - QList<const Pokemod*> openedPokemods() const; - void addPokemod(Pokemod* pokemod); - void addPokemod(Pokemod* pokemod, const KUrl& url); - void deletePokemod(const Pokemod* pokemod); + QList<const Pokemod::Pokemod*> openedPokemods() const; + void addPokemod(Pokemod::Pokemod* pokemod); + void addPokemod(Pokemod::Pokemod* pokemod, const KUrl& url); + void deletePokemod(const Pokemod::Pokemod* pokemod); void deleteAllPokemods(); bool isOpen(const KUrl& url) const; - KUrl url(const Pokemod* pokemod) const; + KUrl url(const Pokemod::Pokemod* pokemod) const; QStringList urls() const; - void setUrl(const Pokemod* pokemod, const KUrl& url); + void setUrl(const Pokemod::Pokemod* pokemod, const KUrl& url); - bool dirty(const Pokemod* pokemod) const; - void setDirty(const Pokemod* pokemod, const bool dirty); + bool dirty(const Pokemod::Pokemod* pokemod) const; + void setDirty(const Pokemod::Pokemod* pokemod, const bool dirty); private slots: void setDirty(); private: typedef QPair<KUrl, bool> UrlDirty; - QMap<const Pokemod*, UrlDirty> m_pokemods; + QMap<const Pokemod::Pokemod*, UrlDirty> m_pokemods; }; +} #endif diff --git a/pokemodr/PokemodTreeModel.cpp b/pokemodr/PokemodTreeModel.cpp index fbb0c707..2fa0467a 100644 --- a/pokemodr/PokemodTreeModel.cpp +++ b/pokemodr/PokemodTreeModel.cpp @@ -26,18 +26,18 @@ #include <QMimeData> #include <QStringList> -PokemodTreeModel::PokemodTreeModel(QObject* parent) : +Pokemodr::PokemodTreeModel::PokemodTreeModel(QObject* parent) : QAbstractItemModel(parent), m_root(new RootModel) { } -PokemodTreeModel::~PokemodTreeModel() +Pokemodr::PokemodTreeModel::~PokemodTreeModel() { delete m_root; } -QVariant PokemodTreeModel::data(const QModelIndex& index, int role) const +QVariant Pokemodr::PokemodTreeModel::data(const QModelIndex& index, int role) const { if (!index.isValid()) return QVariant(); @@ -45,12 +45,12 @@ QVariant PokemodTreeModel::data(const QModelIndex& index, int role) const return object->data(role); } -QVariant PokemodTreeModel::headerData(int /*section*/, Qt::Orientation /*orientation*/, int /*role = Qt::DisplayRole*/) const +QVariant Pokemodr::PokemodTreeModel::headerData(int /*section*/, Qt::Orientation /*orientation*/, int /*role = Qt::DisplayRole*/) const { return QVariant(); } -QModelIndex PokemodTreeModel::index(int row, int column, const QModelIndex& parent) const +QModelIndex Pokemodr::PokemodTreeModel::index(int row, int column, const QModelIndex& parent) const { if ((row < -1) || (column < -1)) return QModelIndex(); @@ -63,7 +63,7 @@ QModelIndex PokemodTreeModel::index(int row, int column, const QModelIndex& pare return createIndex(row, 0, object); } -QModelIndex PokemodTreeModel::parent(const QModelIndex& index) const +QModelIndex Pokemodr::PokemodTreeModel::parent(const QModelIndex& index) const { if (!index.isValid()) return QModelIndex(); @@ -73,18 +73,18 @@ QModelIndex PokemodTreeModel::parent(const QModelIndex& index) const return createIndex(parent->indexNumber(), 0, parent); } -int PokemodTreeModel::rowCount(const QModelIndex& parent) const +int Pokemodr::PokemodTreeModel::rowCount(const QModelIndex& parent) const { BaseModel* object = getItem(parent); return object->rowCount(); } -int PokemodTreeModel::columnCount(const QModelIndex& /*parent*/) const +int Pokemodr::PokemodTreeModel::columnCount(const QModelIndex& /*parent*/) const { return 1; } -Qt::ItemFlags PokemodTreeModel::flags(const QModelIndex& index) const +Qt::ItemFlags Pokemodr::PokemodTreeModel::flags(const QModelIndex& index) const { if (!index.isValid()) return 0; @@ -92,7 +92,7 @@ Qt::ItemFlags PokemodTreeModel::flags(const QModelIndex& index) const return object->flags(); } -bool PokemodTreeModel::setData(const QModelIndex& index, const QVariant& value, int role) +bool Pokemodr::PokemodTreeModel::setData(const QModelIndex& index, const QVariant& value, int role) { if (!index.isValid()) return false; @@ -104,7 +104,7 @@ bool PokemodTreeModel::setData(const QModelIndex& index, const QVariant& value, return success; } -BaseModel* PokemodTreeModel::getItem(const QModelIndex& index) const +Pokemodr::BaseModel* Pokemodr::PokemodTreeModel::getItem(const QModelIndex& index) const { if (index.isValid()) { @@ -115,44 +115,44 @@ BaseModel* PokemodTreeModel::getItem(const QModelIndex& index) const return m_root; } -QStringList PokemodTreeModel::mimeTypes() const +QStringList Pokemodr::PokemodTreeModel::mimeTypes() const { return QStringList() << "application/x-pokemod+xml"; } -QMimeData* PokemodTreeModel::mimeData(const QModelIndexList& indexes) const +QMimeData* Pokemodr::PokemodTreeModel::mimeData(const QModelIndexList& indexes) const { QMimeData *mimeData = new QMimeData(); if ((indexes.size() == 1) && indexes[0].isValid()) { QDomDocument xml; - xml.setContent(data(indexes[0], BaseModel::XmlRole).toString()); + xml.setContent(data(indexes[0], Pokemodr::BaseModel::XmlRole).toString()); mimeData->setData("application/x-pokemod+xml", xml.toByteArray()); } return mimeData; } -bool PokemodTreeModel::dropMimeData(const QMimeData* data, Qt::DropAction action, int /*row*/, int /*column*/, const QModelIndex& parent) +bool Pokemodr::PokemodTreeModel::dropMimeData(const QMimeData* data, Qt::DropAction action, int /*row*/, int /*column*/, const QModelIndex& parent) { if (action == Qt::IgnoreAction) return true; if (!data->hasFormat("application/x-pokemod+xml")) return false; if (parent.isValid()) - return setData(parent, data->data("application/x-pokemod+xml"), BaseModel::XmlRole); + return setData(parent, data->data("application/x-pokemod+xml"), Pokemodr::BaseModel::XmlRole); emit(layoutAboutToBeChanged()); - bool success = m_root->setData(data->data("application/x-pokemod+xml"), BaseModel::XmlRole); + bool success = m_root->setData(data->data("application/x-pokemod+xml"), Pokemodr::BaseModel::XmlRole); emit(layoutChanged()); return success; } -void PokemodTreeModel::addPokemod(Pokemod* pokemod) +void Pokemodr::PokemodTreeModel::addPokemod(Pokemod::Pokemod* pokemod) { m_root->addPokemod(pokemod); emit(reset()); } -void PokemodTreeModel::deletePokemod(const Pokemod* pokemod) +void Pokemodr::PokemodTreeModel::deletePokemod(const Pokemod::Pokemod* pokemod) { m_root->deletePokemod(pokemod); emit(reset()); diff --git a/pokemodr/PokemodTreeModel.h b/pokemodr/PokemodTreeModel.h index 670b9b3c..8f44aa97 100644 --- a/pokemodr/PokemodTreeModel.h +++ b/pokemodr/PokemodTreeModel.h @@ -28,6 +28,8 @@ #include <QStringList> #include <QVariant> +namespace Pokemodr +{ class PokemodTreeModel : public QAbstractItemModel { Q_OBJECT @@ -54,12 +56,13 @@ class PokemodTreeModel : public QAbstractItemModel QMimeData* mimeData(const QModelIndexList& indexes) const; bool dropMimeData(const QMimeData* data, Qt::DropAction action, int /*row*/, int /*column*/, const QModelIndex& parent); - void addPokemod(Pokemod* pokemod); - void deletePokemod(const Pokemod* pokemod); + void addPokemod(Pokemod::Pokemod* pokemod); + void deletePokemod(const Pokemod::Pokemod* pokemod); private: BaseModel* getItem(const QModelIndex& index) const; RootModel* m_root; }; +} #endif diff --git a/pokemodr/PokemodUI.cpp b/pokemodr/PokemodUI.cpp index 52be0137..55c856d0 100644 --- a/pokemodr/PokemodUI.cpp +++ b/pokemodr/PokemodUI.cpp @@ -18,7 +18,7 @@ // Header include #include "PokemodUI.h" -// PokeModr includes +// Pokemodr includes #include "FileDialog.h" #include "TypechartModel.h" @@ -28,185 +28,185 @@ #include "../pokemod/Pokemod.h" #include "../pokemod/Type.h" -PokemodUI::PokemodUI(Pokemod* pokemod, QWidget* parent) : +Pokemodr::PokemodUI::PokemodUI(Pokemod::Pokemod* pokemod, QWidget* parent) : ObjectUI(parent), m_lastMap(-1) { setupUi(this); - setObjects(pokemod, new Pokemod(*pokemod)); + setObjects(pokemod, new Pokemod::Pokemod(*pokemod)); } -PokemodUI::~PokemodUI() +Pokemodr::PokemodUI::~PokemodUI() { } -void PokemodUI::initGui() +void Pokemodr::PokemodUI::initGui() { QStringList types; - for (int i = 0; i < static_cast<Pokemod*>(original())->typeCount(); ++i) - types << static_cast<Pokemod*>(original())->type(i)->name(); - varTypechart->setModel(new TypechartModel(static_cast<Pokemod*>(modified())->typechart(), types)); + for (int i = 0; i < static_cast<Pokemod::Pokemod*>(original())->typeCount(); ++i) + types << static_cast<Pokemod::Pokemod*>(original())->type(i)->name(); + varTypechart->setModel(new TypechartModel(*static_cast<Pokemod::Pokemod*>(modified())->typechart(), types)); } -void PokemodUI::refreshGui() +void Pokemodr::PokemodUI::refreshGui() { varMap->clear(); - for (int i = 0; i < static_cast<Pokemod*>(original())->mapCount(); ++i) + for (int i = 0; i < static_cast<Pokemod::Pokemod*>(original())->mapCount(); ++i) { - const Map* map = static_cast<Pokemod*>(original())->map(i); + const Pokemod::Map* map = static_cast<Pokemod::Pokemod*>(original())->map(i); varMap->addItem(map->name(), map->id()); } varEffectiveness->setEnabled(false); } -void PokemodUI::setGui() +void Pokemodr::PokemodUI::setGui() { - const bool resetWarps = (static_cast<Pokemod*>(modified())->startMap() != m_lastMap); - varTitle->setText(static_cast<Pokemod*>(modified())->title()); - varVersion->setText(static_cast<Pokemod*>(modified())->version()); - varDescription->setText(static_cast<Pokemod*>(modified())->description()); - varMap->setCurrentIndex(varMap->findData(static_cast<Pokemod*>(modified())->startMap())); - m_lastMap = static_cast<Pokemod*>(modified())->startMap(); + const bool resetWarps = (static_cast<Pokemod::Pokemod*>(modified())->startMap() != m_lastMap); + varTitle->setText(static_cast<Pokemod::Pokemod*>(modified())->title()); + varVersion->setText(static_cast<Pokemod::Pokemod*>(modified())->version()); + varDescription->setText(static_cast<Pokemod::Pokemod*>(modified())->description()); + varMap->setCurrentIndex(varMap->findData(static_cast<Pokemod::Pokemod*>(modified())->startMap())); + m_lastMap = static_cast<Pokemod::Pokemod*>(modified())->startMap(); if (resetWarps) { varWarp->clear(); - const int mapIndex = static_cast<Pokemod*>(original())->mapIndex(static_cast<Pokemod*>(modified())->startMap()); + const int mapIndex = static_cast<Pokemod::Pokemod*>(original())->mapIndex(static_cast<Pokemod::Pokemod*>(modified())->startMap()); if (mapIndex != INT_MAX) { - const Map* map = static_cast<Pokemod*>(original())->map(mapIndex); + const Pokemod::Map* map = static_cast<Pokemod::Pokemod*>(original())->map(mapIndex); for (int i = 0; i < map->warpCount(); ++i) { - const MapWarp* warp = map->warp(i); + const Pokemod::MapWarp* warp = map->warp(i); varWarp->addItem(warp->name(), warp->id()); } } } - varWarp->setCurrentIndex(varWarp->findData(static_cast<Pokemod*>(modified())->startWarp())); - varWalkSkin->setIcon(static_cast<Pokemod*>(original())->walkSkin()); - varBikeSkin->setIcon(static_cast<Pokemod*>(original())->bikeSkin()); - varFlySkin->setIcon(static_cast<Pokemod*>(original())->flySkin()); - varSurfSkin->setIcon(static_cast<Pokemod*>(original())->surfSkin()); - varFishSkin->setIcon(static_cast<Pokemod*>(original())->fishSkin()); - varSurfFishSkin->setIcon(static_cast<Pokemod*>(original())->surfFishSkin()); + varWarp->setCurrentIndex(varWarp->findData(static_cast<Pokemod::Pokemod*>(modified())->startWarp())); + varWalkSkin->setIcon(static_cast<Pokemod::Pokemod*>(original())->walkSkin()); + varBikeSkin->setIcon(static_cast<Pokemod::Pokemod*>(original())->bikeSkin()); + varFlySkin->setIcon(static_cast<Pokemod::Pokemod*>(original())->flySkin()); + varSurfSkin->setIcon(static_cast<Pokemod::Pokemod*>(original())->surfSkin()); + varFishSkin->setIcon(static_cast<Pokemod::Pokemod*>(original())->fishSkin()); + varSurfFishSkin->setIcon(static_cast<Pokemod::Pokemod*>(original())->surfFishSkin()); } -void PokemodUI::apply() +void Pokemodr::PokemodUI::apply() { - *static_cast<Pokemod*>(original()) = *static_cast<Pokemod*>(modified()); + *static_cast<Pokemod::Pokemod*>(original()) = *static_cast<Pokemod::Pokemod*>(modified()); emit(changed(false)); } -void PokemodUI::discard() +void Pokemodr::PokemodUI::discard() { - *static_cast<Pokemod*>(modified()) = *static_cast<Pokemod*>(original()); + *static_cast<Pokemod::Pokemod*>(modified()) = *static_cast<Pokemod::Pokemod*>(original()); setGui(); emit(changed(false)); } -void PokemodUI::on_varTitle_textChanged(const QString& title) +void Pokemodr::PokemodUI::on_varTitle_textChanged(const QString& title) { const int cursor = varTitle->cursorPosition(); - static_cast<Pokemod*>(modified())->setTitle(title); + static_cast<Pokemod::Pokemod*>(modified())->setTitle(title); varTitle->setCursorPosition(cursor); } -void PokemodUI::on_varVersion_textChanged(const QString& version) +void Pokemodr::PokemodUI::on_varVersion_textChanged(const QString& version) { const int cursor = varVersion->cursorPosition(); - static_cast<Pokemod*>(modified())->setVersion(version); + static_cast<Pokemod::Pokemod*>(modified())->setVersion(version); varVersion->setCursorPosition(cursor); } -void PokemodUI::on_varDescription_textChanged(const QString& description) +void Pokemodr::PokemodUI::on_varDescription_textChanged(const QString& description) { - static_cast<Pokemod*>(modified())->setDescription(description); + static_cast<Pokemod::Pokemod*>(modified())->setDescription(description); } -void PokemodUI::on_varMap_activated(const int map) +void Pokemodr::PokemodUI::on_varMap_activated(const int map) { - static_cast<Pokemod*>(modified())->setStartMap(varMap->itemData(map).toInt()); + static_cast<Pokemod::Pokemod*>(modified())->setStartMap(varMap->itemData(map).toInt()); } -void PokemodUI::on_varWarp_activated(const int warp) +void Pokemodr::PokemodUI::on_varWarp_activated(const int warp) { - static_cast<Pokemod*>(modified())->setStartWarp(varWarp->itemData(warp).toInt()); + static_cast<Pokemod::Pokemod*>(modified())->setStartWarp(varWarp->itemData(warp).toInt()); } -void PokemodUI::on_varWalkSkin_pressed() +void Pokemodr::PokemodUI::on_varWalkSkin_pressed() { FileDialog* dialog = new FileDialog(QSize(192, 168)); if (dialog->exec() == QDialog::Accepted) { - static_cast<Pokemod*>(original())->setWalkSkin(QPixmap(dialog->selectedFile())); + static_cast<Pokemod::Pokemod*>(original())->setWalkSkin(QPixmap(dialog->selectedFile())); setGui(); } delete dialog; } -void PokemodUI::on_varBikeSkin_pressed() +void Pokemodr::PokemodUI::on_varBikeSkin_pressed() { FileDialog* dialog = new FileDialog(QSize(192, 168)); if (dialog->exec() == QDialog::Accepted) { - static_cast<Pokemod*>(original())->setBikeSkin(QPixmap(dialog->selectedFile())); + static_cast<Pokemod::Pokemod*>(original())->setBikeSkin(QPixmap(dialog->selectedFile())); setGui(); } delete dialog; } -void PokemodUI::on_varFlySkin_pressed() +void Pokemodr::PokemodUI::on_varFlySkin_pressed() { FileDialog* dialog = new FileDialog(QSize(192, 168)); if (dialog->exec() == QDialog::Accepted) { - static_cast<Pokemod*>(original())->setFlySkin(QPixmap(dialog->selectedFile())); + static_cast<Pokemod::Pokemod*>(original())->setFlySkin(QPixmap(dialog->selectedFile())); setGui(); } delete dialog; } -void PokemodUI::on_varSurfSkin_pressed() +void Pokemodr::PokemodUI::on_varSurfSkin_pressed() { FileDialog* dialog = new FileDialog(QSize(192, 168)); if (dialog->exec() == QDialog::Accepted) { - static_cast<Pokemod*>(original())->setSurfSkin(QPixmap(dialog->selectedFile())); + static_cast<Pokemod::Pokemod*>(original())->setSurfSkin(QPixmap(dialog->selectedFile())); setGui(); } delete dialog; } -void PokemodUI::on_varFishSkin_pressed() +void Pokemodr::PokemodUI::on_varFishSkin_pressed() { FileDialog* dialog = new FileDialog(QSize(192, 168)); if (dialog->exec() == QDialog::Accepted) { - static_cast<Pokemod*>(original())->setFishSkin(QPixmap(dialog->selectedFile())); + static_cast<Pokemod::Pokemod*>(original())->setFishSkin(QPixmap(dialog->selectedFile())); setGui(); } delete dialog; } -void PokemodUI::on_varSurfFishSkin_pressed() +void Pokemodr::PokemodUI::on_varSurfFishSkin_pressed() { FileDialog* dialog = new FileDialog(QSize(192, 168)); if (dialog->exec() == QDialog::Accepted) { - static_cast<Pokemod*>(original())->setSurfFishSkin(QPixmap(dialog->selectedFile())); + static_cast<Pokemod::Pokemod*>(original())->setSurfFishSkin(QPixmap(dialog->selectedFile())); setGui(); } delete dialog; } -void PokemodUI::on_varTypechart_clicked(const QModelIndex& index) +void Pokemodr::PokemodUI::on_varTypechart_clicked(const QModelIndex& index) { m_index = index; varEffectiveness->setEnabled(true); boxEffectiveness->setTitle(QString("%1 vs. %2").arg(varTypechart->model()->headerData(index.row(), Qt::Vertical, Qt::DisplayRole).toString()).arg(varTypechart->model()->headerData(index.column(), Qt::Horizontal, Qt::DisplayRole).toString())); - varEffectiveness->setValue(varTypechart->model()->data(m_index, Qt::EditRole).value<Fraction>()); + varEffectiveness->setValue(varTypechart->model()->data(m_index, Qt::EditRole).value<Pokemod::Fraction>()); } -void PokemodUI::on_varEffectiveness_valueChanged(const Fraction& multiplier) +void Pokemodr::PokemodUI::on_varEffectiveness_valueChanged(const Pokemod::Fraction& multiplier) { varTypechart->model()->setData(m_index, QVariant::fromValue(multiplier), Qt::EditRole); emit(changed()); diff --git a/pokemodr/PokemodUI.h b/pokemodr/PokemodUI.h index 91a562ee..e0921755 100644 --- a/pokemodr/PokemodUI.h +++ b/pokemodr/PokemodUI.h @@ -18,20 +18,26 @@ #ifndef __POKEMODR_POKEMODUI__ #define __POKEMODR_POKEMODUI__ -// PokeModr includes +// Pokemodr includes #include "ObjectUI.h" // Form include #include "ui_pokemod.h" +// Forward declarations +namespace Pokemod +{ class Pokemod; +} +namespace Pokemodr +{ class PokemodUI : public ObjectUI, private Ui::formPokemod { Q_OBJECT public: - PokemodUI(Pokemod* pokemod, QWidget* parent); + PokemodUI(Pokemod::Pokemod* pokemod, QWidget* parent); ~PokemodUI(); public slots: void apply(); @@ -49,7 +55,7 @@ class PokemodUI : public ObjectUI, private Ui::formPokemod void on_varFishSkin_pressed(); void on_varSurfFishSkin_pressed(); void on_varTypechart_clicked(const QModelIndex& index); - void on_varEffectiveness_valueChanged(const Fraction& multiplier); + void on_varEffectiveness_valueChanged(const Pokemod::Fraction& multiplier); private slots: void initGui(); void refreshGui(); @@ -58,5 +64,6 @@ class PokemodUI : public ObjectUI, private Ui::formPokemod int m_lastMap; QModelIndex m_index; }; +} #endif diff --git a/pokemodr/PokeModr.cpp b/pokemodr/Pokemodr.cpp index defbc3b0..62e579bf 100644 --- a/pokemodr/PokeModr.cpp +++ b/pokemodr/Pokemodr.cpp @@ -16,11 +16,11 @@ */ // Header include -#include "PokeModr.h" +#include "Pokemodr.h" -// PokeModr includes +// Pokemodr includes #include "FileDialog.h" -#include "PokeModrUI.h" +#include "PokemodrUI.h" // Qt includes #include <QTextCodec> @@ -72,7 +72,7 @@ int main(int argc, char* argv[]) KApplication* app = new KApplication(); - PokeModrUI* mainWindow = new PokeModrUI; + Pokemodr::PokemodrUI* mainWindow = new Pokemodr::PokemodrUI; mainWindow->show(); app->exec(); return 0; diff --git a/pokemodr/PokeModr.h b/pokemodr/Pokemodr.h index 7ff0a99b..7ff0a99b 100644 --- a/pokemodr/PokeModr.h +++ b/pokemodr/Pokemodr.h diff --git a/pokemodr/PokeModrPreferences.cpp b/pokemodr/PokemodrPreferences.cpp index ca720077..5c7ef7f5 100644 --- a/pokemodr/PokeModrPreferences.cpp +++ b/pokemodr/PokemodrPreferences.cpp @@ -16,7 +16,7 @@ */ // Header include -#include "PokeModrPreferences.h" +#include "PokemodrPreferences.h" // Qt includes #include <QCheckBox> @@ -24,7 +24,7 @@ // KDE includes #include <KConfigGroup> -PokeModrPreferences::PokeModrPreferences(QWidget* parent, KConfigGroup& config) : +Pokemodr::PokemodrPreferences::PokemodrPreferences(QWidget* parent, KConfigGroup& config) : KDialog(parent), m_config(config) { @@ -35,7 +35,7 @@ PokeModrPreferences::PokeModrPreferences(QWidget* parent, KConfigGroup& config) setMainWidget(varReloadOnOpen); } -void PokeModrPreferences::save() +void Pokemodr::PokemodrPreferences::save() { m_config.writeEntry("reloadOnStart", varReloadOnOpen->isChecked()); } diff --git a/pokemodr/PokeModrPreferences.h b/pokemodr/PokemodrPreferences.h index 121e01ac..2be05c3f 100644 --- a/pokemodr/PokeModrPreferences.h +++ b/pokemodr/PokemodrPreferences.h @@ -25,17 +25,20 @@ class KConfigGroup; class QCheckBox; -class PokeModrPreferences : public KDialog +namespace Pokemodr +{ +class PokemodrPreferences : public KDialog { Q_OBJECT public: - PokeModrPreferences(QWidget* parent, KConfigGroup& config); + PokemodrPreferences(QWidget* parent, KConfigGroup& config); protected slots: void save(); private: KConfigGroup& m_config; QCheckBox* varReloadOnOpen; }; +} #endif diff --git a/pokemodr/PokeModrUI.cpp b/pokemodr/PokemodrUI.cpp index 1367beef..c4c45d4f 100644 --- a/pokemodr/PokeModrUI.cpp +++ b/pokemodr/PokemodrUI.cpp @@ -16,11 +16,11 @@ */ // Header include -#include "PokeModrUI.h" +#include "PokemodrUI.h" -// PokeModr includes +// Pokemodr includes #include "ObjectUI.h" -#include "PokeModrPreferences.h" +#include "PokemodrPreferences.h" #include "PokemodTreeModel.h" // Pokemod includes @@ -48,7 +48,7 @@ #include <KUrl> #include <KIO/NetAccess> -PokeModrUI::PokeModrUI(QWidget* parent) : +Pokemodr::PokemodrUI::PokemodrUI(QWidget* parent) : KMainWindow(parent), m_config(KGlobal::config()->group("pokemodr")) { @@ -72,18 +72,18 @@ PokeModrUI::PokeModrUI(QWidget* parent) : setAutoSaveSettings("MainWindow", true); } -PokeModrUI::~PokeModrUI() +Pokemodr::PokemodrUI::~PokemodrUI() { m_config.config()->sync(); closeAllPokemods(true); } -void PokeModrUI::update() +void Pokemodr::PokemodrUI::update() { treePokemod->update(treePokemod->currentIndex()); } -void PokeModrUI::closeEvent(QCloseEvent* event) +void Pokemodr::PokemodrUI::closeEvent(QCloseEvent* event) { m_recent->saveEntries(m_config.group("Recent Files")); if (closeAllPokemods()) @@ -92,23 +92,23 @@ void PokeModrUI::closeEvent(QCloseEvent* event) event->ignore(); } -void PokeModrUI::setChangedTitle(const bool changed) +void Pokemodr::PokemodrUI::setChangedTitle(const bool changed) { setWindowTitle(QString::fromUtf8("%1%2 - PokéModr").arg(treePokemod->description(treePokemod->currentIndex()), changed ? "*" : "")); } -void PokeModrUI::setDirty(const bool dirty) +void Pokemodr::PokemodrUI::setDirty(const bool dirty) { - const Pokemod* pokemod = static_cast<const Pokemod*>(static_cast<Object*>(treePokemod->currentIndex().internalPointer())->pokemod()); + const Pokemod::Pokemod* pokemod = static_cast<const Pokemod::Pokemod*>(static_cast<Pokemod::Object*>(treePokemod->currentIndex().internalPointer())->pokemod()); treePokemod->setDirty(pokemod, dirty); } -void PokeModrUI::newPokemod() +void Pokemodr::PokemodrUI::newPokemod() { - treePokemod->addPokemod(new Pokemod); + treePokemod->addPokemod(new Pokemod::Pokemod); } -void PokeModrUI::openPokemod() +void Pokemodr::PokemodrUI::openPokemod() { KUrl::List urls = KFileDialog::getOpenUrls(KUrl("kfiledialog:///pokemod"), QString::fromUtf8("*.pmod|PokéMod files"), this); foreach (KUrl url, urls) @@ -118,7 +118,7 @@ void PokeModrUI::openPokemod() } } -bool PokeModrUI::openPokemod(const KUrl& url) +bool Pokemodr::PokemodrUI::openPokemod(const KUrl& url) { bool opened = false; if (treePokemod->isOpen(url)) @@ -144,7 +144,7 @@ bool PokeModrUI::openPokemod(const KUrl& url) return opened; } -bool PokeModrUI::openPokemod(const QString& path, const bool isRemote) +bool Pokemodr::PokemodrUI::openPokemod(const QString& path, const bool isRemote) { QFile file(path); if (file.open(QIODevice::ReadOnly)) @@ -154,7 +154,7 @@ bool PokeModrUI::openPokemod(const QString& path, const bool isRemote) { if (xml.doctype().name() == "Pokemod") { - treePokemod->addPokemod(new Pokemod(xml.documentElement()), isRemote ? KUrl() : KUrl(path)); + treePokemod->addPokemod(new Pokemod::Pokemod(xml.documentElement()), isRemote ? KUrl() : KUrl(path)); return true; } else @@ -169,12 +169,12 @@ bool PokeModrUI::openPokemod(const QString& path, const bool isRemote) return false; } -void PokeModrUI::savePokemod() +void Pokemodr::PokemodrUI::savePokemod() { savePokemod(treePokemod->currentPokemod()); } -void PokeModrUI::savePokemod(const Pokemod* pokemod) +void Pokemodr::PokemodrUI::savePokemod(const Pokemod::Pokemod* pokemod) { const KUrl url = treePokemod->url(pokemod); if (url.isEmpty()) @@ -183,7 +183,7 @@ void PokeModrUI::savePokemod(const Pokemod* pokemod) savePokemod(pokemod, url); } -bool PokeModrUI::savePokemod(const Pokemod* pokemod, const KUrl& url) +bool Pokemodr::PokemodrUI::savePokemod(const Pokemod::Pokemod* pokemod, const KUrl& url) { if (pokemod) { @@ -192,7 +192,7 @@ bool PokeModrUI::savePokemod(const Pokemod* pokemod, const KUrl& url) QFile file(url.path()); if (file.open(QIODevice::WriteOnly)) { - file.write(Object::xml(pokemod).toByteArray()); + file.write(Pokemod::Object::xml(pokemod).toByteArray()); treePokemod->setDirty(pokemod, false); file.close(); return true; @@ -205,7 +205,7 @@ bool PokeModrUI::savePokemod(const Pokemod* pokemod, const KUrl& url) KTemporaryFile temp; if (temp.open()) { - temp.write(Object::xml(pokemod).toByteArray()); + temp.write(Pokemod::Object::xml(pokemod).toByteArray()); if (KIO::NetAccess::upload(temp.fileName(), url, this)) { treePokemod->setDirty(pokemod, false); @@ -221,12 +221,12 @@ bool PokeModrUI::savePokemod(const Pokemod* pokemod, const KUrl& url) return false; } -void PokeModrUI::saveAsPokemod() +void Pokemodr::PokemodrUI::saveAsPokemod() { saveAsPokemod(treePokemod->currentPokemod()); } -void PokeModrUI::saveAsPokemod(const Pokemod* pokemod) +void Pokemodr::PokemodrUI::saveAsPokemod(const Pokemod::Pokemod* pokemod) { if (pokemod) { @@ -239,12 +239,12 @@ void PokeModrUI::saveAsPokemod(const Pokemod* pokemod) } } -void PokeModrUI::closePokemod() +void Pokemodr::PokemodrUI::closePokemod() { closePokemod(treePokemod->currentPokemod()); } -bool PokeModrUI::closePokemod(const Pokemod* pokemod, const bool force) +bool Pokemodr::PokemodrUI::closePokemod(const Pokemod::Pokemod* pokemod, const bool force) { if (pokemod) { @@ -272,9 +272,9 @@ bool PokeModrUI::closePokemod(const Pokemod* pokemod, const bool force) return true; } -bool PokeModrUI::closeAllPokemods(const bool force) +bool Pokemodr::PokemodrUI::closeAllPokemods(const bool force) { - QList<const Pokemod*> pokemods = treePokemod->openedPokemods(); + QList<const Pokemod::Pokemod*> pokemods = treePokemod->openedPokemods(); if (pokemods.size()) m_config.writeEntry("Opened Files", treePokemod->urls()); for (int i = 0; i < pokemods.size(); ) @@ -289,30 +289,30 @@ bool PokeModrUI::closeAllPokemods(const bool force) return !pokemods.size(); } -void PokeModrUI::copyObject() +void Pokemodr::PokemodrUI::copyObject() { m_clipboard = treePokemod->copy(treePokemod->currentIndex()); } -void PokeModrUI::pasteObject() +void Pokemodr::PokemodrUI::pasteObject() { treePokemod->paste(treePokemod->currentIndex(), m_clipboard); } -void PokeModrUI::preferences() +void Pokemodr::PokemodrUI::preferences() { - PokeModrPreferences* dialog = new PokeModrPreferences(this, m_config); + PokemodrPreferences* dialog = new PokemodrPreferences(this, m_config); connect(dialog, SIGNAL(okClicked()), dialog, SLOT(save())); dialog->exec(); } -void PokeModrUI::on_splitter_splitterMoved() +void Pokemodr::PokemodrUI::on_splitter_splitterMoved() { m_config.writeEntry("treeWidth", splitter->sizes()[0]); m_config.writeEntry("panelWidth", splitter->sizes()[1]); } -void PokeModrUI::on_treePokemod_clicked(const QModelIndex& index) +void Pokemodr::PokemodrUI::on_treePokemod_clicked(const QModelIndex& index) { if (!(treePokemod->model()->flags(index) & Qt::ItemIsSelectable)) return; @@ -345,7 +345,7 @@ void PokeModrUI::on_treePokemod_clicked(const QModelIndex& index) } } -void PokeModrUI::on_treePokemod_customContextMenuRequested(const QPoint& position) +void Pokemodr::PokemodrUI::on_treePokemod_customContextMenuRequested(const QPoint& position) { QModelIndex index = treePokemod->indexAt(position); KMenu* menu = treePokemod->contextMenu(index); @@ -368,15 +368,15 @@ void PokeModrUI::on_treePokemod_customContextMenuRequested(const QPoint& positio } } -void PokeModrUI::setupActions() +void Pokemodr::PokemodrUI::setupActions() { - KAction* openNew = KStandardAction::openNew(this, SLOT(newPokemod()), this); - KAction* open = KStandardAction::open(this, SLOT(openPokemod()), this); - m_recent = KStandardAction::openRecent(this, SLOT(openPokemod(const KUrl&)), this); + KAction* openNew = KStandardAction::openNew(this, SLOT(newPokemod::Pokemod()), this); + KAction* open = KStandardAction::open(this, SLOT(openPokemod::Pokemod()), this); + m_recent = KStandardAction::openRecent(this, SLOT(openPokemod::Pokemod(const KUrl&)), this); m_recent->loadEntries(m_config.group("Recent Files")); - KAction* close = KStandardAction::close(this, SLOT(closePokemod()), this); - KAction* save = KStandardAction::save(this, SLOT(savePokemod()), this); - KAction* saveAs = KStandardAction::saveAs(this, SLOT(saveAsPokemod()), this); + KAction* close = KStandardAction::close(this, SLOT(closePokemod::Pokemod()), this); + KAction* save = KStandardAction::save(this, SLOT(savePokemod::Pokemod()), this); + KAction* saveAs = KStandardAction::saveAs(this, SLOT(saveAsPokemod::Pokemod()), this); KAction* quit = KStandardAction::quit(this, SLOT(closeAllPokemods()), this); KAction* cut = KStandardAction::cut(this); KAction* copy = KStandardAction::copy(this); diff --git a/pokemodr/PokeModrUI.h b/pokemodr/PokemodrUI.h index 04029af3..5339b141 100644 --- a/pokemodr/PokeModrUI.h +++ b/pokemodr/PokemodrUI.h @@ -31,16 +31,21 @@ // Forward declarations class KRecentFilesAction; class KUrl; +namespace Pokemod +{ class Object; class Pokemod; +} -class PokeModrUI : public KMainWindow, private Ui::formPokeModr +namespace Pokemodr +{ +class PokemodrUI : public KMainWindow, private Ui::formPokemodr { Q_OBJECT public: - PokeModrUI(QWidget* parent = 0); - ~PokeModrUI(); + PokemodrUI(QWidget* parent = 0); + ~PokemodrUI(); protected slots: void update(); @@ -55,12 +60,12 @@ class PokeModrUI : public KMainWindow, private Ui::formPokeModr bool openPokemod(const KUrl& url); bool openPokemod(const QString& path, const bool isRemote = false); void savePokemod(); - void savePokemod(const Pokemod* pokemod); - bool savePokemod(const Pokemod* pokemod, const KUrl& url); + void savePokemod(const Pokemod::Pokemod* pokemod); + bool savePokemod(const Pokemod::Pokemod* pokemod, const KUrl& url); void saveAsPokemod(); - void saveAsPokemod(const Pokemod* pokemod); + void saveAsPokemod(const Pokemod::Pokemod* pokemod); void closePokemod(); - bool closePokemod(const Pokemod* pokemod, const bool force = false); + bool closePokemod(const Pokemod::Pokemod* pokemod, const bool force = false); bool closeAllPokemods(const bool force = false); void copyObject(); void pasteObject(); @@ -75,5 +80,6 @@ class PokeModrUI : public KMainWindow, private Ui::formPokeModr KRecentFilesAction* m_recent; QDomDocument m_clipboard; }; +} #endif diff --git a/pokemodr/RulesUI.cpp b/pokemodr/RulesUI.cpp index c41ec4fb..c453af43 100644 --- a/pokemodr/RulesUI.cpp +++ b/pokemodr/RulesUI.cpp @@ -21,207 +21,207 @@ // Pokemod includes #include "../pokemod/Rules.h" -RulesUI::RulesUI(Rules* rules, QWidget* parent) : +Pokemodr::RulesUI::RulesUI(Pokemod::Rules* rules, QWidget* parent) : ObjectUI(parent) { setupUi(this); - setObjects(rules, new Rules(*rules)); + setObjects(rules, new Pokemod::Rules(*rules)); } -RulesUI::~RulesUI() +Pokemodr::RulesUI::~RulesUI() { } -void RulesUI::initGui() +void Pokemodr::RulesUI::initGui() { - varMaxDV->addItems(Rules::DVStr); + varMaxDV->addItems(Pokemod::Rules::DVStr); } -void RulesUI::setGui() +void Pokemodr::RulesUI::setGui() { - boxGenders->setChecked(static_cast<Rules*>(modified())->genderAllowed() ? Qt::Checked : Qt::Unchecked); - varBreeding->setCheckState(static_cast<Rules*>(modified())->breedingAllowed() ? Qt::Checked : Qt::Unchecked); - varCriticalDomains->setChecked(static_cast<Rules*>(modified())->criticalDomains() ? Qt::Checked : Qt::Unchecked); - varHardCash->setChecked(static_cast<Rules*>(modified())->hardCash() ? Qt::Checked : Qt::Unchecked); - varSwitchStyle->setChecked(static_cast<Rules*>(modified())->allowSwitchStyle() ? Qt::Checked : Qt::Unchecked); - boxSplitSpecial->setChecked(static_cast<Rules*>(modified())->specialSplit() ? Qt::Checked : Qt::Unchecked); - varSplitSpecialDV->setCheckState(static_cast<Rules*>(modified())->specialDVSplit() ? Qt::Checked : Qt::Unchecked); - varMaxDV->setCurrentIndex(static_cast<Rules*>(modified())->maxDVValue()); - boxHappiness->setChecked(static_cast<Rules*>(modified())->happiness() ? Qt::Checked : Qt::Unchecked); - varFaintLoss->setValue(static_cast<Rules*>(modified())->happyFaintLoss()); - varLevelGain->setValue(static_cast<Rules*>(modified())->happyLevelGain()); - varNumSteps->setValue(static_cast<Rules*>(modified())->happySteps()); - boxEffortValues->setChecked(static_cast<Rules*>(modified())->effortValuesAllowed() ? Qt::Checked : Qt::Unchecked); - varMaxEV->setValue(static_cast<Rules*>(modified())->maxTotalEV()); - varMaxEVPerStat->setEnabled(0 < static_cast<Rules*>(modified())->maxTotalEV()); - varMaxEVPerStat->setMaximum(static_cast<Rules*>(modified())->maxTotalEV()); - varMaxEVPerStat->setValue(static_cast<Rules*>(modified())->maxEVPerStat()); - varPokerus->setValue(static_cast<Rules*>(modified())->pokerusChance()); - varBoxes->setValue(static_cast<Rules*>(modified())->numBoxes()); - varBoxSize->setEnabled(0 < static_cast<Rules*>(modified())->numBoxes()); - varBoxSize->setValue(static_cast<Rules*>(modified())->boxSize()); - varMaxParty->setValue(static_cast<Rules*>(modified())->maxParty()); - varMaxFight->setMaximum(static_cast<Rules*>(modified())->maxParty()); - varMaxFight->setValue(static_cast<Rules*>(modified())->maxFight()); - varMaxPlayers->setValue(static_cast<Rules*>(modified())->maxPlayers()); - varMaxMoves->setValue(static_cast<Rules*>(modified())->maxMoves()); - varMaxLevel->setValue(static_cast<Rules*>(modified())->maxLevel()); - varMaxHeldItems->setValue(static_cast<Rules*>(modified())->maxHeldItems()); - varMaxNatures->setValue(static_cast<Rules*>(modified())->maxNatures()); - varMaxAbilities->setValue(static_cast<Rules*>(modified())->maxAbilities()); - varMaxStages->setValue(static_cast<Rules*>(modified())->maxStages()); - varMaxMoney->setValue(static_cast<Rules*>(modified())->maxMoney()); + boxGenders->setChecked(static_cast<Pokemod::Rules*>(modified())->genderAllowed() ? Qt::Checked : Qt::Unchecked); + varBreeding->setCheckState(static_cast<Pokemod::Rules*>(modified())->breedingAllowed() ? Qt::Checked : Qt::Unchecked); + varCriticalDomains->setChecked(static_cast<Pokemod::Rules*>(modified())->criticalDomains() ? Qt::Checked : Qt::Unchecked); + varHardCash->setChecked(static_cast<Pokemod::Rules*>(modified())->hardCash() ? Qt::Checked : Qt::Unchecked); + varSwitchStyle->setChecked(static_cast<Pokemod::Rules*>(modified())->allowSwitchStyle() ? Qt::Checked : Qt::Unchecked); + boxSplitSpecial->setChecked(static_cast<Pokemod::Rules*>(modified())->specialSplit() ? Qt::Checked : Qt::Unchecked); + varSplitSpecialDV->setCheckState(static_cast<Pokemod::Rules*>(modified())->specialDVSplit() ? Qt::Checked : Qt::Unchecked); + varMaxDV->setCurrentIndex(static_cast<Pokemod::Rules*>(modified())->maxDVValue()); + boxHappiness->setChecked(static_cast<Pokemod::Rules*>(modified())->happiness() ? Qt::Checked : Qt::Unchecked); + varFaintLoss->setValue(static_cast<Pokemod::Rules*>(modified())->happyFaintLoss()); + varLevelGain->setValue(static_cast<Pokemod::Rules*>(modified())->happyLevelGain()); + varNumSteps->setValue(static_cast<Pokemod::Rules*>(modified())->happySteps()); + boxEffortValues->setChecked(static_cast<Pokemod::Rules*>(modified())->effortValuesAllowed() ? Qt::Checked : Qt::Unchecked); + varMaxEV->setValue(static_cast<Pokemod::Rules*>(modified())->maxTotalEV()); + varMaxEVPerStat->setEnabled(0 < static_cast<Pokemod::Rules*>(modified())->maxTotalEV()); + varMaxEVPerStat->setMaximum(static_cast<Pokemod::Rules*>(modified())->maxTotalEV()); + varMaxEVPerStat->setValue(static_cast<Pokemod::Rules*>(modified())->maxEVPerStat()); + varPokerus->setValue(static_cast<Pokemod::Rules*>(modified())->pokerusChance()); + varBoxes->setValue(static_cast<Pokemod::Rules*>(modified())->numBoxes()); + varBoxSize->setEnabled(0 < static_cast<Pokemod::Rules*>(modified())->numBoxes()); + varBoxSize->setValue(static_cast<Pokemod::Rules*>(modified())->boxSize()); + varMaxParty->setValue(static_cast<Pokemod::Rules*>(modified())->maxParty()); + varMaxFight->setMaximum(static_cast<Pokemod::Rules*>(modified())->maxParty()); + varMaxFight->setValue(static_cast<Pokemod::Rules*>(modified())->maxFight()); + varMaxPlayers->setValue(static_cast<Pokemod::Rules*>(modified())->maxPlayers()); + varMaxMoves->setValue(static_cast<Pokemod::Rules*>(modified())->maxMoves()); + varMaxLevel->setValue(static_cast<Pokemod::Rules*>(modified())->maxLevel()); + varMaxHeldItems->setValue(static_cast<Pokemod::Rules*>(modified())->maxHeldItems()); + varMaxNatures->setValue(static_cast<Pokemod::Rules*>(modified())->maxNatures()); + varMaxAbilities->setValue(static_cast<Pokemod::Rules*>(modified())->maxAbilities()); + varMaxStages->setValue(static_cast<Pokemod::Rules*>(modified())->maxStages()); + varMaxMoney->setValue(static_cast<Pokemod::Rules*>(modified())->maxMoney()); } -void RulesUI::apply() +void Pokemodr::RulesUI::apply() { - *static_cast<Rules*>(original()) = *static_cast<Rules*>(modified()); + *static_cast<Pokemod::Rules*>(original()) = *static_cast<Pokemod::Rules*>(modified()); emit(changed(false)); } -void RulesUI::discard() +void Pokemodr::RulesUI::discard() { - *static_cast<Rules*>(modified()) = *static_cast<Rules*>(original()); + *static_cast<Pokemod::Rules*>(modified()) = *static_cast<Pokemod::Rules*>(original()); setGui(); emit(changed(false)); } -void RulesUI::on_boxGenders_toggled(const bool genders) +void Pokemodr::RulesUI::on_boxGenders_toggled(const bool genders) { - static_cast<Rules*>(modified())->setGenderAllowed(genders); + static_cast<Pokemod::Rules*>(modified())->setGenderAllowed(genders); } -void RulesUI::on_varBreeding_toggled(const bool breeding) +void Pokemodr::RulesUI::on_varBreeding_toggled(const bool breeding) { - static_cast<Rules*>(modified())->setBreedingAllowed(breeding); + static_cast<Pokemod::Rules*>(modified())->setBreedingAllowed(breeding); } -void RulesUI::on_varCriticalDomains_toggled(const bool criticalDomains) +void Pokemodr::RulesUI::on_varCriticalDomains_toggled(const bool criticalDomains) { - static_cast<Rules*>(modified())->setCriticalDomains(criticalDomains); + static_cast<Pokemod::Rules*>(modified())->setCriticalDomains(criticalDomains); } -void RulesUI::on_varHardCash_toggled(const bool hardCash) +void Pokemodr::RulesUI::on_varHardCash_toggled(const bool hardCash) { - static_cast<Rules*>(modified())->setHardCash(hardCash); + static_cast<Pokemod::Rules*>(modified())->setHardCash(hardCash); } -void RulesUI::on_varSwitchStyle_toggled(const bool switchStyle) +void Pokemodr::RulesUI::on_varSwitchStyle_toggled(const bool switchStyle) { - static_cast<Rules*>(modified())->setAllowSwitchStyle(switchStyle); + static_cast<Pokemod::Rules*>(modified())->setAllowSwitchStyle(switchStyle); } -void RulesUI::on_boxSplitSpecial_toggled(const bool splitSpecial) +void Pokemodr::RulesUI::on_boxSplitSpecial_toggled(const bool splitSpecial) { - static_cast<Rules*>(modified())->setSpecialSplit(splitSpecial); + static_cast<Pokemod::Rules*>(modified())->setSpecialSplit(splitSpecial); } -void RulesUI::on_varSplitSpecialDV_toggled(const bool splitSpecialDV) +void Pokemodr::RulesUI::on_varSplitSpecialDV_toggled(const bool splitSpecialDV) { - static_cast<Rules*>(modified())->setSpecialDVSplit(splitSpecialDV); + static_cast<Pokemod::Rules*>(modified())->setSpecialDVSplit(splitSpecialDV); } -void RulesUI::on_varMaxDV_activated(const int maxDV) +void Pokemodr::RulesUI::on_varMaxDV_activated(const int maxDV) { - static_cast<Rules*>(modified())->setMaxDVValue(maxDV); + static_cast<Pokemod::Rules*>(modified())->setMaxDVValue(maxDV); } -void RulesUI::on_boxHappiness_toggled(const bool happiness) +void Pokemodr::RulesUI::on_boxHappiness_toggled(const bool happiness) { - static_cast<Rules*>(modified())->setHappiness(happiness); + static_cast<Pokemod::Rules*>(modified())->setHappiness(happiness); } -void RulesUI::on_varFaintLoss_valueChanged(const int faintLoss) +void Pokemodr::RulesUI::on_varFaintLoss_valueChanged(const int faintLoss) { - static_cast<Rules*>(modified())->setHappyFaintLoss(faintLoss); + static_cast<Pokemod::Rules*>(modified())->setHappyFaintLoss(faintLoss); } -void RulesUI::on_varLevelGain_valueChanged(const int levelGain) +void Pokemodr::RulesUI::on_varLevelGain_valueChanged(const int levelGain) { - static_cast<Rules*>(modified())->setHappyLevelGain(levelGain); + static_cast<Pokemod::Rules*>(modified())->setHappyLevelGain(levelGain); } -void RulesUI::on_varNumSteps_valueChanged(const int numSteps) +void Pokemodr::RulesUI::on_varNumSteps_valueChanged(const int numSteps) { - static_cast<Rules*>(modified())->setHappySteps(numSteps); + static_cast<Pokemod::Rules*>(modified())->setHappySteps(numSteps); } -void RulesUI::on_boxEffortValues_toggled(const bool effortValues) +void Pokemodr::RulesUI::on_boxEffortValues_toggled(const bool effortValues) { - static_cast<Rules*>(modified())->setEffortValuesAllowed(effortValues); + static_cast<Pokemod::Rules*>(modified())->setEffortValuesAllowed(effortValues); } -void RulesUI::on_varMaxEV_valueChanged(const int maxEV) +void Pokemodr::RulesUI::on_varMaxEV_valueChanged(const int maxEV) { - static_cast<Rules*>(modified())->setMaxTotalEV(maxEV); + static_cast<Pokemod::Rules*>(modified())->setMaxTotalEV(maxEV); } -void RulesUI::on_varMaxEVPerStat_valueChanged(const int maxEVPerStat) +void Pokemodr::RulesUI::on_varMaxEVPerStat_valueChanged(const int maxEVPerStat) { - static_cast<Rules*>(modified())->setMaxEVPerStat(maxEVPerStat); + static_cast<Pokemod::Rules*>(modified())->setMaxEVPerStat(maxEVPerStat); } -void RulesUI::on_varPokerus_valueChanged(const Fraction& pokerusChance) +void Pokemodr::RulesUI::on_varPokerus_valueChanged(const Pokemod::Fraction& pokerusChance) { - static_cast<Rules*>(modified())->setPokerusChance(pokerusChance); + static_cast<Pokemod::Rules*>(modified())->setPokerusChance(pokerusChance); } -void RulesUI::on_varBoxes_valueChanged(const int boxes) +void Pokemodr::RulesUI::on_varBoxes_valueChanged(const int boxes) { - static_cast<Rules*>(modified())->setNumBoxes(boxes); + static_cast<Pokemod::Rules*>(modified())->setNumBoxes(boxes); } -void RulesUI::on_varBoxSize_valueChanged(const int boxSize) +void Pokemodr::RulesUI::on_varBoxSize_valueChanged(const int boxSize) { - static_cast<Rules*>(modified())->setBoxSize(boxSize); + static_cast<Pokemod::Rules*>(modified())->setBoxSize(boxSize); } -void RulesUI::on_varMaxParty_valueChanged(const int maxParty) +void Pokemodr::RulesUI::on_varMaxParty_valueChanged(const int maxParty) { - static_cast<Rules*>(modified())->setMaxParty(maxParty); + static_cast<Pokemod::Rules*>(modified())->setMaxParty(maxParty); } -void RulesUI::on_varMaxFight_valueChanged(const int maxFight) +void Pokemodr::RulesUI::on_varMaxFight_valueChanged(const int maxFight) { - static_cast<Rules*>(modified())->setMaxFight(maxFight); + static_cast<Pokemod::Rules*>(modified())->setMaxFight(maxFight); } -void RulesUI::on_varMaxPlayers_valueChanged(const int maxPlayers) +void Pokemodr::RulesUI::on_varMaxPlayers_valueChanged(const int maxPlayers) { - static_cast<Rules*>(modified())->setMaxPlayers(maxPlayers); + static_cast<Pokemod::Rules*>(modified())->setMaxPlayers(maxPlayers); } -void RulesUI::on_varMaxMoves_valueChanged(const int maxMoves) +void Pokemodr::RulesUI::on_varMaxMoves_valueChanged(const int maxMoves) { - static_cast<Rules*>(modified())->setMaxMoves(maxMoves); + static_cast<Pokemod::Rules*>(modified())->setMaxMoves(maxMoves); } -void RulesUI::on_varMaxLevel_valueChanged(const int maxLevel) +void Pokemodr::RulesUI::on_varMaxLevel_valueChanged(const int maxLevel) { - static_cast<Rules*>(modified())->setMaxLevel(maxLevel); + static_cast<Pokemod::Rules*>(modified())->setMaxLevel(maxLevel); } -void RulesUI::on_varMaxHeldItems_valueChanged(const int maxHeldItems) +void Pokemodr::RulesUI::on_varMaxHeldItems_valueChanged(const int maxHeldItems) { - static_cast<Rules*>(modified())->setMaxHeldItems(maxHeldItems); + static_cast<Pokemod::Rules*>(modified())->setMaxHeldItems(maxHeldItems); } -void RulesUI::on_varMaxNatures_valueChanged(const int maxNatures) +void Pokemodr::RulesUI::on_varMaxNatures_valueChanged(const int maxNatures) { - static_cast<Rules*>(modified())->setMaxNatures(maxNatures); + static_cast<Pokemod::Rules*>(modified())->setMaxNatures(maxNatures); } -void RulesUI::on_varMaxAbilities_valueChanged(const int maxAbilities) +void Pokemodr::RulesUI::on_varMaxAbilities_valueChanged(const int maxAbilities) { - static_cast<Rules*>(modified())->setMaxAbilities(maxAbilities); + static_cast<Pokemod::Rules*>(modified())->setMaxAbilities(maxAbilities); } -void RulesUI::on_varMaxStages_valueChanged(const int maxStages) +void Pokemodr::RulesUI::on_varMaxStages_valueChanged(const int maxStages) { - static_cast<Rules*>(modified())->setMaxStages(maxStages); + static_cast<Pokemod::Rules*>(modified())->setMaxStages(maxStages); } -void RulesUI::on_varMaxMoney_valueChanged(const int maxMoney) +void Pokemodr::RulesUI::on_varMaxMoney_valueChanged(const int maxMoney) { - static_cast<Rules*>(modified())->setMaxMoney(maxMoney); + static_cast<Pokemod::Rules*>(modified())->setMaxMoney(maxMoney); } diff --git a/pokemodr/RulesUI.h b/pokemodr/RulesUI.h index c108c908..8f3b6c2c 100644 --- a/pokemodr/RulesUI.h +++ b/pokemodr/RulesUI.h @@ -18,21 +18,26 @@ #ifndef __POKEMODR_RULESUI__ #define __POKEMODR_RULESUI__ -// PokeModr includes +// Pokemodr includes #include "ObjectUI.h" // Form include #include "ui_rules.h" // Forward declarations +namespace Pokemod +{ class Rules; +} +namespace Pokemodr +{ class RulesUI : public ObjectUI, private Ui::formRules { Q_OBJECT public: - RulesUI(Rules* rules, QWidget* parent); + RulesUI(Pokemod::Rules* rules, QWidget* parent); ~RulesUI(); public slots: void apply(); @@ -53,7 +58,7 @@ class RulesUI : public ObjectUI, private Ui::formRules void on_boxEffortValues_toggled(const bool effortValues); void on_varMaxEV_valueChanged(const int maxEV); void on_varMaxEVPerStat_valueChanged(const int maxEVPerStat); - void on_varPokerus_valueChanged(const Fraction& pokerusChance); + void on_varPokerus_valueChanged(const Pokemod::Fraction& pokerusChance); void on_varBoxes_valueChanged(const int boxes); void on_varBoxSize_valueChanged(const int boxSize); void on_varMaxParty_valueChanged(const int maxParty); @@ -70,5 +75,6 @@ class RulesUI : public ObjectUI, private Ui::formRules void initGui(); void setGui(); }; +} #endif diff --git a/pokemodr/ScriptWidget.cpp b/pokemodr/ScriptWidget.cpp index cdde5c83..23307d93 100644 --- a/pokemodr/ScriptWidget.cpp +++ b/pokemodr/ScriptWidget.cpp @@ -18,22 +18,21 @@ // Header include #include "ScriptWidget.h" -ScriptWidget::ScriptWidget(QWidget* parent, const Script& value) : +Pokemodr::ScriptWidget::ScriptWidget(QWidget* parent, const Pokemod::Script& value) : QWidget(parent), m_value(value) { setupUi(this); - varInterpreter->addItem("python"); - varInterpreter->addItem("ruby"); - varInterpreter->addItem("kjs"); + QStringList languages = QStringList() << "python" << "ruby" << "kjs"; + varInterpreter->addItems(languages); } -Script ScriptWidget::value() const +Pokemod::Script Pokemodr::ScriptWidget::value() const { return m_value; } -void ScriptWidget::setValue(const Script& value) +void Pokemodr::ScriptWidget::setValue(const Pokemod::Script& value) { if (m_value == value) return; @@ -45,13 +44,13 @@ void ScriptWidget::setValue(const Script& value) emit(valueChanged(m_value)); } -void ScriptWidget::on_varInterpreter_activated(const QString& interpreter) +void Pokemodr::ScriptWidget::on_varInterpreter_activated(const QString& interpreter) { m_value.setInterpreter(interpreter); emit(valueChanged(m_value)); } -void ScriptWidget::on_varScript_textChanged() +void Pokemodr::ScriptWidget::on_varScript_textChanged() { m_value.setScript(varScript->toPlainText()); emit(valueChanged(m_value)); diff --git a/pokemodr/ScriptWidget.h b/pokemodr/ScriptWidget.h index f881a32d..3d23d97a 100644 --- a/pokemodr/ScriptWidget.h +++ b/pokemodr/ScriptWidget.h @@ -27,23 +27,26 @@ // Form include #include "ui_script.h" +namespace Pokemodr +{ class ScriptWidget : public QWidget, private Ui::formScript { Q_OBJECT public: - ScriptWidget(QWidget* parent, const Script& value = Script("", "")); + ScriptWidget(QWidget* parent, const Pokemod::Script& value = Pokemod::Script("", "")); - Script value() const; + Pokemod::Script value() const; signals: - void valueChanged(const Script&); + void valueChanged(const Pokemod::Script&); public slots: - void setValue(const Script& value); + void setValue(const Pokemod::Script& value); protected slots: void on_varInterpreter_activated(const QString& interpreter); void on_varScript_textChanged(); private: - Script m_value; + Pokemod::Script m_value; }; +} #endif diff --git a/pokemodr/SoundUI.cpp b/pokemodr/SoundUI.cpp index e5f49e8d..96ba12e0 100644 --- a/pokemodr/SoundUI.cpp +++ b/pokemodr/SoundUI.cpp @@ -31,20 +31,20 @@ #include <KFileDialog> #include <Phonon/MediaObject> -SoundUI::SoundUI(Sound* sound, QWidget* parent) : +Pokemodr::SoundUI::SoundUI(Pokemod::Sound* sound, QWidget* parent) : ObjectUI(parent), m_media(new Phonon::MediaObject) { setupUi(this); - setObjects(sound, new Sound(*sound)); + setObjects(sound, new Pokemod::Sound(*sound)); } -SoundUI::~SoundUI() +Pokemodr::SoundUI::~SoundUI() { delete m_media; } -void SoundUI::initGui() +void Pokemodr::SoundUI::initGui() { seeker->setMediaObject(m_media); connect(m_media, SIGNAL(finished()), buttonStop, SIGNAL(clicked())); @@ -53,41 +53,41 @@ void SoundUI::initGui() buttonBrowse->setIcon(KIcon("document-open")); } -void SoundUI::refreshGui() +void Pokemodr::SoundUI::refreshGui() { on_buttonStop_clicked(); QBuffer* buffer = new QBuffer; - buffer->setData(static_cast<Sound*>(modified())->data()); + buffer->setData(static_cast<Pokemod::Sound*>(modified())->data()); m_media->setCurrentSource(Phonon::MediaSource(buffer)); delete buffer; } -void SoundUI::setGui() +void Pokemodr::SoundUI::setGui() { - varName->setText(static_cast<Sound*>(modified())->name()); + varName->setText(static_cast<Pokemod::Sound*>(modified())->name()); } -void SoundUI::apply() +void Pokemodr::SoundUI::apply() { - *static_cast<Sound*>(original()) = *static_cast<Sound*>(modified()); + *static_cast<Pokemod::Sound*>(original()) = *static_cast<Pokemod::Sound*>(modified()); emit(changed(false)); } -void SoundUI::discard() +void Pokemodr::SoundUI::discard() { - *static_cast<Sound*>(modified()) = *static_cast<Sound*>(original()); + *static_cast<Pokemod::Sound*>(modified()) = *static_cast<Pokemod::Sound*>(original()); setGui(); emit(changed(false)); } -void SoundUI::on_varName_textChanged(const QString& name) +void Pokemodr::SoundUI::on_varName_textChanged(const QString& name) { const int cursor = varName->cursorPosition(); - static_cast<Sound*>(modified())->setName(name); + static_cast<Pokemod::Sound*>(modified())->setName(name); varName->setCursorPosition(cursor); } -void SoundUI::on_buttonPlayPause_clicked() +void Pokemodr::SoundUI::on_buttonPlayPause_clicked() { if (m_media->state() == Phonon::PlayingState) { @@ -109,18 +109,18 @@ void SoundUI::on_buttonPlayPause_clicked() } } -void SoundUI::on_buttonStop_clicked() +void Pokemodr::SoundUI::on_buttonStop_clicked() { buttonPlayPause->setIcon(KIcon("media-playback-start")); m_media->stop(); } -void SoundUI::on_buttonBrowse_clicked() +void Pokemodr::SoundUI::on_buttonBrowse_clicked() { QFile file(KFileDialog::getOpenFileName(KUrl("kfiledialog:///audio"), "*.ogg|OGG files", this)); if (file.open(QIODevice::ReadOnly)) { - static_cast<Sound*>(modified())->setData(file.readAll()); + static_cast<Pokemod::Sound*>(modified())->setData(file.readAll()); file.close(); refreshGui(); } diff --git a/pokemodr/SoundUI.h b/pokemodr/SoundUI.h index 153e0c04..380475cf 100644 --- a/pokemodr/SoundUI.h +++ b/pokemodr/SoundUI.h @@ -18,25 +18,30 @@ #ifndef __POKEMODR_SOUNDUI__ #define __POKEMODR_SOUNFUI__ -// PokeModr includes +// Pokemodr includes #include "ObjectUI.h" // Form include #include "ui_sound.h" // Forward declarations +namespace Pokemod +{ class Sound; +} namespace Phonon { class MediaObject; } +namespace Pokemodr +{ class SoundUI : public ObjectUI, private Ui::formSound { Q_OBJECT public: - SoundUI(Sound* sound, QWidget* parent); + SoundUI(Pokemod::Sound* sound, QWidget* parent); ~SoundUI(); public slots: void apply(); @@ -53,5 +58,6 @@ class SoundUI : public ObjectUI, private Ui::formSound private: Phonon::MediaObject* m_media; }; +} #endif diff --git a/pokemodr/SpeciesAbilityUI.cpp b/pokemodr/SpeciesAbilityUI.cpp index 1b938d23..1144c0fa 100644 --- a/pokemodr/SpeciesAbilityUI.cpp +++ b/pokemodr/SpeciesAbilityUI.cpp @@ -23,52 +23,52 @@ #include "../pokemod/Pokemod.h" #include "../pokemod/SpeciesAbility.h" -SpeciesAbilityUI::SpeciesAbilityUI(SpeciesAbility* ability, QWidget* parent) : +Pokemodr::SpeciesAbilityUI::SpeciesAbilityUI(Pokemod::SpeciesAbility* ability, QWidget* parent) : ObjectUI(parent) { setupUi(this); - setObjects(ability, new SpeciesAbility(*ability)); + setObjects(ability, new Pokemod::SpeciesAbility(*ability)); } -SpeciesAbilityUI::~SpeciesAbilityUI() +Pokemodr::SpeciesAbilityUI::~SpeciesAbilityUI() { } -void SpeciesAbilityUI::refreshGui() +void Pokemodr::SpeciesAbilityUI::refreshGui() { varAbility->clear(); for (int i = 0; i < pokemod()->abilityCount(); ++i) { - const Ability* ability = pokemod()->ability(i); + const Pokemod::Ability* ability = pokemod()->ability(i); varAbility->addItem(ability->name(), ability->id()); } } -void SpeciesAbilityUI::setGui() +void Pokemodr::SpeciesAbilityUI::setGui() { - varAbility->setCurrentIndex(varAbility->findData(static_cast<SpeciesAbility*>(modified())->ability())); - varWeight->setValue(static_cast<SpeciesAbility*>(modified())->weight()); + varAbility->setCurrentIndex(varAbility->findData(static_cast<Pokemod::SpeciesAbility*>(modified())->ability())); + varWeight->setValue(static_cast<Pokemod::SpeciesAbility*>(modified())->weight()); } -void SpeciesAbilityUI::apply() +void Pokemodr::SpeciesAbilityUI::apply() { - *static_cast<SpeciesAbility*>(original()) = *static_cast<SpeciesAbility*>(modified()); + *static_cast<Pokemod::SpeciesAbility*>(original()) = *static_cast<Pokemod::SpeciesAbility*>(modified()); emit(changed(false)); } -void SpeciesAbilityUI::discard() +void Pokemodr::SpeciesAbilityUI::discard() { - *static_cast<SpeciesAbility*>(modified()) = *static_cast<SpeciesAbility*>(original()); + *static_cast<Pokemod::SpeciesAbility*>(modified()) = *static_cast<Pokemod::SpeciesAbility*>(original()); setGui(); emit(changed(false)); } -void SpeciesAbilityUI::on_varAbility_activated(const int ability) +void Pokemodr::SpeciesAbilityUI::on_varAbility_activated(const int ability) { - static_cast<SpeciesAbility*>(modified())->setAbility(varAbility->itemData(ability).toInt()); + static_cast<Pokemod::SpeciesAbility*>(modified())->setAbility(varAbility->itemData(ability).toInt()); } -void SpeciesAbilityUI::on_varWeight_valueChanged(const int weight) +void Pokemodr::SpeciesAbilityUI::on_varWeight_valueChanged(const int weight) { - static_cast<SpeciesAbility*>(modified())->setWeight(weight); + static_cast<Pokemod::SpeciesAbility*>(modified())->setWeight(weight); } diff --git a/pokemodr/SpeciesAbilityUI.h b/pokemodr/SpeciesAbilityUI.h index 925dbb20..3d81759e 100644 --- a/pokemodr/SpeciesAbilityUI.h +++ b/pokemodr/SpeciesAbilityUI.h @@ -18,21 +18,26 @@ #ifndef __POKEMODR_SPECIESABILITYUI__ #define __POKEMODR_SPECIESABILITYUI__ -// PokeModr includes +// Pokemodr includes #include "ObjectUI.h" // Form include #include "ui_speciesability.h" // Forward declarations +namespace Pokemod +{ class SpeciesAbility; +} +namespace Pokemodr +{ class SpeciesAbilityUI : public ObjectUI, private Ui::formSpeciesAbility { Q_OBJECT public: - SpeciesAbilityUI(SpeciesAbility* ability, QWidget* parent); + SpeciesAbilityUI(Pokemod::SpeciesAbility* ability, QWidget* parent); ~SpeciesAbilityUI(); public slots: void apply(); @@ -44,5 +49,6 @@ class SpeciesAbilityUI : public ObjectUI, private Ui::formSpeciesAbility void refreshGui(); void setGui(); }; +} #endif diff --git a/pokemodr/SpeciesItemUI.cpp b/pokemodr/SpeciesItemUI.cpp index decdec39..cead16d2 100644 --- a/pokemodr/SpeciesItemUI.cpp +++ b/pokemodr/SpeciesItemUI.cpp @@ -23,52 +23,52 @@ #include "../pokemod/Pokemod.h" #include "../pokemod/SpeciesItem.h" -SpeciesItemUI::SpeciesItemUI(SpeciesItem* item, QWidget* parent) : +Pokemodr::SpeciesItemUI::SpeciesItemUI(Pokemod::SpeciesItem* item, QWidget* parent) : ObjectUI(parent) { setupUi(this); - setObjects(item, new SpeciesItem(*item)); + setObjects(item, new Pokemod::SpeciesItem(*item)); } -SpeciesItemUI::~SpeciesItemUI() +Pokemodr::SpeciesItemUI::~SpeciesItemUI() { } -void SpeciesItemUI::refreshGui() +void Pokemodr::SpeciesItemUI::refreshGui() { varItem->clear(); for (int i = 0; i < pokemod()->itemCount(); ++i) { - const Item* item = pokemod()->item(i); + const Pokemod::Item* item = pokemod()->item(i); varItem->addItem(item->name(), item->id()); } } -void SpeciesItemUI::setGui() +void Pokemodr::SpeciesItemUI::setGui() { - varItem->setCurrentIndex(varItem->findData(static_cast<SpeciesItem*>(modified())->item())); - varWeight->setValue(static_cast<SpeciesItem*>(modified())->weight()); + varItem->setCurrentIndex(varItem->findData(static_cast<Pokemod::SpeciesItem*>(modified())->item())); + varWeight->setValue(static_cast<Pokemod::SpeciesItem*>(modified())->weight()); } -void SpeciesItemUI::apply() +void Pokemodr::SpeciesItemUI::apply() { - *static_cast<SpeciesItem*>(original()) = *static_cast<SpeciesItem*>(modified()); + *static_cast<Pokemod::SpeciesItem*>(original()) = *static_cast<Pokemod::SpeciesItem*>(modified()); emit(changed(false)); } -void SpeciesItemUI::discard() +void Pokemodr::SpeciesItemUI::discard() { - *static_cast<SpeciesItem*>(modified()) = *static_cast<SpeciesItem*>(original()); + *static_cast<Pokemod::SpeciesItem*>(modified()) = *static_cast<Pokemod::SpeciesItem*>(original()); setGui(); emit(changed(false)); } -void SpeciesItemUI::on_varItem_activated(const int item) +void Pokemodr::SpeciesItemUI::on_varItem_activated(const int item) { - static_cast<SpeciesItem*>(modified())->setItem(varItem->itemData(item).toInt()); + static_cast<Pokemod::SpeciesItem*>(modified())->setItem(varItem->itemData(item).toInt()); } -void SpeciesItemUI::on_varWeight_valueChanged(const int weight) +void Pokemodr::SpeciesItemUI::on_varWeight_valueChanged(const int weight) { - static_cast<SpeciesItem*>(modified())->setWeight(weight); + static_cast<Pokemod::SpeciesItem*>(modified())->setWeight(weight); } diff --git a/pokemodr/SpeciesItemUI.h b/pokemodr/SpeciesItemUI.h index f860511f..101dffef 100644 --- a/pokemodr/SpeciesItemUI.h +++ b/pokemodr/SpeciesItemUI.h @@ -18,21 +18,26 @@ #ifndef __POKEMODR_SPECIESITEMUI__ #define __POKEMODR_SPECIESITEMUI__ -// PokeModr includes +// Pokemodr includes #include "ObjectUI.h" // Form include #include "ui_speciesitem.h" // Forward declarations +namespace Pokemod +{ class SpeciesItem; +} +namespace Pokemodr +{ class SpeciesItemUI : public ObjectUI, private Ui::formSpeciesItem { Q_OBJECT public: - SpeciesItemUI(SpeciesItem* item, QWidget* parent); + SpeciesItemUI(Pokemod::SpeciesItem* item, QWidget* parent); ~SpeciesItemUI(); public slots: void apply(); @@ -44,5 +49,6 @@ class SpeciesItemUI : public ObjectUI, private Ui::formSpeciesItem void refreshGui(); void setGui(); }; +} #endif diff --git a/pokemodr/SpeciesMoveUI.cpp b/pokemodr/SpeciesMoveUI.cpp index baf4ab31..b323cc27 100644 --- a/pokemodr/SpeciesMoveUI.cpp +++ b/pokemodr/SpeciesMoveUI.cpp @@ -24,60 +24,60 @@ #include "../pokemod/Rules.h" #include "../pokemod/SpeciesMove.h" -SpeciesMoveUI::SpeciesMoveUI(SpeciesMove* move, QWidget* parent) : +Pokemodr::SpeciesMoveUI::SpeciesMoveUI(Pokemod::SpeciesMove* move, QWidget* parent) : ObjectUI(parent) { setupUi(this); - setObjects(move, new SpeciesMove(*move)); + setObjects(move, new Pokemod::SpeciesMove(*move)); } -SpeciesMoveUI::~SpeciesMoveUI() +Pokemodr::SpeciesMoveUI::~SpeciesMoveUI() { } -void SpeciesMoveUI::refreshGui() +void Pokemodr::SpeciesMoveUI::refreshGui() { varMove->clear(); for (int i = 0; i < pokemod()->moveCount(); ++i) { - const Move* move = pokemod()->move(i); + const Pokemod::Move* move = pokemod()->move(i); varMove->addItem(move->name(), move->id()); } varLevel->setMaximum(pokemod()->rules()->maxLevel()); varWildLevel->setMaximum(pokemod()->rules()->maxLevel()); } -void SpeciesMoveUI::setGui() +void Pokemodr::SpeciesMoveUI::setGui() { - varMove->setCurrentIndex(varMove->findData(static_cast<SpeciesMove*>(modified())->move())); - varLevel->setValue(static_cast<SpeciesMove*>(modified())->level()); - varWildLevel->setValue(static_cast<SpeciesMove*>(modified())->wild()); + varMove->setCurrentIndex(varMove->findData(static_cast<Pokemod::SpeciesMove*>(modified())->move())); + varLevel->setValue(static_cast<Pokemod::SpeciesMove*>(modified())->level()); + varWildLevel->setValue(static_cast<Pokemod::SpeciesMove*>(modified())->wild()); } -void SpeciesMoveUI::apply() +void Pokemodr::SpeciesMoveUI::apply() { - *static_cast<SpeciesMove*>(original()) = *static_cast<SpeciesMove*>(modified()); + *static_cast<Pokemod::SpeciesMove*>(original()) = *static_cast<Pokemod::SpeciesMove*>(modified()); emit(changed(false)); } -void SpeciesMoveUI::discard() +void Pokemodr::SpeciesMoveUI::discard() { - *static_cast<SpeciesMove*>(modified()) = *static_cast<SpeciesMove*>(original()); + *static_cast<Pokemod::SpeciesMove*>(modified()) = *static_cast<Pokemod::SpeciesMove*>(original()); setGui(); emit(changed(false)); } -void SpeciesMoveUI::on_varMove_activated(const int move) +void Pokemodr::SpeciesMoveUI::on_varMove_activated(const int move) { - static_cast<SpeciesMove*>(modified())->setMove(varMove->itemData(move).toInt()); + static_cast<Pokemod::SpeciesMove*>(modified())->setMove(varMove->itemData(move).toInt()); } -void SpeciesMoveUI::on_varLevel_valueChanged(const int level) +void Pokemodr::SpeciesMoveUI::on_varLevel_valueChanged(const int level) { - static_cast<SpeciesMove*>(modified())->setLevel(level); + static_cast<Pokemod::SpeciesMove*>(modified())->setLevel(level); } -void SpeciesMoveUI::on_varWildLevel_valueChanged(const int wildLevel) +void Pokemodr::SpeciesMoveUI::on_varWildLevel_valueChanged(const int wildLevel) { - static_cast<SpeciesMove*>(modified())->setWild(wildLevel); + static_cast<Pokemod::SpeciesMove*>(modified())->setWild(wildLevel); } diff --git a/pokemodr/SpeciesMoveUI.h b/pokemodr/SpeciesMoveUI.h index f4576343..ca68873c 100644 --- a/pokemodr/SpeciesMoveUI.h +++ b/pokemodr/SpeciesMoveUI.h @@ -18,21 +18,26 @@ #ifndef __POKEMODR_SPECIESMOVEUI__ #define __POKEMODR_SPECIESMOVEUI__ -// PokeModr includes +// Pokemodr includes #include "ObjectUI.h" // Form include #include "ui_speciesmove.h" // Forward declarations +namespace Pokemod +{ class SpeciesMove; +} +namespace Pokemodr +{ class SpeciesMoveUI : public ObjectUI, private Ui::formSpeciesMove { Q_OBJECT public: - SpeciesMoveUI(SpeciesMove* move, QWidget* parent); + SpeciesMoveUI(Pokemod::SpeciesMove* move, QWidget* parent); ~SpeciesMoveUI(); public slots: void apply(); @@ -45,5 +50,6 @@ class SpeciesMoveUI : public ObjectUI, private Ui::formSpeciesMove void refreshGui(); void setGui(); }; +} #endif diff --git a/pokemodr/SpeciesUI.cpp b/pokemodr/SpeciesUI.cpp index 8b849452..5908ae97 100644 --- a/pokemodr/SpeciesUI.cpp +++ b/pokemodr/SpeciesUI.cpp @@ -18,7 +18,7 @@ // Header include #include "SpeciesUI.h" -// PokeModr includes +// Pokemodr includes #include "FileDialog.h" // Pokemod includes @@ -28,25 +28,25 @@ #include "../pokemod/Species.h" #include "../pokemod/Type.h" -SpeciesUI::SpeciesUI(Species* species, QWidget* parent) : +Pokemodr::SpeciesUI::SpeciesUI(Pokemod::Species* species, QWidget* parent) : ObjectUI(parent) { setupUi(this); - setObjects(species, new Species(*species)); + setObjects(species, new Pokemod::Species(*species)); } -SpeciesUI::~SpeciesUI() +Pokemodr::SpeciesUI::~SpeciesUI() { } -void SpeciesUI::initGui() +void Pokemodr::SpeciesUI::initGui() { connect(varBaseStat, SIGNAL(activated(const int)), this, SLOT(setGui())); connect(varEVStat, SIGNAL(activated(const int)), this, SLOT(setGui())); - varGrowth->addItems(Species::StyleStr); + varGrowth->addItems(Pokemod::Species::StyleStr); } -void SpeciesUI::refreshGui() +void Pokemodr::SpeciesUI::refreshGui() { varBaseStat->clear(); varEVStat->clear(); @@ -66,12 +66,12 @@ void SpeciesUI::refreshGui() { for (int i = 0; i < pokemod()->speciesCount(); ++i) { - const Species* species = pokemod()->species(i); + const Pokemod::Species* species = pokemod()->species(i); varEggSpecies->addItem(species->name(), species->id()); } for (int i = 0; i < pokemod()->eggGroupCount(); ++i) { - const EggGroup* eggGroup = pokemod()->eggGroup(i); + const Pokemod::EggGroup* eggGroup = pokemod()->eggGroup(i); QListWidgetItem* widgetItem = new QListWidgetItem(eggGroup->name(), varEggGroups); widgetItem->setData(Qt::UserRole, eggGroup->id()); } @@ -92,218 +92,224 @@ void SpeciesUI::refreshGui() varTypes->clear(); for (int i = 0; i < pokemod()->typeCount(); ++i) { - const Type* type = pokemod()->type(i); + const Pokemod::Type* type = pokemod()->type(i); QListWidgetItem* widgetItem = new QListWidgetItem(type->name(), varTypes); widgetItem->setData(Qt::UserRole, type->id()); } } -void SpeciesUI::setGui() -{ - varName->setText(static_cast<Species*>(modified())->name()); - varBaseStatValue->setValue(static_cast<Species*>(modified())->baseStat(varBaseStat->currentIndex())); - varEffortValue->setValue(static_cast<Species*>(modified())->effortValue(varBaseStat->currentIndex())); - varGrowth->setCurrentIndex(static_cast<Species*>(modified())->growth()); - varExperienceValue->setValue(static_cast<Species*>(modified())->experienceValue()); - varCatchValue->setValue(static_cast<Species*>(modified())->catchValue()); - varRunChance->setValue(static_cast<Species*>(modified())->runChance()); - varItemChance->setValue(static_cast<Species*>(modified())->itemChance()); - varPokedexNumber->setValue(static_cast<Species*>(modified())->pokedexNumber()); - varWeight->setValue(static_cast<Species*>(modified())->weight()); - varHeightFeet->setValue(static_cast<Species*>(modified())->heightFeet()); - varHeightInches->setValue(static_cast<Species*>(modified())->heightInches()); - varPokedexEntry->setText(static_cast<Species*>(modified())->pokedexEntry()); - varMaleFront->setIcon(static_cast<Species*>(modified())->frontMaleSprite()); - varMaleBack->setIcon(static_cast<Species*>(modified())->backMaleSprite()); +void Pokemodr::SpeciesUI::setGui() +{ + varName->setText(static_cast<Pokemod::Species*>(modified())->name()); + varBaseStatValue->setValue(static_cast<Pokemod::Species*>(modified())->baseStat(varBaseStat->currentIndex())); + varEffortValue->setValue(static_cast<Pokemod::Species*>(modified())->effortValue(varBaseStat->currentIndex())); + varGrowth->setCurrentIndex(static_cast<Pokemod::Species*>(modified())->growth()); + varExperienceValue->setValue(static_cast<Pokemod::Species*>(modified())->experienceValue()); + varCatchValue->setValue(static_cast<Pokemod::Species*>(modified())->catchValue()); + varRunChance->setValue(static_cast<Pokemod::Species*>(modified())->runChance()); + varItemChance->setValue(static_cast<Pokemod::Species*>(modified())->itemChance()); + varPokedexNumber->setValue(static_cast<Pokemod::Species*>(modified())->pokedexNumber()); + varWeight->setValue(static_cast<Pokemod::Species*>(modified())->weight()); + varHeightFeet->setValue(static_cast<Pokemod::Species*>(modified())->heightFeet()); + varHeightInches->setValue(static_cast<Pokemod::Species*>(modified())->heightInches()); + varPokedexEntry->setText(static_cast<Pokemod::Species*>(modified())->pokedexEntry()); + varMaleFront->setIcon(static_cast<Pokemod::Species*>(modified())->frontMaleSprite()); + varMaleBack->setIcon(static_cast<Pokemod::Species*>(modified())->backMaleSprite()); if (pokemod()->rules()->genderAllowed()) { - varFemaleFront->setIcon(static_cast<Species*>(modified())->frontFemaleSprite()); - varFemaleBack->setIcon(static_cast<Species*>(modified())->backFemaleSprite()); + varFemaleFront->setIcon(static_cast<Pokemod::Species*>(modified())->frontFemaleSprite()); + varFemaleBack->setIcon(static_cast<Pokemod::Species*>(modified())->backFemaleSprite()); } - varList->setIcon(static_cast<Species*>(modified())->listSprite()); - boxGenderChance->setChecked((static_cast<Species*>(modified())->genderFactor().denominator() < static_cast<Species*>(modified())->genderFactor().numerator()) ? Qt::Checked : Qt::Unchecked); - varGenderChance->setValue(static_cast<Species*>(modified())->genderFactor()); - varEggSpecies->setCurrentIndex(varEggSpecies->findData(static_cast<Species*>(modified())->eggSpecies())); - varEggSteps->setValue(static_cast<Species*>(modified())->eggSteps()); - varNidoranGroup->setValue(static_cast<Species*>(modified())->nidoranGroup()); + varList->setIcon(static_cast<Pokemod::Species*>(modified())->listSprite()); + boxGenderChance->setChecked((static_cast<Pokemod::Species*>(modified())->genderFactor().denominator() < static_cast<Pokemod::Species*>(modified())->genderFactor().numerator()) ? Qt::Checked : Qt::Unchecked); + varGenderChance->setValue(static_cast<Pokemod::Species*>(modified())->genderFactor()); + varEggSpecies->setCurrentIndex(varEggSpecies->findData(static_cast<Pokemod::Species*>(modified())->eggSpecies())); + varEggSteps->setValue(static_cast<Pokemod::Species*>(modified())->eggSteps()); + varEvolution->setValue(static_cast<Pokemod::Species*>(modified())->evolution()); + varNidoranGroup->setValue(static_cast<Pokemod::Species*>(modified())->nidoranGroup()); for (int i = 0; i < varTypes->count(); ++i) { QListWidgetItem* widgetItem = varTypes->item(i); - widgetItem->setSelected(static_cast<Species*>(modified())->type(widgetItem->data(Qt::UserRole).toInt())); + widgetItem->setSelected(static_cast<Pokemod::Species*>(modified())->type(widgetItem->data(Qt::UserRole).toInt())); } for (int i = 0; i < varEggGroups->count(); ++i) { QListWidgetItem* widgetItem = varEggGroups->item(i); - widgetItem->setSelected(static_cast<Species*>(modified())->eggGroup(widgetItem->data(Qt::UserRole).toInt())); + widgetItem->setSelected(static_cast<Pokemod::Species*>(modified())->eggGroup(widgetItem->data(Qt::UserRole).toInt())); } } -void SpeciesUI::apply() +void Pokemodr::SpeciesUI::apply() { - *static_cast<Species*>(original()) = *static_cast<Species*>(modified()); + *static_cast<Pokemod::Species*>(original()) = *static_cast<Pokemod::Species*>(modified()); emit(changed(false)); } -void SpeciesUI::discard() +void Pokemodr::SpeciesUI::discard() { - *static_cast<Species*>(modified()) = *static_cast<Species*>(original()); + *static_cast<Pokemod::Species*>(modified()) = *static_cast<Pokemod::Species*>(original()); setGui(); emit(changed(false)); } -void SpeciesUI::on_varName_textChanged(const QString& name) +void Pokemodr::SpeciesUI::on_varName_textChanged(const QString& name) { const int cursor = varName->cursorPosition(); - static_cast<Species*>(modified())->setName(name); + static_cast<Pokemod::Species*>(modified())->setName(name); varName->setCursorPosition(cursor); } -void SpeciesUI::on_varBaseStatValue_valueChanged(const int baseStat) +void Pokemodr::SpeciesUI::on_varBaseStatValue_valueChanged(const int baseStat) { - static_cast<Species*>(modified())->setBaseStat(varBaseStat->currentIndex(), baseStat); + static_cast<Pokemod::Species*>(modified())->setBaseStat(varBaseStat->currentIndex(), baseStat); } -void SpeciesUI::on_varEffortValue_valueChanged(const int effortValue) +void Pokemodr::SpeciesUI::on_varEffortValue_valueChanged(const int effortValue) { - static_cast<Species*>(modified())->setEffortValue(varEVStat->currentIndex(), effortValue); + static_cast<Pokemod::Species*>(modified())->setEffortValue(varEVStat->currentIndex(), effortValue); } -void SpeciesUI::on_varGrowth_activated(const int growth) +void Pokemodr::SpeciesUI::on_varGrowth_activated(const int growth) { - static_cast<Species*>(modified())->setGrowth(growth); + static_cast<Pokemod::Species*>(modified())->setGrowth(growth); } -void SpeciesUI::on_varExperienceValue_valueChanged(const int experienceValue) +void Pokemodr::SpeciesUI::on_varExperienceValue_valueChanged(const int experienceValue) { - static_cast<Species*>(modified())->setExperienceValue(experienceValue); + static_cast<Pokemod::Species*>(modified())->setExperienceValue(experienceValue); } -void SpeciesUI::on_varCatchValue_valueChanged(const int catchValue) +void Pokemodr::SpeciesUI::on_varCatchValue_valueChanged(const int catchValue) { - static_cast<Species*>(modified())->setCatchValue(catchValue); + static_cast<Pokemod::Species*>(modified())->setCatchValue(catchValue); } -void SpeciesUI::on_varRunChance_valueChanged(const Fraction& runChance) +void Pokemodr::SpeciesUI::on_varRunChance_valueChanged(const Pokemod::Fraction& runChance) { - static_cast<Species*>(modified())->setRunChance(runChance); + static_cast<Pokemod::Species*>(modified())->setRunChance(runChance); } -void SpeciesUI::on_varItemChance_valueChanged(const Fraction& itemChance) +void Pokemodr::SpeciesUI::on_varItemChance_valueChanged(const Pokemod::Fraction& itemChance) { - static_cast<Species*>(modified())->setItemChance(itemChance); + static_cast<Pokemod::Species*>(modified())->setItemChance(itemChance); } -void SpeciesUI::on_varPokedexNumber_valueChanged(const int pokedexNumber) +void Pokemodr::SpeciesUI::on_varPokedexNumber_valueChanged(const int pokedexNumber) { - static_cast<Species*>(modified())->setPokedexNumber(pokedexNumber); + static_cast<Pokemod::Species*>(modified())->setPokedexNumber(pokedexNumber); } -void SpeciesUI::on_varWeight_valueChanged(const int weight) +void Pokemodr::SpeciesUI::on_varWeight_valueChanged(const int weight) { - static_cast<Species*>(modified())->setWeight(weight); + static_cast<Pokemod::Species*>(modified())->setWeight(weight); } -void SpeciesUI::on_varHeightFeet_valueChanged(const int feet) +void Pokemodr::SpeciesUI::on_varHeightFeet_valueChanged(const int feet) { - static_cast<Species*>(modified())->setHeightFeet(feet); + static_cast<Pokemod::Species*>(modified())->setHeightFeet(feet); } -void SpeciesUI::on_varHeightInches_valueChanged(const int inches) +void Pokemodr::SpeciesUI::on_varHeightInches_valueChanged(const int inches) { - static_cast<Species*>(modified())->setHeightInches(inches); + static_cast<Pokemod::Species*>(modified())->setHeightInches(inches); } -void SpeciesUI::on_varPokedexEntry_textChanged(const QString& pokedexEntry) +void Pokemodr::SpeciesUI::on_varPokedexEntry_textChanged(const QString& pokedexEntry) { - static_cast<Species*>(modified())->setPokedexEntry(pokedexEntry); + static_cast<Pokemod::Species*>(modified())->setPokedexEntry(pokedexEntry); } -void SpeciesUI::on_varMaleFront_pressed() +void Pokemodr::SpeciesUI::on_varMaleFront_pressed() { FileDialog* dialog = new FileDialog(QSize(64, 64)); if (dialog->exec() == QDialog::Accepted) { - static_cast<Species*>(modified())->setFrontMaleSprite(QPixmap(dialog->selectedFile())); + static_cast<Pokemod::Species*>(modified())->setFrontMaleSprite(QPixmap(dialog->selectedFile())); setGui(); } delete dialog; } -void SpeciesUI::on_varMaleBack_pressed() +void Pokemodr::SpeciesUI::on_varMaleBack_pressed() { FileDialog* dialog = new FileDialog(QSize(64, 64)); if (dialog->exec() == QDialog::Accepted) { - static_cast<Species*>(modified())->setBackMaleSprite(QPixmap(dialog->selectedFile())); + static_cast<Pokemod::Species*>(modified())->setBackMaleSprite(QPixmap(dialog->selectedFile())); setGui(); } delete dialog; } -void SpeciesUI::on_varFemaleFront_pressed() +void Pokemodr::SpeciesUI::on_varFemaleFront_pressed() { FileDialog* dialog = new FileDialog(QSize(64, 64)); if (dialog->exec() == QDialog::Accepted) { - static_cast<Species*>(modified())->setFrontFemaleSprite(QPixmap(dialog->selectedFile())); + static_cast<Pokemod::Species*>(modified())->setFrontFemaleSprite(QPixmap(dialog->selectedFile())); setGui(); } delete dialog; } -void SpeciesUI::on_varFemaleBack_pressed() +void Pokemodr::SpeciesUI::on_varFemaleBack_pressed() { FileDialog* dialog = new FileDialog(QSize(64, 64)); if (dialog->exec() == QDialog::Accepted) { - static_cast<Species*>(modified())->setBackFemaleSprite(QPixmap(dialog->selectedFile())); + static_cast<Pokemod::Species*>(modified())->setBackFemaleSprite(QPixmap(dialog->selectedFile())); setGui(); } delete dialog; } -void SpeciesUI::on_varList_pressed() +void Pokemodr::SpeciesUI::on_varList_pressed() { FileDialog* dialog = new FileDialog(QSize(128, 64)); if (dialog->exec() == QDialog::Accepted) { - static_cast<Species*>(modified())->setListSprite(QPixmap(dialog->selectedFile())); + static_cast<Pokemod::Species*>(modified())->setListSprite(QPixmap(dialog->selectedFile())); setGui(); } delete dialog; } -void SpeciesUI::on_boxGenderChance_clicked(const bool genderChance) +void Pokemodr::SpeciesUI::on_boxGenderChance_clicked(const bool genderChance) { - static_cast<Species*>(modified())->setGenderFactor(Fraction((genderChance ? 1 : 2), 1)); + static_cast<Pokemod::Species*>(modified())->setGenderFactor(Pokemod::Fraction((genderChance ? 1 : 2), 1)); } -void SpeciesUI::on_varGenderChance_valueChanged(const Fraction& genderChance) +void Pokemodr::SpeciesUI::on_varGenderChance_valueChanged(const Pokemod::Fraction& genderChance) { - static_cast<Species*>(modified())->setGenderFactor(genderChance); + static_cast<Pokemod::Species*>(modified())->setGenderFactor(genderChance); } -void SpeciesUI::on_varEggSpecies_activated(const int eggSpecies) +void Pokemodr::SpeciesUI::on_varEggSpecies_activated(const int eggSpecies) { - static_cast<Species*>(modified())->setEggSpecies(varEggSpecies->itemData(eggSpecies).toInt()); + static_cast<Pokemod::Species*>(modified())->setEggSpecies(varEggSpecies->itemData(eggSpecies).toInt()); } -void SpeciesUI::on_varEggSteps_valueChanged(const int eggSteps) +void Pokemodr::SpeciesUI::on_varEggSteps_valueChanged(const int eggSteps) { - static_cast<Species*>(modified())->setEggSteps(eggSteps); + static_cast<Pokemod::Species*>(modified())->setEggSteps(eggSteps); } -void SpeciesUI::on_varNidoranGroup_valueChanged(const int nidoranGroup) +void Pokemodr::SpeciesUI::on_varEvolution_valueChanged(const Pokemod::Script& evolution) { - static_cast<Species*>(modified())->setNidoranGroup(nidoranGroup); + static_cast<Pokemod::Species*>(modified())->setEvolution(evolution); } -void SpeciesUI::on_varTypes_itemClicked(QListWidgetItem* item) +void Pokemodr::SpeciesUI::on_varNidoranGroup_valueChanged(const int nidoranGroup) { - static_cast<Species*>(modified())->setType(item->data(Qt::UserRole).toInt(), item->isSelected()); + static_cast<Pokemod::Species*>(modified())->setNidoranGroup(nidoranGroup); } -void SpeciesUI::on_varEggGroups_itemClicked(QListWidgetItem* item) +void Pokemodr::SpeciesUI::on_varTypes_itemClicked(QListWidgetItem* item) { - static_cast<Species*>(modified())->setEggGroup(item->data(Qt::UserRole).toInt(), !item->isSelected()); + static_cast<Pokemod::Species*>(modified())->setType(item->data(Qt::UserRole).toInt(), item->isSelected()); +} + +void Pokemodr::SpeciesUI::on_varEggGroups_itemClicked(QListWidgetItem* item) +{ + static_cast<Pokemod::Species*>(modified())->setEggGroup(item->data(Qt::UserRole).toInt(), !item->isSelected()); } diff --git a/pokemodr/SpeciesUI.h b/pokemodr/SpeciesUI.h index 650d6944..77546b3e 100644 --- a/pokemodr/SpeciesUI.h +++ b/pokemodr/SpeciesUI.h @@ -18,21 +18,26 @@ #ifndef __POKEMODR_SPECIESUI__ #define __POKEMODR_SPECIESUI__ -// PokeModr includes +// Pokemodr includes #include "ObjectUI.h" // Form include #include "ui_species.h" // Forward declarations +namespace Pokemod +{ class Species; +} +namespace Pokemodr +{ class SpeciesUI : public ObjectUI, private Ui::formSpecies { Q_OBJECT public: - SpeciesUI(Species* species, QWidget* parent); + SpeciesUI(Pokemod::Species* species, QWidget* parent); ~SpeciesUI(); public slots: void apply(); @@ -44,8 +49,8 @@ class SpeciesUI : public ObjectUI, private Ui::formSpecies void on_varGrowth_activated(const int growth); void on_varExperienceValue_valueChanged(const int experienceValue); void on_varCatchValue_valueChanged(const int catchValue); - void on_varRunChance_valueChanged(const Fraction& runChance); - void on_varItemChance_valueChanged(const Fraction& itemChance); + void on_varRunChance_valueChanged(const Pokemod::Fraction& runChance); + void on_varItemChance_valueChanged(const Pokemod::Fraction& itemChance); void on_varPokedexNumber_valueChanged(const int pokedexNumber); void on_varWeight_valueChanged(const int weight); void on_varHeightFeet_valueChanged(const int feet); @@ -57,9 +62,10 @@ class SpeciesUI : public ObjectUI, private Ui::formSpecies void on_varFemaleBack_pressed(); void on_varList_pressed(); void on_boxGenderChance_clicked(const bool genderUsed); - void on_varGenderChance_valueChanged(const Fraction& genderChance); + void on_varGenderChance_valueChanged(const Pokemod::Fraction& genderChance); void on_varEggSpecies_activated(const int eggSpecies); void on_varEggSteps_valueChanged(const int eggSteps); + void on_varEvolution_valueChanged(const Pokemod::Script& evolution); void on_varNidoranGroup_valueChanged(const int nidoranGroup); void on_varTypes_itemClicked(QListWidgetItem* item); void on_varEggGroups_itemClicked(QListWidgetItem* item); @@ -68,5 +74,6 @@ class SpeciesUI : public ObjectUI, private Ui::formSpecies void refreshGui(); void setGui(); }; +} #endif diff --git a/pokemodr/SpriteUI.cpp b/pokemodr/SpriteUI.cpp index 5175a80f..53f9a652 100644 --- a/pokemodr/SpriteUI.cpp +++ b/pokemodr/SpriteUI.cpp @@ -26,51 +26,51 @@ #include <KFileDialog> #include <KImageFilePreview> -SpriteUI::SpriteUI(Sprite* sprite, QWidget* parent) : +Pokemodr::SpriteUI::SpriteUI(Pokemod::Sprite* sprite, QWidget* parent) : ObjectUI(parent) { setupUi(this); - setObjects(sprite, new Sprite(*sprite)); + setObjects(sprite, new Pokemod::Sprite(*sprite)); } -SpriteUI::~SpriteUI() +Pokemodr::SpriteUI::~SpriteUI() { } -void SpriteUI::setGui() +void Pokemodr::SpriteUI::setGui() { - varName->setText(static_cast<Sprite*>(modified())->name()); - varSprite->setIcon(static_cast<Sprite*>(modified())->sprite()); + varName->setText(static_cast<Pokemod::Sprite*>(modified())->name()); + varSprite->setIcon(static_cast<Pokemod::Sprite*>(modified())->sprite()); } -void SpriteUI::apply() +void Pokemodr::SpriteUI::apply() { - *static_cast<Sprite*>(original()) = *static_cast<Sprite*>(modified()); + *static_cast<Pokemod::Sprite*>(original()) = *static_cast<Pokemod::Sprite*>(modified()); emit(changed(false)); } -void SpriteUI::discard() +void Pokemodr::SpriteUI::discard() { - *static_cast<Sprite*>(modified()) = *static_cast<Sprite*>(original()); + *static_cast<Pokemod::Sprite*>(modified()) = *static_cast<Pokemod::Sprite*>(original()); setGui(); emit(changed(false)); } -void SpriteUI::on_varName_textChanged(const QString& name) +void Pokemodr::SpriteUI::on_varName_textChanged(const QString& name) { const int cursor = varName->cursorPosition(); - static_cast<Sprite*>(modified())->setName(name); + static_cast<Pokemod::Sprite*>(modified())->setName(name); varName->setCursorPosition(cursor); } -void SpriteUI::on_varSprite_pressed() +void Pokemodr::SpriteUI::on_varSprite_pressed() { KFileDialog* dialog = new KFileDialog(KUrl("kfiledialog:///image"), "*.jpg *.jpeg *.png|Image files", NULL); dialog->setOperationMode(KFileDialog::Opening); dialog->setPreviewWidget(new KImageFilePreview); if (dialog->exec() == QDialog::Accepted) { - static_cast<Sprite*>(modified())->setSprite(QPixmap(dialog->selectedFile())); + static_cast<Pokemod::Sprite*>(modified())->setSprite(QPixmap(dialog->selectedFile())); setGui(); } delete dialog; diff --git a/pokemodr/SpriteUI.h b/pokemodr/SpriteUI.h index 8dda7ce0..d7498de1 100644 --- a/pokemodr/SpriteUI.h +++ b/pokemodr/SpriteUI.h @@ -18,21 +18,26 @@ #ifndef __POKEMODR_SPRITEUI__ #define __POKEMODR_SPRITEUI__ -// PokeModr includes +// Pokemodr includes #include "ObjectUI.h" // Form include #include "ui_sprite.h" // Forward declarations +namespace Pokemod +{ class Sprite; +} +namespace Pokemodr +{ class SpriteUI : public ObjectUI, private Ui::formSprite { Q_OBJECT public: - SpriteUI(Sprite* sprite, QWidget* parent); + SpriteUI(Pokemod::Sprite* sprite, QWidget* parent); ~SpriteUI(); public slots: void apply(); @@ -43,5 +48,6 @@ class SpriteUI : public ObjectUI, private Ui::formSprite private slots: void setGui(); }; +} #endif diff --git a/pokemodr/StatusUI.cpp b/pokemodr/StatusUI.cpp index 2806c294..e3dcd405 100644 --- a/pokemodr/StatusUI.cpp +++ b/pokemodr/StatusUI.cpp @@ -21,44 +21,44 @@ // Pokemod includes #include "../pokemod/Status.h" -StatusUI::StatusUI(Status* status, QWidget* parent) : +Pokemodr::StatusUI::StatusUI(Pokemod::Status* status, QWidget* parent) : ObjectUI(parent) { setupUi(this); - setObjects(status, new Status(*status)); + setObjects(status, new Pokemod::Status(*status)); } -StatusUI::~StatusUI() +Pokemodr::StatusUI::~StatusUI() { } -void StatusUI::setGui() +void Pokemodr::StatusUI::setGui() { - varName->setText(static_cast<Status*>(modified())->name()); - varScript->setValue(static_cast<Status*>(modified())->script()); + varName->setText(static_cast<Pokemod::Status*>(modified())->name()); + varScript->setValue(static_cast<Pokemod::Status*>(modified())->script()); } -void StatusUI::apply() +void Pokemodr::StatusUI::apply() { - *static_cast<Status*>(original()) = *static_cast<Status*>(modified()); + *static_cast<Pokemod::Status*>(original()) = *static_cast<Pokemod::Status*>(modified()); emit(changed(false)); } -void StatusUI::discard() +void Pokemodr::StatusUI::discard() { - *static_cast<Status*>(modified()) = *static_cast<Status*>(original()); + *static_cast<Pokemod::Status*>(modified()) = *static_cast<Pokemod::Status*>(original()); setGui(); emit(changed(false)); } -void StatusUI::on_varName_textChanged(const QString& name) +void Pokemodr::StatusUI::on_varName_textChanged(const QString& name) { const int cursor = varName->cursorPosition(); - static_cast<Status*>(modified())->setName(name); + static_cast<Pokemod::Status*>(modified())->setName(name); varName->setCursorPosition(cursor); } -void StatusUI::on_varScript_valueChanged(const Script& script) +void Pokemodr::StatusUI::on_varScript_valueChanged(const Pokemod::Script& script) { - static_cast<Status*>(modified())->setScript(script); + static_cast<Pokemod::Status*>(modified())->setScript(script); } diff --git a/pokemodr/StatusUI.h b/pokemodr/StatusUI.h index dac6aaf9..632ca056 100644 --- a/pokemodr/StatusUI.h +++ b/pokemodr/StatusUI.h @@ -18,30 +18,36 @@ #ifndef __POKEMODR_STATUSUI__ #define __POKEMODR_STATUSUI__ -// PokeModr includes +// Pokemodr includes #include "ObjectUI.h" // Form include #include "ui_status.h" // Forward declarations +namespace Pokemod +{ class Status; +} +namespace Pokemodr +{ class StatusUI : public ObjectUI, private Ui::formStatus { Q_OBJECT public: - StatusUI(Status* status, QWidget* parent); + StatusUI(Pokemod::Status* status, QWidget* parent); ~StatusUI(); public slots: void apply(); void discard(); protected slots: void on_varName_textChanged(const QString& name); - void on_varScript_valueChanged(const Script& script); + void on_varScript_valueChanged(const Pokemod::Script& script); private slots: void setGui(); }; +} #endif diff --git a/pokemodr/StoreUI.cpp b/pokemodr/StoreUI.cpp index 8c7e4a25..7baad40f 100644 --- a/pokemodr/StoreUI.cpp +++ b/pokemodr/StoreUI.cpp @@ -23,59 +23,59 @@ #include "../pokemod/Pokemod.h" #include "../pokemod/Store.h" -StoreUI::StoreUI(Store* store, QWidget* parent) : +Pokemodr::StoreUI::StoreUI(Pokemod::Store* store, QWidget* parent) : ObjectUI(parent) { setupUi(this); - setObjects(store, new Store(*store)); + setObjects(store, new Pokemod::Store(*store)); } -StoreUI::~StoreUI() +Pokemodr::StoreUI::~StoreUI() { } -void StoreUI::refreshGui() +void Pokemodr::StoreUI::refreshGui() { varItems->clear(); for (int i = 0; i < pokemod()->itemCount(); ++i) { - const Item* item = pokemod()->item(i); + const Pokemod::Item* item = pokemod()->item(i); QListWidgetItem* widgetItem = new QListWidgetItem(item->name(), varItems); widgetItem->setData(Qt::UserRole, item->id()); } } -void StoreUI::setGui() +void Pokemodr::StoreUI::setGui() { - varName->setText(static_cast<Store*>(modified())->name()); + varName->setText(static_cast<Pokemod::Store*>(modified())->name()); for (int i = 0; i < varItems->count(); ++i) { QListWidgetItem* widgetItem = varItems->item(i); - widgetItem->setSelected(static_cast<Store*>(modified())->item(widgetItem->data(Qt::UserRole).toInt())); + widgetItem->setSelected(static_cast<Pokemod::Store*>(modified())->item(widgetItem->data(Qt::UserRole).toInt())); } } -void StoreUI::apply() +void Pokemodr::StoreUI::apply() { - *static_cast<Store*>(original()) = *static_cast<Store*>(modified()); + *static_cast<Pokemod::Store*>(original()) = *static_cast<Pokemod::Store*>(modified()); emit(changed(false)); } -void StoreUI::discard() +void Pokemodr::StoreUI::discard() { - *static_cast<Store*>(modified()) = *static_cast<Store*>(original()); + *static_cast<Pokemod::Store*>(modified()) = *static_cast<Pokemod::Store*>(original()); setGui(); emit(changed(false)); } -void StoreUI::on_varName_textChanged(const QString& name) +void Pokemodr::StoreUI::on_varName_textChanged(const QString& name) { const int cursor = varName->cursorPosition(); - static_cast<Store*>(modified())->setName(name); + static_cast<Pokemod::Store*>(modified())->setName(name); varName->setCursorPosition(cursor); } -void StoreUI::on_varItems_itemClicked(QListWidgetItem* item) +void Pokemodr::StoreUI::on_varItems_itemClicked(QListWidgetItem* item) { - static_cast<Store*>(modified())->setItem(item->data(Qt::UserRole).toInt(), item->isSelected()); + static_cast<Pokemod::Store*>(modified())->setItem(item->data(Qt::UserRole).toInt(), item->isSelected()); } diff --git a/pokemodr/StoreUI.h b/pokemodr/StoreUI.h index ea58e755..9e75dbb7 100644 --- a/pokemodr/StoreUI.h +++ b/pokemodr/StoreUI.h @@ -18,21 +18,26 @@ #ifndef __POKEMODR_STOREUI__ #define __POKEMODR_STOREUI__ -// PokeModr includes +// Pokemodr includes #include "ObjectUI.h" // Form include #include "ui_store.h" // Forward declarations +namespace Pokemod +{ class Store; +} +namespace Pokemodr +{ class StoreUI : public ObjectUI, private Ui::formStore { Q_OBJECT public: - StoreUI(Store* store, QWidget* parent); + StoreUI(Pokemod::Store* store, QWidget* parent); ~StoreUI(); public slots: void apply(); @@ -44,5 +49,6 @@ class StoreUI : public ObjectUI, private Ui::formStore void refreshGui(); void setGui(); }; +} #endif diff --git a/pokemodr/TileUI.cpp b/pokemodr/TileUI.cpp index 827d3433..a4870ead 100644 --- a/pokemodr/TileUI.cpp +++ b/pokemodr/TileUI.cpp @@ -18,75 +18,75 @@ // Header include #include "TileUI.h" -// PokeModr includes +// Pokemodr includes #include "FileDialog.h" // Pokemod includes #include "../pokemod/Tile.h" #include "../pokemod/Pokemod.h" -TileUI::TileUI(Tile* tile, QWidget* parent) : +Pokemodr::TileUI::TileUI(Pokemod::Tile* tile, QWidget* parent) : ObjectUI(parent) { setupUi(this); - setObjects(tile, new Tile(*tile)); + setObjects(tile, new Pokemod::Tile(*tile)); } -TileUI::~TileUI() +Pokemodr::TileUI::~TileUI() { } -void TileUI::initGui() +void Pokemodr::TileUI::initGui() { varAccessibility->addItems(Pokemod::DirectionStr.mid(0, Pokemod::D_End)); } -void TileUI::setGui() +void Pokemodr::TileUI::setGui() { - varName->setText(static_cast<Tile*>(modified())->name()); - varSprite->setIcon(static_cast<Tile*>(modified())->sprite()); + varName->setText(static_cast<Pokemod::Tile*>(modified())->name()); + varSprite->setIcon(static_cast<Pokemod::Tile*>(modified())->sprite()); for (int i = 0; i < varAccessibility->count(); ++i) - varAccessibility->item(i)->setSelected(static_cast<Tile*>(modified())->from(i)); - varScript->setValue(static_cast<Tile*>(modified())->script()); + varAccessibility->item(i)->setSelected(static_cast<Pokemod::Tile*>(modified())->from(i)); + varScript->setValue(static_cast<Pokemod::Tile*>(modified())->script()); } -void TileUI::apply() +void Pokemodr::TileUI::apply() { - *static_cast<Tile*>(original()) = *static_cast<Tile*>(modified()); + *static_cast<Pokemod::Tile*>(original()) = *static_cast<Pokemod::Tile*>(modified()); emit(changed(false)); } -void TileUI::discard() +void Pokemodr::TileUI::discard() { - *static_cast<Tile*>(modified()) = *static_cast<Tile*>(original()); + *static_cast<Pokemod::Tile*>(modified()) = *static_cast<Pokemod::Tile*>(original()); setGui(); emit(changed(false)); } -void TileUI::on_varName_textChanged(const QString& name) +void Pokemodr::TileUI::on_varName_textChanged(const QString& name) { const int cursor = varName->cursorPosition(); - static_cast<Tile*>(modified())->setName(name); + static_cast<Pokemod::Tile*>(modified())->setName(name); varName->setCursorPosition(cursor); } -void TileUI::on_varSprite_pressed() +void Pokemodr::TileUI::on_varSprite_pressed() { FileDialog* dialog = new FileDialog(QSize(64, 64)); if (dialog->exec() == QDialog::Accepted) { - static_cast<Tile*>(modified())->setSprite(QPixmap(dialog->selectedFile())); + static_cast<Pokemod::Tile*>(modified())->setSprite(QPixmap(dialog->selectedFile())); setGui(); } delete dialog; } -void TileUI::on_varAccessibility_itemClicked(QListWidgetItem* item) +void Pokemodr::TileUI::on_varAccessibility_itemClicked(QListWidgetItem* item) { - static_cast<Tile*>(modified())->setFrom(item->data(Qt::UserRole).toInt(), item->isSelected()); + static_cast<Pokemod::Tile*>(modified())->setFrom(item->data(Qt::UserRole).toInt(), item->isSelected()); } -void TileUI::on_varScript_valueChanged(const Script& script) +void Pokemodr::TileUI::on_varScript_valueChanged(const Pokemod::Script& script) { - static_cast<Tile*>(modified())->setScript(script); + static_cast<Pokemod::Tile*>(modified())->setScript(script); } diff --git a/pokemodr/TileUI.h b/pokemodr/TileUI.h index 176fd019..a73b0555 100644 --- a/pokemodr/TileUI.h +++ b/pokemodr/TileUI.h @@ -18,21 +18,26 @@ #ifndef __POKEMODR_TILEUI__ #define __POKEMODR_TILEUI__ -// PokeModr includes +// Pokemodr includes #include "ObjectUI.h" // Form include #include "ui_tile.h" // Forward declarations +namespace Pokemod +{ class Tile; +} +namespace Pokemodr +{ class TileUI : public ObjectUI, private Ui::formTile { Q_OBJECT public: - TileUI(Tile* tile, QWidget* parent); + TileUI(Pokemod::Tile* tile, QWidget* parent); ~TileUI(); public slots: void apply(); @@ -41,10 +46,11 @@ class TileUI : public ObjectUI, private Ui::formTile void on_varName_textChanged(const QString& name); void on_varSprite_pressed(); void on_varAccessibility_itemClicked(QListWidgetItem* item); - void on_varScript_valueChanged(const Script& script); + void on_varScript_valueChanged(const Pokemod::Script& script); private slots: void initGui(); void setGui(); }; +} #endif diff --git a/pokemodr/TilemapModel.h b/pokemodr/TilemapModel.h index 19403a6a..2e6a21c0 100644 --- a/pokemodr/TilemapModel.h +++ b/pokemodr/TilemapModel.h @@ -27,111 +27,135 @@ #include <QAbstractTableModel> #include <QVariant> +namespace Pokemodr +{ class TilemapModel : public QAbstractTableModel { Q_OBJECT public: - TilemapModel(Matrix<int>* tilemap, const Pokemod* pokemod) : - QAbstractTableModel(), - m_tilemap(*tilemap), - m_pokemod(pokemod) - { - } - - QVariant data(const QModelIndex& index, int role) const - { - if (!index.isValid()) - return QVariant(); - if (role == Qt::DisplayRole) - { - const int tileIndex = m_pokemod->tileIndex(m_tilemap(index.row(), index.column())); - if (tileIndex != INT_MAX) - return m_pokemod->tile(tileIndex)->sprite(); - } - else if (role == Qt::EditRole) - return m_tilemap.at(index.row(), index.column()); - return QVariant(); - } + TilemapModel(Pokemod::Matrix<int>* tilemap, const Pokemod::Pokemod* pokemod); - QVariant headerData(int section, Qt::Orientation /*orientation*/, int role = Qt::DisplayRole) const - { - if (role == Qt::DisplayRole) - return section; - return QVariant(); - } + QVariant data(const QModelIndex& index, int role) const; - int rowCount(const QModelIndex& /*parent*/) const - { - return m_tilemap.height(); - } + QVariant headerData(int section, Qt::Orientation /*orientation*/, int role = Qt::DisplayRole) const; - int columnCount(const QModelIndex& /*parent*/) const - { - return m_tilemap.width(); - } + int rowCount(const QModelIndex& /*parent*/) const; + int columnCount(const QModelIndex& /*parent*/) const; - bool insertRows(int row, int count, const QModelIndex& parent = QModelIndex()) - { - emit(beginInsertRows(parent, row, row + count - 1)); - for (int i = 0; i < count; ++i) - m_tilemap.insertRow(row); - emit(endInsertRows()); - if (m_tilemap.height() == 1) - reset(); - return true; - } - bool insertColumns(int column, int count, const QModelIndex& parent = QModelIndex()) - { - emit(beginInsertColumns(parent, column, column + count - 1)); - for (int i = 0; i < count; ++i) - m_tilemap.insertColumn(column); - emit(endInsertColumns()); - if (m_tilemap.width() == 1) - reset(); - return true; - } - bool removeRows(int row, int count, const QModelIndex& parent = QModelIndex()) - { - emit(beginRemoveRows(parent, row, row + count - 1)); - for (int i = 0; i < count; ++i) - m_tilemap.deleteRow(row); - emit(endRemoveRows()); - if (!m_tilemap.height()) - reset(); - return true; - } - bool removeColumns(int column, int count, const QModelIndex& parent = QModelIndex()) - { - emit(beginRemoveColumns(parent, column, column + count - 1)); - for (int i = 0; i < count; ++i) - m_tilemap.deleteColumn(column); - emit(endRemoveColumns()); - if (!m_tilemap.width()) - reset(); - return true; - } + bool insertRows(int row, int count, const QModelIndex& parent = QModelIndex()); + bool insertColumns(int column, int count, const QModelIndex& parent = QModelIndex()); + bool removeRows(int row, int count, const QModelIndex& parent = QModelIndex()); + bool removeColumns(int column, int count, const QModelIndex& parent = QModelIndex()); - Qt::ItemFlags flags(const QModelIndex& index) const - { - if (!index.isValid()) - return 0; - return Qt::ItemIsEnabled | Qt::ItemIsSelectable; - } + Qt::ItemFlags flags(const QModelIndex& index) const; - bool setData(const QModelIndex& index, const QVariant& value, int role) - { - if (!index.isValid()) - return false; - if (role == Qt::EditRole) - { - m_tilemap(index.row(), index.column()) = value.toInt(); - emit(dataChanged(index, index)); - } - } + bool setData(const QModelIndex& index, const QVariant& value, int role); private: - Matrix<int>& m_tilemap; - const Pokemod* m_pokemod; + Pokemod::Matrix<int>& m_tilemap; + const Pokemod::Pokemod* m_pokemod; }; +inline TilemapModel::TilemapModel(Pokemod::Matrix<int>* tilemap, const Pokemod::Pokemod* pokemod) : + QAbstractTableModel(), + m_tilemap(*tilemap), + m_pokemod(pokemod) +{ +} + +inline QVariant TilemapModel::data(const QModelIndex& index, int role) const +{ + if (!index.isValid()) + return QVariant(); + if (role == Qt::DisplayRole) + { + const int tileIndex = m_pokemod->tileIndex(m_tilemap(index.row(), index.column())); + if (tileIndex != INT_MAX) + return m_pokemod->tile(tileIndex)->sprite(); + } + else if (role == Qt::EditRole) + return m_tilemap.at(index.row(), index.column()); + return QVariant(); +} + +inline QVariant TilemapModel::headerData(int section, Qt::Orientation /*orientation*/, int role) const +{ + if (role == Qt::DisplayRole) + return section; + return QVariant(); +} + +inline int TilemapModel::rowCount(const QModelIndex& /*parent*/) const +{ + return m_tilemap.height(); +} + +inline int TilemapModel::columnCount(const QModelIndex& /*parent*/) const +{ + return m_tilemap.width(); +} + +inline bool TilemapModel::insertRows(int row, int count, const QModelIndex& parent) +{ + emit(beginInsertRows(parent, row, row + count - 1)); + for (int i = 0; i < count; ++i) + m_tilemap.insertRow(row); + emit(endInsertRows()); + if (m_tilemap.height() == 1) + reset(); + return true; +} + +inline bool TilemapModel::insertColumns(int column, int count, const QModelIndex& parent) +{ + emit(beginInsertColumns(parent, column, column + count - 1)); + for (int i = 0; i < count; ++i) + m_tilemap.insertColumn(column); + emit(endInsertColumns()); + if (m_tilemap.width() == 1) + reset(); + return true; +} + +inline bool TilemapModel::removeRows(int row, int count, const QModelIndex& parent) +{ + emit(beginRemoveRows(parent, row, row + count - 1)); + for (int i = 0; i < count; ++i) + m_tilemap.deleteRow(row); + emit(endRemoveRows()); + if (!m_tilemap.height()) + reset(); + return true; +} + +inline bool TilemapModel::removeColumns(int column, int count, const QModelIndex& parent) +{ + emit(beginRemoveColumns(parent, column, column + count - 1)); + for (int i = 0; i < count; ++i) + m_tilemap.deleteColumn(column); + emit(endRemoveColumns()); + if (!m_tilemap.width()) + reset(); + return true; +} + +inline Qt::ItemFlags TilemapModel::flags(const QModelIndex& index) const +{ + if (!index.isValid()) + return 0; + return Qt::ItemIsEnabled | Qt::ItemIsSelectable; +} + +inline bool TilemapModel::setData(const QModelIndex& index, const QVariant& value, int role) +{ + if (!index.isValid()) + return false; + if (role == Qt::EditRole) + { + m_tilemap(index.row(), index.column()) = value.toInt(); + emit(dataChanged(index, index)); + } +} +} + #endif diff --git a/pokemodr/TimeUI.cpp b/pokemodr/TimeUI.cpp index 26c14b60..b0014825 100644 --- a/pokemodr/TimeUI.cpp +++ b/pokemodr/TimeUI.cpp @@ -21,45 +21,45 @@ // Pokemod includes #include "../pokemod/Time.h" -TimeUI::TimeUI(Time* time, QWidget* parent) : +Pokemodr::TimeUI::TimeUI(Pokemod::Time* time, QWidget* parent) : ObjectUI(parent) { setupUi(this); - setObjects(time, new Time(*time)); + setObjects(time, new Pokemod::Time(*time)); } -TimeUI::~TimeUI() +Pokemodr::TimeUI::~TimeUI() { } -void TimeUI::setGui() +void Pokemodr::TimeUI::setGui() { - varName->setText(static_cast<Time*>(modified())->name()); - varTime->setTime(QTime(static_cast<Time*>(modified())->hour(), static_cast<Time*>(modified())->minute())); + varName->setText(static_cast<Pokemod::Time*>(modified())->name()); + varTime->setTime(QTime(static_cast<Pokemod::Time*>(modified())->hour(), static_cast<Pokemod::Time*>(modified())->minute())); } -void TimeUI::apply() +void Pokemodr::TimeUI::apply() { - *static_cast<Time*>(original()) = *static_cast<Time*>(modified()); + *static_cast<Pokemod::Time*>(original()) = *static_cast<Pokemod::Time*>(modified()); emit(changed(false)); } -void TimeUI::discard() +void Pokemodr::TimeUI::discard() { - *static_cast<Time*>(modified()) = *static_cast<Time*>(original()); + *static_cast<Pokemod::Time*>(modified()) = *static_cast<Pokemod::Time*>(original()); setGui(); emit(changed(false)); } -void TimeUI::on_varName_textChanged(const QString& name) +void Pokemodr::TimeUI::on_varName_textChanged(const QString& name) { const int cursor = varName->cursorPosition(); - static_cast<Time*>(modified())->setName(name); + static_cast<Pokemod::Time*>(modified())->setName(name); varName->setCursorPosition(cursor); } -void TimeUI::on_varTime_timeChanged(const QTime& time) +void Pokemodr::TimeUI::on_varTime_timeChanged(const QTime& time) { - static_cast<Time*>(modified())->setHour(time.hour()); - static_cast<Time*>(modified())->setMinute(time.minute()); + static_cast<Pokemod::Time*>(modified())->setHour(time.hour()); + static_cast<Pokemod::Time*>(modified())->setMinute(time.minute()); } diff --git a/pokemodr/TimeUI.h b/pokemodr/TimeUI.h index b888776c..acd90ac3 100644 --- a/pokemodr/TimeUI.h +++ b/pokemodr/TimeUI.h @@ -18,21 +18,26 @@ #ifndef __POKEMODR_TIMEUI__ #define __POKEMODR_TIMEUI__ -// PokeModr includes +// Pokemodr includes #include "ObjectUI.h" // Form include #include "ui_time.h" // Forward declarations +namespace Pokemod +{ class Time; +} +namespace Pokemodr +{ class TimeUI : public ObjectUI, private Ui::formTime { Q_OBJECT public: - TimeUI(Time* time, QWidget* parent); + TimeUI(Pokemod::Time* time, QWidget* parent); ~TimeUI(); public slots: void apply(); @@ -43,5 +48,6 @@ class TimeUI : public ObjectUI, private Ui::formTime private slots: void setGui(); }; +} #endif diff --git a/pokemodr/TrainerUI.cpp b/pokemodr/TrainerUI.cpp index ded81761..1dfbd172 100644 --- a/pokemodr/TrainerUI.cpp +++ b/pokemodr/TrainerUI.cpp @@ -18,77 +18,59 @@ // Header include #include "TrainerUI.h" -// PokeModr includes +// Pokemodr includes #include "FileDialog.h" // Pokemod includes #include "../pokemod/Trainer.h" -TrainerUI::TrainerUI(Trainer * trainer, QWidget * parent) : +Pokemodr::TrainerUI::TrainerUI(Pokemod::Trainer* trainer, QWidget* parent) : ObjectUI(parent) { setupUi(this); - setObjects(trainer, new Trainer(*trainer)); + setObjects(trainer, new Pokemod::Trainer(*trainer)); } -TrainerUI::~TrainerUI() +Pokemodr::TrainerUI::~TrainerUI() { } -void TrainerUI::setGui() +void Pokemodr::TrainerUI::setGui() { - varName->setText(static_cast<Trainer*>(modified())->name()); - varMoneyFactor->setValue(static_cast<Trainer*>(modified())->moneyFactor()); - varSkin->setIcon(static_cast<Trainer*>(modified())->skin()); -// varAI->setText(QFile::exists(static_cast<Trainer*>(modified())->ai()) ? "Valid" : "Invalid"); + varName->setText(static_cast<Pokemod::Trainer*>(modified())->name()); + varMoneyFactor->setValue(static_cast<Pokemod::Trainer*>(modified())->moneyFactor()); + varSkin->setIcon(static_cast<Pokemod::Trainer*>(modified())->skin()); } -void TrainerUI::apply() +void Pokemodr::TrainerUI::apply() { - *static_cast<Trainer*>(original()) = *static_cast<Trainer*>(modified()); + *static_cast<Pokemod::Trainer*>(original()) = *static_cast<Pokemod::Trainer*>(modified()); emit(changed(false)); } -void TrainerUI::discard() +void Pokemodr::TrainerUI::discard() { - *static_cast<Trainer*>(modified()) = *static_cast<Trainer*>(original()); + *static_cast<Pokemod::Trainer*>(modified()) = *static_cast<Pokemod::Trainer*>(original()); emit(changed(false)); } -void TrainerUI::on_varName_textChanged(const QString & name) +void Pokemodr::TrainerUI::on_varName_textChanged(const QString& name) { - static_cast<Trainer*>(modified())->setName(name); + static_cast<Pokemod::Trainer*>(modified())->setName(name); } -void TrainerUI::on_varMoneyFactor_valueChanged(const int moneyFactor) +void Pokemodr::TrainerUI::on_varMoneyFactor_valueChanged(const int moneyFactor) { - static_cast<Trainer*>(modified())->setMoneyFactor(moneyFactor); + static_cast<Pokemod::Trainer*>(modified())->setMoneyFactor(moneyFactor); } -void TrainerUI::on_varSkin_pressed() +void Pokemodr::TrainerUI::on_varSkin_pressed() { FileDialog* dialog = new FileDialog(QSize(192, 168)); if (dialog->exec() == QDialog::Accepted) { - static_cast<Trainer*>(modified())->setSkin(QPixmap(dialog->selectedFile())); + static_cast<Pokemod::Trainer*>(modified())->setSkin(QPixmap(dialog->selectedFile())); setGui(); } delete dialog; } - -// void TrainerUI::on_varAI_pressed() -// { -// FileDialog* dialog = new FileDialog(QString::fromUtf8("*.pai|PokéMod AI Files")); -// if (dlg.show()) -// { -// try -// { -// trainer_mod->setAi(dlg.selectedUrl()); -// } -// catch (SaveException& exception) -// { -// BugCatcher::report(exception); -// } -// setGui(); -// } -// } diff --git a/pokemodr/TrainerUI.h b/pokemodr/TrainerUI.h index c9368b7d..a4648729 100644 --- a/pokemodr/TrainerUI.h +++ b/pokemodr/TrainerUI.h @@ -18,21 +18,26 @@ #ifndef __POKEMODR_TRAINERUI__ #define __POKEMODR_TRAINERUI__ -// PokeModr includes +// Pokemodr includes #include "ObjectUI.h" // Form include #include "ui_trainer.h" // Forward declarations +namespace Pokemod +{ class Trainer; +} +namespace Pokemodr +{ class TrainerUI : public ObjectUI, private Ui::formTrainer { Q_OBJECT public: - TrainerUI(Trainer* trainer, QWidget* parent); + TrainerUI(Pokemod::Trainer* trainer, QWidget* parent); ~TrainerUI(); public slots: void apply(); @@ -41,9 +46,9 @@ class TrainerUI : public ObjectUI, private Ui::formTrainer void on_varName_textChanged(const QString& name); void on_varMoneyFactor_valueChanged(const int moneyFactor); void on_varSkin_pressed(); -// void on_varAI_pressed(); private slots: void setGui(); }; +} #endif diff --git a/pokemodr/TypeUI.cpp b/pokemodr/TypeUI.cpp index 97c8bf23..79968dd2 100644 --- a/pokemodr/TypeUI.cpp +++ b/pokemodr/TypeUI.cpp @@ -21,44 +21,44 @@ // Pokemod includes #include "../pokemod/Type.h" -TypeUI::TypeUI(Type* type, QWidget* parent) : +Pokemodr::TypeUI::TypeUI(Pokemod::Type* type, QWidget* parent) : ObjectUI(parent) { setupUi(this); - setObjects(type, new Type(*type)); + setObjects(type, new Pokemod::Type(*type)); } -TypeUI::~TypeUI() +Pokemodr::TypeUI::~TypeUI() { } -void TypeUI::setGui() +void Pokemodr::TypeUI::setGui() { - varName->setText(static_cast<Type*>(modified())->name()); - varSTAB->setValue(static_cast<Type*>(modified())->stab()); + varName->setText(static_cast<Pokemod::Type*>(modified())->name()); + varSTAB->setValue(static_cast<Pokemod::Type*>(modified())->stab()); } -void TypeUI::apply() +void Pokemodr::TypeUI::apply() { - *static_cast<Type*>(original()) = *static_cast<Type*>(modified()); + *static_cast<Pokemod::Type*>(original()) = *static_cast<Pokemod::Type*>(modified()); emit(changed(false)); } -void TypeUI::discard() +void Pokemodr::TypeUI::discard() { - *static_cast<Type*>(modified()) = *static_cast<Type*>(original()); + *static_cast<Pokemod::Type*>(modified()) = *static_cast<Pokemod::Type*>(original()); setGui(); emit(changed(false)); } -void TypeUI::on_varName_textChanged(const QString& name) +void Pokemodr::TypeUI::on_varName_textChanged(const QString& name) { const int cursor = varName->cursorPosition(); - static_cast<Type*>(modified())->setName(name); + static_cast<Pokemod::Type*>(modified())->setName(name); varName->setCursorPosition(cursor); } -void TypeUI::on_varSTAB_valueChanged(const Fraction& stab) +void Pokemodr::TypeUI::on_varSTAB_valueChanged(const Pokemod::Fraction& stab) { - static_cast<Type*>(modified())->setStab(stab); + static_cast<Pokemod::Type*>(modified())->setStab(stab); } diff --git a/pokemodr/TypeUI.h b/pokemodr/TypeUI.h index 2e3c9632..1c8eff63 100644 --- a/pokemodr/TypeUI.h +++ b/pokemodr/TypeUI.h @@ -18,30 +18,36 @@ #ifndef __POKEMODR_TYPEUI__ #define __POKEMODR_TYPEUI__ -// PokeModr includes +// Pokemodr includes #include "ObjectUI.h" // Form include #include "ui_type.h" // Forward declarations +namespace Pokemod +{ class Type; +} +namespace Pokemodr +{ class TypeUI : public ObjectUI, private Ui::formType { Q_OBJECT public: - TypeUI(Type* type, QWidget* parent); + TypeUI(Pokemod::Type* type, QWidget* parent); ~TypeUI(); public slots: void apply(); void discard(); protected slots: void on_varName_textChanged(const QString& name); - void on_varSTAB_valueChanged(const Fraction& stab); + void on_varSTAB_valueChanged(const Pokemod::Fraction& stab); private slots: void setGui(); }; +} #endif diff --git a/pokemodr/TypechartModel.h b/pokemodr/TypechartModel.h index 134f747a..a322ab1d 100644 --- a/pokemodr/TypechartModel.h +++ b/pokemodr/TypechartModel.h @@ -27,71 +27,88 @@ #include <QStringList> #include <QVariant> +namespace Pokemodr +{ class TypechartModel : public QAbstractTableModel { Q_OBJECT public: - TypechartModel(Matrix<Fraction>& typechart, const QStringList& types) : - QAbstractTableModel(), - m_typechart(typechart), - m_types(types) - { - } + TypechartModel(Pokemod::Matrix<Pokemod::Fraction>& typechart, const QStringList& types); - QVariant data(const QModelIndex& index, int role) const - { - if (!index.isValid()) - return QVariant(); - if (role == Qt::DisplayRole) - return QString::number(m_typechart.at(index.row(), index.column()), 'g', 3); - else if (role == Qt::EditRole) - return QVariant::fromValue(m_typechart.at(index.row(), index.column())); - return QVariant(); - } + QVariant data(const QModelIndex& index, int role) const; - QVariant headerData(int section, Qt::Orientation /*orientation*/, int role = Qt::DisplayRole) const - { - if (role == Qt::DisplayRole) - return m_types.at(section); - return QVariant(); - } + QVariant headerData(int section, Qt::Orientation /*orientation*/, int role = Qt::DisplayRole) const; - int rowCount(const QModelIndex& /*parent*/) const - { - return m_typechart.height(); - } + int rowCount(const QModelIndex& /*parent*/) const; - int columnCount(const QModelIndex& /*parent*/) const - { - return m_typechart.width(); - } + int columnCount(const QModelIndex& /*parent*/) const; - Qt::ItemFlags flags(const QModelIndex& index) const - { - if (!index.isValid()) - return 0; - return Qt::ItemIsEnabled | Qt::ItemIsSelectable; - } + Qt::ItemFlags flags(const QModelIndex& index) const; - bool setData(const QModelIndex& index, const QVariant& value, int role) - { - if (!index.isValid()) - return false; - if (role == Qt::EditRole) - { - if (value.canConvert<Fraction>()) - { - m_typechart(index.row(), index.column()) = value.value<Fraction>(); - emit(dataChanged(index, index)); - return true; - } - } - return false; - } + bool setData(const QModelIndex& index, const QVariant& value, int role); private: - Matrix<Fraction>& m_typechart; + Pokemod::Matrix<Pokemod::Fraction>& m_typechart; const QStringList m_types; }; +inline TypechartModel::TypechartModel(Pokemod::Matrix<Pokemod::Fraction>& typechart, const QStringList& types) : + QAbstractTableModel(), + m_typechart(typechart), + m_types(types) +{ +} + +inline QVariant TypechartModel::data(const QModelIndex& index, int role) const +{ + if (!index.isValid()) + return QVariant(); + if (role == Qt::DisplayRole) + return QString::number(m_typechart.at(index.row(), index.column()), 'g', 3); + else if (role == Qt::EditRole) + return QVariant::fromValue(m_typechart.at(index.row(), index.column())); + return QVariant(); +} + +inline QVariant TypechartModel::headerData(int section, Qt::Orientation /*orientation*/, int role) const +{ + if (role == Qt::DisplayRole) + return m_types.at(section); + return QVariant(); +} + +inline int TypechartModel::rowCount(const QModelIndex& /*parent*/) const +{ + return m_typechart.height(); +} + +inline int TypechartModel::columnCount(const QModelIndex& /*parent*/) const +{ + return m_typechart.width(); +} + +inline Qt::ItemFlags TypechartModel::flags(const QModelIndex& index) const +{ + if (!index.isValid()) + return 0; + return Qt::ItemIsEnabled | Qt::ItemIsSelectable; +} + +inline bool TypechartModel::setData(const QModelIndex& index, const QVariant& value, int role) +{ + if (!index.isValid()) + return false; + if (role == Qt::EditRole) + { + if (value.canConvert<Pokemod::Fraction>()) + { + m_typechart(index.row(), index.column()) = value.value<Pokemod::Fraction>(); + emit(dataChanged(index, index)); + return true; + } + } + return false; +} +} + #endif diff --git a/pokemodr/WeatherUI.cpp b/pokemodr/WeatherUI.cpp index e80d5016..5b80de69 100644 --- a/pokemodr/WeatherUI.cpp +++ b/pokemodr/WeatherUI.cpp @@ -21,44 +21,44 @@ // Pokemod includes #include "../pokemod/Weather.h" -WeatherUI::WeatherUI(Weather* weather, QWidget* parent) : +Pokemodr::WeatherUI::WeatherUI(Pokemod::Weather* weather, QWidget* parent) : ObjectUI(parent) { setupUi(this); - setObjects(weather, new Weather(*weather)); + setObjects(weather, new Pokemod::Weather(*weather)); } -WeatherUI::~WeatherUI() +Pokemodr::WeatherUI::~WeatherUI() { } -void WeatherUI::setGui() +void Pokemodr::WeatherUI::setGui() { - varName->setText(static_cast<Weather*>(modified())->name()); - varScript->setValue(static_cast<Weather*>(modified())->script()); + varName->setText(static_cast<Pokemod::Weather*>(modified())->name()); + varScript->setValue(static_cast<Pokemod::Weather*>(modified())->script()); } -void WeatherUI::apply() +void Pokemodr::WeatherUI::apply() { - *static_cast<Weather*>(original()) = *static_cast<Weather*>(modified()); + *static_cast<Pokemod::Weather*>(original()) = *static_cast<Pokemod::Weather*>(modified()); emit(changed(false)); } -void WeatherUI::discard() +void Pokemodr::WeatherUI::discard() { - *static_cast<Weather*>(modified()) = *static_cast<Weather*>(original()); + *static_cast<Pokemod::Weather*>(modified()) = *static_cast<Pokemod::Weather*>(original()); setGui(); emit(changed(false)); } -void WeatherUI::on_varName_textChanged(const QString& name) +void Pokemodr::WeatherUI::on_varName_textChanged(const QString& name) { const int cursor = varName->cursorPosition(); - static_cast<Weather*>(modified())->setName(name); + static_cast<Pokemod::Weather*>(modified())->setName(name); varName->setCursorPosition(cursor); } -void WeatherUI::on_varScript_valueChanged(const Script& script) +void Pokemodr::WeatherUI::on_varScript_valueChanged(const Pokemod::Script& script) { - static_cast<Weather*>(modified())->setScript(script); + static_cast<Pokemod::Weather*>(modified())->setScript(script); } diff --git a/pokemodr/WeatherUI.h b/pokemodr/WeatherUI.h index 49ea17dd..f76d19de 100644 --- a/pokemodr/WeatherUI.h +++ b/pokemodr/WeatherUI.h @@ -18,30 +18,36 @@ #ifndef __POKEMODR_WEATHERUI__ #define __POKEMODR_WEATHERUI__ -// PokeModr includes +// Pokemodr includes #include "ObjectUI.h" // Form include #include "ui_weather.h" // Forward declarations +namespace Pokemod +{ class Weather; +} +namespace Pokemodr +{ class WeatherUI : public ObjectUI, private Ui::formWeather { Q_OBJECT public: - WeatherUI(Weather* weather, QWidget* parent); + WeatherUI(Pokemod::Weather* weather, QWidget* parent); ~WeatherUI(); public slots: void apply(); void discard(); protected slots: void on_varName_textChanged(const QString& name); - void on_varScript_valueChanged(const Script& script); + void on_varScript_valueChanged(const Pokemod::Script& script); private slots: void setGui(); }; +} #endif diff --git a/pokemodr/gui/ability.ui b/pokemodr/gui/ability.ui index c750096e..bd3912e5 100644 --- a/pokemodr/gui/ability.ui +++ b/pokemodr/gui/ability.ui @@ -40,7 +40,7 @@ </property> <layout class="QHBoxLayout" > <item> - <widget class="ScriptWidget" name="varScript" /> + <widget class="Pokemodr::ScriptWidget" name="varScript" /> </item> </layout> </widget> @@ -67,7 +67,7 @@ <header location="global" >KLineEdit</header> </customwidget> <customwidget> - <class>ScriptWidget</class> + <class>Pokemodr::ScriptWidget</class> <extends>QWidget</extends> <header>../ScriptWidget.h</header> </customwidget> diff --git a/pokemodr/gui/badge.ui b/pokemodr/gui/badge.ui index ad5030b6..cc66dcc7 100644 --- a/pokemodr/gui/badge.ui +++ b/pokemodr/gui/badge.ui @@ -128,7 +128,7 @@ </property> <layout class="QVBoxLayout" > <item> - <widget class="FractionWidget" name="varStatMultiplier" > + <widget class="Pokemodr::FractionWidget" name="varStatMultiplier" > <property name="toolTip" > <string>The multiplier to the stat in-game battles</string> </property> @@ -180,7 +180,7 @@ <header location="global" >KPushButton</header> </customwidget> <customwidget> - <class>FractionWidget</class> + <class>Pokemodr::FractionWidget</class> <extends>QWidget</extends> <header>../FractionWidget.h</header> </customwidget> diff --git a/pokemodr/gui/coinlist.ui b/pokemodr/gui/coinlist.ui index f30c4275..5b34f107 100644 --- a/pokemodr/gui/coinlist.ui +++ b/pokemodr/gui/coinlist.ui @@ -28,7 +28,7 @@ </property> <layout class="QHBoxLayout" > <item> - <widget class="ScriptWidget" name="varScript" /> + <widget class="Pokemodr::ScriptWidget" name="varScript" /> </item> </layout> </widget> @@ -55,7 +55,7 @@ <header location="global" >KLineEdit</header> </customwidget> <customwidget> - <class>ScriptWidget</class> + <class>Pokemodr::ScriptWidget</class> <extends>QWidget</extends> <header>../ScriptWidget.h</header> </customwidget> diff --git a/pokemodr/gui/globalscript.ui b/pokemodr/gui/globalscript.ui index e07aacf1..53ddf12f 100644 --- a/pokemodr/gui/globalscript.ui +++ b/pokemodr/gui/globalscript.ui @@ -25,7 +25,7 @@ </property> <layout class="QHBoxLayout" > <item> - <widget class="ScriptWidget" name="varScript" /> + <widget class="Pokemodr::ScriptWidget" name="varScript" /> </item> </layout> </widget> @@ -52,7 +52,7 @@ <header location="global" >KLineEdit</header> </customwidget> <customwidget> - <class>ScriptWidget</class> + <class>Pokemodr::ScriptWidget</class> <extends>QWidget</extends> <header>../ScriptWidget.h</header> </customwidget> diff --git a/pokemodr/gui/item.ui b/pokemodr/gui/item.ui index 473572a5..f183abe3 100644 --- a/pokemodr/gui/item.ui +++ b/pokemodr/gui/item.ui @@ -92,7 +92,7 @@ </property> <layout class="QHBoxLayout" > <item> - <widget class="ScriptWidget" name="varScript" /> + <widget class="Pokemodr::ScriptWidget" name="varScript" /> </item> </layout> </widget> @@ -129,7 +129,7 @@ <header location="global" >KLineEdit</header> </customwidget> <customwidget> - <class>ScriptWidget</class> + <class>Pokemodr::ScriptWidget</class> <extends>QWidget</extends> <header>../ScriptWidget.h</header> </customwidget> diff --git a/pokemodr/gui/mapeffect.ui b/pokemodr/gui/mapeffect.ui index 33c44760..ec5eccf7 100644 --- a/pokemodr/gui/mapeffect.ui +++ b/pokemodr/gui/mapeffect.ui @@ -31,7 +31,7 @@ </property> <layout class="QVBoxLayout" > <item> - <widget class="PointWidget" name="varCoordinate" > + <widget class="Pokemodr::PointWidget" name="varCoordinate" > <property name="toolTip" > <string>The coordinate of the effect</string> </property> @@ -109,7 +109,7 @@ </property> <layout class="QVBoxLayout" > <item> - <widget class="ScriptWidget" name="varScript" /> + <widget class="Pokemodr::ScriptWidget" name="varScript" /> </item> </layout> </widget> @@ -141,12 +141,12 @@ <header location="global" >KPushButton</header> </customwidget> <customwidget> - <class>ScriptWidget</class> + <class>Pokemodr::ScriptWidget</class> <extends>QWidget</extends> <header>../ScriptWidget.h</header> </customwidget> <customwidget> - <class>PointWidget</class> + <class>Pokemodr::PointWidget</class> <extends>QWidget</extends> <header>../PointWidget.h</header> </customwidget> diff --git a/pokemodr/gui/maptrainer.ui b/pokemodr/gui/maptrainer.ui index 694d1ad8..e14ef25d 100644 --- a/pokemodr/gui/maptrainer.ui +++ b/pokemodr/gui/maptrainer.ui @@ -44,7 +44,7 @@ </property> <layout class="QVBoxLayout" > <item> - <widget class="PointWidget" name="varCoordinate" /> + <widget class="Pokemodr::PointWidget" name="varCoordinate" /> </item> </layout> </widget> @@ -75,7 +75,7 @@ </property> <layout class="QHBoxLayout" name="horizontalLayout" > <item> - <widget class="ScriptWidget" name="varScript" /> + <widget class="Pokemodr::ScriptWidget" name="varScript" /> </item> </layout> </widget> @@ -128,12 +128,12 @@ <header location="global" >KLineEdit</header> </customwidget> <customwidget> - <class>ScriptWidget</class> + <class>Pokemodr::ScriptWidget</class> <extends>QWidget</extends> <header>../ScriptWidget.h</header> </customwidget> <customwidget> - <class>PointWidget</class> + <class>Pokemodr::PointWidget</class> <extends>QWidget</extends> <header>../PointWidget.h</header> </customwidget> diff --git a/pokemodr/gui/mapwarp.ui b/pokemodr/gui/mapwarp.ui index 89b05b8c..0fd28b35 100644 --- a/pokemodr/gui/mapwarp.ui +++ b/pokemodr/gui/mapwarp.ui @@ -28,7 +28,7 @@ </property> <layout class="QVBoxLayout" > <item> - <widget class="PointWidget" name="varCoordinate" > + <widget class="Pokemodr::PointWidget" name="varCoordinate" > <property name="toolTip" > <string>The coordinate of the warp</string> </property> @@ -92,7 +92,7 @@ </property> <layout class="QHBoxLayout" > <item> - <widget class="ScriptWidget" name="varScript" /> + <widget class="Pokemodr::ScriptWidget" name="varScript" /> </item> </layout> </widget> @@ -124,12 +124,12 @@ <header location="global" >KLineEdit</header> </customwidget> <customwidget> - <class>ScriptWidget</class> + <class>Pokemodr::ScriptWidget</class> <extends>QWidget</extends> <header>../ScriptWidget.h</header> </customwidget> <customwidget> - <class>PointWidget</class> + <class>Pokemodr::PointWidget</class> <extends>QWidget</extends> <header>../PointWidget.h</header> </customwidget> diff --git a/pokemodr/gui/move.ui b/pokemodr/gui/move.ui index 86e419c9..331edfcc 100644 --- a/pokemodr/gui/move.ui +++ b/pokemodr/gui/move.ui @@ -28,7 +28,7 @@ </property> <layout class="QVBoxLayout" > <item> - <widget class="FractionWidget" name="varAccuracy" > + <widget class="Pokemodr::FractionWidget" name="varAccuracy" > <property name="toolTip" > <string>The chance that the move hits</string> </property> @@ -143,7 +143,7 @@ </property> <layout class="QHBoxLayout" > <item> - <widget class="ScriptWidget" name="varScript" /> + <widget class="Pokemodr::ScriptWidget" name="varScript" /> </item> </layout> </widget> @@ -180,12 +180,12 @@ <header location="global" >KLineEdit</header> </customwidget> <customwidget> - <class>FractionWidget</class> + <class>Pokemodr::FractionWidget</class> <extends>QWidget</extends> <header>../FractionWidget.h</header> </customwidget> <customwidget> - <class>ScriptWidget</class> + <class>Pokemodr::ScriptWidget</class> <extends>QWidget</extends> <header>../ScriptWidget.h</header> </customwidget> diff --git a/pokemodr/gui/nature.ui b/pokemodr/gui/nature.ui index c782442c..a658d604 100644 --- a/pokemodr/gui/nature.ui +++ b/pokemodr/gui/nature.ui @@ -38,7 +38,7 @@ </property> <layout class="QVBoxLayout" > <item> - <widget class="FractionWidget" name="varStatMultiplier" > + <widget class="Pokemodr::FractionWidget" name="varStatMultiplier" > <property name="toolTip" > <string>The multiplier of the stat</string> </property> @@ -104,7 +104,7 @@ <header location="global" >KLineEdit</header> </customwidget> <customwidget> - <class>FractionWidget</class> + <class>Pokemodr::FractionWidget</class> <extends>QWidget</extends> <header>../FractionWidget.h</header> </customwidget> diff --git a/pokemodr/gui/pokemod.ui b/pokemodr/gui/pokemod.ui index 6ea2d44b..ada84380 100644 --- a/pokemodr/gui/pokemod.ui +++ b/pokemodr/gui/pokemod.ui @@ -416,7 +416,7 @@ <widget class="QGroupBox" name="boxEffectiveness" > <layout class="QVBoxLayout" > <item> - <widget class="FractionWidget" name="varEffectiveness" > + <widget class="Pokemodr::FractionWidget" name="varEffectiveness" > <property name="toolTip" > <string>Multiplier for attacks of the attacking type against the defending type</string> </property> @@ -457,7 +457,7 @@ <container>1</container> </customwidget> <customwidget> - <class>FractionWidget</class> + <class>Pokemodr::FractionWidget</class> <extends>QWidget</extends> <header>../FractionWidget.h</header> </customwidget> diff --git a/pokemodr/gui/pokemodr.ui b/pokemodr/gui/pokemodr.ui index c9b6a74c..c49b55ea 100644 --- a/pokemodr/gui/pokemodr.ui +++ b/pokemodr/gui/pokemodr.ui @@ -1,6 +1,6 @@ <ui version="4.0" > - <class>formPokeModr</class> - <widget class="KMainWindow" name="formPokeModr" > + <class>formPokemodr</class> + <widget class="KMainWindow" name="formPokemodr" > <widget class="QWidget" name="frameMain" > <layout class="QVBoxLayout" > <item> @@ -11,7 +11,7 @@ <property name="childrenCollapsible" > <bool>false</bool> </property> - <widget class="PokemodTree" name="treePokemod" > + <widget class="Pokemodr::PokemodTree" name="treePokemod" > <property name="contextMenuPolicy" > <enum>Qt::CustomContextMenu</enum> </property> @@ -92,7 +92,7 @@ <container>1</container> </customwidget> <customwidget> - <class>PokemodTree</class> + <class>Pokemodr::PokemodTree</class> <extends>QTreeView</extends> <header>../PokemodTree.h</header> </customwidget> diff --git a/pokemodr/gui/rules.ui b/pokemodr/gui/rules.ui index 5e287c11..a88ab5e0 100644 --- a/pokemodr/gui/rules.ui +++ b/pokemodr/gui/rules.ui @@ -213,7 +213,7 @@ </property> <layout class="QVBoxLayout" > <item> - <widget class="FractionWidget" name="varPokerus" > + <widget class="Pokemodr::FractionWidget" name="varPokerus" > <property name="toolTip" > <string>The chance of contracting the Pokérus virus</string> </property> @@ -465,7 +465,7 @@ <container>1</container> </customwidget> <customwidget> - <class>FractionWidget</class> + <class>Pokemodr::FractionWidget</class> <extends>QWidget</extends> <header>../FractionWidget.h</header> </customwidget> diff --git a/pokemodr/gui/species.ui b/pokemodr/gui/species.ui index 071fd759..1e670181 100644 --- a/pokemodr/gui/species.ui +++ b/pokemodr/gui/species.ui @@ -54,7 +54,7 @@ </property> <layout class="QVBoxLayout" > <item> - <widget class="FractionWidget" name="varRunChance" > + <widget class="Pokemodr::FractionWidget" name="varRunChance" > <property name="toolTip" > <string>The chance that the species runs in a wild battle</string> </property> @@ -73,7 +73,7 @@ </property> <layout class="QVBoxLayout" > <item> - <widget class="FractionWidget" name="varFleeChance" > + <widget class="Pokemodr::FractionWidget" name="varFleeChance" > <property name="toolTip" > <string>Chance that the player can flee from a wild battle</string> </property> @@ -92,7 +92,7 @@ </property> <layout class="QVBoxLayout" > <item> - <widget class="FractionWidget" name="varItemChance" > + <widget class="Pokemodr::FractionWidget" name="varItemChance" > <property name="toolTip" > <string>Chance the species is carrying an item in a wild battle</string> </property> @@ -363,7 +363,7 @@ </property> <layout class="QVBoxLayout" > <item> - <widget class="FractionWidget" name="varGenderChance" > + <widget class="Pokemodr::FractionWidget" name="varGenderChance" > <property name="toolTip" > <string>Chance of getting a female version of the species (negative is genderless)</string> </property> @@ -440,7 +440,7 @@ </property> <layout class="QHBoxLayout" > <item> - <widget class="ScriptWidget" name="varEvolution" /> + <widget class="Pokemodr::ScriptWidget" name="varEvolution" /> </item> </layout> </widget> @@ -699,12 +699,12 @@ <container>1</container> </customwidget> <customwidget> - <class>FractionWidget</class> + <class>Pokemodr::FractionWidget</class> <extends>QWidget</extends> <header>../FractionWidget.h</header> </customwidget> <customwidget> - <class>ScriptWidget</class> + <class>Pokemodr::ScriptWidget</class> <extends>QWidget</extends> <header>../ScriptWidget.h</header> </customwidget> diff --git a/pokemodr/gui/status.ui b/pokemodr/gui/status.ui index 762bdaf5..28c082f8 100644 --- a/pokemodr/gui/status.ui +++ b/pokemodr/gui/status.ui @@ -28,7 +28,7 @@ </property> <layout class="QHBoxLayout" > <item> - <widget class="ScriptWidget" name="varScript" /> + <widget class="Pokemodr::ScriptWidget" name="varScript" /> </item> </layout> </widget> @@ -55,7 +55,7 @@ <header location="global" >KLineEdit</header> </customwidget> <customwidget> - <class>ScriptWidget</class> + <class>Pokemodr::ScriptWidget</class> <extends>QWidget</extends> <header>../ScriptWidget.h</header> </customwidget> diff --git a/pokemodr/gui/tile.ui b/pokemodr/gui/tile.ui index f8f654c7..86c98107 100644 --- a/pokemodr/gui/tile.ui +++ b/pokemodr/gui/tile.ui @@ -95,7 +95,7 @@ </property> <layout class="QHBoxLayout" > <item> - <widget class="ScriptWidget" name="varScript" /> + <widget class="Pokemodr::ScriptWidget" name="varScript" /> </item> </layout> </widget> @@ -132,7 +132,7 @@ <header location="global" >KPushButton</header> </customwidget> <customwidget> - <class>ScriptWidget</class> + <class>Pokemodr::ScriptWidget</class> <extends>QWidget</extends> <header>../ScriptWidget.h</header> </customwidget> diff --git a/pokemodr/gui/type.ui b/pokemodr/gui/type.ui index 8b712978..5ed55a3c 100644 --- a/pokemodr/gui/type.ui +++ b/pokemodr/gui/type.ui @@ -28,7 +28,7 @@ </property> <layout class="QVBoxLayout" > <item> - <widget class="FractionWidget" name="varSTAB" > + <widget class="Pokemodr::FractionWidget" name="varSTAB" > <property name="toolTip" > <string>Multiplier for species with this type for using a move of this type</string> </property> @@ -62,7 +62,7 @@ <header location="global" >KLineEdit</header> </customwidget> <customwidget> - <class>FractionWidget</class> + <class>Pokemodr::FractionWidget</class> <extends>QWidget</extends> <header>../FractionWidget.h</header> </customwidget> diff --git a/pokemodr/gui/weather.ui b/pokemodr/gui/weather.ui index 8cc59eb8..175cff6b 100644 --- a/pokemodr/gui/weather.ui +++ b/pokemodr/gui/weather.ui @@ -28,7 +28,7 @@ </property> <layout class="QHBoxLayout" > <item> - <widget class="ScriptWidget" name="varScript" /> + <widget class="Pokemodr::ScriptWidget" name="varScript" /> </item> </layout> </widget> @@ -55,7 +55,7 @@ <header location="global" >KLineEdit</header> </customwidget> <customwidget> - <class>ScriptWidget</class> + <class>Pokemodr::ScriptWidget</class> <extends>QWidget</extends> <header>../ScriptWidget.h</header> </customwidget> diff --git a/pokemodr/models/AbilityGroupModel.cpp b/pokemodr/models/AbilityGroupModel.cpp index b7a6536b..03a8e65e 100644 --- a/pokemodr/models/AbilityGroupModel.cpp +++ b/pokemodr/models/AbilityGroupModel.cpp @@ -31,31 +31,31 @@ // KDE includes #include <KMenu> -AbilityGroupModel::AbilityGroupModel(BaseModel* parent, Pokemod* pokemod) : +Pokemodr::AbilityGroupModel::AbilityGroupModel(BaseModel* parent, Pokemod::Pokemod* pokemod) : GroupModel(parent, pokemod, "Abilities") { for (int i = 0; i < pokemod->abilityCount(); ++i) addObject(pokemod->ability(i)); } -AbilityGroupModel::~AbilityGroupModel() +Pokemodr::AbilityGroupModel::~AbilityGroupModel() { } -QVariant AbilityGroupModel::data(const int role) const +QVariant Pokemodr::AbilityGroupModel::data(const int role) const { - if (role == BaseModel::ContextMenuRole) + if (role == Pokemodr::BaseModel::ContextMenuRole) { KMenu* menu = new KMenu; menu->addAction("Add Ability", this, SLOT(addObject())); return QVariant::fromValue(static_cast<void*>(menu)); } - return GroupModel::data(role); + return Pokemodr::GroupModel::data(role); } -bool AbilityGroupModel::setData(const QVariant& value, int role) +bool Pokemodr::AbilityGroupModel::setData(const QVariant& value, int role) { - if (role == BaseModel::XmlRole) + if (role == Pokemodr::BaseModel::XmlRole) { if (value.canConvert<QString>()) { @@ -65,7 +65,7 @@ bool AbilityGroupModel::setData(const QVariant& value, int role) { if (xml.doctype().name() == "Ability") { - addObject(static_cast<Pokemod*>(m_object)->newAbility(xml.documentElement())); + addObject(static_cast<Pokemod::Pokemod*>(m_object)->newAbility(xml.documentElement())); return true; } file.close(); @@ -75,20 +75,20 @@ bool AbilityGroupModel::setData(const QVariant& value, int role) return false; } -void AbilityGroupModel::addObject(Object* object) +void Pokemodr::AbilityGroupModel::addObject(Pokemod::Object* object) { if (!object) - object = static_cast<Pokemod*>(m_object)->newAbility(); + object = static_cast<Pokemod::Pokemod*>(m_object)->newAbility(); if (object->className() == "Ability") - m_objects.append(new AbilityModel(this, static_cast<Ability*>(object))); + m_objects.append(new AbilityModel(this, static_cast<Pokemod::Ability*>(object))); } -void AbilityGroupModel::deleteObject(BaseObjectModel* model) +void Pokemodr::AbilityGroupModel::deleteObject(BaseObjectModel* model) { const int index = m_objects.indexOf(model); if (0 <= index) { - static_cast<Pokemod*>(m_object)->deleteAbility(index); + static_cast<Pokemod::Pokemod*>(m_object)->deleteAbility(index); m_objects[index]->deleteLater(); m_objects.removeAt(index); } diff --git a/pokemodr/models/AbilityGroupModel.h b/pokemodr/models/AbilityGroupModel.h index 5f52c6ac..63ec916e 100644 --- a/pokemodr/models/AbilityGroupModel.h +++ b/pokemodr/models/AbilityGroupModel.h @@ -22,21 +22,27 @@ #include "GroupModel.h" // Forward declarations +namespace Pokemod +{ class Pokemod; +} +namespace Pokemodr +{ class AbilityGroupModel : public GroupModel { Q_OBJECT public: - AbilityGroupModel(BaseModel* parent, Pokemod* pokemod); + AbilityGroupModel(BaseModel* parent, Pokemod::Pokemod* pokemod); ~AbilityGroupModel(); QVariant data(const int role = Qt::DisplayRole) const; bool setData(const QVariant& value, int role = Qt::EditRole); public slots: - void addObject(Object* object = NULL); + void addObject(Pokemod::Object* object = NULL); void deleteObject(BaseObjectModel* model); }; +} #endif diff --git a/pokemodr/models/AbilityModel.cpp b/pokemodr/models/AbilityModel.cpp index 687fdd2d..72bcc35f 100644 --- a/pokemodr/models/AbilityModel.cpp +++ b/pokemodr/models/AbilityModel.cpp @@ -21,7 +21,7 @@ // Model includes #include "GroupModel.h" -// PokeModr includes +// Pokemodr includes #include "../AbilityUI.h" // Pokemod includes @@ -33,42 +33,42 @@ // KDE includes #include <KMenu> -AbilityModel::AbilityModel(BaseModel* parent, Ability* ability) : +Pokemodr::AbilityModel::AbilityModel(BaseModel* parent, Pokemod::Ability* ability) : ObjectModel(parent, ability) { } -AbilityModel::~AbilityModel() +Pokemodr::AbilityModel::~AbilityModel() { } -QVariant AbilityModel::data(int role) const +QVariant Pokemodr::AbilityModel::data(int role) const { if (role == Qt::DisplayRole) - return static_cast<Ability*>(m_object)->name(); - else if (role == BaseModel::XmlRole) + return static_cast<Pokemod::Ability*>(m_object)->name(); + else if (role == Pokemodr::BaseModel::XmlRole) { QDomDocument xml(m_object->className()); xml.appendChild(m_object->save()); return xml.toString(); } - else if (role == BaseModel::WidgetRole) + else if (role == Pokemodr::BaseModel::WidgetRole) { - QWidget* widget = new AbilityUI(static_cast<Ability*>(m_object), NULL); + QWidget* widget = new AbilityUI(static_cast<Pokemod::Ability*>(m_object), NULL); return QVariant::fromValue(widget); } - else if (role == BaseModel::ContextMenuRole) + else if (role == Pokemodr::BaseModel::ContextMenuRole) { KMenu* menu = new KMenu; menu->addAction("Delete Ability", this, SLOT(deleteSelf())); return QVariant::fromValue(static_cast<void*>(menu)); } - return ObjectModel::data(role); + return Pokemodr::ObjectModel::data(role); } -bool AbilityModel::setData(const QVariant& value, int role) +bool Pokemodr::AbilityModel::setData(const QVariant& value, int role) { - if (role == BaseModel::XmlRole) + if (role == Pokemodr::BaseModel::XmlRole) { if (value.canConvert<QString>()) { @@ -88,7 +88,7 @@ bool AbilityModel::setData(const QVariant& value, int role) return false; } -void AbilityModel::deleteSelf() +void Pokemodr::AbilityModel::deleteSelf() { // static_cast<GroupModel*>(m_parent)->deleteObject(this); } diff --git a/pokemodr/models/AbilityModel.h b/pokemodr/models/AbilityModel.h index b2a8f14d..ad25655a 100644 --- a/pokemodr/models/AbilityModel.h +++ b/pokemodr/models/AbilityModel.h @@ -22,14 +22,19 @@ #include "ObjectModel.h" // Forward declarations +namespace Pokemod +{ class Ability; +} +namespace Pokemodr +{ class AbilityModel : public ObjectModel { Q_OBJECT public: - AbilityModel(BaseModel* parent, Ability* ability); + AbilityModel(BaseModel* parent, Pokemod::Ability* ability); ~AbilityModel(); QVariant data(int role = Qt::DisplayRole) const; @@ -38,5 +43,6 @@ class AbilityModel : public ObjectModel public slots: void deleteSelf(); }; +} #endif diff --git a/pokemodr/models/AuthorGroupModel.cpp b/pokemodr/models/AuthorGroupModel.cpp index b1e02b9c..3e98eb98 100644 --- a/pokemodr/models/AuthorGroupModel.cpp +++ b/pokemodr/models/AuthorGroupModel.cpp @@ -31,31 +31,31 @@ // KDE includes #include <KMenu> -AuthorGroupModel::AuthorGroupModel(BaseModel* parent, Pokemod* pokemod) : +Pokemodr::AuthorGroupModel::AuthorGroupModel(BaseModel* parent, Pokemod::Pokemod* pokemod) : GroupModel(parent, pokemod, "Authors") { for (int i = 0; i < pokemod->authorCount(); ++i) addObject(pokemod->author(i)); } -AuthorGroupModel::~AuthorGroupModel() +Pokemodr::AuthorGroupModel::~AuthorGroupModel() { } -QVariant AuthorGroupModel::data(const int role) const +QVariant Pokemodr::AuthorGroupModel::data(const int role) const { - if (role == BaseModel::ContextMenuRole) + if (role == Pokemodr::BaseModel::ContextMenuRole) { KMenu* menu = new KMenu; menu->addAction("Add Author", this, SLOT(addObject())); return QVariant::fromValue(static_cast<void*>(menu)); } - return GroupModel::data(role); + return Pokemodr::GroupModel::data(role); } -bool AuthorGroupModel::setData(const QVariant& value, int role) +bool Pokemodr::AuthorGroupModel::setData(const QVariant& value, int role) { - if (role == BaseModel::XmlRole) + if (role == Pokemodr::BaseModel::XmlRole) { if (value.canConvert<QString>()) { @@ -65,7 +65,7 @@ bool AuthorGroupModel::setData(const QVariant& value, int role) { if (xml.doctype().name() == "Author") { - addObject(static_cast<Pokemod*>(m_object)->newAuthor(xml.documentElement())); + addObject(static_cast<Pokemod::Pokemod*>(m_object)->newAuthor(xml.documentElement())); return true; } file.close(); @@ -75,20 +75,20 @@ bool AuthorGroupModel::setData(const QVariant& value, int role) return false; } -void AuthorGroupModel::addObject(Object* object) +void Pokemodr::AuthorGroupModel::addObject(Pokemod::Object* object) { if (!object) - object = static_cast<Pokemod*>(m_object)->newAuthor(); + object = static_cast<Pokemod::Pokemod*>(m_object)->newAuthor(); if (object->className() == "Author") - m_objects.append(new AuthorModel(this, static_cast<Author*>(object))); + m_objects.append(new AuthorModel(this, static_cast<Pokemod::Author*>(object))); } -void AuthorGroupModel::deleteObject(BaseObjectModel* model) +void Pokemodr::AuthorGroupModel::deleteObject(BaseObjectModel* model) { const int index = m_objects.indexOf(model); if (0 <= index) { - static_cast<Pokemod*>(m_object)->deleteAuthor(index); + static_cast<Pokemod::Pokemod*>(m_object)->deleteAuthor(index); m_objects[index]->deleteLater(); m_objects.removeAt(index); } diff --git a/pokemodr/models/AuthorGroupModel.h b/pokemodr/models/AuthorGroupModel.h index c11bac13..76e26a6d 100644 --- a/pokemodr/models/AuthorGroupModel.h +++ b/pokemodr/models/AuthorGroupModel.h @@ -22,21 +22,27 @@ #include "GroupModel.h" // Forward declarations +namespace Pokemod +{ class Pokemod; +} +namespace Pokemodr +{ class AuthorGroupModel : public GroupModel { Q_OBJECT public: - AuthorGroupModel(BaseModel* parent, Pokemod* pokemod); + AuthorGroupModel(BaseModel* parent, Pokemod::Pokemod* pokemod); ~AuthorGroupModel(); QVariant data(const int role = Qt::DisplayRole) const; bool setData(const QVariant& value, int role = Qt::EditRole); public slots: - void addObject(Object* object = NULL); + void addObject(Pokemod::Object* object = NULL); void deleteObject(BaseObjectModel* model); }; +} #endif diff --git a/pokemodr/models/AuthorModel.cpp b/pokemodr/models/AuthorModel.cpp index ef71d814..4eddebd4 100644 --- a/pokemodr/models/AuthorModel.cpp +++ b/pokemodr/models/AuthorModel.cpp @@ -21,7 +21,7 @@ // Model includes #include "GroupModel.h" -// PokeModr includes +// Pokemodr includes #include "../AuthorUI.h" // Pokemod includes @@ -33,42 +33,42 @@ // KDE includes #include <KMenu> -AuthorModel::AuthorModel(BaseModel* parent, Author* author) : +Pokemodr::AuthorModel::AuthorModel(BaseModel* parent, Pokemod::Author* author) : ObjectModel(parent, author) { } -AuthorModel::~AuthorModel() +Pokemodr::AuthorModel::~AuthorModel() { } -QVariant AuthorModel::data(int role) const +QVariant Pokemodr::AuthorModel::data(int role) const { if (role == Qt::DisplayRole) - return static_cast<Author*>(m_object)->name(); - else if (role == BaseModel::XmlRole) + return static_cast<Pokemod::Author*>(m_object)->name(); + else if (role == Pokemodr::BaseModel::XmlRole) { QDomDocument xml(m_object->className()); xml.appendChild(m_object->save()); return xml.toString(); } - else if (role == BaseModel::WidgetRole) + else if (role == Pokemodr::BaseModel::WidgetRole) { - QWidget* widget = new AuthorUI(static_cast<Author*>(m_object), NULL); + QWidget* widget = new AuthorUI(static_cast<Pokemod::Author*>(m_object), NULL); return QVariant::fromValue(widget); } - else if (role == BaseModel::ContextMenuRole) + else if (role == Pokemodr::BaseModel::ContextMenuRole) { KMenu* menu = new KMenu; menu->addAction("Delete Author", this, SLOT(deleteSelf())); return QVariant::fromValue(static_cast<void*>(menu)); } - return ObjectModel::data(role); + return Pokemodr::ObjectModel::data(role); } -bool AuthorModel::setData(const QVariant& value, int role) +bool Pokemodr::AuthorModel::setData(const QVariant& value, int role) { - if (role == BaseModel::XmlRole) + if (role == Pokemodr::BaseModel::XmlRole) { if (value.canConvert<QString>()) { @@ -88,7 +88,7 @@ bool AuthorModel::setData(const QVariant& value, int role) return false; } -void AuthorModel::deleteSelf() +void Pokemodr::AuthorModel::deleteSelf() { // static_cast<GroupModel*>(m_parent)->deleteObject(this); } diff --git a/pokemodr/models/AuthorModel.h b/pokemodr/models/AuthorModel.h index e6bbceda..2795d7c5 100644 --- a/pokemodr/models/AuthorModel.h +++ b/pokemodr/models/AuthorModel.h @@ -22,14 +22,19 @@ #include "ObjectModel.h" // Forward declarations +namespace Pokemod +{ class Author; +} +namespace Pokemodr +{ class AuthorModel : public ObjectModel { Q_OBJECT public: - AuthorModel(BaseModel* parent, Author* author); + AuthorModel(BaseModel* parent, Pokemod::Author* author); ~AuthorModel(); QVariant data(int role = Qt::DisplayRole) const; @@ -38,5 +43,6 @@ class AuthorModel : public ObjectModel public slots: void deleteSelf(); }; +} #endif diff --git a/pokemodr/models/BadgeGroupModel.cpp b/pokemodr/models/BadgeGroupModel.cpp index 01032056..5d06faf9 100644 --- a/pokemodr/models/BadgeGroupModel.cpp +++ b/pokemodr/models/BadgeGroupModel.cpp @@ -31,31 +31,31 @@ // KDE includes #include <KMenu> -BadgeGroupModel::BadgeGroupModel(BaseModel* parent, Pokemod* pokemod) : +Pokemodr::BadgeGroupModel::BadgeGroupModel(BaseModel* parent, Pokemod::Pokemod* pokemod) : GroupModel(parent, pokemod, "Badges") { for (int i = 0; i < pokemod->badgeCount(); ++i) addObject(pokemod->badge(i)); } -BadgeGroupModel::~BadgeGroupModel() +Pokemodr::BadgeGroupModel::~BadgeGroupModel() { } -QVariant BadgeGroupModel::data(const int role) const +QVariant Pokemodr::BadgeGroupModel::data(const int role) const { - if (role == BaseModel::ContextMenuRole) + if (role == Pokemodr::BaseModel::ContextMenuRole) { KMenu* menu = new KMenu; menu->addAction("Add Badge", this, SLOT(addObject())); return QVariant::fromValue(static_cast<void*>(menu)); } - return GroupModel::data(role); + return Pokemodr::GroupModel::data(role); } -bool BadgeGroupModel::setData(const QVariant& value, int role) +bool Pokemodr::BadgeGroupModel::setData(const QVariant& value, int role) { - if (role == BaseModel::XmlRole) + if (role == Pokemodr::BaseModel::XmlRole) { if (value.canConvert<QString>()) { @@ -65,7 +65,7 @@ bool BadgeGroupModel::setData(const QVariant& value, int role) { if (xml.doctype().name() == "Badge") { - addObject(static_cast<Pokemod*>(m_object)->newBadge(xml.documentElement())); + addObject(static_cast<Pokemod::Pokemod*>(m_object)->newBadge(xml.documentElement())); return true; } file.close(); @@ -75,20 +75,20 @@ bool BadgeGroupModel::setData(const QVariant& value, int role) return false; } -void BadgeGroupModel::addObject(Object* object) +void Pokemodr::BadgeGroupModel::addObject(Pokemod::Object* object) { if (!object) - object = static_cast<Pokemod*>(m_object)->newBadge(); + object = static_cast<Pokemod::Pokemod*>(m_object)->newBadge(); if (object->className() == "Badge") - m_objects.append(new BadgeModel(this, static_cast<Badge*>(object))); + m_objects.append(new BadgeModel(this, static_cast<Pokemod::Badge*>(object))); } -void BadgeGroupModel::deleteObject(BaseObjectModel* model) +void Pokemodr::BadgeGroupModel::deleteObject(BaseObjectModel* model) { const int index = m_objects.indexOf(model); if (0 <= index) { - static_cast<Pokemod*>(m_object)->deleteBadge(index); + static_cast<Pokemod::Pokemod*>(m_object)->deleteBadge(index); m_objects[index]->deleteLater(); m_objects.removeAt(index); } diff --git a/pokemodr/models/BadgeGroupModel.h b/pokemodr/models/BadgeGroupModel.h index 0569d79a..b9a11b42 100644 --- a/pokemodr/models/BadgeGroupModel.h +++ b/pokemodr/models/BadgeGroupModel.h @@ -22,21 +22,27 @@ #include "GroupModel.h" // Forward declarations +namespace Pokemod +{ class Pokemod; +} +namespace Pokemodr +{ class BadgeGroupModel : public GroupModel { Q_OBJECT public: - BadgeGroupModel(BaseModel* parent, Pokemod* pokemod); + BadgeGroupModel(BaseModel* parent, Pokemod::Pokemod* pokemod); ~BadgeGroupModel(); QVariant data(const int role = Qt::DisplayRole) const; bool setData(const QVariant& value, int role = Qt::EditRole); public slots: - void addObject(Object* object = NULL); + void addObject(Pokemod::Object* object = NULL); void deleteObject(BaseObjectModel* model); }; +} #endif diff --git a/pokemodr/models/BadgeModel.cpp b/pokemodr/models/BadgeModel.cpp index a373efef..efebe456 100644 --- a/pokemodr/models/BadgeModel.cpp +++ b/pokemodr/models/BadgeModel.cpp @@ -21,7 +21,7 @@ // Model includes #include "GroupModel.h" -// PokeModr includes +// Pokemodr includes #include "../BadgeUI.h" // Pokemod includes @@ -33,42 +33,42 @@ // KDE includes #include <KMenu> -BadgeModel::BadgeModel(BaseModel* parent, Badge* badge) : +Pokemodr::BadgeModel::BadgeModel(BaseModel* parent, Pokemod::Badge* badge) : ObjectModel(parent, badge) { } -BadgeModel::~BadgeModel() +Pokemodr::BadgeModel::~BadgeModel() { } -QVariant BadgeModel::data(int role) const +QVariant Pokemodr::BadgeModel::data(int role) const { if (role == Qt::DisplayRole) - return static_cast<Badge*>(m_object)->name(); - else if (role == BaseModel::XmlRole) + return static_cast<Pokemod::Badge*>(m_object)->name(); + else if (role == Pokemodr::BaseModel::XmlRole) { QDomDocument xml(m_object->className()); xml.appendChild(m_object->save()); return xml.toString(); } - else if (role == BaseModel::WidgetRole) + else if (role == Pokemodr::BaseModel::WidgetRole) { - QWidget* widget = new BadgeUI(static_cast<Badge*>(m_object), NULL); + QWidget* widget = new BadgeUI(static_cast<Pokemod::Badge*>(m_object), NULL); return QVariant::fromValue(widget); } - else if (role == BaseModel::ContextMenuRole) + else if (role == Pokemodr::BaseModel::ContextMenuRole) { KMenu* menu = new KMenu; menu->addAction("Delete Badge", this, SLOT(deleteSelf())); return QVariant::fromValue(static_cast<void*>(menu)); } - return ObjectModel::data(role); + return Pokemodr::ObjectModel::data(role); } -bool BadgeModel::setData(const QVariant& value, int role) +bool Pokemodr::BadgeModel::setData(const QVariant& value, int role) { - if (role == BaseModel::XmlRole) + if (role == Pokemodr::BaseModel::XmlRole) { if (value.canConvert<QString>()) { @@ -88,7 +88,7 @@ bool BadgeModel::setData(const QVariant& value, int role) return false; } -void BadgeModel::deleteSelf() +void Pokemodr::BadgeModel::deleteSelf() { // static_cast<GroupModel*>(m_parent)->deleteObject(this); } diff --git a/pokemodr/models/BadgeModel.h b/pokemodr/models/BadgeModel.h index 4c67796c..41108e61 100644 --- a/pokemodr/models/BadgeModel.h +++ b/pokemodr/models/BadgeModel.h @@ -22,14 +22,19 @@ #include "ObjectModel.h" // Forward declarations +namespace Pokemod +{ class Badge; +} +namespace Pokemodr +{ class BadgeModel : public ObjectModel { Q_OBJECT public: - BadgeModel(BaseModel* parent, Badge* badge); + BadgeModel(BaseModel* parent, Pokemod::Badge* badge); ~BadgeModel(); QVariant data(int role = Qt::DisplayRole) const; @@ -38,5 +43,6 @@ class BadgeModel : public ObjectModel public slots: void deleteSelf(); }; +} #endif diff --git a/pokemodr/models/BaseModel.cpp b/pokemodr/models/BaseModel.cpp index c4cc4b99..616b475e 100644 --- a/pokemodr/models/BaseModel.cpp +++ b/pokemodr/models/BaseModel.cpp @@ -21,47 +21,47 @@ // Pokemod includes #include "../../pokemod/Object.h" -BaseModel::BaseModel(BaseModel* parent, Object* object, const QString& name) : +Pokemodr::BaseModel::BaseModel(BaseModel* parent, Pokemod::Object* object, const QString& name) : m_parent(parent), m_object(object), m_name(name) { } -BaseModel::~BaseModel() +Pokemodr::BaseModel::~BaseModel() { } -QVariant BaseModel::data(int role) const +QVariant Pokemodr::BaseModel::data(int role) const { - if (role == BaseModel::TypeRole) + if (role == Pokemodr::BaseModel::TypeRole) return type(); return QVariant(); } -BaseModel* BaseModel::parent() +Pokemodr::BaseModel* Pokemodr::BaseModel::parent() { return m_parent; } -int BaseModel::indexNumber() const +int Pokemodr::BaseModel::indexNumber() const { if (m_parent) return m_parent->findChild(this); return -1; } -QString BaseModel::type() const +QString Pokemodr::BaseModel::type() const { return ""; } -const Object* BaseModel::object() const +const Pokemod::Object* Pokemodr::BaseModel::object() const { return m_object; } -int BaseModel::findChild(const BaseModel* /*model*/) const +int Pokemodr::BaseModel::findChild(const BaseModel* /*model*/) const { return -1; } diff --git a/pokemodr/models/BaseModel.h b/pokemodr/models/BaseModel.h index 2c0eb648..eb972e3a 100644 --- a/pokemodr/models/BaseModel.h +++ b/pokemodr/models/BaseModel.h @@ -23,14 +23,19 @@ #include <QVariant> // Forward declarations +namespace Pokemod +{ class Object; +} +namespace Pokemodr +{ class BaseModel : public QObject { Q_OBJECT public: - BaseModel(BaseModel* parent, Object* object, const QString& name = ""); + BaseModel(BaseModel* parent, Pokemod::Object* object, const QString& name = ""); virtual ~BaseModel(); BaseModel* parent(); @@ -49,7 +54,7 @@ class BaseModel : public QObject virtual QString type() const; - const Object* object() const; + const Pokemod::Object* object() const; static const int TypeRole = Qt::UserRole; static const int XmlRole = Qt::UserRole + 1; @@ -59,8 +64,9 @@ class BaseModel : public QObject virtual int findChild(const BaseModel* /*model*/) const; BaseModel* m_parent; - Object* m_object; + Pokemod::Object* m_object; QString m_name; }; +} #endif diff --git a/pokemodr/models/BaseObjectModel.cpp b/pokemodr/models/BaseObjectModel.cpp index 8e60ffad..8282a7f5 100644 --- a/pokemodr/models/BaseObjectModel.cpp +++ b/pokemodr/models/BaseObjectModel.cpp @@ -21,41 +21,41 @@ // Pokemod includes #include "../../pokemod/Object.h" -BaseObjectModel::BaseObjectModel(BaseModel* parent, Object* object) : +Pokemodr::BaseObjectModel::BaseObjectModel(BaseModel* parent, Pokemod::Object* object) : BaseModel(parent, object, "") { } -BaseObjectModel::~BaseObjectModel() +Pokemodr::BaseObjectModel::~BaseObjectModel() { } -QVariant BaseObjectModel::data(int role) const +QVariant Pokemodr::BaseObjectModel::data(int role) const { - return BaseModel::data(role); + return Pokemodr::BaseModel::data(role); } -Qt::ItemFlags BaseObjectModel::flags() const +Qt::ItemFlags Pokemodr::BaseObjectModel::flags() const { return Qt::ItemIsDragEnabled | Qt::ItemIsSelectable | Qt::ItemIsDropEnabled | Qt::ItemIsEnabled; } -Qt::DropActions BaseObjectModel::supportedDragActions() +Qt::DropActions Pokemodr::BaseObjectModel::supportedDragActions() { return Qt::CopyAction | Qt::MoveAction; } -Qt::DropActions BaseObjectModel::supportedDropActions() +Qt::DropActions Pokemodr::BaseObjectModel::supportedDropActions() { return Qt::CopyAction | Qt::MoveAction; } -QString BaseObjectModel::type() const +QString Pokemodr::BaseObjectModel::type() const { return m_object->className(); } -int BaseObjectModel::findChild(const BaseModel* /*model*/) const +int Pokemodr::BaseObjectModel::findChild(const BaseModel* /*model*/) const { return -1; } diff --git a/pokemodr/models/BaseObjectModel.h b/pokemodr/models/BaseObjectModel.h index 309ff8d9..e840fee4 100644 --- a/pokemodr/models/BaseObjectModel.h +++ b/pokemodr/models/BaseObjectModel.h @@ -21,12 +21,14 @@ // Model includes #include "BaseModel.h" +namespace Pokemodr +{ class BaseObjectModel : public BaseModel { Q_OBJECT public: - BaseObjectModel(BaseModel* parent, Object* object); + BaseObjectModel(BaseModel* parent, Pokemod::Object* object); virtual ~BaseObjectModel(); virtual QVariant data(int role = Qt::DisplayRole) const; @@ -44,5 +46,6 @@ class BaseObjectModel : public BaseModel protected: virtual int findChild(const BaseModel* /*model*/) const; }; +} #endif diff --git a/pokemodr/models/CoinListGroupModel.cpp b/pokemodr/models/CoinListGroupModel.cpp index d958d792..2de15681 100644 --- a/pokemodr/models/CoinListGroupModel.cpp +++ b/pokemodr/models/CoinListGroupModel.cpp @@ -31,31 +31,31 @@ // KDE includes #include <KMenu> -CoinListGroupModel::CoinListGroupModel(BaseModel* parent, Pokemod* pokemod) : +Pokemodr::CoinListGroupModel::CoinListGroupModel(BaseModel* parent, Pokemod::Pokemod* pokemod) : GroupModel(parent, pokemod, "Coin Lists") { for (int i = 0; i < pokemod->coinListCount(); ++i) addObject(pokemod->coinList(i)); } -CoinListGroupModel::~CoinListGroupModel() +Pokemodr::CoinListGroupModel::~CoinListGroupModel() { } -QVariant CoinListGroupModel::data(const int role) const +QVariant Pokemodr::CoinListGroupModel::data(const int role) const { - if (role == BaseModel::ContextMenuRole) + if (role == Pokemodr::BaseModel::ContextMenuRole) { KMenu* menu = new KMenu; menu->addAction("Add Coin List", this, SLOT(addObject())); return QVariant::fromValue(static_cast<void*>(menu)); } - return GroupModel::data(role); + return Pokemodr::GroupModel::data(role); } -bool CoinListGroupModel::setData(const QVariant& value, int role) +bool Pokemodr::CoinListGroupModel::setData(const QVariant& value, int role) { - if (role == BaseModel::XmlRole) + if (role == Pokemodr::BaseModel::XmlRole) { if (value.canConvert<QString>()) { @@ -65,7 +65,7 @@ bool CoinListGroupModel::setData(const QVariant& value, int role) { if (xml.doctype().name() == "CoinList") { - addObject(static_cast<Pokemod*>(m_object)->newCoinList(xml.documentElement())); + addObject(static_cast<Pokemod::Pokemod*>(m_object)->newCoinList(xml.documentElement())); return true; } file.close(); @@ -75,20 +75,20 @@ bool CoinListGroupModel::setData(const QVariant& value, int role) return false; } -void CoinListGroupModel::addObject(Object* object) +void Pokemodr::CoinListGroupModel::addObject(Pokemod::Object* object) { if (!object) - object = static_cast<Pokemod*>(m_object)->newCoinList(); + object = static_cast<Pokemod::Pokemod*>(m_object)->newCoinList(); if (object->className() == "CoinList") - m_objects.append(new CoinListModel(this, static_cast<CoinList*>(object))); + m_objects.append(new CoinListModel(this, static_cast<Pokemod::CoinList*>(object))); } -void CoinListGroupModel::deleteObject(BaseObjectModel* model) +void Pokemodr::CoinListGroupModel::deleteObject(BaseObjectModel* model) { const int index = m_objects.indexOf(model); if (0 <= index) { - static_cast<Pokemod*>(m_object)->deleteCoinList(index); + static_cast<Pokemod::Pokemod*>(m_object)->deleteCoinList(index); m_objects[index]->deleteLater(); m_objects.removeAt(index); } diff --git a/pokemodr/models/CoinListGroupModel.h b/pokemodr/models/CoinListGroupModel.h index b1a2572c..fb281a4f 100644 --- a/pokemodr/models/CoinListGroupModel.h +++ b/pokemodr/models/CoinListGroupModel.h @@ -22,21 +22,27 @@ #include "GroupModel.h" // Forward declarations +namespace Pokemod +{ class Pokemod; +} +namespace Pokemodr +{ class CoinListGroupModel : public GroupModel { Q_OBJECT public: - CoinListGroupModel(BaseModel* parent, Pokemod* pokemod); + CoinListGroupModel(BaseModel* parent, Pokemod::Pokemod* pokemod); ~CoinListGroupModel(); QVariant data(const int role = Qt::DisplayRole) const; bool setData(const QVariant& value, int role = Qt::EditRole); public slots: - void addObject(Object* object = NULL); + void addObject(Pokemod::Object* object = NULL); void deleteObject(BaseObjectModel* model); }; +} #endif diff --git a/pokemodr/models/CoinListModel.cpp b/pokemodr/models/CoinListModel.cpp index 5e75e6ed..8f82ccc1 100644 --- a/pokemodr/models/CoinListModel.cpp +++ b/pokemodr/models/CoinListModel.cpp @@ -21,7 +21,7 @@ // Model includes #include "CoinListObjectModel.h" -// PokeModr includes +// Pokemodr includes #include "../CoinListUI.h" // Pokemod includes @@ -34,33 +34,33 @@ // KDE includes #include <KMenu> -CoinListModel::CoinListModel(BaseModel* parent, CoinList* coinList) : +Pokemodr::CoinListModel::CoinListModel(BaseModel* parent, Pokemod::CoinList* coinList) : GroupObjectModel(parent, coinList) { setupData(); } -CoinListModel::~CoinListModel() +Pokemodr::CoinListModel::~CoinListModel() { clearData(); } -QVariant CoinListModel::data(int role) const +QVariant Pokemodr::CoinListModel::data(int role) const { if (role == Qt::DisplayRole) - return static_cast<CoinList*>(m_object)->name(); - else if (role == BaseModel::XmlRole) + return static_cast<Pokemod::CoinList*>(m_object)->name(); + else if (role == Pokemodr::BaseModel::XmlRole) { QDomDocument xml(m_object->className()); xml.appendChild(m_object->save()); return xml.toString(); } - else if (role == BaseModel::WidgetRole) + else if (role == Pokemodr::BaseModel::WidgetRole) { - QWidget* widget = new CoinListUI(static_cast<CoinList*>(m_object), NULL); + QWidget* widget = new CoinListUI(static_cast<Pokemod::CoinList*>(m_object), NULL); return QVariant::fromValue(widget); } - else if (role == BaseModel::ContextMenuRole) + else if (role == Pokemodr::BaseModel::ContextMenuRole) { KMenu* menu = new KMenu; menu->addAction("Add Object", this, SLOT(addObject())); @@ -68,12 +68,12 @@ QVariant CoinListModel::data(int role) const menu->addAction("Delete Coin List", this, SLOT(deleteSelf())); return QVariant::fromValue(static_cast<void*>(menu)); } - return GroupObjectModel::data(role); + return Pokemodr::GroupObjectModel::data(role); } -bool CoinListModel::setData(const QVariant& value, int role) +bool Pokemodr::CoinListModel::setData(const QVariant& value, int role) { - if (role == BaseModel::XmlRole) + if (role == Pokemodr::BaseModel::XmlRole) { if (value.canConvert<QString>()) { @@ -90,7 +90,7 @@ bool CoinListModel::setData(const QVariant& value, int role) } else if (xml.doctype().name() == "CoinListObject") { - addObject(static_cast<CoinList*>(m_object)->newObject(xml.documentElement())); + addObject(static_cast<Pokemod::CoinList*>(m_object)->newObject(xml.documentElement())); return true; } file.close(); @@ -100,33 +100,33 @@ bool CoinListModel::setData(const QVariant& value, int role) return false; } -void CoinListModel::addObject(Object* object) +void Pokemodr::CoinListModel::addObject(Pokemod::Object* object) { if (!object) - object = static_cast<CoinList*>(m_object)->newObject(); + object = static_cast<Pokemod::CoinList*>(m_object)->newObject(); if (object->className() == "CoinListObject") - m_objects.append(new CoinListObjectModel(this, static_cast<CoinListObject*>(object))); + m_objects.append(new CoinListObjectModel(this, static_cast<Pokemod::CoinListObject*>(object))); } -void CoinListModel::deleteObject(BaseModel* model) +void Pokemodr::CoinListModel::deleteObject(BaseModel* model) { const int index = m_objects.indexOf(model); if (0 <= index) { - static_cast<CoinList*>(m_object)->deleteObject(index); + static_cast<Pokemod::CoinList*>(m_object)->deleteObject(index); m_objects[index]->deleteLater(); m_objects.removeAt(index); } } -void CoinListModel::deleteSelf() +void Pokemodr::CoinListModel::deleteSelf() { // static_cast<GroupModel*>(m_parent)->deleteObject(this); } -void CoinListModel::setupData() +void Pokemodr::CoinListModel::setupData() { - CoinList* coinList = static_cast<CoinList*>(m_object); + Pokemod::CoinList* coinList = static_cast<Pokemod::CoinList*>(m_object); for (int i = 0; i < coinList->objectCount(); ++i) m_objects.append(new CoinListObjectModel(this, coinList->object(i))); } diff --git a/pokemodr/models/CoinListModel.h b/pokemodr/models/CoinListModel.h index a0615a82..26dc0a8d 100644 --- a/pokemodr/models/CoinListModel.h +++ b/pokemodr/models/CoinListModel.h @@ -22,26 +22,32 @@ #include "GroupObjectModel.h" // Forward declarations +namespace Pokemod +{ class CoinList; +} +namespace Pokemodr +{ class CoinListModel : public GroupObjectModel { Q_OBJECT public: - CoinListModel(BaseModel* parent, CoinList* coinList); + CoinListModel(BaseModel* parent, Pokemod::CoinList* coinList); ~CoinListModel(); QVariant data(int role = Qt::DisplayRole) const; bool setData(const QVariant& value, int role = Qt::EditRole); public slots: - void addObject(Object* object = NULL); + void addObject(Pokemod::Object* object = NULL); void deleteObject(BaseModel* model); void deleteSelf(); protected: void setupData(); }; +} #endif diff --git a/pokemodr/models/CoinListObjectModel.cpp b/pokemodr/models/CoinListObjectModel.cpp index 996378a5..8e86767c 100644 --- a/pokemodr/models/CoinListObjectModel.cpp +++ b/pokemodr/models/CoinListObjectModel.cpp @@ -21,13 +21,14 @@ // Model includes #include "GroupObjectModel.h" -// PokeModr includes +// Pokemodr includes #include "../CoinListObjectUI.h" // Pokemod includes #include "../../pokemod/CoinList.h" #include "../../pokemod/CoinListObject.h" #include "../../pokemod/Item.h" +#include "../../pokemod/Pokemod.h" #include "../../pokemod/Species.h" // Qt includes @@ -36,57 +37,57 @@ // KDE includes #include <KMenu> -CoinListObjectModel::CoinListObjectModel(BaseModel* parent, CoinListObject* object) : +Pokemodr::CoinListObjectModel::CoinListObjectModel(BaseModel* parent, Pokemod::CoinListObject* object) : ObjectModel(parent, object) { } -CoinListObjectModel::~CoinListObjectModel() +Pokemodr::CoinListObjectModel::~CoinListObjectModel() { } -QVariant CoinListObjectModel::data(int role) const +QVariant Pokemodr::CoinListObjectModel::data(int role) const { if (role == Qt::DisplayRole) { - CoinListObject* object = static_cast<CoinListObject*>(m_object); - if (object->type() == CoinListObject::Item) + Pokemod::CoinListObject* object = static_cast<Pokemod::CoinListObject*>(m_object); + if (object->type() == Pokemod::CoinListObject::Item) { - const Item* item = static_cast<const Pokemod*>(m_object->pokemod())->itemById(object->object()); + const Pokemod::Item* item = static_cast<const Pokemod::Pokemod*>(m_object->pokemod())->itemById(object->object()); if (item) return item->name(); } - else if (object->type() == CoinListObject::Species) + else if (object->type() == Pokemod::CoinListObject::Species) { - const Species* species = static_cast<const Pokemod*>(m_object->pokemod())->speciesById(object->object()); + const Pokemod::Species* species = static_cast<const Pokemod::Pokemod*>(m_object->pokemod())->speciesById(object->object()); if (species) return species->name(); } return ""; } - else if (role == BaseModel::XmlRole) + else if (role == Pokemodr::BaseModel::XmlRole) { QDomDocument xml(m_object->className()); xml.appendChild(m_object->save()); return xml.toString(); } - else if (role == BaseModel::WidgetRole) + else if (role == Pokemodr::BaseModel::WidgetRole) { - QWidget* widget = new CoinListObjectUI(static_cast<CoinListObject*>(m_object), NULL); + QWidget* widget = new CoinListObjectUI(static_cast<Pokemod::CoinListObject*>(m_object), NULL); return QVariant::fromValue(widget); } - else if (role == BaseModel::ContextMenuRole) + else if (role == Pokemodr::BaseModel::ContextMenuRole) { KMenu* menu = new KMenu; menu->addAction("Delete Object", this, SLOT(deleteSelf())); return QVariant::fromValue(static_cast<void*>(menu)); } - return ObjectModel::data(role); + return Pokemodr::ObjectModel::data(role); } -bool CoinListObjectModel::setData(const QVariant& value, int role) +bool Pokemodr::CoinListObjectModel::setData(const QVariant& value, int role) { - if (role == BaseModel::XmlRole) + if (role == Pokemodr::BaseModel::XmlRole) { if (value.canConvert<QString>()) { @@ -106,7 +107,7 @@ bool CoinListObjectModel::setData(const QVariant& value, int role) return false; } -void CoinListObjectModel::deleteSelf() +void Pokemodr::CoinListObjectModel::deleteSelf() { // static_cast<GroupObjectModel*>(m_parent)->deleteObject(this); } diff --git a/pokemodr/models/CoinListObjectModel.h b/pokemodr/models/CoinListObjectModel.h index 2bfc170c..63f38369 100644 --- a/pokemodr/models/CoinListObjectModel.h +++ b/pokemodr/models/CoinListObjectModel.h @@ -22,14 +22,19 @@ #include "ObjectModel.h" // Forward declarations +namespace Pokemod +{ class CoinListObject; +} +namespace Pokemodr +{ class CoinListObjectModel : public ObjectModel { Q_OBJECT public: - CoinListObjectModel(BaseModel* parent, CoinListObject* object); + CoinListObjectModel(BaseModel* parent, Pokemod::CoinListObject* object); ~CoinListObjectModel(); QVariant data(int role = Qt::DisplayRole) const; @@ -38,5 +43,6 @@ class CoinListObjectModel : public ObjectModel public slots: void deleteSelf(); }; +} #endif diff --git a/pokemodr/models/EggGroupGroupModel.cpp b/pokemodr/models/EggGroupGroupModel.cpp index 8cdc69b1..3a6f8dbe 100644 --- a/pokemodr/models/EggGroupGroupModel.cpp +++ b/pokemodr/models/EggGroupGroupModel.cpp @@ -31,31 +31,31 @@ // KDE includes #include <KMenu> -EggGroupGroupModel::EggGroupGroupModel(BaseModel* parent, Pokemod* pokemod) : +Pokemodr::EggGroupGroupModel::EggGroupGroupModel(BaseModel* parent, Pokemod::Pokemod* pokemod) : GroupModel(parent, pokemod, "Egg Groups") { for (int i = 0; i < pokemod->eggGroupCount(); ++i) addObject(pokemod->eggGroup(i)); } -EggGroupGroupModel::~EggGroupGroupModel() +Pokemodr::EggGroupGroupModel::~EggGroupGroupModel() { } -QVariant EggGroupGroupModel::data(const int role) const +QVariant Pokemodr::EggGroupGroupModel::data(const int role) const { - if (role == BaseModel::ContextMenuRole) + if (role == Pokemodr::BaseModel::ContextMenuRole) { KMenu* menu = new KMenu; menu->addAction("Add EggGroup", this, SLOT(addObject())); return QVariant::fromValue(static_cast<void*>(menu)); } - return GroupModel::data(role); + return Pokemodr::GroupModel::data(role); } -bool EggGroupGroupModel::setData(const QVariant& value, int role) +bool Pokemodr::EggGroupGroupModel::setData(const QVariant& value, int role) { - if (role == BaseModel::XmlRole) + if (role == Pokemodr::BaseModel::XmlRole) { if (value.canConvert<QString>()) { @@ -65,7 +65,7 @@ bool EggGroupGroupModel::setData(const QVariant& value, int role) { if (xml.doctype().name() == "EggGroup") { - addObject(static_cast<Pokemod*>(m_object)->newEggGroup(xml.documentElement())); + addObject(static_cast<Pokemod::Pokemod*>(m_object)->newEggGroup(xml.documentElement())); return true; } file.close(); @@ -75,20 +75,20 @@ bool EggGroupGroupModel::setData(const QVariant& value, int role) return false; } -void EggGroupGroupModel::addObject(Object* object) +void Pokemodr::EggGroupGroupModel::addObject(Pokemod::Object* object) { if (!object) - object = static_cast<Pokemod*>(m_object)->newEggGroup(); + object = static_cast<Pokemod::Pokemod*>(m_object)->newEggGroup(); if (object->className() == "EggGroup") - m_objects.append(new EggGroupModel(this, static_cast<EggGroup*>(object))); + m_objects.append(new EggGroupModel(this, static_cast<Pokemod::EggGroup*>(object))); } -void EggGroupGroupModel::deleteObject(BaseObjectModel* model) +void Pokemodr::EggGroupGroupModel::deleteObject(BaseObjectModel* model) { const int index = m_objects.indexOf(model); if (0 <= index) { - static_cast<Pokemod*>(m_object)->deleteEggGroup(index); + static_cast<Pokemod::Pokemod*>(m_object)->deleteEggGroup(index); m_objects[index]->deleteLater(); m_objects.removeAt(index); } diff --git a/pokemodr/models/EggGroupGroupModel.h b/pokemodr/models/EggGroupGroupModel.h index 31bc94f1..65b0f3b0 100644 --- a/pokemodr/models/EggGroupGroupModel.h +++ b/pokemodr/models/EggGroupGroupModel.h @@ -22,21 +22,27 @@ #include "GroupModel.h" // Forward declarations +namespace Pokemod +{ class Pokemod; +} +namespace Pokemodr +{ class EggGroupGroupModel : public GroupModel { Q_OBJECT public: - EggGroupGroupModel(BaseModel* parent, Pokemod* pokemod); + EggGroupGroupModel(BaseModel* parent, Pokemod::Pokemod* pokemod); ~EggGroupGroupModel(); QVariant data(const int role = Qt::DisplayRole) const; bool setData(const QVariant& value, int role = Qt::EditRole); public slots: - void addObject(Object* object = NULL); + void addObject(Pokemod::Object* object = NULL); void deleteObject(BaseObjectModel* model); }; +} #endif diff --git a/pokemodr/models/EggGroupModel.cpp b/pokemodr/models/EggGroupModel.cpp index 27e39e02..c622d59d 100644 --- a/pokemodr/models/EggGroupModel.cpp +++ b/pokemodr/models/EggGroupModel.cpp @@ -21,7 +21,7 @@ // Model includes #include "GroupModel.h" -// PokeModr includes +// Pokemodr includes #include "../EggGroupUI.h" // Pokemod includes @@ -33,42 +33,42 @@ // KDE includes #include <KMenu> -EggGroupModel::EggGroupModel(BaseModel* parent, EggGroup* eggGroup) : +Pokemodr::EggGroupModel::EggGroupModel(BaseModel* parent, Pokemod::EggGroup* eggGroup) : ObjectModel(parent, eggGroup) { } -EggGroupModel::~EggGroupModel() +Pokemodr::EggGroupModel::~EggGroupModel() { } -QVariant EggGroupModel::data(int role) const +QVariant Pokemodr::EggGroupModel::data(int role) const { if (role == Qt::DisplayRole) - return static_cast<EggGroup*>(m_object)->name(); - else if (role == BaseModel::XmlRole) + return static_cast<Pokemod::EggGroup*>(m_object)->name(); + else if (role == Pokemodr::BaseModel::XmlRole) { QDomDocument xml(m_object->className()); xml.appendChild(m_object->save()); return xml.toString(); } - else if (role == BaseModel::WidgetRole) + else if (role == Pokemodr::BaseModel::WidgetRole) { - QWidget* widget = new EggGroupUI(static_cast<EggGroup*>(m_object), NULL); + QWidget* widget = new EggGroupUI(static_cast<Pokemod::EggGroup*>(m_object), NULL); return QVariant::fromValue(widget); } - else if (role == BaseModel::ContextMenuRole) + else if (role == Pokemodr::BaseModel::ContextMenuRole) { KMenu* menu = new KMenu; menu->addAction("Delete Egg Group", this, SLOT(deleteSelf())); return QVariant::fromValue(static_cast<void*>(menu)); } - return ObjectModel::data(role); + return Pokemodr::ObjectModel::data(role); } -bool EggGroupModel::setData(const QVariant& value, int role) +bool Pokemodr::EggGroupModel::setData(const QVariant& value, int role) { - if (role == BaseModel::XmlRole) + if (role == Pokemodr::BaseModel::XmlRole) { if (value.canConvert<QString>()) { @@ -88,7 +88,7 @@ bool EggGroupModel::setData(const QVariant& value, int role) return false; } -void EggGroupModel::deleteSelf() +void Pokemodr::EggGroupModel::deleteSelf() { // static_cast<GroupModel*>(m_parent)->deleteObject(this); } diff --git a/pokemodr/models/EggGroupModel.h b/pokemodr/models/EggGroupModel.h index 97835c93..8686a977 100644 --- a/pokemodr/models/EggGroupModel.h +++ b/pokemodr/models/EggGroupModel.h @@ -22,14 +22,19 @@ #include "ObjectModel.h" // Forward declarations +namespace Pokemod +{ class EggGroup; +} +namespace Pokemodr +{ class EggGroupModel : public ObjectModel { Q_OBJECT public: - EggGroupModel(BaseModel* parent, EggGroup* eggGroup); + EggGroupModel(BaseModel* parent, Pokemod::EggGroup* eggGroup); ~EggGroupModel(); QVariant data(int role = Qt::DisplayRole) const; @@ -38,5 +43,6 @@ class EggGroupModel : public ObjectModel public slots: void deleteSelf(); }; +} #endif diff --git a/pokemodr/models/GlobalScriptGroupModel.cpp b/pokemodr/models/GlobalScriptGroupModel.cpp index f17c6c29..7f43cea6 100644 --- a/pokemodr/models/GlobalScriptGroupModel.cpp +++ b/pokemodr/models/GlobalScriptGroupModel.cpp @@ -31,31 +31,31 @@ // KDE includes #include <KMenu> -GlobalScriptGroupModel::GlobalScriptGroupModel(BaseModel* parent, Pokemod* pokemod) : +Pokemodr::GlobalScriptGroupModel::GlobalScriptGroupModel(BaseModel* parent, Pokemod::Pokemod* pokemod) : GroupModel(parent, pokemod, "Global Scripts") { for (int i = 0; i < pokemod->globalScriptCount(); ++i) addObject(pokemod->globalScript(i)); } -GlobalScriptGroupModel::~GlobalScriptGroupModel() +Pokemodr::GlobalScriptGroupModel::~GlobalScriptGroupModel() { } -QVariant GlobalScriptGroupModel::data(const int role) const +QVariant Pokemodr::GlobalScriptGroupModel::data(const int role) const { - if (role == BaseModel::ContextMenuRole) + if (role == Pokemodr::BaseModel::ContextMenuRole) { KMenu* menu = new KMenu; menu->addAction("Add Global Script", this, SLOT(addObject())); return QVariant::fromValue(static_cast<void*>(menu)); } - return GroupModel::data(role); + return Pokemodr::GroupModel::data(role); } -bool GlobalScriptGroupModel::setData(const QVariant& value, int role) +bool Pokemodr::GlobalScriptGroupModel::setData(const QVariant& value, int role) { - if (role == BaseModel::XmlRole) + if (role == Pokemodr::BaseModel::XmlRole) { if (value.canConvert<QString>()) { @@ -65,7 +65,7 @@ bool GlobalScriptGroupModel::setData(const QVariant& value, int role) { if (xml.doctype().name() == "GlobalScript") { - addObject(static_cast<Pokemod*>(m_object)->newGlobalScript(xml.documentElement())); + addObject(static_cast<Pokemod::Pokemod*>(m_object)->newGlobalScript(xml.documentElement())); return true; } file.close(); @@ -75,20 +75,20 @@ bool GlobalScriptGroupModel::setData(const QVariant& value, int role) return false; } -void GlobalScriptGroupModel::addObject(Object* object) +void Pokemodr::GlobalScriptGroupModel::addObject(Pokemod::Object* object) { if (!object) - object = static_cast<Pokemod*>(m_object)->newGlobalScript(); + object = static_cast<Pokemod::Pokemod*>(m_object)->newGlobalScript(); if (object->className() == "GlobalScript") - m_objects.append(new GlobalScriptModel(this, static_cast<GlobalScript*>(object))); + m_objects.append(new GlobalScriptModel(this, static_cast<Pokemod::GlobalScript*>(object))); } -void GlobalScriptGroupModel::deleteObject(BaseObjectModel* model) +void Pokemodr::GlobalScriptGroupModel::deleteObject(BaseObjectModel* model) { const int index = m_objects.indexOf(model); if (0 <= index) { - static_cast<Pokemod*>(m_object)->deleteGlobalScript(index); + static_cast<Pokemod::Pokemod*>(m_object)->deleteGlobalScript(index); m_objects[index]->deleteLater(); m_objects.removeAt(index); } diff --git a/pokemodr/models/GlobalScriptGroupModel.h b/pokemodr/models/GlobalScriptGroupModel.h index 8e995d25..442135b0 100644 --- a/pokemodr/models/GlobalScriptGroupModel.h +++ b/pokemodr/models/GlobalScriptGroupModel.h @@ -22,21 +22,27 @@ #include "GroupModel.h" // Forward declarations +namespace Pokemod +{ class Pokemod; +} +namespace Pokemodr +{ class GlobalScriptGroupModel : public GroupModel { Q_OBJECT public: - GlobalScriptGroupModel(BaseModel* parent, Pokemod* pokemod); + GlobalScriptGroupModel(BaseModel* parent, Pokemod::Pokemod* pokemod); ~GlobalScriptGroupModel(); QVariant data(const int role = Qt::DisplayRole) const; bool setData(const QVariant& value, int role = Qt::EditRole); public slots: - void addObject(Object* object = NULL); + void addObject(Pokemod::Object* object = NULL); void deleteObject(BaseObjectModel* model); }; +} #endif diff --git a/pokemodr/models/GlobalScriptModel.cpp b/pokemodr/models/GlobalScriptModel.cpp index ae3f4e47..4431e508 100644 --- a/pokemodr/models/GlobalScriptModel.cpp +++ b/pokemodr/models/GlobalScriptModel.cpp @@ -21,7 +21,7 @@ // Model includes #include "GroupModel.h" -// PokeModr includes +// Pokemodr includes #include "../GlobalScriptUI.h" // Pokemod includes @@ -33,42 +33,42 @@ // KDE includes #include <KMenu> -GlobalScriptModel::GlobalScriptModel(BaseModel* parent, GlobalScript* globalScript) : +Pokemodr::GlobalScriptModel::GlobalScriptModel(BaseModel* parent, Pokemod::GlobalScript* globalScript) : ObjectModel(parent, globalScript) { } -GlobalScriptModel::~GlobalScriptModel() +Pokemodr::GlobalScriptModel::~GlobalScriptModel() { } -QVariant GlobalScriptModel::data(int role) const +QVariant Pokemodr::GlobalScriptModel::data(int role) const { if (role == Qt::DisplayRole) - return static_cast<GlobalScript*>(m_object)->name(); - else if (role == BaseModel::XmlRole) + return static_cast<Pokemod::GlobalScript*>(m_object)->name(); + else if (role == Pokemodr::BaseModel::XmlRole) { QDomDocument xml(m_object->className()); xml.appendChild(m_object->save()); return xml.toString(); } - else if (role == BaseModel::WidgetRole) + else if (role == Pokemodr::BaseModel::WidgetRole) { - QWidget* widget = new GlobalScriptUI(static_cast<GlobalScript*>(m_object), NULL); + QWidget* widget = new GlobalScriptUI(static_cast<Pokemod::GlobalScript*>(m_object), NULL); return QVariant::fromValue(widget); } - else if (role == BaseModel::ContextMenuRole) + else if (role == Pokemodr::BaseModel::ContextMenuRole) { KMenu* menu = new KMenu; menu->addAction("Delete Global Script", this, SLOT(deleteSelf())); return QVariant::fromValue(static_cast<void*>(menu)); } - return ObjectModel::data(role); + return Pokemodr::ObjectModel::data(role); } -bool GlobalScriptModel::setData(const QVariant& value, int role) +bool Pokemodr::GlobalScriptModel::setData(const QVariant& value, int role) { - if (role == BaseModel::XmlRole) + if (role == Pokemodr::BaseModel::XmlRole) { if (value.canConvert<QString>()) { @@ -88,7 +88,7 @@ bool GlobalScriptModel::setData(const QVariant& value, int role) return false; } -void GlobalScriptModel::deleteSelf() +void Pokemodr::GlobalScriptModel::deleteSelf() { // static_cast<GroupModel*>(m_parent)->deleteObject(this); } diff --git a/pokemodr/models/GlobalScriptModel.h b/pokemodr/models/GlobalScriptModel.h index 83d59194..cf2bb3ec 100644 --- a/pokemodr/models/GlobalScriptModel.h +++ b/pokemodr/models/GlobalScriptModel.h @@ -22,14 +22,19 @@ #include "ObjectModel.h" // Forward declarations +namespace Pokemod +{ class GlobalScript; +} +namespace Pokemodr +{ class GlobalScriptModel : public ObjectModel { Q_OBJECT public: - GlobalScriptModel(BaseModel* parent, GlobalScript* globalScript); + GlobalScriptModel(BaseModel* parent, Pokemod::GlobalScript* globalScript); ~GlobalScriptModel(); QVariant data(int role = Qt::DisplayRole) const; @@ -38,5 +43,6 @@ class GlobalScriptModel : public ObjectModel public slots: void deleteSelf(); }; +} #endif diff --git a/pokemodr/models/GroupModel.cpp b/pokemodr/models/GroupModel.cpp index 0e6f9ce2..9ceaef09 100644 --- a/pokemodr/models/GroupModel.cpp +++ b/pokemodr/models/GroupModel.cpp @@ -21,56 +21,56 @@ // Model includes #include "BaseObjectModel.h" -GroupModel::GroupModel(BaseModel* parent, Object* object, const QString& name) : +Pokemodr::GroupModel::GroupModel(BaseModel* parent, Pokemod::Object* object, const QString& name) : BaseModel(parent, object, name) { } -GroupModel::~GroupModel() +Pokemodr::GroupModel::~GroupModel() { clearData(); } -QVariant GroupModel::data(int role) const +QVariant Pokemodr::GroupModel::data(int role) const { if (role == Qt::DisplayRole) return m_name; - return BaseModel::data(role); + return Pokemodr::BaseModel::data(role); } -int GroupModel::rowCount() const +int Pokemodr::GroupModel::rowCount() const { return m_objects.size(); } -Qt::ItemFlags GroupModel::flags() const +Qt::ItemFlags Pokemodr::GroupModel::flags() const { return Qt::ItemIsDropEnabled | Qt::ItemIsEnabled; } -BaseModel* GroupModel::childItem(const int row) +Pokemodr::BaseModel* Pokemodr::GroupModel::childItem(const int row) { if (row < m_objects.size()) return m_objects[row]; return NULL; } -Qt::DropActions GroupModel::supportedDragActions() +Qt::DropActions Pokemodr::GroupModel::supportedDragActions() { return 0; } -Qt::DropActions GroupModel::supportedDropActions() +Qt::DropActions Pokemodr::GroupModel::supportedDropActions() { return Qt::CopyAction | Qt::MoveAction; } -int GroupModel::findChild(const BaseModel* model) const +int Pokemodr::GroupModel::findChild(const BaseModel* model) const { return m_objects.indexOf(const_cast<BaseObjectModel*>(static_cast<const BaseObjectModel*>(model))); } -void GroupModel::clearData() +void Pokemodr::GroupModel::clearData() { foreach (BaseObjectModel* model, m_objects) delete model; diff --git a/pokemodr/models/GroupModel.h b/pokemodr/models/GroupModel.h index 9971aa6a..6f254af6 100644 --- a/pokemodr/models/GroupModel.h +++ b/pokemodr/models/GroupModel.h @@ -25,7 +25,12 @@ #include <QList> // Forward declarations +namespace Pokemod +{ class Object; +} +namespace Pokemodr +{ class BaseObjectModel; class GroupModel : public BaseModel @@ -33,7 +38,7 @@ class GroupModel : public BaseModel Q_OBJECT public: - GroupModel(BaseModel* parent, Object* object, const QString& name = ""); + GroupModel(BaseModel* parent, Pokemod::Object* object, const QString& name = ""); virtual ~GroupModel(); QVariant data(int role = Qt::DisplayRole) const; @@ -47,7 +52,7 @@ class GroupModel : public BaseModel Qt::DropActions supportedDragActions(); Qt::DropActions supportedDropActions(); public slots: - virtual void addObject(Object* object = NULL) = 0; + virtual void addObject(Pokemod::Object* object = NULL) = 0; virtual void deleteObject(BaseObjectModel* model) = 0; protected: int findChild(const BaseModel* model) const; @@ -56,5 +61,6 @@ class GroupModel : public BaseModel private: void clearData(); }; +} #endif diff --git a/pokemodr/models/GroupObjectModel.cpp b/pokemodr/models/GroupObjectModel.cpp index 2631bac7..cf677dc2 100644 --- a/pokemodr/models/GroupObjectModel.cpp +++ b/pokemodr/models/GroupObjectModel.cpp @@ -18,38 +18,38 @@ // Header include #include "GroupObjectModel.h" -GroupObjectModel::GroupObjectModel(BaseModel* parent, Object* object) : +Pokemodr::GroupObjectModel::GroupObjectModel(BaseModel* parent, Pokemod::Object* object) : BaseObjectModel(parent, object) { } -GroupObjectModel::~GroupObjectModel() +Pokemodr::GroupObjectModel::~GroupObjectModel() { } -QVariant GroupObjectModel::data(int role) const +QVariant Pokemodr::GroupObjectModel::data(int role) const { - return BaseObjectModel::data(role); + return Pokemodr::BaseObjectModel::data(role); } -int GroupObjectModel::rowCount() const +int Pokemodr::GroupObjectModel::rowCount() const { return m_objects.size(); } -BaseModel* GroupObjectModel::childItem(const int row) +Pokemodr::BaseModel* Pokemodr::GroupObjectModel::childItem(const int row) { if (row < m_objects.size()) return m_objects[row]; return NULL; } -int GroupObjectModel::findChild(const BaseModel* model) const +int Pokemodr::GroupObjectModel::findChild(const BaseModel* model) const { return m_objects.indexOf(const_cast<BaseModel*>(model)); } -void GroupObjectModel::clearData() +void Pokemodr::GroupObjectModel::clearData() { foreach (BaseModel* model, m_objects) delete model; diff --git a/pokemodr/models/GroupObjectModel.h b/pokemodr/models/GroupObjectModel.h index 26029a49..110c7b9f 100644 --- a/pokemodr/models/GroupObjectModel.h +++ b/pokemodr/models/GroupObjectModel.h @@ -22,12 +22,14 @@ #include "BaseObjectModel.h" #include "GroupModel.h" +namespace Pokemodr +{ class GroupObjectModel : public BaseObjectModel { Q_OBJECT public: - GroupObjectModel(BaseModel* parent, Object* object); + GroupObjectModel(BaseModel* parent, Pokemod::Object* object); virtual ~GroupObjectModel(); virtual QVariant data(int role = Qt::DisplayRole) const; @@ -37,7 +39,7 @@ class GroupObjectModel : public BaseObjectModel BaseModel* childItem(const int row); public slots: - virtual void addObject(Object* object = NULL) = 0; + virtual void addObject(Pokemod::Object* object = NULL) = 0; virtual void deleteObject(BaseModel* model) = 0; virtual void deleteSelf() = 0; @@ -49,5 +51,6 @@ class GroupObjectModel : public BaseObjectModel QList<BaseModel*> m_objects; }; +} #endif diff --git a/pokemodr/models/ItemGroupModel.cpp b/pokemodr/models/ItemGroupModel.cpp index d97b3293..521bd9d2 100644 --- a/pokemodr/models/ItemGroupModel.cpp +++ b/pokemodr/models/ItemGroupModel.cpp @@ -31,31 +31,31 @@ // KDE includes #include <KMenu> -ItemGroupModel::ItemGroupModel(BaseModel* parent, Pokemod* pokemod) : +Pokemodr::ItemGroupModel::ItemGroupModel(BaseModel* parent, Pokemod::Pokemod* pokemod) : GroupModel(parent, pokemod, "Items") { for (int i = 0; i < pokemod->itemCount(); ++i) addObject(pokemod->item(i)); } -ItemGroupModel::~ItemGroupModel() +Pokemodr::ItemGroupModel::~ItemGroupModel() { } -QVariant ItemGroupModel::data(const int role) const +QVariant Pokemodr::ItemGroupModel::data(const int role) const { - if (role == BaseModel::ContextMenuRole) + if (role == Pokemodr::BaseModel::ContextMenuRole) { KMenu* menu = new KMenu; menu->addAction("Add Item", this, SLOT(addObject())); return QVariant::fromValue(static_cast<void*>(menu)); } - return GroupModel::data(role); + return Pokemodr::GroupModel::data(role); } -bool ItemGroupModel::setData(const QVariant& value, int role) +bool Pokemodr::ItemGroupModel::setData(const QVariant& value, int role) { - if (role == BaseModel::XmlRole) + if (role == Pokemodr::BaseModel::XmlRole) { if (value.canConvert<QString>()) { @@ -65,7 +65,7 @@ bool ItemGroupModel::setData(const QVariant& value, int role) { if (xml.doctype().name() == "Item") { - addObject(static_cast<Pokemod*>(m_object)->newItem(xml.documentElement())); + addObject(static_cast<Pokemod::Pokemod*>(m_object)->newItem(xml.documentElement())); return true; } file.close(); @@ -75,20 +75,20 @@ bool ItemGroupModel::setData(const QVariant& value, int role) return false; } -void ItemGroupModel::addObject(Object* object) +void Pokemodr::ItemGroupModel::addObject(Pokemod::Object* object) { if (!object) - object = static_cast<Pokemod*>(m_object)->newItem(); + object = static_cast<Pokemod::Pokemod*>(m_object)->newItem(); if (object->className() == "Item") - m_objects.append(new ItemModel(this, static_cast<Item*>(object))); + m_objects.append(new ItemModel(this, static_cast<Pokemod::Item*>(object))); } -void ItemGroupModel::deleteObject(BaseObjectModel* model) +void Pokemodr::ItemGroupModel::deleteObject(BaseObjectModel* model) { const int index = m_objects.indexOf(model); if (0 <= index) { - static_cast<Pokemod*>(m_object)->deleteItem(index); + static_cast<Pokemod::Pokemod*>(m_object)->deleteItem(index); m_objects[index]->deleteLater(); m_objects.removeAt(index); } diff --git a/pokemodr/models/ItemGroupModel.h b/pokemodr/models/ItemGroupModel.h index cb5b5a01..6812fc5b 100644 --- a/pokemodr/models/ItemGroupModel.h +++ b/pokemodr/models/ItemGroupModel.h @@ -22,21 +22,27 @@ #include "GroupModel.h" // Forward declarations +namespace Pokemod +{ class Pokemod; +} +namespace Pokemodr +{ class ItemGroupModel : public GroupModel { Q_OBJECT public: - ItemGroupModel(BaseModel* parent, Pokemod* pokemod); + ItemGroupModel(BaseModel* parent, Pokemod::Pokemod* pokemod); ~ItemGroupModel(); QVariant data(const int role = Qt::DisplayRole) const; bool setData(const QVariant& value, int role = Qt::EditRole); public slots: - void addObject(Object* object = NULL); + void addObject(Pokemod::Object* object = NULL); void deleteObject(BaseObjectModel* model); }; +} #endif diff --git a/pokemodr/models/ItemModel.cpp b/pokemodr/models/ItemModel.cpp index 7d30bfbc..b12827c2 100644 --- a/pokemodr/models/ItemModel.cpp +++ b/pokemodr/models/ItemModel.cpp @@ -21,7 +21,7 @@ // Model includes #include "GroupModel.h" -// PokeModr includes +// Pokemodr includes #include "../ItemUI.h" // Pokemod includes @@ -33,42 +33,42 @@ // KDE includes #include <KMenu> -ItemModel::ItemModel(BaseModel* parent, Item* item) : +Pokemodr::ItemModel::ItemModel(BaseModel* parent, Pokemod::Item* item) : ObjectModel(parent, item) { } -ItemModel::~ItemModel() +Pokemodr::ItemModel::~ItemModel() { } -QVariant ItemModel::data(int role) const +QVariant Pokemodr::ItemModel::data(int role) const { if (role == Qt::DisplayRole) - return static_cast<Item*>(m_object)->name(); - else if (role == BaseModel::XmlRole) + return static_cast<Pokemod::Item*>(m_object)->name(); + else if (role == Pokemodr::BaseModel::XmlRole) { QDomDocument xml(m_object->className()); xml.appendChild(m_object->save()); return xml.toString(); } - else if (role == BaseModel::WidgetRole) + else if (role == Pokemodr::BaseModel::WidgetRole) { - QWidget* widget = new ItemUI(static_cast<Item*>(m_object), NULL); + QWidget* widget = new ItemUI(static_cast<Pokemod::Item*>(m_object), NULL); return QVariant::fromValue(widget); } - else if (role == BaseModel::ContextMenuRole) + else if (role == Pokemodr::BaseModel::ContextMenuRole) { KMenu* menu = new KMenu; menu->addAction("Delete Item", this, SLOT(deleteSelf())); return QVariant::fromValue(static_cast<void*>(menu)); } - return ObjectModel::data(role); + return Pokemodr::ObjectModel::data(role); } -bool ItemModel::setData(const QVariant& value, int role) +bool Pokemodr::ItemModel::setData(const QVariant& value, int role) { - if (role == BaseModel::XmlRole) + if (role == Pokemodr::BaseModel::XmlRole) { if (value.canConvert<QString>()) { @@ -88,7 +88,7 @@ bool ItemModel::setData(const QVariant& value, int role) return false; } -void ItemModel::deleteSelf() +void Pokemodr::ItemModel::deleteSelf() { // static_cast<GroupModel*>(m_parent)->deleteObject(this); } diff --git a/pokemodr/models/ItemModel.h b/pokemodr/models/ItemModel.h index 63f7047e..960129cc 100644 --- a/pokemodr/models/ItemModel.h +++ b/pokemodr/models/ItemModel.h @@ -22,14 +22,19 @@ #include "ObjectModel.h" // Forward declarations +namespace Pokemod +{ class Item; +} +namespace Pokemodr +{ class ItemModel : public ObjectModel { Q_OBJECT public: - ItemModel(BaseModel* parent, Item* item); + ItemModel(BaseModel* parent, Pokemod::Item* item); ~ItemModel(); QVariant data(int role = Qt::DisplayRole) const; @@ -38,5 +43,6 @@ class ItemModel : public ObjectModel public slots: void deleteSelf(); }; +} #endif diff --git a/pokemodr/models/ItemTypeGroupModel.cpp b/pokemodr/models/ItemTypeGroupModel.cpp index bcac947a..4841322f 100644 --- a/pokemodr/models/ItemTypeGroupModel.cpp +++ b/pokemodr/models/ItemTypeGroupModel.cpp @@ -31,31 +31,31 @@ // KDE includes #include <KMenu> -ItemTypeGroupModel::ItemTypeGroupModel(BaseModel* parent, Pokemod* pokemod) : +Pokemodr::ItemTypeGroupModel::ItemTypeGroupModel(BaseModel* parent, Pokemod::Pokemod* pokemod) : GroupModel(parent, pokemod, "Item Types") { for (int i = 0; i < pokemod->itemTypeCount(); ++i) addObject(pokemod->itemType(i)); } -ItemTypeGroupModel::~ItemTypeGroupModel() +Pokemodr::ItemTypeGroupModel::~ItemTypeGroupModel() { } -QVariant ItemTypeGroupModel::data(const int role) const +QVariant Pokemodr::ItemTypeGroupModel::data(const int role) const { - if (role == BaseModel::ContextMenuRole) + if (role == Pokemodr::BaseModel::ContextMenuRole) { KMenu* menu = new KMenu; menu->addAction("Add Item Type", this, SLOT(addObject())); return QVariant::fromValue(static_cast<void*>(menu)); } - return GroupModel::data(role); + return Pokemodr::GroupModel::data(role); } -bool ItemTypeGroupModel::setData(const QVariant& value, int role) +bool Pokemodr::ItemTypeGroupModel::setData(const QVariant& value, int role) { - if (role == BaseModel::XmlRole) + if (role == Pokemodr::BaseModel::XmlRole) { if (value.canConvert<QString>()) { @@ -65,7 +65,7 @@ bool ItemTypeGroupModel::setData(const QVariant& value, int role) { if (xml.doctype().name() == "ItemType") { - addObject(static_cast<Pokemod*>(m_object)->newItemType(xml.documentElement())); + addObject(static_cast<Pokemod::Pokemod*>(m_object)->newItemType(xml.documentElement())); return true; } file.close(); @@ -75,20 +75,20 @@ bool ItemTypeGroupModel::setData(const QVariant& value, int role) return false; } -void ItemTypeGroupModel::addObject(Object* object) +void Pokemodr::ItemTypeGroupModel::addObject(Pokemod::Object* object) { if (!object) - object = static_cast<Pokemod*>(m_object)->newItemType(); + object = static_cast<Pokemod::Pokemod*>(m_object)->newItemType(); if (object->className() == "ItemType") - m_objects.append(new ItemTypeModel(this, static_cast<ItemType*>(object))); + m_objects.append(new ItemTypeModel(this, static_cast<Pokemod::ItemType*>(object))); } -void ItemTypeGroupModel::deleteObject(BaseObjectModel* model) +void Pokemodr::ItemTypeGroupModel::deleteObject(BaseObjectModel* model) { const int index = m_objects.indexOf(model); if (0 <= index) { - static_cast<Pokemod*>(m_object)->deleteItemType(index); + static_cast<Pokemod::Pokemod*>(m_object)->deleteItemType(index); m_objects[index]->deleteLater(); m_objects.removeAt(index); } diff --git a/pokemodr/models/ItemTypeGroupModel.h b/pokemodr/models/ItemTypeGroupModel.h index 5386e8e2..9b23486c 100644 --- a/pokemodr/models/ItemTypeGroupModel.h +++ b/pokemodr/models/ItemTypeGroupModel.h @@ -22,21 +22,27 @@ #include "GroupModel.h" // Forward declarations +namespace Pokemod +{ class Pokemod; +} +namespace Pokemodr +{ class ItemTypeGroupModel : public GroupModel { Q_OBJECT public: - ItemTypeGroupModel(BaseModel* parent, Pokemod* pokemod); + ItemTypeGroupModel(BaseModel* parent, Pokemod::Pokemod* pokemod); ~ItemTypeGroupModel(); QVariant data(const int role = Qt::DisplayRole) const; bool setData(const QVariant& value, int role = Qt::EditRole); public slots: - void addObject(Object* object = NULL); + void addObject(Pokemod::Object* object = NULL); void deleteObject(BaseObjectModel* model); }; +} #endif diff --git a/pokemodr/models/ItemTypeModel.cpp b/pokemodr/models/ItemTypeModel.cpp index 8b92bd99..75d657fe 100644 --- a/pokemodr/models/ItemTypeModel.cpp +++ b/pokemodr/models/ItemTypeModel.cpp @@ -21,7 +21,7 @@ // Model includes #include "GroupModel.h" -// PokeModr includes +// Pokemodr includes #include "../ItemTypeUI.h" // Pokemod includes @@ -33,42 +33,42 @@ // KDE includes #include <KMenu> -ItemTypeModel::ItemTypeModel(BaseModel* parent, ItemType* itemType) : +Pokemodr::ItemTypeModel::ItemTypeModel(BaseModel* parent, Pokemod::ItemType* itemType) : ObjectModel(parent, itemType) { } -ItemTypeModel::~ItemTypeModel() +Pokemodr::ItemTypeModel::~ItemTypeModel() { } -QVariant ItemTypeModel::data(int role) const +QVariant Pokemodr::ItemTypeModel::data(int role) const { if (role == Qt::DisplayRole) - return static_cast<ItemType*>(m_object)->name(); - else if (role == BaseModel::XmlRole) + return static_cast<Pokemod::ItemType*>(m_object)->name(); + else if (role == Pokemodr::BaseModel::XmlRole) { QDomDocument xml(m_object->className()); xml.appendChild(m_object->save()); return xml.toString(); } - else if (role == BaseModel::WidgetRole) + else if (role == Pokemodr::BaseModel::WidgetRole) { - QWidget* widget = new ItemTypeUI(static_cast<ItemType*>(m_object), NULL); + QWidget* widget = new ItemTypeUI(static_cast<Pokemod::ItemType*>(m_object), NULL); return QVariant::fromValue(widget); } - else if (role == BaseModel::ContextMenuRole) + else if (role == Pokemodr::BaseModel::ContextMenuRole) { KMenu* menu = new KMenu; menu->addAction("Delete Item Type", this, SLOT(deleteSelf())); return QVariant::fromValue(static_cast<void*>(menu)); } - return ObjectModel::data(role); + return Pokemodr::ObjectModel::data(role); } -bool ItemTypeModel::setData(const QVariant& value, int role) +bool Pokemodr::ItemTypeModel::setData(const QVariant& value, int role) { - if (role == BaseModel::XmlRole) + if (role == Pokemodr::BaseModel::XmlRole) { if (value.canConvert<QString>()) { @@ -88,7 +88,7 @@ bool ItemTypeModel::setData(const QVariant& value, int role) return false; } -void ItemTypeModel::deleteSelf() +void Pokemodr::ItemTypeModel::deleteSelf() { // static_cast<GroupModel*>(m_parent)->deleteObject(this); } diff --git a/pokemodr/models/ItemTypeModel.h b/pokemodr/models/ItemTypeModel.h index 53dde9fe..254e04d6 100644 --- a/pokemodr/models/ItemTypeModel.h +++ b/pokemodr/models/ItemTypeModel.h @@ -22,14 +22,19 @@ #include "ObjectModel.h" // Forward declarations +namespace Pokemod +{ class ItemType; +} +namespace Pokemodr +{ class ItemTypeModel : public ObjectModel { Q_OBJECT public: - ItemTypeModel(BaseModel* parent, ItemType* itemType); + ItemTypeModel(BaseModel* parent, Pokemod::ItemType* itemType); ~ItemTypeModel(); QVariant data(int role = Qt::DisplayRole) const; @@ -38,5 +43,6 @@ class ItemTypeModel : public ObjectModel public slots: void deleteSelf(); }; +} #endif diff --git a/pokemodr/models/MapEffectGroupModel.cpp b/pokemodr/models/MapEffectGroupModel.cpp index 97101747..b3e67dc7 100644 --- a/pokemodr/models/MapEffectGroupModel.cpp +++ b/pokemodr/models/MapEffectGroupModel.cpp @@ -31,31 +31,31 @@ // KDE includes #include <KMenu> -MapEffectGroupModel::MapEffectGroupModel(BaseModel* parent, Map* map) : +Pokemodr::MapEffectGroupModel::MapEffectGroupModel(BaseModel* parent, Pokemod::Map* map) : GroupModel(parent, map, "Effects") { for (int i = 0; i < map->effectCount(); ++i) addObject(map->effect(i)); } -MapEffectGroupModel::~MapEffectGroupModel() +Pokemodr::MapEffectGroupModel::~MapEffectGroupModel() { } -QVariant MapEffectGroupModel::data(const int role) const +QVariant Pokemodr::MapEffectGroupModel::data(const int role) const { - if (role == BaseModel::ContextMenuRole) + if (role == Pokemodr::BaseModel::ContextMenuRole) { KMenu* menu = new KMenu; menu->addAction("Add Effect", this, SLOT(addObject())); return QVariant::fromValue(static_cast<void*>(menu)); } - return GroupModel::data(role); + return Pokemodr::GroupModel::data(role); } -bool MapEffectGroupModel::setData(const QVariant& value, int role) +bool Pokemodr::MapEffectGroupModel::setData(const QVariant& value, int role) { - if (role == BaseModel::XmlRole) + if (role == Pokemodr::BaseModel::XmlRole) { if (value.canConvert<QString>()) { @@ -65,7 +65,7 @@ bool MapEffectGroupModel::setData(const QVariant& value, int role) { if (xml.doctype().name() == "MapEffect") { - addObject(static_cast<Map*>(m_object)->newEffect(xml.documentElement())); + addObject(static_cast<Pokemod::Map*>(m_object)->newEffect(xml.documentElement())); return true; } file.close(); @@ -75,20 +75,20 @@ bool MapEffectGroupModel::setData(const QVariant& value, int role) return false; } -void MapEffectGroupModel::addObject(Object* object) +void Pokemodr::MapEffectGroupModel::addObject(Pokemod::Object* object) { if (!object) - object = static_cast<Map*>(m_object)->newEffect(); + object = static_cast<Pokemod::Map*>(m_object)->newEffect(); if (object->className() == "MapEffect") - m_objects.append(new MapEffectModel(this, static_cast<MapEffect*>(object))); + m_objects.append(new MapEffectModel(this, static_cast<Pokemod::MapEffect*>(object))); } -void MapEffectGroupModel::deleteObject(BaseObjectModel* model) +void Pokemodr::MapEffectGroupModel::deleteObject(BaseObjectModel* model) { const int index = m_objects.indexOf(model); if (0 <= index) { - static_cast<Map*>(m_object)->deleteEffect(index); + static_cast<Pokemod::Map*>(m_object)->deleteEffect(index); m_objects[index]->deleteLater(); m_objects.removeAt(index); } diff --git a/pokemodr/models/MapEffectGroupModel.h b/pokemodr/models/MapEffectGroupModel.h index ea62503d..6291c6e5 100644 --- a/pokemodr/models/MapEffectGroupModel.h +++ b/pokemodr/models/MapEffectGroupModel.h @@ -22,21 +22,27 @@ #include "GroupModel.h" // Forward declarations +namespace Pokemod +{ class Map; +} +namespace Pokemodr +{ class MapEffectGroupModel : public GroupModel { Q_OBJECT public: - MapEffectGroupModel(BaseModel* parent, Map* map); + MapEffectGroupModel(BaseModel* parent, Pokemod::Map* map); ~MapEffectGroupModel(); QVariant data(const int role = Qt::DisplayRole) const; bool setData(const QVariant& value, int role = Qt::EditRole); public slots: - void addObject(Object* object = NULL); + void addObject(Pokemod::Object* object = NULL); void deleteObject(BaseObjectModel* model); }; +} #endif diff --git a/pokemodr/models/MapEffectModel.cpp b/pokemodr/models/MapEffectModel.cpp index a43d2e53..79528265 100644 --- a/pokemodr/models/MapEffectModel.cpp +++ b/pokemodr/models/MapEffectModel.cpp @@ -21,7 +21,7 @@ // Model includes #include "GroupModel.h" -// PokeModr includes +// Pokemodr includes #include "../MapEffectUI.h" // Pokemod includes @@ -34,42 +34,42 @@ // KDE includes #include <KMenu> -MapEffectModel::MapEffectModel(BaseModel* parent, MapEffect* effect) : +Pokemodr::MapEffectModel::MapEffectModel(BaseModel* parent, Pokemod::MapEffect* effect) : ObjectModel(parent, effect) { } -MapEffectModel::~MapEffectModel() +Pokemodr::MapEffectModel::~MapEffectModel() { } -QVariant MapEffectModel::data(int role) const +QVariant Pokemodr::MapEffectModel::data(int role) const { if (role == Qt::DisplayRole) - return static_cast<MapEffect*>(m_object)->name(); - else if (role == BaseModel::XmlRole) + return static_cast<Pokemod::MapEffect*>(m_object)->name(); + else if (role == Pokemodr::BaseModel::XmlRole) { QDomDocument xml(m_object->className()); xml.appendChild(m_object->save()); return xml.toString(); } - else if (role == BaseModel::WidgetRole) + else if (role == Pokemodr::BaseModel::WidgetRole) { - QWidget* widget = new MapEffectUI(static_cast<MapEffect*>(m_object), NULL); + QWidget* widget = new MapEffectUI(static_cast<Pokemod::MapEffect*>(m_object), NULL); return QVariant::fromValue(widget); } - else if (role == BaseModel::ContextMenuRole) + else if (role == Pokemodr::BaseModel::ContextMenuRole) { KMenu* menu = new KMenu; menu->addAction("Delete Effect", this, SLOT(deleteSelf())); return QVariant::fromValue(static_cast<void*>(menu)); } - return ObjectModel::data(role); + return Pokemodr::ObjectModel::data(role); } -bool MapEffectModel::setData(const QVariant& value, int role) +bool Pokemodr::MapEffectModel::setData(const QVariant& value, int role) { - if (role == BaseModel::XmlRole) + if (role == Pokemodr::BaseModel::XmlRole) { if (value.canConvert<QString>()) { @@ -89,7 +89,7 @@ bool MapEffectModel::setData(const QVariant& value, int role) return false; } -void MapEffectModel::deleteSelf() +void Pokemodr::MapEffectModel::deleteSelf() { // static_cast<GroupModel*>(m_parent)->deleteObject(this); } diff --git a/pokemodr/models/MapEffectModel.h b/pokemodr/models/MapEffectModel.h index 848a92db..925399a4 100644 --- a/pokemodr/models/MapEffectModel.h +++ b/pokemodr/models/MapEffectModel.h @@ -22,14 +22,19 @@ #include "ObjectModel.h" // Forward declarations +namespace Pokemod +{ class MapEffect; +} +namespace Pokemodr +{ class MapEffectModel : public ObjectModel { Q_OBJECT public: - MapEffectModel(BaseModel* parent, MapEffect* effect); + MapEffectModel(BaseModel* parent, Pokemod::MapEffect* effect); ~MapEffectModel(); QVariant data(int role = Qt::DisplayRole) const; @@ -38,5 +43,6 @@ class MapEffectModel : public ObjectModel public slots: void deleteSelf(); }; +} #endif diff --git a/pokemodr/models/MapGroupModel.cpp b/pokemodr/models/MapGroupModel.cpp index 70641808..5986c47b 100644 --- a/pokemodr/models/MapGroupModel.cpp +++ b/pokemodr/models/MapGroupModel.cpp @@ -31,31 +31,31 @@ // KDE includes #include <KMenu> -MapGroupModel::MapGroupModel(BaseModel* parent, Pokemod* pokemod) : +Pokemodr::MapGroupModel::MapGroupModel(BaseModel* parent, Pokemod::Pokemod* pokemod) : GroupModel(parent, pokemod, "Maps") { for (int i = 0; i < pokemod->mapCount(); ++i) addObject(pokemod->map(i)); } -MapGroupModel::~MapGroupModel() +Pokemodr::MapGroupModel::~MapGroupModel() { } -QVariant MapGroupModel::data(const int role) const +QVariant Pokemodr::MapGroupModel::data(const int role) const { - if (role == BaseModel::ContextMenuRole) + if (role == Pokemodr::BaseModel::ContextMenuRole) { KMenu* menu = new KMenu; menu->addAction("Add Map", this, SLOT(addObject())); return QVariant::fromValue(static_cast<void*>(menu)); } - return GroupModel::data(role); + return Pokemodr::GroupModel::data(role); } -bool MapGroupModel::setData(const QVariant& value, int role) +bool Pokemodr::MapGroupModel::setData(const QVariant& value, int role) { - if (role == BaseModel::XmlRole) + if (role == Pokemodr::BaseModel::XmlRole) { if (value.canConvert<QString>()) { @@ -65,7 +65,7 @@ bool MapGroupModel::setData(const QVariant& value, int role) { if (xml.doctype().name() == "Map") { - addObject(static_cast<Pokemod*>(m_object)->newMap(xml.documentElement())); + addObject(static_cast<Pokemod::Pokemod*>(m_object)->newMap(xml.documentElement())); return true; } file.close(); @@ -75,20 +75,20 @@ bool MapGroupModel::setData(const QVariant& value, int role) return false; } -void MapGroupModel::addObject(Object* object) +void Pokemodr::MapGroupModel::addObject(Pokemod::Object* object) { if (!object) - object = static_cast<Pokemod*>(m_object)->newMap(); + object = static_cast<Pokemod::Pokemod*>(m_object)->newMap(); if (object->className() == "Map") - m_objects.append(new MapModel(this, static_cast<Map*>(object))); + m_objects.append(new MapModel(this, static_cast<Pokemod::Map*>(object))); } -void MapGroupModel::deleteObject(BaseObjectModel* model) +void Pokemodr::MapGroupModel::deleteObject(BaseObjectModel* model) { const int index = m_objects.indexOf(model); if (0 <= index) { - static_cast<Pokemod*>(m_object)->deleteMap(index); + static_cast<Pokemod::Pokemod*>(m_object)->deleteMap(index); m_objects[index]->deleteLater(); m_objects.removeAt(index); } diff --git a/pokemodr/models/MapGroupModel.h b/pokemodr/models/MapGroupModel.h index 95126ecf..01c3cc12 100644 --- a/pokemodr/models/MapGroupModel.h +++ b/pokemodr/models/MapGroupModel.h @@ -22,21 +22,27 @@ #include "GroupModel.h" // Forward declarations +namespace Pokemod +{ class Pokemod; +} +namespace Pokemodr +{ class MapGroupModel : public GroupModel { Q_OBJECT public: - MapGroupModel(BaseModel* parent, Pokemod* pokemod); + MapGroupModel(BaseModel* parent, Pokemod::Pokemod* pokemod); ~MapGroupModel(); QVariant data(const int role = Qt::DisplayRole) const; bool setData(const QVariant& value, int role = Qt::EditRole); public slots: - void addObject(Object* object = NULL); + void addObject(Pokemod::Object* object = NULL); void deleteObject(BaseObjectModel* model); }; +} #endif diff --git a/pokemodr/models/MapModel.cpp b/pokemodr/models/MapModel.cpp index 040f2871..67642346 100644 --- a/pokemodr/models/MapModel.cpp +++ b/pokemodr/models/MapModel.cpp @@ -24,7 +24,7 @@ #include "MapWarpGroupModel.h" #include "MapWildListGroupModel.h" -// PokeModr includes +// Pokemodr includes #include "../MapUI.h" // Pokemod includes @@ -36,43 +36,43 @@ // KDE includes #include <KMenu> -MapModel::MapModel(BaseModel* parent, Map* map) : +Pokemodr::MapModel::MapModel(BaseModel* parent, Pokemod::Map* map) : GroupObjectModel(parent, map) { setupData(); } -MapModel::~MapModel() +Pokemodr::MapModel::~MapModel() { } -QVariant MapModel::data(int role) const +QVariant Pokemodr::MapModel::data(int role) const { if (role == Qt::DisplayRole) - return static_cast<Map*>(m_object)->name(); - else if (role == BaseModel::XmlRole) + return static_cast<Pokemod::Map*>(m_object)->name(); + else if (role == Pokemodr::BaseModel::XmlRole) { QDomDocument xml(m_object->className()); xml.appendChild(m_object->save()); return xml.toString(); } - else if (role == BaseModel::WidgetRole) + else if (role == Pokemodr::BaseModel::WidgetRole) { - QWidget* widget = new MapUI(static_cast<Map*>(m_object), NULL); + QWidget* widget = new MapUI(static_cast<Pokemod::Map*>(m_object), NULL); return QVariant::fromValue(widget); } - else if (role == BaseModel::ContextMenuRole) + else if (role == Pokemodr::BaseModel::ContextMenuRole) { KMenu* menu = new KMenu; menu->addAction("Delete Map", this, SLOT(deleteSelf())); return QVariant::fromValue(static_cast<void*>(menu)); } - return GroupObjectModel::data(role); + return Pokemodr::GroupObjectModel::data(role); } -bool MapModel::setData(const QVariant& value, int role) +bool Pokemodr::MapModel::setData(const QVariant& value, int role) { - if (role == BaseModel::XmlRole) + if (role == Pokemodr::BaseModel::XmlRole) { if (value.canConvert<QString>()) { @@ -94,22 +94,22 @@ bool MapModel::setData(const QVariant& value, int role) return false; } -void MapModel::addObject(Object* /*object*/) +void Pokemodr::MapModel::addObject(Pokemod::Object* /*object*/) { } -void MapModel::deleteObject(BaseModel* /*model*/) +void Pokemodr::MapModel::deleteObject(BaseModel* /*model*/) { } -void MapModel::deleteSelf() +void Pokemodr::MapModel::deleteSelf() { // static_cast<GroupModel*>(m_parent)->deleteObject(this); } -void MapModel::setupData() +void Pokemodr::MapModel::setupData() { - Map* map = static_cast<Map*>(m_object); + Pokemod::Map* map = static_cast<Pokemod::Map*>(m_object); m_objects.append(new MapEffectGroupModel(this, map)); m_objects.append(new MapTrainerGroupModel(this, map)); m_objects.append(new MapWarpGroupModel(this, map)); diff --git a/pokemodr/models/MapModel.h b/pokemodr/models/MapModel.h index 332e6a35..d054c9c3 100644 --- a/pokemodr/models/MapModel.h +++ b/pokemodr/models/MapModel.h @@ -22,26 +22,32 @@ #include "GroupObjectModel.h" // Forward declarations +namespace Pokemod +{ class Map; +} +namespace Pokemodr +{ class MapModel : public GroupObjectModel { Q_OBJECT public: - MapModel(BaseModel* parent, Map* map); + MapModel(BaseModel* parent, Pokemod::Map* map); ~MapModel(); QVariant data(int role = Qt::DisplayRole) const; bool setData(const QVariant& value, int role = Qt::EditRole); public slots: - void addObject(Object* /*object = NULL*/); + void addObject(Pokemod::Object* /*object = NULL*/); void deleteObject(BaseModel* /*model*/); void deleteSelf(); protected: void setupData(); }; +} #endif diff --git a/pokemodr/models/MapTrainerGroupModel.cpp b/pokemodr/models/MapTrainerGroupModel.cpp index beab7cdd..fcf4d8b5 100644 --- a/pokemodr/models/MapTrainerGroupModel.cpp +++ b/pokemodr/models/MapTrainerGroupModel.cpp @@ -31,31 +31,31 @@ // KDE includes #include <KMenu> -MapTrainerGroupModel::MapTrainerGroupModel(BaseModel* parent, Map* map) : +Pokemodr::MapTrainerGroupModel::MapTrainerGroupModel(BaseModel* parent, Pokemod::Map* map) : GroupModel(parent, map, "Trainers") { for (int i = 0; i < map->trainerCount(); ++i) addObject(map->trainer(i)); } -MapTrainerGroupModel::~MapTrainerGroupModel() +Pokemodr::MapTrainerGroupModel::~MapTrainerGroupModel() { } -QVariant MapTrainerGroupModel::data(const int role) const +QVariant Pokemodr::MapTrainerGroupModel::data(const int role) const { - if (role == BaseModel::ContextMenuRole) + if (role == Pokemodr::BaseModel::ContextMenuRole) { KMenu* menu = new KMenu; menu->addAction("Add Trainer", this, SLOT(addObject())); return QVariant::fromValue(static_cast<void*>(menu)); } - return GroupModel::data(role); + return Pokemodr::GroupModel::data(role); } -bool MapTrainerGroupModel::setData(const QVariant& value, int role) +bool Pokemodr::MapTrainerGroupModel::setData(const QVariant& value, int role) { - if (role == BaseModel::XmlRole) + if (role == Pokemodr::BaseModel::XmlRole) { if (value.canConvert<QString>()) { @@ -65,7 +65,7 @@ bool MapTrainerGroupModel::setData(const QVariant& value, int role) { if (xml.doctype().name() == "MapTrainer") { - addObject(static_cast<Map*>(m_object)->newTrainer(xml.documentElement())); + addObject(static_cast<Pokemod::Map*>(m_object)->newTrainer(xml.documentElement())); return true; } file.close(); @@ -75,20 +75,20 @@ bool MapTrainerGroupModel::setData(const QVariant& value, int role) return false; } -void MapTrainerGroupModel::addObject(Object* object) +void Pokemodr::MapTrainerGroupModel::addObject(Pokemod::Object* object) { if (!object) - object = static_cast<Map*>(m_object)->newTrainer(); + object = static_cast<Pokemod::Map*>(m_object)->newTrainer(); if (object->className() == "MapTrainer") - m_objects.append(new MapTrainerModel(this, static_cast<MapTrainer*>(object))); + m_objects.append(new MapTrainerModel(this, static_cast<Pokemod::MapTrainer*>(object))); } -void MapTrainerGroupModel::deleteObject(BaseObjectModel* model) +void Pokemodr::MapTrainerGroupModel::deleteObject(BaseObjectModel* model) { const int index = m_objects.indexOf(model); if (0 <= index) { - static_cast<Map*>(m_object)->deleteTrainer(index); + static_cast<Pokemod::Map*>(m_object)->deleteTrainer(index); m_objects[index]->deleteLater(); m_objects.removeAt(index); } diff --git a/pokemodr/models/MapTrainerGroupModel.h b/pokemodr/models/MapTrainerGroupModel.h index 7feab325..72f660ec 100644 --- a/pokemodr/models/MapTrainerGroupModel.h +++ b/pokemodr/models/MapTrainerGroupModel.h @@ -22,21 +22,27 @@ #include "GroupModel.h" // Forward declarations +namespace Pokemod +{ class Map; +} +namespace Pokemodr +{ class MapTrainerGroupModel : public GroupModel { Q_OBJECT public: - MapTrainerGroupModel(BaseModel* parent, Map* map); + MapTrainerGroupModel(BaseModel* parent, Pokemod::Map* map); ~MapTrainerGroupModel(); QVariant data(const int role = Qt::DisplayRole) const; bool setData(const QVariant& value, int role = Qt::EditRole); public slots: - void addObject(Object* object = NULL); + void addObject(Pokemod::Object* object = NULL); void deleteObject(BaseObjectModel* model); }; +} #endif diff --git a/pokemodr/models/MapTrainerModel.cpp b/pokemodr/models/MapTrainerModel.cpp index 2a7154ea..45281b6e 100644 --- a/pokemodr/models/MapTrainerModel.cpp +++ b/pokemodr/models/MapTrainerModel.cpp @@ -21,7 +21,7 @@ // Model includes #include "MapTrainerTeamMemberModel.h" -// PokeModr includes +// Pokemodr includes #include "../MapTrainerUI.h" // Pokemod includes @@ -35,33 +35,33 @@ // KDE includes #include <KMenu> -MapTrainerModel::MapTrainerModel(BaseModel* parent, MapTrainer* trainer) : +Pokemodr::MapTrainerModel::MapTrainerModel(BaseModel* parent, Pokemod::MapTrainer* trainer) : GroupObjectModel(parent, trainer) { setupData(); } -MapTrainerModel::~MapTrainerModel() +Pokemodr::MapTrainerModel::~MapTrainerModel() { clearData(); } -QVariant MapTrainerModel::data(int role) const +QVariant Pokemodr::MapTrainerModel::data(int role) const { if (role == Qt::DisplayRole) - return static_cast<MapTrainer*>(m_object)->name(); - else if (role == BaseModel::XmlRole) + return static_cast<Pokemod::MapTrainer*>(m_object)->name(); + else if (role == Pokemodr::BaseModel::XmlRole) { QDomDocument xml(m_object->className()); xml.appendChild(m_object->save()); return xml.toString(); } - else if (role == BaseModel::WidgetRole) + else if (role == Pokemodr::BaseModel::WidgetRole) { - QWidget* widget = new MapTrainerUI(static_cast<MapTrainer*>(m_object), NULL); + QWidget* widget = new MapTrainerUI(static_cast<Pokemod::MapTrainer*>(m_object), NULL); return QVariant::fromValue(widget); } - else if (role == BaseModel::ContextMenuRole) + else if (role == Pokemodr::BaseModel::ContextMenuRole) { KMenu* menu = new KMenu; menu->addAction("Add Team Member", this, SLOT(addObject())); @@ -69,36 +69,36 @@ QVariant MapTrainerModel::data(int role) const menu->addAction("Delete Trainer", this, SLOT(deleteSelf())); return QVariant::fromValue(static_cast<void*>(menu)); } - return GroupObjectModel::data(role); + return Pokemodr::GroupObjectModel::data(role); } -void MapTrainerModel::addObject(Object* object) +void Pokemodr::MapTrainerModel::addObject(Pokemod::Object* object) { if (!object) - object = static_cast<MapTrainer*>(m_object)->newTeamMember(); + object = static_cast<Pokemod::MapTrainer*>(m_object)->newTeamMember(); if (object->className() == "MapTrainerTeamMember") - m_objects.append(new MapTrainerTeamMemberModel(this, static_cast<MapTrainerTeamMember*>(object))); + m_objects.append(new MapTrainerTeamMemberModel(this, static_cast<Pokemod::MapTrainerTeamMember*>(object))); } -void MapTrainerModel::deleteObject(BaseModel* model) +void Pokemodr::MapTrainerModel::deleteObject(BaseModel* model) { const int index = m_objects.indexOf(model); if (0 <= index) { - static_cast<MapTrainer*>(m_object)->deleteTeamMember(index); + static_cast<Pokemod::MapTrainer*>(m_object)->deleteTeamMember(index); m_objects[index]->deleteLater(); m_objects.removeAt(index); } } -void MapTrainerModel::deleteSelf() +void Pokemodr::MapTrainerModel::deleteSelf() { // static_cast<GroupModel*>(m_parent)->deleteObject(this); } -bool MapTrainerModel::setData(const QVariant& value, int role) +bool Pokemodr::MapTrainerModel::setData(const QVariant& value, int role) { - if (role == BaseModel::XmlRole) + if (role == Pokemodr::BaseModel::XmlRole) { if (value.canConvert<QString>()) { @@ -115,7 +115,7 @@ bool MapTrainerModel::setData(const QVariant& value, int role) } else if (xml.doctype().name() == "MapTrainerTeamMember") { - addObject(static_cast<MapTrainer*>(m_object)->newTeamMember(xml.documentElement())); + addObject(static_cast<Pokemod::MapTrainer*>(m_object)->newTeamMember(xml.documentElement())); return true; } file.close(); @@ -125,9 +125,9 @@ bool MapTrainerModel::setData(const QVariant& value, int role) return false; } -void MapTrainerModel::setupData() +void Pokemodr::MapTrainerModel::setupData() { - MapTrainer* trainer = static_cast<MapTrainer*>(m_object); + Pokemod::MapTrainer* trainer = static_cast<Pokemod::MapTrainer*>(m_object); for (int i = 0; i < trainer->teamMemberCount(); ++i) m_objects.append(new MapTrainerTeamMemberModel(this, trainer->teamMember(i))); } diff --git a/pokemodr/models/MapTrainerModel.h b/pokemodr/models/MapTrainerModel.h index 81426311..7b52d01e 100644 --- a/pokemodr/models/MapTrainerModel.h +++ b/pokemodr/models/MapTrainerModel.h @@ -22,26 +22,32 @@ #include "GroupObjectModel.h" // Forward declarations +namespace Pokemod +{ class MapTrainer; +} +namespace Pokemodr +{ class MapTrainerModel : public GroupObjectModel { Q_OBJECT public: - MapTrainerModel(BaseModel* parent, MapTrainer* trainer); + MapTrainerModel(BaseModel* parent, Pokemod::MapTrainer* trainer); ~MapTrainerModel(); QVariant data(int role = Qt::DisplayRole) const; bool setData(const QVariant& value, int role = Qt::EditRole); public slots: - void addObject(Object* object = NULL); + void addObject(Pokemod::Object* object = NULL); void deleteObject(BaseModel* model); void deleteSelf(); protected: void setupData(); }; +} #endif diff --git a/pokemodr/models/MapTrainerTeamMemberModel.cpp b/pokemodr/models/MapTrainerTeamMemberModel.cpp index fa6844d9..92e7910c 100644 --- a/pokemodr/models/MapTrainerTeamMemberModel.cpp +++ b/pokemodr/models/MapTrainerTeamMemberModel.cpp @@ -21,12 +21,13 @@ // Model includes #include "GroupObjectModel.h" -// PokeModr includes +// Pokemodr includes #include "../MapTrainerTeamMemberUI.h" // Pokemod includes #include "../../pokemod/MapTrainer.h" #include "../../pokemod/MapTrainerTeamMember.h" +#include "../../pokemod/Pokemod.h" #include "../../pokemod/Species.h" // Qt includes @@ -35,47 +36,47 @@ // KDE includes #include <KMenu> -MapTrainerTeamMemberModel::MapTrainerTeamMemberModel(BaseModel* parent, MapTrainerTeamMember* teamMember) : +Pokemodr::MapTrainerTeamMemberModel::MapTrainerTeamMemberModel(BaseModel* parent, Pokemod::MapTrainerTeamMember* teamMember) : ObjectModel(parent, teamMember) { } -MapTrainerTeamMemberModel::~MapTrainerTeamMemberModel() +Pokemodr::MapTrainerTeamMemberModel::~MapTrainerTeamMemberModel() { } -QVariant MapTrainerTeamMemberModel::data(int role) const +QVariant Pokemodr::MapTrainerTeamMemberModel::data(int role) const { if (role == Qt::DisplayRole) { - const Species* species = static_cast<const Pokemod*>(m_object->pokemod())->speciesById(static_cast<MapTrainerTeamMember*>(m_object)->species()); + const Pokemod::Species* species = static_cast<const Pokemod::Pokemod*>(m_object->pokemod())->speciesById(static_cast<Pokemod::MapTrainerTeamMember*>(m_object)->species()); if (species) return species->name(); return ""; } - else if (role == BaseModel::XmlRole) + else if (role == Pokemodr::BaseModel::XmlRole) { QDomDocument xml(m_object->className()); xml.appendChild(m_object->save()); return xml.toString(); } - else if (role == BaseModel::WidgetRole) + else if (role == Pokemodr::BaseModel::WidgetRole) { - QWidget* widget = new MapTrainerTeamMemberUI(static_cast<MapTrainerTeamMember*>(m_object), NULL); + QWidget* widget = new MapTrainerTeamMemberUI(static_cast<Pokemod::MapTrainerTeamMember*>(m_object), NULL); return QVariant::fromValue(widget); } - else if (role == BaseModel::ContextMenuRole) + else if (role == Pokemodr::BaseModel::ContextMenuRole) { KMenu* menu = new KMenu; menu->addAction("Delete Team Member", this, SLOT(deleteSelf())); return QVariant::fromValue(static_cast<void*>(menu)); } - return ObjectModel::data(role); + return Pokemodr::ObjectModel::data(role); } -bool MapTrainerTeamMemberModel::setData(const QVariant& value, int role) +bool Pokemodr::MapTrainerTeamMemberModel::setData(const QVariant& value, int role) { - if (role == BaseModel::XmlRole) + if (role == Pokemodr::BaseModel::XmlRole) { if (value.canConvert<QString>()) { @@ -95,7 +96,7 @@ bool MapTrainerTeamMemberModel::setData(const QVariant& value, int role) return false; } -void MapTrainerTeamMemberModel::deleteSelf() +void Pokemodr::MapTrainerTeamMemberModel::deleteSelf() { // static_cast<GroupObjectModel*>(m_parent)->deleteObject(this); } diff --git a/pokemodr/models/MapTrainerTeamMemberModel.h b/pokemodr/models/MapTrainerTeamMemberModel.h index 7ca6fc5e..db8a874e 100644 --- a/pokemodr/models/MapTrainerTeamMemberModel.h +++ b/pokemodr/models/MapTrainerTeamMemberModel.h @@ -22,14 +22,19 @@ #include "ObjectModel.h" // Forward declarations +namespace Pokemod +{ class MapTrainerTeamMember; +} +namespace Pokemodr +{ class MapTrainerTeamMemberModel : public ObjectModel { Q_OBJECT public: - MapTrainerTeamMemberModel(BaseModel* parent, MapTrainerTeamMember* teamMember); + MapTrainerTeamMemberModel(BaseModel* parent, Pokemod::MapTrainerTeamMember* teamMember); ~MapTrainerTeamMemberModel(); QVariant data(int role = Qt::DisplayRole) const; @@ -38,5 +43,6 @@ class MapTrainerTeamMemberModel : public ObjectModel public slots: void deleteSelf(); }; +} #endif diff --git a/pokemodr/models/MapWarpGroupModel.cpp b/pokemodr/models/MapWarpGroupModel.cpp index 9e451a03..a3963958 100644 --- a/pokemodr/models/MapWarpGroupModel.cpp +++ b/pokemodr/models/MapWarpGroupModel.cpp @@ -31,31 +31,31 @@ // KDE includes #include <KMenu> -MapWarpGroupModel::MapWarpGroupModel(BaseModel* parent, Map* map) : +Pokemodr::MapWarpGroupModel::MapWarpGroupModel(BaseModel* parent, Pokemod::Map* map) : GroupModel(parent, map, "Warps") { for (int i = 0; i < map->warpCount(); ++i) addObject(map->warp(i)); } -MapWarpGroupModel::~MapWarpGroupModel() +Pokemodr::MapWarpGroupModel::~MapWarpGroupModel() { } -QVariant MapWarpGroupModel::data(const int role) const +QVariant Pokemodr::MapWarpGroupModel::data(const int role) const { - if (role == BaseModel::ContextMenuRole) + if (role == Pokemodr::BaseModel::ContextMenuRole) { KMenu* menu = new KMenu; menu->addAction("Add Warp", this, SLOT(addObject())); return QVariant::fromValue(static_cast<void*>(menu)); } - return GroupModel::data(role); + return Pokemodr::GroupModel::data(role); } -bool MapWarpGroupModel::setData(const QVariant& value, int role) +bool Pokemodr::MapWarpGroupModel::setData(const QVariant& value, int role) { - if (role == BaseModel::XmlRole) + if (role == Pokemodr::BaseModel::XmlRole) { if (value.canConvert<QString>()) { @@ -65,7 +65,7 @@ bool MapWarpGroupModel::setData(const QVariant& value, int role) { if (xml.doctype().name() == "MapWarp") { - addObject(static_cast<Map*>(m_object)->newWarp(xml.documentElement())); + addObject(static_cast<Pokemod::Map*>(m_object)->newWarp(xml.documentElement())); return true; } file.close(); @@ -75,20 +75,20 @@ bool MapWarpGroupModel::setData(const QVariant& value, int role) return false; } -void MapWarpGroupModel::addObject(Object* object) +void Pokemodr::MapWarpGroupModel::addObject(Pokemod::Object* object) { if (!object) - object = static_cast<Map*>(m_object)->newWarp(); + object = static_cast<Pokemod::Map*>(m_object)->newWarp(); if (object->className() == "MapWarp") - m_objects.append(new MapWarpModel(this, static_cast<MapWarp*>(object))); + m_objects.append(new MapWarpModel(this, static_cast<Pokemod::MapWarp*>(object))); } -void MapWarpGroupModel::deleteObject(BaseObjectModel* model) +void Pokemodr::MapWarpGroupModel::deleteObject(BaseObjectModel* model) { const int index = m_objects.indexOf(model); if (0 <= index) { - static_cast<Map*>(m_object)->deleteWarp(index); + static_cast<Pokemod::Map*>(m_object)->deleteWarp(index); m_objects[index]->deleteLater(); m_objects.removeAt(index); } diff --git a/pokemodr/models/MapWarpGroupModel.h b/pokemodr/models/MapWarpGroupModel.h index 1eda6e81..dfcff263 100644 --- a/pokemodr/models/MapWarpGroupModel.h +++ b/pokemodr/models/MapWarpGroupModel.h @@ -22,21 +22,27 @@ #include "GroupModel.h" // Forward declarations +namespace Pokemod +{ class Map; +} +namespace Pokemodr +{ class MapWarpGroupModel : public GroupModel { Q_OBJECT public: - MapWarpGroupModel(BaseModel* parent, Map* map); + MapWarpGroupModel(BaseModel* parent, Pokemod::Map* map); ~MapWarpGroupModel(); QVariant data(const int role = Qt::DisplayRole) const; bool setData(const QVariant& value, int role = Qt::EditRole); public slots: - void addObject(Object* object = NULL); + void addObject(Pokemod::Object* object = NULL); void deleteObject(BaseObjectModel* model); }; +} #endif diff --git a/pokemodr/models/MapWarpModel.cpp b/pokemodr/models/MapWarpModel.cpp index 2a3c7825..941d38ca 100644 --- a/pokemodr/models/MapWarpModel.cpp +++ b/pokemodr/models/MapWarpModel.cpp @@ -21,7 +21,7 @@ // Model includes #include "GroupModel.h" -// PokeModr includes +// Pokemodr includes #include "../MapWarpUI.h" // Pokemod includes @@ -34,42 +34,42 @@ // KDE includes #include <KMenu> -MapWarpModel::MapWarpModel(BaseModel* parent, MapWarp* warp) : +Pokemodr::MapWarpModel::MapWarpModel(BaseModel* parent, Pokemod::MapWarp* warp) : ObjectModel(parent, warp) { } -MapWarpModel::~MapWarpModel() +Pokemodr::MapWarpModel::~MapWarpModel() { } -QVariant MapWarpModel::data(int role) const +QVariant Pokemodr::MapWarpModel::data(int role) const { if (role == Qt::DisplayRole) - return static_cast<MapWarp*>(m_object)->name(); - else if (role == BaseModel::XmlRole) + return static_cast<Pokemod::MapWarp*>(m_object)->name(); + else if (role == Pokemodr::BaseModel::XmlRole) { QDomDocument xml(m_object->className()); xml.appendChild(m_object->save()); return xml.toString(); } - else if (role == BaseModel::WidgetRole) + else if (role == Pokemodr::BaseModel::WidgetRole) { - QWidget* widget = new MapWarpUI(static_cast<MapWarp*>(m_object), NULL); + QWidget* widget = new MapWarpUI(static_cast<Pokemod::MapWarp*>(m_object), NULL); return QVariant::fromValue(widget); } - else if (role == BaseModel::ContextMenuRole) + else if (role == Pokemodr::BaseModel::ContextMenuRole) { KMenu* menu = new KMenu; menu->addAction("Delete Warp", this, SLOT(deleteSelf())); return QVariant::fromValue(static_cast<void*>(menu)); } - return ObjectModel::data(role); + return Pokemodr::ObjectModel::data(role); } -bool MapWarpModel::setData(const QVariant& value, int role) +bool Pokemodr::MapWarpModel::setData(const QVariant& value, int role) { - if (role == BaseModel::XmlRole) + if (role == Pokemodr::BaseModel::XmlRole) { if (value.canConvert<QString>()) { @@ -89,7 +89,7 @@ bool MapWarpModel::setData(const QVariant& value, int role) return false; } -void MapWarpModel::deleteSelf() +void Pokemodr::MapWarpModel::deleteSelf() { // static_cast<GroupModel*>(m_parent)->deleteObject(this); } diff --git a/pokemodr/models/MapWarpModel.h b/pokemodr/models/MapWarpModel.h index da4808ba..552dbfb6 100644 --- a/pokemodr/models/MapWarpModel.h +++ b/pokemodr/models/MapWarpModel.h @@ -22,14 +22,19 @@ #include "ObjectModel.h" // Forward declarations +namespace Pokemod +{ class MapWarp; +} +namespace Pokemodr +{ class MapWarpModel : public ObjectModel { Q_OBJECT public: - MapWarpModel(BaseModel* parent, MapWarp* warp); + MapWarpModel(BaseModel* parent, Pokemod::MapWarp* warp); ~MapWarpModel(); QVariant data(int role = Qt::DisplayRole) const; @@ -38,5 +43,6 @@ class MapWarpModel : public ObjectModel public slots: void deleteSelf(); }; +} #endif diff --git a/pokemodr/models/MapWildListEncounterModel.cpp b/pokemodr/models/MapWildListEncounterModel.cpp index ea21fe90..43c7bc79 100644 --- a/pokemodr/models/MapWildListEncounterModel.cpp +++ b/pokemodr/models/MapWildListEncounterModel.cpp @@ -21,12 +21,13 @@ // Model includes #include "GroupObjectModel.h" -// PokeModr includes +// Pokemodr includes #include "../MapWildListEncounterUI.h" // Pokemod includes #include "../../pokemod/MapWildList.h" #include "../../pokemod/MapWildListEncounter.h" +#include "../../pokemod/Pokemod.h" #include "../../pokemod/Species.h" // Qt includes @@ -35,47 +36,47 @@ // KDE includes #include <KMenu> -MapWildListEncounterModel::MapWildListEncounterModel(BaseModel* parent, MapWildListEncounter* encounter) : +Pokemodr::MapWildListEncounterModel::MapWildListEncounterModel(BaseModel* parent, Pokemod::MapWildListEncounter* encounter) : ObjectModel(parent, encounter) { } -MapWildListEncounterModel::~MapWildListEncounterModel() +Pokemodr::MapWildListEncounterModel::~MapWildListEncounterModel() { } -QVariant MapWildListEncounterModel::data(int role) const +QVariant Pokemodr::MapWildListEncounterModel::data(int role) const { if (role == Qt::DisplayRole) { - const Species* species = static_cast<const Pokemod*>(m_object->pokemod())->speciesById(static_cast<MapWildListEncounter*>(m_object)->species()); + const Pokemod::Species* species = static_cast<const Pokemod::Pokemod*>(m_object->pokemod())->speciesById(static_cast<Pokemod::MapWildListEncounter*>(m_object)->species()); if (species) return species->name(); return ""; } - else if (role == BaseModel::XmlRole) + else if (role == Pokemodr::BaseModel::XmlRole) { QDomDocument xml(m_object->className()); xml.appendChild(m_object->save()); return xml.toString(); } - else if (role == BaseModel::WidgetRole) + else if (role == Pokemodr::BaseModel::WidgetRole) { - QWidget* widget = new MapWildListEncounterUI(static_cast<MapWildListEncounter*>(m_object), NULL); + QWidget* widget = new MapWildListEncounterUI(static_cast<Pokemod::MapWildListEncounter*>(m_object), NULL); return QVariant::fromValue(widget); } - else if (role == BaseModel::ContextMenuRole) + else if (role == Pokemodr::BaseModel::ContextMenuRole) { KMenu* menu = new KMenu; menu->addAction("Delete Encounter", this, SLOT(deleteSelf())); return QVariant::fromValue(static_cast<void*>(menu)); } - return ObjectModel::data(role); + return Pokemodr::ObjectModel::data(role); } -bool MapWildListEncounterModel::setData(const QVariant& value, int role) +bool Pokemodr::MapWildListEncounterModel::setData(const QVariant& value, int role) { - if (role == BaseModel::XmlRole) + if (role == Pokemodr::BaseModel::XmlRole) { if (value.canConvert<QString>()) { @@ -95,7 +96,7 @@ bool MapWildListEncounterModel::setData(const QVariant& value, int role) return false; } -void MapWildListEncounterModel::deleteSelf() +void Pokemodr::MapWildListEncounterModel::deleteSelf() { // static_cast<GroupObjectModel*>(m_parent)->deleteObject(this); } diff --git a/pokemodr/models/MapWildListEncounterModel.h b/pokemodr/models/MapWildListEncounterModel.h index b09cc177..216c34ca 100644 --- a/pokemodr/models/MapWildListEncounterModel.h +++ b/pokemodr/models/MapWildListEncounterModel.h @@ -22,14 +22,19 @@ #include "ObjectModel.h" // Forward declarations +namespace Pokemod +{ class MapWildListEncounter; +} +namespace Pokemodr +{ class MapWildListEncounterModel : public ObjectModel { Q_OBJECT public: - MapWildListEncounterModel(BaseModel* parent, MapWildListEncounter* encounter); + MapWildListEncounterModel(BaseModel* parent, Pokemod::MapWildListEncounter* encounter); ~MapWildListEncounterModel(); QVariant data(int role = Qt::DisplayRole) const; @@ -38,5 +43,6 @@ class MapWildListEncounterModel : public ObjectModel public slots: void deleteSelf(); }; +} #endif diff --git a/pokemodr/models/MapWildListGroupModel.cpp b/pokemodr/models/MapWildListGroupModel.cpp index 04c7231e..757c5d61 100644 --- a/pokemodr/models/MapWildListGroupModel.cpp +++ b/pokemodr/models/MapWildListGroupModel.cpp @@ -31,31 +31,31 @@ // KDE includes #include <KMenu> -MapWildListGroupModel::MapWildListGroupModel(BaseModel* parent, Map* map) : +Pokemodr::MapWildListGroupModel::MapWildListGroupModel(BaseModel* parent, Pokemod::Map* map) : GroupModel(parent, map, "Wild Lists") { for (int i = 0; i < map->wildListCount(); ++i) addObject(map->wildList(i)); } -MapWildListGroupModel::~MapWildListGroupModel() +Pokemodr::MapWildListGroupModel::~MapWildListGroupModel() { } -QVariant MapWildListGroupModel::data(const int role) const +QVariant Pokemodr::MapWildListGroupModel::data(const int role) const { - if (role == BaseModel::ContextMenuRole) + if (role == Pokemodr::BaseModel::ContextMenuRole) { KMenu* menu = new KMenu; menu->addAction("Add Wild List", this, SLOT(addObject())); return QVariant::fromValue(static_cast<void*>(menu)); } - return GroupModel::data(role); + return Pokemodr::GroupModel::data(role); } -bool MapWildListGroupModel::setData(const QVariant& value, int role) +bool Pokemodr::MapWildListGroupModel::setData(const QVariant& value, int role) { - if (role == BaseModel::XmlRole) + if (role == Pokemodr::BaseModel::XmlRole) { if (value.canConvert<QString>()) { @@ -65,7 +65,7 @@ bool MapWildListGroupModel::setData(const QVariant& value, int role) { if (xml.doctype().name() == "MapWildList") { - addObject(static_cast<Map*>(m_object)->newWildList(xml.documentElement())); + addObject(static_cast<Pokemod::Map*>(m_object)->newWildList(xml.documentElement())); return true; } file.close(); @@ -75,20 +75,20 @@ bool MapWildListGroupModel::setData(const QVariant& value, int role) return false; } -void MapWildListGroupModel::addObject(Object* object) +void Pokemodr::MapWildListGroupModel::addObject(Pokemod::Object* object) { if (!object) - object = static_cast<Map*>(m_object)->newWildList(); + object = static_cast<Pokemod::Map*>(m_object)->newWildList(); if (object->className() == "MapWildList") - m_objects.append(new MapWildListModel(this, static_cast<MapWildList*>(object))); + m_objects.append(new MapWildListModel(this, static_cast<Pokemod::MapWildList*>(object))); } -void MapWildListGroupModel::deleteObject(BaseObjectModel* model) +void Pokemodr::MapWildListGroupModel::deleteObject(BaseObjectModel* model) { const int index = m_objects.indexOf(model); if (0 <= index) { - static_cast<Map*>(m_object)->deleteWildList(index); + static_cast<Pokemod::Map*>(m_object)->deleteWildList(index); m_objects[index]->deleteLater(); m_objects.removeAt(index); } diff --git a/pokemodr/models/MapWildListGroupModel.h b/pokemodr/models/MapWildListGroupModel.h index abde451f..f318ef1f 100644 --- a/pokemodr/models/MapWildListGroupModel.h +++ b/pokemodr/models/MapWildListGroupModel.h @@ -22,21 +22,27 @@ #include "GroupModel.h" // Forward declarations +namespace Pokemod +{ class Map; +} +namespace Pokemodr +{ class MapWildListGroupModel : public GroupModel { Q_OBJECT public: - MapWildListGroupModel(BaseModel* parent, Map* map); + MapWildListGroupModel(BaseModel* parent, Pokemod::Map* map); ~MapWildListGroupModel(); QVariant data(const int role = Qt::DisplayRole) const; bool setData(const QVariant& value, int role = Qt::EditRole); public slots: - void addObject(Object* object = NULL); + void addObject(Pokemod::Object* object = NULL); void deleteObject(BaseObjectModel* model); }; +} #endif diff --git a/pokemodr/models/MapWildListModel.cpp b/pokemodr/models/MapWildListModel.cpp index 22df10d3..c3dc26eb 100644 --- a/pokemodr/models/MapWildListModel.cpp +++ b/pokemodr/models/MapWildListModel.cpp @@ -21,7 +21,7 @@ // Model includes #include "MapWildListEncounterModel.h" -// PokeModr includes +// Pokemodr includes #include "../MapWildListUI.h" // Pokemod includes @@ -35,35 +35,35 @@ // KDE includes #include <KMenu> -MapWildListModel::MapWildListModel(BaseModel* parent, MapWildList* wildList) : +Pokemodr::MapWildListModel::MapWildListModel(BaseModel* parent, Pokemod::MapWildList* wildList) : GroupObjectModel(parent, wildList) { setupData(); } -MapWildListModel::~MapWildListModel() +Pokemodr::MapWildListModel::~MapWildListModel() { clearData(); } -QVariant MapWildListModel::data(int role) const +QVariant Pokemodr::MapWildListModel::data(int role) const { if (role == Qt::DisplayRole) { - return static_cast<MapWildList*>(m_object)->name(); + return static_cast<Pokemod::MapWildList*>(m_object)->name(); } - else if (role == BaseModel::XmlRole) + else if (role == Pokemodr::BaseModel::XmlRole) { QDomDocument xml(m_object->className()); xml.appendChild(m_object->save()); return xml.toString(); } - else if (role == BaseModel::WidgetRole) + else if (role == Pokemodr::BaseModel::WidgetRole) { - QWidget* widget = new MapWildListUI(static_cast<MapWildList*>(m_object), NULL); + QWidget* widget = new MapWildListUI(static_cast<Pokemod::MapWildList*>(m_object), NULL); return QVariant::fromValue(widget); } - else if (role == BaseModel::ContextMenuRole) + else if (role == Pokemodr::BaseModel::ContextMenuRole) { KMenu* menu = new KMenu; menu->addAction("Add Encounter", this, SLOT(addObject())); @@ -71,36 +71,36 @@ QVariant MapWildListModel::data(int role) const menu->addAction("Delete Wild List", this, SLOT(deleteSelf())); return QVariant::fromValue(static_cast<void*>(menu)); } - return GroupObjectModel::data(role); + return Pokemodr::GroupObjectModel::data(role); } -void MapWildListModel::addObject(Object* object) +void Pokemodr::MapWildListModel::addObject(Pokemod::Object* object) { if (!object) - object = static_cast<MapWildList*>(m_object)->newEncounter(); + object = static_cast<Pokemod::MapWildList*>(m_object)->newEncounter(); if (object->className() == "MapWildListEncounter") - m_objects.append(new MapWildListEncounterModel(this, static_cast<MapWildListEncounter*>(object))); + m_objects.append(new MapWildListEncounterModel(this, static_cast<Pokemod::MapWildListEncounter*>(object))); } -void MapWildListModel::deleteObject(BaseModel* model) +void Pokemodr::MapWildListModel::deleteObject(BaseModel* model) { const int index = m_objects.indexOf(model); if (0 <= index) { - static_cast<MapWildList*>(m_object)->deleteEncounter(index); + static_cast<Pokemod::MapWildList*>(m_object)->deleteEncounter(index); m_objects[index]->deleteLater(); m_objects.removeAt(index); } } -void MapWildListModel::deleteSelf() +void Pokemodr::MapWildListModel::deleteSelf() { // static_cast<GroupModel*>(m_parent)->deleteObject(this); } -bool MapWildListModel::setData(const QVariant& value, int role) +bool Pokemodr::MapWildListModel::setData(const QVariant& value, int role) { - if (role == BaseModel::XmlRole) + if (role == Pokemodr::BaseModel::XmlRole) { if (value.canConvert<QString>()) { @@ -117,7 +117,7 @@ bool MapWildListModel::setData(const QVariant& value, int role) } else if (xml.doctype().name() == "MapWildListEncounter") { - addObject(static_cast<MapWildList*>(m_object)->newEncounter(xml.documentElement())); + addObject(static_cast<Pokemod::MapWildList*>(m_object)->newEncounter(xml.documentElement())); return true; } file.close(); @@ -127,9 +127,9 @@ bool MapWildListModel::setData(const QVariant& value, int role) return false; } -void MapWildListModel::setupData() +void Pokemodr::MapWildListModel::setupData() { - MapWildList* wildList = static_cast<MapWildList*>(m_object); + Pokemod::MapWildList* wildList = static_cast<Pokemod::MapWildList*>(m_object); for (int i = 0; i < wildList->encounterCount(); ++i) m_objects.append(new MapWildListEncounterModel(this, wildList->encounter(i))); } diff --git a/pokemodr/models/MapWildListModel.h b/pokemodr/models/MapWildListModel.h index e9bf2174..dbb924df 100644 --- a/pokemodr/models/MapWildListModel.h +++ b/pokemodr/models/MapWildListModel.h @@ -22,26 +22,32 @@ #include "GroupObjectModel.h" // Forward declarations +namespace Pokemod +{ class MapWildList; +} +namespace Pokemodr +{ class MapWildListModel : public GroupObjectModel { Q_OBJECT public: - MapWildListModel(BaseModel* parent, MapWildList* wildList); + MapWildListModel(BaseModel* parent, Pokemod::MapWildList* wildList); ~MapWildListModel(); QVariant data(int role = Qt::DisplayRole) const; bool setData(const QVariant& value, int role = Qt::EditRole); public slots: - void addObject(Object* object = NULL); + void addObject(Pokemod::Object* object = NULL); void deleteObject(BaseModel* model); void deleteSelf(); protected: void setupData(); }; +} #endif diff --git a/pokemodr/models/MoveGroupModel.cpp b/pokemodr/models/MoveGroupModel.cpp index c34c5fcc..15d7f3d2 100644 --- a/pokemodr/models/MoveGroupModel.cpp +++ b/pokemodr/models/MoveGroupModel.cpp @@ -31,31 +31,31 @@ // KDE includes #include <KMenu> -MoveGroupModel::MoveGroupModel(BaseModel* parent, Pokemod* pokemod) : +Pokemodr::MoveGroupModel::MoveGroupModel(BaseModel* parent, Pokemod::Pokemod* pokemod) : GroupModel(parent, pokemod, "Moves") { for (int i = 0; i < pokemod->moveCount(); ++i) addObject(pokemod->move(i)); } -MoveGroupModel::~MoveGroupModel() +Pokemodr::MoveGroupModel::~MoveGroupModel() { } -QVariant MoveGroupModel::data(const int role) const +QVariant Pokemodr::MoveGroupModel::data(const int role) const { - if (role == BaseModel::ContextMenuRole) + if (role == Pokemodr::BaseModel::ContextMenuRole) { KMenu* menu = new KMenu; menu->addAction("Add Move", this, SLOT(addObject())); return QVariant::fromValue(static_cast<void*>(menu)); } - return GroupModel::data(role); + return Pokemodr::GroupModel::data(role); } -bool MoveGroupModel::setData(const QVariant& value, int role) +bool Pokemodr::MoveGroupModel::setData(const QVariant& value, int role) { - if (role == BaseModel::XmlRole) + if (role == Pokemodr::BaseModel::XmlRole) { if (value.canConvert<QString>()) { @@ -65,7 +65,7 @@ bool MoveGroupModel::setData(const QVariant& value, int role) { if (xml.doctype().name() == "Move") { - addObject(static_cast<Pokemod*>(m_object)->newMove(xml.documentElement())); + addObject(static_cast<Pokemod::Pokemod*>(m_object)->newMove(xml.documentElement())); return true; } file.close(); @@ -75,20 +75,20 @@ bool MoveGroupModel::setData(const QVariant& value, int role) return false; } -void MoveGroupModel::addObject(Object* object) +void Pokemodr::MoveGroupModel::addObject(Pokemod::Object* object) { if (!object) - object = static_cast<Pokemod*>(m_object)->newMove(); + object = static_cast<Pokemod::Pokemod*>(m_object)->newMove(); if (object->className() == "Move") - m_objects.append(new MoveModel(this, static_cast<Move*>(object))); + m_objects.append(new MoveModel(this, static_cast<Pokemod::Move*>(object))); } -void MoveGroupModel::deleteObject(BaseObjectModel* model) +void Pokemodr::MoveGroupModel::deleteObject(BaseObjectModel* model) { const int index = m_objects.indexOf(model); if (0 <= index) { - static_cast<Pokemod*>(m_object)->deleteMove(index); + static_cast<Pokemod::Pokemod*>(m_object)->deleteMove(index); m_objects[index]->deleteLater(); m_objects.removeAt(index); } diff --git a/pokemodr/models/MoveGroupModel.h b/pokemodr/models/MoveGroupModel.h index 40a351ec..86ab98d2 100644 --- a/pokemodr/models/MoveGroupModel.h +++ b/pokemodr/models/MoveGroupModel.h @@ -22,21 +22,27 @@ #include "GroupModel.h" // Forward declarations +namespace Pokemod +{ class Pokemod; +} +namespace Pokemodr +{ class MoveGroupModel : public GroupModel { Q_OBJECT public: - MoveGroupModel(BaseModel* parent, Pokemod* pokemod); + MoveGroupModel(BaseModel* parent, Pokemod::Pokemod* pokemod); ~MoveGroupModel(); QVariant data(const int role = Qt::DisplayRole) const; bool setData(const QVariant& value, int role = Qt::EditRole); public slots: - void addObject(Object* object = NULL); + void addObject(Pokemod::Object* object = NULL); void deleteObject(BaseObjectModel* model); }; +} #endif diff --git a/pokemodr/models/MoveModel.cpp b/pokemodr/models/MoveModel.cpp index b5052232..3d512589 100644 --- a/pokemodr/models/MoveModel.cpp +++ b/pokemodr/models/MoveModel.cpp @@ -21,7 +21,7 @@ // Model includes #include "GroupModel.h" -// PokeModr includes +// Pokemodr includes #include "../MoveUI.h" // Pokemod includes @@ -33,42 +33,42 @@ // KDE includes #include <KMenu> -MoveModel::MoveModel(BaseModel* parent, Move* move) : +Pokemodr::MoveModel::MoveModel(BaseModel* parent, Pokemod::Move* move) : ObjectModel(parent, move) { } -MoveModel::~MoveModel() +Pokemodr::MoveModel::~MoveModel() { } -QVariant MoveModel::data(int role) const +QVariant Pokemodr::MoveModel::data(int role) const { if (role == Qt::DisplayRole) - return static_cast<Move*>(m_object)->name(); - else if (role == BaseModel::XmlRole) + return static_cast<Pokemod::Move*>(m_object)->name(); + else if (role == Pokemodr::BaseModel::XmlRole) { QDomDocument xml(m_object->className()); xml.appendChild(m_object->save()); return xml.toString(); } - else if (role == BaseModel::WidgetRole) + else if (role == Pokemodr::BaseModel::WidgetRole) { - QWidget* widget = new MoveUI(static_cast<Move*>(m_object), NULL); + QWidget* widget = new MoveUI(static_cast<Pokemod::Move*>(m_object), NULL); return QVariant::fromValue(widget); } - else if (role == BaseModel::ContextMenuRole) + else if (role == Pokemodr::BaseModel::ContextMenuRole) { KMenu* menu = new KMenu; menu->addAction("Delete Move", this, SLOT(deleteSelf())); return QVariant::fromValue(static_cast<void*>(menu)); } - return ObjectModel::data(role); + return Pokemodr::ObjectModel::data(role); } -bool MoveModel::setData(const QVariant& value, int role) +bool Pokemodr::MoveModel::setData(const QVariant& value, int role) { - if (role == BaseModel::XmlRole) + if (role == Pokemodr::BaseModel::XmlRole) { if (value.canConvert<QString>()) { @@ -88,7 +88,7 @@ bool MoveModel::setData(const QVariant& value, int role) return false; } -void MoveModel::deleteSelf() +void Pokemodr::MoveModel::deleteSelf() { // static_cast<GroupModel*>(m_parent)->deleteObject(this); } diff --git a/pokemodr/models/MoveModel.h b/pokemodr/models/MoveModel.h index 2acebb5a..19a00f79 100644 --- a/pokemodr/models/MoveModel.h +++ b/pokemodr/models/MoveModel.h @@ -22,14 +22,19 @@ #include "ObjectModel.h" // Forward declarations +namespace Pokemod +{ class Move; +} +namespace Pokemodr +{ class MoveModel : public ObjectModel { Q_OBJECT public: - MoveModel(BaseModel* parent, Move* move); + MoveModel(BaseModel* parent, Pokemod::Move* move); ~MoveModel(); QVariant data(int role = Qt::DisplayRole) const; @@ -38,5 +43,6 @@ class MoveModel : public ObjectModel public slots: void deleteSelf(); }; +} #endif diff --git a/pokemodr/models/NatureGroupModel.cpp b/pokemodr/models/NatureGroupModel.cpp index 2884b7d3..cc317e33 100644 --- a/pokemodr/models/NatureGroupModel.cpp +++ b/pokemodr/models/NatureGroupModel.cpp @@ -31,31 +31,31 @@ // KDE includes #include <KMenu> -NatureGroupModel::NatureGroupModel(BaseModel* parent, Pokemod* pokemod) : +Pokemodr::NatureGroupModel::NatureGroupModel(BaseModel* parent, Pokemod::Pokemod* pokemod) : GroupModel(parent, pokemod, "Natures") { for (int i = 0; i < pokemod->natureCount(); ++i) addObject(pokemod->nature(i)); } -NatureGroupModel::~NatureGroupModel() +Pokemodr::NatureGroupModel::~NatureGroupModel() { } -QVariant NatureGroupModel::data(const int role) const +QVariant Pokemodr::NatureGroupModel::data(const int role) const { - if (role == BaseModel::ContextMenuRole) + if (role == Pokemodr::BaseModel::ContextMenuRole) { KMenu* menu = new KMenu; menu->addAction("Add Nature", this, SLOT(addObject())); return QVariant::fromValue(static_cast<void*>(menu)); } - return GroupModel::data(role); + return Pokemodr::GroupModel::data(role); } -bool NatureGroupModel::setData(const QVariant& value, int role) +bool Pokemodr::NatureGroupModel::setData(const QVariant& value, int role) { - if (role == BaseModel::XmlRole) + if (role == Pokemodr::BaseModel::XmlRole) { if (value.canConvert<QString>()) { @@ -65,7 +65,7 @@ bool NatureGroupModel::setData(const QVariant& value, int role) { if (xml.doctype().name() == "Nature") { - addObject(static_cast<Pokemod*>(m_object)->newNature(xml.documentElement())); + addObject(static_cast<Pokemod::Pokemod*>(m_object)->newNature(xml.documentElement())); return true; } file.close(); @@ -75,20 +75,20 @@ bool NatureGroupModel::setData(const QVariant& value, int role) return false; } -void NatureGroupModel::addObject(Object* object) +void Pokemodr::NatureGroupModel::addObject(Pokemod::Object* object) { if (!object) - object = static_cast<Pokemod*>(m_object)->newNature(); + object = static_cast<Pokemod::Pokemod*>(m_object)->newNature(); if (object->className() == "Nature") - m_objects.append(new NatureModel(this, static_cast<Nature*>(object))); + m_objects.append(new NatureModel(this, static_cast<Pokemod::Nature*>(object))); } -void NatureGroupModel::deleteObject(BaseObjectModel* model) +void Pokemodr::NatureGroupModel::deleteObject(BaseObjectModel* model) { const int index = m_objects.indexOf(model); if (0 <= index) { - static_cast<Pokemod*>(m_object)->deleteNature(index); + static_cast<Pokemod::Pokemod*>(m_object)->deleteNature(index); m_objects[index]->deleteLater(); m_objects.removeAt(index); } diff --git a/pokemodr/models/NatureGroupModel.h b/pokemodr/models/NatureGroupModel.h index 3add1813..ba9411ff 100644 --- a/pokemodr/models/NatureGroupModel.h +++ b/pokemodr/models/NatureGroupModel.h @@ -22,21 +22,27 @@ #include "GroupModel.h" // Forward declarations +namespace Pokemod +{ class Pokemod; +} +namespace Pokemodr +{ class NatureGroupModel : public GroupModel { Q_OBJECT public: - NatureGroupModel(BaseModel* parent, Pokemod* pokemod); + NatureGroupModel(BaseModel* parent, Pokemod::Pokemod* pokemod); ~NatureGroupModel(); QVariant data(const int role = Qt::DisplayRole) const; bool setData(const QVariant& value, int role = Qt::EditRole); public slots: - void addObject(Object* object = NULL); + void addObject(Pokemod::Object* object = NULL); void deleteObject(BaseObjectModel* model); }; +} #endif diff --git a/pokemodr/models/NatureModel.cpp b/pokemodr/models/NatureModel.cpp index 1fe0227b..79098e4b 100644 --- a/pokemodr/models/NatureModel.cpp +++ b/pokemodr/models/NatureModel.cpp @@ -21,7 +21,7 @@ // Model includes #include "GroupModel.h" -// PokeModr includes +// Pokemodr includes #include "../NatureUI.h" // Pokemod includes @@ -34,42 +34,42 @@ // KDE includes #include <KMenu> -NatureModel::NatureModel(BaseModel* parent, Nature* nature) : +Pokemodr::NatureModel::NatureModel(BaseModel* parent, Pokemod::Nature* nature) : ObjectModel(parent, nature) { } -NatureModel::~NatureModel() +Pokemodr::NatureModel::~NatureModel() { } -QVariant NatureModel::data(int role) const +QVariant Pokemodr::NatureModel::data(int role) const { if (role == Qt::DisplayRole) - return static_cast<Nature*>(m_object)->name(); - else if (role == BaseModel::XmlRole) + return static_cast<Pokemod::Nature*>(m_object)->name(); + else if (role == Pokemodr::BaseModel::XmlRole) { QDomDocument xml(m_object->className()); xml.appendChild(m_object->save()); return xml.toString(); } - else if (role == BaseModel::WidgetRole) + else if (role == Pokemodr::BaseModel::WidgetRole) { - QWidget* widget = new NatureUI(static_cast<Nature*>(m_object), NULL); + QWidget* widget = new NatureUI(static_cast<Pokemod::Nature*>(m_object), NULL); return QVariant::fromValue(widget); } - else if (role == BaseModel::ContextMenuRole) + else if (role == Pokemodr::BaseModel::ContextMenuRole) { KMenu* menu = new KMenu; menu->addAction("Delete Nature", this, SLOT(deleteSelf())); return QVariant::fromValue(static_cast<void*>(menu)); } - return ObjectModel::data(role); + return Pokemodr::ObjectModel::data(role); } -bool NatureModel::setData(const QVariant& value, int role) +bool Pokemodr::NatureModel::setData(const QVariant& value, int role) { - if (role == BaseModel::XmlRole) + if (role == Pokemodr::BaseModel::XmlRole) { if (value.canConvert<QString>()) { @@ -89,7 +89,7 @@ bool NatureModel::setData(const QVariant& value, int role) return false; } -void NatureModel::deleteSelf() +void Pokemodr::NatureModel::deleteSelf() { // static_cast<GroupModel*>(m_parent)->deleteObject(this); } diff --git a/pokemodr/models/NatureModel.h b/pokemodr/models/NatureModel.h index 5083a87f..8ec8425e 100644 --- a/pokemodr/models/NatureModel.h +++ b/pokemodr/models/NatureModel.h @@ -22,14 +22,19 @@ #include "ObjectModel.h" // Forward declarations +namespace Pokemod +{ class Nature; +} +namespace Pokemodr +{ class NatureModel : public ObjectModel { Q_OBJECT public: - NatureModel(BaseModel* parent, Nature* nature); + NatureModel(BaseModel* parent, Pokemod::Nature* nature); ~NatureModel(); QVariant data(int role = Qt::DisplayRole) const; @@ -38,5 +43,6 @@ class NatureModel : public ObjectModel public slots: void deleteSelf(); }; +} #endif diff --git a/pokemodr/models/ObjectModel.cpp b/pokemodr/models/ObjectModel.cpp index ee5556b8..2bd29a06 100644 --- a/pokemodr/models/ObjectModel.cpp +++ b/pokemodr/models/ObjectModel.cpp @@ -18,26 +18,26 @@ // Header include #include "ObjectModel.h" -ObjectModel::ObjectModel(BaseModel* parent, Object* object) : +Pokemodr::ObjectModel::ObjectModel(BaseModel* parent, Pokemod::Object* object) : BaseObjectModel(parent, object) { } -ObjectModel::~ObjectModel() +Pokemodr::ObjectModel::~ObjectModel() { } -int ObjectModel::rowCount() const +int Pokemodr::ObjectModel::rowCount() const { return 0; } -QVariant ObjectModel::data(int role) const +QVariant Pokemodr::ObjectModel::data(int role) const { - return BaseObjectModel::data(role); + return Pokemodr::BaseObjectModel::data(role); } -BaseModel* ObjectModel::childItem(const int /*row*/) +Pokemodr::BaseModel* Pokemodr::ObjectModel::childItem(const int /*row*/) { return NULL; } diff --git a/pokemodr/models/ObjectModel.h b/pokemodr/models/ObjectModel.h index bfb01252..9288d036 100644 --- a/pokemodr/models/ObjectModel.h +++ b/pokemodr/models/ObjectModel.h @@ -21,12 +21,14 @@ // Model includes #include "BaseObjectModel.h" +namespace Pokemodr +{ class ObjectModel : public BaseObjectModel { Q_OBJECT public: - ObjectModel(BaseModel* parent, Object* object); + ObjectModel(BaseModel* parent, Pokemod::Object* object); virtual ~ObjectModel(); virtual QVariant data(int role = Qt::DisplayRole) const = 0; @@ -38,5 +40,6 @@ class ObjectModel : public BaseObjectModel public slots: virtual void deleteSelf() = 0; }; +} #endif diff --git a/pokemodr/models/PokemodModel.cpp b/pokemodr/models/PokemodModel.cpp index dab58947..1e035db9 100644 --- a/pokemodr/models/PokemodModel.cpp +++ b/pokemodr/models/PokemodModel.cpp @@ -42,7 +42,7 @@ #include "TypeGroupModel.h" #include "WeatherGroupModel.h" -// PokeModr includes +// Pokemodr includes #include "../PokemodUI.h" // Pokemod includes @@ -54,43 +54,43 @@ // KDE includes #include <KMenu> -PokemodModel::PokemodModel(BaseModel* parent, Pokemod* pokemod) : +Pokemodr::PokemodModel::PokemodModel(BaseModel* parent, Pokemod::Pokemod* pokemod) : GroupObjectModel(parent, pokemod) { setupData(); } -PokemodModel::~PokemodModel() +Pokemodr::PokemodModel::~PokemodModel() { clearData(); } -QVariant PokemodModel::data(int role) const +QVariant Pokemodr::PokemodModel::data(int role) const { if (role == Qt::DisplayRole) - return static_cast<Pokemod*>(m_object)->title(); - else if (role == BaseModel::XmlRole) + return static_cast<Pokemod::Pokemod*>(m_object)->title(); + else if (role == Pokemodr::BaseModel::XmlRole) { QDomDocument xml(m_object->className()); xml.appendChild(m_object->save()); return xml.toString(); } - else if (role == BaseModel::WidgetRole) + else if (role == Pokemodr::BaseModel::WidgetRole) { - QWidget* widget = new PokemodUI(static_cast<Pokemod*>(m_object), NULL); + QWidget* widget = new PokemodUI(static_cast<Pokemod::Pokemod*>(m_object), NULL); return QVariant::fromValue(widget); } - else if (role == BaseModel::ContextMenuRole) + else if (role == Pokemodr::BaseModel::ContextMenuRole) { KMenu* menu = new KMenu; return QVariant::fromValue(static_cast<void*>(menu)); } - return GroupObjectModel::data(role); + return Pokemodr::GroupObjectModel::data(role); } -bool PokemodModel::setData(const QVariant& value, int role) +bool Pokemodr::PokemodModel::setData(const QVariant& value, int role) { - if (role == BaseModel::XmlRole) + if (role == Pokemodr::BaseModel::XmlRole) { if (value.canConvert<QString>()) { @@ -107,7 +107,7 @@ bool PokemodModel::setData(const QVariant& value, int role) } else if (xml.doctype().name() == "Rules") { - static_cast<Pokemod*>(m_object)->setRules(xml.documentElement()); + static_cast<Pokemod::Pokemod*>(m_object)->setRules(xml.documentElement()); return true; } file.close(); @@ -117,21 +117,21 @@ bool PokemodModel::setData(const QVariant& value, int role) return false; } -void PokemodModel::addObject(Object* /*object*/) +void Pokemodr::PokemodModel::addObject(Pokemod::Object* /*object*/) { } -void PokemodModel::deleteObject(BaseModel* /*model*/) +void Pokemodr::PokemodModel::deleteObject(BaseModel* /*model*/) { } -void PokemodModel::deleteSelf() +void Pokemodr::PokemodModel::deleteSelf() { } -void PokemodModel::setupData() +void Pokemodr::PokemodModel::setupData() { - Pokemod* pokemod = static_cast<Pokemod*>(m_object); + Pokemod::Pokemod* pokemod = static_cast<Pokemod::Pokemod*>(m_object); m_objects.append(new RulesModel(this, pokemod->rules())); m_objects.append(new AbilityGroupModel(this, pokemod)); m_objects.append(new AuthorGroupModel(this, pokemod)); diff --git a/pokemodr/models/PokemodModel.h b/pokemodr/models/PokemodModel.h index cd4a2653..a7f461da 100644 --- a/pokemodr/models/PokemodModel.h +++ b/pokemodr/models/PokemodModel.h @@ -22,26 +22,32 @@ #include "GroupObjectModel.h" // Forward declarations +namespace Pokemod +{ class Pokemod; +} +namespace Pokemodr +{ class PokemodModel : public GroupObjectModel { Q_OBJECT public: - PokemodModel(BaseModel* parent, Pokemod* pokemod); + PokemodModel(BaseModel* parent, Pokemod::Pokemod* pokemod); ~PokemodModel(); QVariant data(int role = Qt::DisplayRole) const; bool setData(const QVariant& value, int role = Qt::EditRole); public slots: - void addObject(Object* /*object = NULL*/); + void addObject(Pokemod::Object* /*object = NULL*/); void deleteObject(BaseModel* /*model*/); void deleteSelf(); protected: void setupData(); }; +} #endif diff --git a/pokemodr/models/RootModel.cpp b/pokemodr/models/RootModel.cpp index 1dc8ced0..40ebc886 100644 --- a/pokemodr/models/RootModel.cpp +++ b/pokemodr/models/RootModel.cpp @@ -27,26 +27,26 @@ // Test code includes #include <QFile> -RootModel::RootModel() : +Pokemodr::RootModel::RootModel() : GroupModel(NULL, NULL) { } -RootModel::~RootModel() +Pokemodr::RootModel::~RootModel() { } -bool RootModel::setData(const QVariant& /*value*/, int /*role = Qt::EditRole*/) +bool Pokemodr::RootModel::setData(const QVariant& /*value*/, int /*role = Qt::EditRole*/) { return false; } -void RootModel::addPokemod(Pokemod* pokemod) +void Pokemodr::RootModel::addPokemod(Pokemod::Pokemod* pokemod) { m_objects.append(new PokemodModel(this, pokemod)); } -void RootModel::deletePokemod(const Pokemod* pokemod) +void Pokemodr::RootModel::deletePokemod(const Pokemod::Pokemod* pokemod) { for (int i = 0; i < m_objects.size(); ++i) { @@ -59,10 +59,10 @@ void RootModel::deletePokemod(const Pokemod* pokemod) } } -void RootModel::addObject(Object* /*object*/) +void Pokemodr::RootModel::addObject(Pokemod::Object* /*object*/) { } -void RootModel::deleteObject(BaseObjectModel* /*model*/) +void Pokemodr::RootModel::deleteObject(BaseObjectModel* /*model*/) { } diff --git a/pokemodr/models/RootModel.h b/pokemodr/models/RootModel.h index 72f454e5..b53f20da 100644 --- a/pokemodr/models/RootModel.h +++ b/pokemodr/models/RootModel.h @@ -22,6 +22,9 @@ #include "GroupModel.h" #include "PokemodModel.h" +namespace Pokemodr +{ +// Forward declarations class PokemodModel; class RootModel : public GroupModel @@ -34,11 +37,12 @@ class RootModel : public GroupModel bool setData(const QVariant& /*value*/, int /*role = Qt::EditRole*/); - void addPokemod(Pokemod* pokemod); - void deletePokemod(const Pokemod* pokemod); + void addPokemod(Pokemod::Pokemod* pokemod); + void deletePokemod(const Pokemod::Pokemod* pokemod); public slots: - void addObject(Object* /*object = NULL*/); + void addObject(Pokemod::Object* /*object = NULL*/); void deleteObject(BaseObjectModel* /*model*/); }; +} #endif diff --git a/pokemodr/models/RulesModel.cpp b/pokemodr/models/RulesModel.cpp index 966b83a5..5ad732df 100644 --- a/pokemodr/models/RulesModel.cpp +++ b/pokemodr/models/RulesModel.cpp @@ -18,7 +18,7 @@ // Header include #include "RulesModel.h" -// PokeModr includes +// Pokemodr includes #include "../RulesUI.h" // Pokemod includes @@ -30,41 +30,41 @@ // KDE includes #include <KMenu> -RulesModel::RulesModel(BaseModel* parent, Rules* rules) : +Pokemodr::RulesModel::RulesModel(BaseModel* parent, Pokemod::Rules* rules) : ObjectModel(parent, rules) { } -RulesModel::~RulesModel() +Pokemodr::RulesModel::~RulesModel() { } -QVariant RulesModel::data(int role) const +QVariant Pokemodr::RulesModel::data(int role) const { if (role == Qt::DisplayRole) return m_object->className(); - else if (role == BaseModel::XmlRole) + else if (role == Pokemodr::BaseModel::XmlRole) { QDomDocument xml(m_object->className()); xml.appendChild(m_object->save()); return xml.toString(); } - else if (role == BaseModel::WidgetRole) + else if (role == Pokemodr::BaseModel::WidgetRole) { - QWidget* widget = new RulesUI(static_cast<Rules*>(m_object), NULL); + QWidget* widget = new RulesUI(static_cast<Pokemod::Rules*>(m_object), NULL); return QVariant::fromValue(widget); } - else if (role == BaseModel::ContextMenuRole) + else if (role == Pokemodr::BaseModel::ContextMenuRole) { KMenu* menu = new KMenu; return QVariant::fromValue(static_cast<void*>(menu)); } - return ObjectModel::data(role); + return Pokemodr::ObjectModel::data(role); } -bool RulesModel::setData(const QVariant& value, int role) +bool Pokemodr::RulesModel::setData(const QVariant& value, int role) { - if (role == BaseModel::XmlRole) + if (role == Pokemodr::BaseModel::XmlRole) { if (value.canConvert<QString>()) { @@ -84,6 +84,6 @@ bool RulesModel::setData(const QVariant& value, int role) return false; } -void RulesModel::deleteSelf() +void Pokemodr::RulesModel::deleteSelf() { } diff --git a/pokemodr/models/RulesModel.h b/pokemodr/models/RulesModel.h index e223e83b..47a9291b 100644 --- a/pokemodr/models/RulesModel.h +++ b/pokemodr/models/RulesModel.h @@ -22,14 +22,19 @@ #include "ObjectModel.h" // Forward declarations +namespace Pokemod +{ class Rules; +} +namespace Pokemodr +{ class RulesModel : public ObjectModel { Q_OBJECT public: - RulesModel(BaseModel* parent, Rules* rules); + RulesModel(BaseModel* parent, Pokemod::Rules* rules); ~RulesModel(); QVariant data(int role = Qt::DisplayRole) const; @@ -38,5 +43,6 @@ class RulesModel : public ObjectModel public slots: void deleteSelf(); }; +} #endif diff --git a/pokemodr/models/SoundGroupModel.cpp b/pokemodr/models/SoundGroupModel.cpp index 4b34ba4c..90c60a64 100644 --- a/pokemodr/models/SoundGroupModel.cpp +++ b/pokemodr/models/SoundGroupModel.cpp @@ -31,31 +31,31 @@ // KDE includes #include <KMenu> -SoundGroupModel::SoundGroupModel(BaseModel* parent, Pokemod* pokemod) : +Pokemodr::SoundGroupModel::SoundGroupModel(BaseModel* parent, Pokemod::Pokemod* pokemod) : GroupModel(parent, pokemod, "Sounds") { for (int i = 0; i < pokemod->soundCount(); ++i) addObject(pokemod->sound(i)); } -SoundGroupModel::~SoundGroupModel() +Pokemodr::SoundGroupModel::~SoundGroupModel() { } -QVariant SoundGroupModel::data(const int role) const +QVariant Pokemodr::SoundGroupModel::data(const int role) const { - if (role == BaseModel::ContextMenuRole) + if (role == Pokemodr::BaseModel::ContextMenuRole) { KMenu* menu = new KMenu; menu->addAction("Add Sound", this, SLOT(addObject())); return QVariant::fromValue(static_cast<void*>(menu)); } - return GroupModel::data(role); + return Pokemodr::GroupModel::data(role); } -bool SoundGroupModel::setData(const QVariant& value, int role) +bool Pokemodr::SoundGroupModel::setData(const QVariant& value, int role) { - if (role == BaseModel::XmlRole) + if (role == Pokemodr::BaseModel::XmlRole) { if (value.canConvert<QString>()) { @@ -65,7 +65,7 @@ bool SoundGroupModel::setData(const QVariant& value, int role) { if (xml.doctype().name() == "Sound") { - addObject(static_cast<Pokemod*>(m_object)->newSound(xml.documentElement())); + addObject(static_cast<Pokemod::Pokemod*>(m_object)->newSound(xml.documentElement())); return true; } file.close(); @@ -75,20 +75,20 @@ bool SoundGroupModel::setData(const QVariant& value, int role) return false; } -void SoundGroupModel::addObject(Object* object) +void Pokemodr::SoundGroupModel::addObject(Pokemod::Object* object) { if (!object) - object = static_cast<Pokemod*>(m_object)->newSound(); + object = static_cast<Pokemod::Pokemod*>(m_object)->newSound(); if (object->className() == "Sound") - m_objects.append(new SoundModel(this, static_cast<Sound*>(object))); + m_objects.append(new SoundModel(this, static_cast<Pokemod::Sound*>(object))); } -void SoundGroupModel::deleteObject(BaseObjectModel* model) +void Pokemodr::SoundGroupModel::deleteObject(BaseObjectModel* model) { const int index = m_objects.indexOf(model); if (0 <= index) { - static_cast<Pokemod*>(m_object)->deleteSound(index); + static_cast<Pokemod::Pokemod*>(m_object)->deleteSound(index); m_objects[index]->deleteLater(); m_objects.removeAt(index); } diff --git a/pokemodr/models/SoundGroupModel.h b/pokemodr/models/SoundGroupModel.h index accadfdf..f52d4bc7 100644 --- a/pokemodr/models/SoundGroupModel.h +++ b/pokemodr/models/SoundGroupModel.h @@ -22,21 +22,27 @@ #include "GroupModel.h" // Forward declarations +namespace Pokemod +{ class Pokemod; +} +namespace Pokemodr +{ class SoundGroupModel : public GroupModel { Q_OBJECT public: - SoundGroupModel(BaseModel* parent, Pokemod* pokemod); + SoundGroupModel(BaseModel* parent, Pokemod::Pokemod* pokemod); ~SoundGroupModel(); QVariant data(const int role = Qt::DisplayRole) const; bool setData(const QVariant& value, int role = Qt::EditRole); public slots: - void addObject(Object* object = NULL); + void addObject(Pokemod::Object* object = NULL); void deleteObject(BaseObjectModel* model); }; +} #endif diff --git a/pokemodr/models/SoundModel.cpp b/pokemodr/models/SoundModel.cpp index e0647526..f4c2f2cc 100644 --- a/pokemodr/models/SoundModel.cpp +++ b/pokemodr/models/SoundModel.cpp @@ -21,7 +21,7 @@ // Model includes #include "GroupModel.h" -// PokeModr includes +// Pokemodr includes #include "../SoundUI.h" // Pokemod includes @@ -34,42 +34,42 @@ // KDE includes #include <KMenu> -SoundModel::SoundModel(BaseModel* parent, Sound* sound) : +Pokemodr::SoundModel::SoundModel(BaseModel* parent, Pokemod::Sound* sound) : ObjectModel(parent, sound) { } -SoundModel::~SoundModel() +Pokemodr::SoundModel::~SoundModel() { } -QVariant SoundModel::data(int role) const +QVariant Pokemodr::SoundModel::data(int role) const { if (role == Qt::DisplayRole) - return static_cast<Sound*>(m_object)->name(); - else if (role == BaseModel::XmlRole) + return static_cast<Pokemod::Sound*>(m_object)->name(); + else if (role == Pokemodr::BaseModel::XmlRole) { QDomDocument xml(m_object->className()); xml.appendChild(m_object->save()); return xml.toString(); } - else if (role == BaseModel::WidgetRole) + else if (role == Pokemodr::BaseModel::WidgetRole) { - QWidget* widget = new SoundUI(static_cast<Sound*>(m_object), NULL); + QWidget* widget = new SoundUI(static_cast<Pokemod::Sound*>(m_object), NULL); return QVariant::fromValue(widget); } - else if (role == BaseModel::ContextMenuRole) + else if (role == Pokemodr::BaseModel::ContextMenuRole) { KMenu* menu = new KMenu; menu->addAction("Delete Sound", this, SLOT(deleteSelf())); return QVariant::fromValue(static_cast<void*>(menu)); } - return ObjectModel::data(role); + return Pokemodr::ObjectModel::data(role); } -bool SoundModel::setData(const QVariant& value, int role) +bool Pokemodr::SoundModel::setData(const QVariant& value, int role) { - if (role == BaseModel::XmlRole) + if (role == Pokemodr::BaseModel::XmlRole) { if (value.canConvert<QString>()) { @@ -89,7 +89,7 @@ bool SoundModel::setData(const QVariant& value, int role) return false; } -void SoundModel::deleteSelf() +void Pokemodr::SoundModel::deleteSelf() { // static_cast<GroupModel*>(m_parent)->deleteObject(this); } diff --git a/pokemodr/models/SoundModel.h b/pokemodr/models/SoundModel.h index f336bd33..01720b3a 100644 --- a/pokemodr/models/SoundModel.h +++ b/pokemodr/models/SoundModel.h @@ -22,14 +22,19 @@ #include "ObjectModel.h" // Forward declarations +namespace Pokemod +{ class Sound; +} +namespace Pokemodr +{ class SoundModel : public ObjectModel { Q_OBJECT public: - SoundModel(BaseModel* parent, Sound* nature); + SoundModel(BaseModel* parent, Pokemod::Sound* nature); ~SoundModel(); QVariant data(int role = Qt::DisplayRole) const; @@ -38,5 +43,6 @@ class SoundModel : public ObjectModel public slots: void deleteSelf(); }; +} #endif diff --git a/pokemodr/models/SpeciesAbilityGroupModel.cpp b/pokemodr/models/SpeciesAbilityGroupModel.cpp index d39b1842..dc5adb21 100644 --- a/pokemodr/models/SpeciesAbilityGroupModel.cpp +++ b/pokemodr/models/SpeciesAbilityGroupModel.cpp @@ -31,31 +31,31 @@ // KDE includes #include <KMenu> -SpeciesAbilityGroupModel::SpeciesAbilityGroupModel(BaseModel* parent, Species* species) : +Pokemodr::SpeciesAbilityGroupModel::SpeciesAbilityGroupModel(BaseModel* parent, Pokemod::Species* species) : GroupModel(parent, species, "Abilities") { for (int i = 0; i < species->abilityCount(); ++i) addObject(species->ability(i)); } -SpeciesAbilityGroupModel::~SpeciesAbilityGroupModel() +Pokemodr::SpeciesAbilityGroupModel::~SpeciesAbilityGroupModel() { } -QVariant SpeciesAbilityGroupModel::data(const int role) const +QVariant Pokemodr::SpeciesAbilityGroupModel::data(const int role) const { - if (role == BaseModel::ContextMenuRole) + if (role == Pokemodr::BaseModel::ContextMenuRole) { KMenu* menu = new KMenu; menu->addAction("Add Ability", this, SLOT(addObject())); return QVariant::fromValue(static_cast<void*>(menu)); } - return GroupModel::data(role); + return Pokemodr::GroupModel::data(role); } -bool SpeciesAbilityGroupModel::setData(const QVariant& value, int role) +bool Pokemodr::SpeciesAbilityGroupModel::setData(const QVariant& value, int role) { - if (role == BaseModel::XmlRole) + if (role == Pokemodr::BaseModel::XmlRole) { if (value.canConvert<QString>()) { @@ -65,7 +65,7 @@ bool SpeciesAbilityGroupModel::setData(const QVariant& value, int role) { if (xml.doctype().name() == "SpeciesAbility") { - addObject(static_cast<Species*>(m_object)->newAbility(xml.documentElement())); + addObject(static_cast<Pokemod::Species*>(m_object)->newAbility(xml.documentElement())); return true; } file.close(); @@ -75,20 +75,20 @@ bool SpeciesAbilityGroupModel::setData(const QVariant& value, int role) return false; } -void SpeciesAbilityGroupModel::addObject(Object* object) +void Pokemodr::SpeciesAbilityGroupModel::addObject(Pokemod::Object* object) { if (!object) - object = static_cast<Species*>(m_object)->newAbility(); + object = static_cast<Pokemod::Species*>(m_object)->newAbility(); if (object->className() == "SpeciesAbility") - m_objects.append(new SpeciesAbilityModel(this, static_cast<SpeciesAbility*>(object))); + m_objects.append(new SpeciesAbilityModel(this, static_cast<Pokemod::SpeciesAbility*>(object))); } -void SpeciesAbilityGroupModel::deleteObject(BaseObjectModel* model) +void Pokemodr::SpeciesAbilityGroupModel::deleteObject(BaseObjectModel* model) { const int index = m_objects.indexOf(model); if (0 <= index) { - static_cast<Species*>(m_object)->deleteAbility(index); + static_cast<Pokemod::Species*>(m_object)->deleteAbility(index); m_objects[index]->deleteLater(); m_objects.removeAt(index); } diff --git a/pokemodr/models/SpeciesAbilityGroupModel.h b/pokemodr/models/SpeciesAbilityGroupModel.h index 6631d8c6..99936a44 100644 --- a/pokemodr/models/SpeciesAbilityGroupModel.h +++ b/pokemodr/models/SpeciesAbilityGroupModel.h @@ -22,21 +22,27 @@ #include "GroupModel.h" // Forward declarations +namespace Pokemod +{ class Species; +} +namespace Pokemodr +{ class SpeciesAbilityGroupModel : public GroupModel { Q_OBJECT public: - SpeciesAbilityGroupModel(BaseModel* parent, Species* species); + SpeciesAbilityGroupModel(BaseModel* parent, Pokemod::Species* species); ~SpeciesAbilityGroupModel(); QVariant data(const int role = Qt::DisplayRole) const; bool setData(const QVariant& value, int role = Qt::EditRole); public slots: - void addObject(Object* object = NULL); + void addObject(Pokemod::Object* object = NULL); void deleteObject(BaseObjectModel* model); }; +} #endif diff --git a/pokemodr/models/SpeciesAbilityModel.cpp b/pokemodr/models/SpeciesAbilityModel.cpp index 9c015f2f..cefd046a 100644 --- a/pokemodr/models/SpeciesAbilityModel.cpp +++ b/pokemodr/models/SpeciesAbilityModel.cpp @@ -21,11 +21,12 @@ // Model includes #include "GroupModel.h" -// PokeModr includes +// Pokemodr includes #include "../SpeciesAbilityUI.h" // Pokemod includes #include "../../pokemod/Ability.h" +#include "../../pokemod/Pokemod.h" #include "../../pokemod/Species.h" #include "../../pokemod/SpeciesAbility.h" @@ -35,47 +36,47 @@ // KDE includes #include <KMenu> -SpeciesAbilityModel::SpeciesAbilityModel(BaseModel* parent, SpeciesAbility* ability) : +Pokemodr::SpeciesAbilityModel::SpeciesAbilityModel(BaseModel* parent, Pokemod::SpeciesAbility* ability) : ObjectModel(parent, ability) { } -SpeciesAbilityModel::~SpeciesAbilityModel() +Pokemodr::SpeciesAbilityModel::~SpeciesAbilityModel() { } -QVariant SpeciesAbilityModel::data(int role) const +QVariant Pokemodr::SpeciesAbilityModel::data(int role) const { if (role == Qt::DisplayRole) { - const Ability* ability = static_cast<const Pokemod*>(m_object->pokemod())->ability(static_cast<SpeciesAbility*>(m_object)->ability()); + const Pokemod::Ability* ability = static_cast<const Pokemod::Pokemod*>(m_object->pokemod())->ability(static_cast<Pokemod::SpeciesAbility*>(m_object)->ability()); if (ability) return ability->name(); return ""; } - else if (role == BaseModel::XmlRole) + else if (role == Pokemodr::BaseModel::XmlRole) { QDomDocument xml(m_object->className()); xml.appendChild(m_object->save()); return xml.toString(); } - else if (role == BaseModel::WidgetRole) + else if (role == Pokemodr::BaseModel::WidgetRole) { - QWidget* widget = new SpeciesAbilityUI(static_cast<SpeciesAbility*>(m_object), NULL); + QWidget* widget = new SpeciesAbilityUI(static_cast<Pokemod::SpeciesAbility*>(m_object), NULL); return QVariant::fromValue(widget); } - else if (role == BaseModel::ContextMenuRole) + else if (role == Pokemodr::BaseModel::ContextMenuRole) { KMenu* menu = new KMenu; menu->addAction("Delete Ability", this, SLOT(deleteSelf())); return QVariant::fromValue(static_cast<void*>(menu)); } - return ObjectModel::data(role); + return Pokemodr::ObjectModel::data(role); } -bool SpeciesAbilityModel::setData(const QVariant& value, int role) +bool Pokemodr::SpeciesAbilityModel::setData(const QVariant& value, int role) { - if (role == BaseModel::XmlRole) + if (role == Pokemodr::BaseModel::XmlRole) { if (value.canConvert<QString>()) { @@ -95,7 +96,7 @@ bool SpeciesAbilityModel::setData(const QVariant& value, int role) return false; } -void SpeciesAbilityModel::deleteSelf() +void Pokemodr::SpeciesAbilityModel::deleteSelf() { // static_cast<GroupModel*>(m_parent)->deleteObject(this); } diff --git a/pokemodr/models/SpeciesAbilityModel.h b/pokemodr/models/SpeciesAbilityModel.h index 440c1202..cdf04eae 100644 --- a/pokemodr/models/SpeciesAbilityModel.h +++ b/pokemodr/models/SpeciesAbilityModel.h @@ -22,14 +22,19 @@ #include "ObjectModel.h" // Forward declarations +namespace Pokemod +{ class SpeciesAbility; +} -class SpeciesAbilityModel : public ObjectModel +namespace Pokemodr +{ + class SpeciesAbilityModel : public ObjectModel { Q_OBJECT public: - SpeciesAbilityModel(BaseModel* parent, SpeciesAbility* ability); + SpeciesAbilityModel(BaseModel* parent, Pokemod::SpeciesAbility* ability); ~SpeciesAbilityModel(); QVariant data(int role = Qt::DisplayRole) const; @@ -38,5 +43,6 @@ class SpeciesAbilityModel : public ObjectModel public slots: void deleteSelf(); }; +} #endif diff --git a/pokemodr/models/SpeciesGroupModel.cpp b/pokemodr/models/SpeciesGroupModel.cpp index 5b329ab5..6ac2fe03 100644 --- a/pokemodr/models/SpeciesGroupModel.cpp +++ b/pokemodr/models/SpeciesGroupModel.cpp @@ -31,31 +31,31 @@ // KDE includes #include <KMenu> -SpeciesGroupModel::SpeciesGroupModel(BaseModel* parent, Pokemod* pokemod) : +Pokemodr::SpeciesGroupModel::SpeciesGroupModel(BaseModel* parent, Pokemod::Pokemod* pokemod) : GroupModel(parent, pokemod, "Species") { for (int i = 0; i < pokemod->speciesCount(); ++i) addObject(pokemod->species(i)); } -SpeciesGroupModel::~SpeciesGroupModel() +Pokemodr::SpeciesGroupModel::~SpeciesGroupModel() { } -QVariant SpeciesGroupModel::data(const int role) const +QVariant Pokemodr::SpeciesGroupModel::data(const int role) const { - if (role == BaseModel::ContextMenuRole) + if (role == Pokemodr::BaseModel::ContextMenuRole) { KMenu* menu = new KMenu; menu->addAction("Add Species", this, SLOT(addObject())); return QVariant::fromValue(static_cast<void*>(menu)); } - return GroupModel::data(role); + return Pokemodr::GroupModel::data(role); } -bool SpeciesGroupModel::setData(const QVariant& value, int role) +bool Pokemodr::SpeciesGroupModel::setData(const QVariant& value, int role) { - if (role == BaseModel::XmlRole) + if (role == Pokemodr::BaseModel::XmlRole) { if (value.canConvert<QString>()) { @@ -65,7 +65,7 @@ bool SpeciesGroupModel::setData(const QVariant& value, int role) { if (xml.doctype().name() == "Species") { - addObject(static_cast<Pokemod*>(m_object)->newSpecies(xml.documentElement())); + addObject(static_cast<Pokemod::Pokemod*>(m_object)->newSpecies(xml.documentElement())); return true; } file.close(); @@ -75,20 +75,20 @@ bool SpeciesGroupModel::setData(const QVariant& value, int role) return false; } -void SpeciesGroupModel::addObject(Object* object) +void Pokemodr::SpeciesGroupModel::addObject(Pokemod::Object* object) { if (!object) - object = static_cast<Pokemod*>(m_object)->newSpecies(); + object = static_cast<Pokemod::Pokemod*>(m_object)->newSpecies(); if (object->className() == "Species") - m_objects.append(new SpeciesModel(this, static_cast<Species*>(object))); + m_objects.append(new SpeciesModel(this, static_cast<Pokemod::Species*>(object))); } -void SpeciesGroupModel::deleteObject(BaseObjectModel* model) +void Pokemodr::SpeciesGroupModel::deleteObject(BaseObjectModel* model) { const int index = m_objects.indexOf(model); if (0 <= index) { - static_cast<Pokemod*>(m_object)->deleteSpecies(index); + static_cast<Pokemod::Pokemod*>(m_object)->deleteSpecies(index); m_objects[index]->deleteLater(); m_objects.removeAt(index); } diff --git a/pokemodr/models/SpeciesGroupModel.h b/pokemodr/models/SpeciesGroupModel.h index 6a16c6f3..98ec4c6f 100644 --- a/pokemodr/models/SpeciesGroupModel.h +++ b/pokemodr/models/SpeciesGroupModel.h @@ -22,21 +22,27 @@ #include "GroupModel.h" // Forward declarations +namespace Pokemod +{ class Pokemod; +} +namespace Pokemodr +{ class SpeciesGroupModel : public GroupModel { Q_OBJECT public: - SpeciesGroupModel(BaseModel* parent, Pokemod* pokemod); + SpeciesGroupModel(BaseModel* parent, Pokemod::Pokemod* pokemod); ~SpeciesGroupModel(); QVariant data(const int role = Qt::DisplayRole) const; bool setData(const QVariant& value, int role = Qt::EditRole); public slots: - void addObject(Object* object = NULL); + void addObject(Pokemod::Object* object = NULL); void deleteObject(BaseObjectModel* model); }; +} #endif diff --git a/pokemodr/models/SpeciesItemGroupModel.cpp b/pokemodr/models/SpeciesItemGroupModel.cpp index 85c19bb1..79b84b85 100644 --- a/pokemodr/models/SpeciesItemGroupModel.cpp +++ b/pokemodr/models/SpeciesItemGroupModel.cpp @@ -31,31 +31,31 @@ // KDE includes #include <KMenu> -SpeciesItemGroupModel::SpeciesItemGroupModel(BaseModel* parent, Species* species) : +Pokemodr::SpeciesItemGroupModel::SpeciesItemGroupModel(BaseModel* parent, Pokemod::Species* species) : GroupModel(parent, species, "Items") { for (int i = 0; i < species->itemCount(); ++i) addObject(species->item(i)); } -SpeciesItemGroupModel::~SpeciesItemGroupModel() +Pokemodr::SpeciesItemGroupModel::~SpeciesItemGroupModel() { } -QVariant SpeciesItemGroupModel::data(const int role) const +QVariant Pokemodr::SpeciesItemGroupModel::data(const int role) const { - if (role == BaseModel::ContextMenuRole) + if (role == Pokemodr::BaseModel::ContextMenuRole) { KMenu* menu = new KMenu; menu->addAction("Add Item", this, SLOT(addObject())); return QVariant::fromValue(static_cast<void*>(menu)); } - return GroupModel::data(role); + return Pokemodr::GroupModel::data(role); } -bool SpeciesItemGroupModel::setData(const QVariant& value, int role) +bool Pokemodr::SpeciesItemGroupModel::setData(const QVariant& value, int role) { - if (role == BaseModel::XmlRole) + if (role == Pokemodr::BaseModel::XmlRole) { if (value.canConvert<QString>()) { @@ -65,7 +65,7 @@ bool SpeciesItemGroupModel::setData(const QVariant& value, int role) { if (xml.doctype().name() == "SpeciesItem") { - addObject(static_cast<Species*>(m_object)->newItem(xml.documentElement())); + addObject(static_cast<Pokemod::Species*>(m_object)->newItem(xml.documentElement())); return true; } file.close(); @@ -75,20 +75,20 @@ bool SpeciesItemGroupModel::setData(const QVariant& value, int role) return false; } -void SpeciesItemGroupModel::addObject(Object* object) +void Pokemodr::SpeciesItemGroupModel::addObject(Pokemod::Object* object) { if (!object) - object = static_cast<Species*>(m_object)->newItem(); + object = static_cast<Pokemod::Species*>(m_object)->newItem(); if (object->className() == "SpeciesItem") - m_objects.append(new SpeciesItemModel(this, static_cast<SpeciesItem*>(object))); + m_objects.append(new SpeciesItemModel(this, static_cast<Pokemod::SpeciesItem*>(object))); } -void SpeciesItemGroupModel::deleteObject(BaseObjectModel* model) +void Pokemodr::SpeciesItemGroupModel::deleteObject(BaseObjectModel* model) { const int index = m_objects.indexOf(model); if (0 <= index) { - static_cast<Species*>(m_object)->deleteItem(index); + static_cast<Pokemod::Species*>(m_object)->deleteItem(index); m_objects[index]->deleteLater(); m_objects.removeAt(index); } diff --git a/pokemodr/models/SpeciesItemGroupModel.h b/pokemodr/models/SpeciesItemGroupModel.h index e3a8b1cc..fb754ce7 100644 --- a/pokemodr/models/SpeciesItemGroupModel.h +++ b/pokemodr/models/SpeciesItemGroupModel.h @@ -22,21 +22,27 @@ #include "GroupModel.h" // Forward declarations +namespace Pokemod +{ class Species; +} +namespace Pokemodr +{ class SpeciesItemGroupModel : public GroupModel { Q_OBJECT public: - SpeciesItemGroupModel(BaseModel* parent, Species* species); + SpeciesItemGroupModel(BaseModel* parent, Pokemod::Species* species); ~SpeciesItemGroupModel(); QVariant data(const int role = Qt::DisplayRole) const; bool setData(const QVariant& value, int role = Qt::EditRole); public slots: - void addObject(Object* object = NULL); + void addObject(Pokemod::Object* object = NULL); void deleteObject(BaseObjectModel* model); }; +} #endif diff --git a/pokemodr/models/SpeciesItemModel.cpp b/pokemodr/models/SpeciesItemModel.cpp index 74f874f7..64aeb44d 100644 --- a/pokemodr/models/SpeciesItemModel.cpp +++ b/pokemodr/models/SpeciesItemModel.cpp @@ -21,11 +21,12 @@ // Model includes #include "GroupModel.h" -// PokeModr includes +// Pokemodr includes #include "../SpeciesItemUI.h" // Pokemod includes #include "../../pokemod/Item.h" +#include "../../pokemod/Pokemod.h" #include "../../pokemod/Species.h" #include "../../pokemod/SpeciesItem.h" @@ -35,47 +36,47 @@ // KDE includes #include <KMenu> -SpeciesItemModel::SpeciesItemModel(BaseModel* parent, SpeciesItem* item) : +Pokemodr::SpeciesItemModel::SpeciesItemModel(BaseModel* parent, Pokemod::SpeciesItem* item) : ObjectModel(parent, item) { } -SpeciesItemModel::~SpeciesItemModel() +Pokemodr::SpeciesItemModel::~SpeciesItemModel() { } -QVariant SpeciesItemModel::data(int role) const +QVariant Pokemodr::SpeciesItemModel::data(int role) const { if (role == Qt::DisplayRole) { - const Item* item = static_cast<const Pokemod*>(m_object->pokemod())->item(static_cast<SpeciesItem*>(m_object)->item()); + const Pokemod::Item* item = static_cast<const Pokemod::Pokemod*>(m_object->pokemod())->item(static_cast<Pokemod::SpeciesItem*>(m_object)->item()); if (item) return item->name(); return ""; } - else if (role == BaseModel::XmlRole) + else if (role == Pokemodr::BaseModel::XmlRole) { QDomDocument xml(m_object->className()); xml.appendChild(m_object->save()); return xml.toString(); } - else if (role == BaseModel::WidgetRole) + else if (role == Pokemodr::BaseModel::WidgetRole) { - QWidget* widget = new SpeciesItemUI(static_cast<SpeciesItem*>(m_object), NULL); + QWidget* widget = new SpeciesItemUI(static_cast<Pokemod::SpeciesItem*>(m_object), NULL); return QVariant::fromValue(widget); } - else if (role == BaseModel::ContextMenuRole) + else if (role == Pokemodr::BaseModel::ContextMenuRole) { KMenu* menu = new KMenu; menu->addAction("Delete Item", this, SLOT(deleteSelf())); return QVariant::fromValue(static_cast<void*>(menu)); } - return ObjectModel::data(role); + return Pokemodr::ObjectModel::data(role); } -bool SpeciesItemModel::setData(const QVariant& value, int role) +bool Pokemodr::SpeciesItemModel::setData(const QVariant& value, int role) { - if (role == BaseModel::XmlRole) + if (role == Pokemodr::BaseModel::XmlRole) { if (value.canConvert<QString>()) { @@ -95,7 +96,7 @@ bool SpeciesItemModel::setData(const QVariant& value, int role) return false; } -void SpeciesItemModel::deleteSelf() +void Pokemodr::SpeciesItemModel::deleteSelf() { // static_cast<GroupModel*>(m_parent)->deleteObject(this); } diff --git a/pokemodr/models/SpeciesItemModel.h b/pokemodr/models/SpeciesItemModel.h index 626d0db9..bf8b5a4e 100644 --- a/pokemodr/models/SpeciesItemModel.h +++ b/pokemodr/models/SpeciesItemModel.h @@ -22,14 +22,19 @@ #include "ObjectModel.h" // Forward declarations +namespace Pokemod +{ class SpeciesItem; +} +namespace Pokemodr +{ class SpeciesItemModel : public ObjectModel { Q_OBJECT public: - SpeciesItemModel(BaseModel* parent, SpeciesItem* item); + SpeciesItemModel(BaseModel* parent, Pokemod::SpeciesItem* item); ~SpeciesItemModel(); QVariant data(int role = Qt::DisplayRole) const; @@ -38,5 +43,6 @@ class SpeciesItemModel : public ObjectModel public slots: void deleteSelf(); }; +} #endif diff --git a/pokemodr/models/SpeciesModel.cpp b/pokemodr/models/SpeciesModel.cpp index dc4415c2..9e5fbc9b 100644 --- a/pokemodr/models/SpeciesModel.cpp +++ b/pokemodr/models/SpeciesModel.cpp @@ -23,7 +23,7 @@ #include "SpeciesItemGroupModel.h" #include "SpeciesMoveGroupModel.h" -// PokeModr includes +// Pokemodr includes #include "../SpeciesUI.h" // Pokemod includes @@ -36,44 +36,44 @@ // KDE includes #include <KMenu> -SpeciesModel::SpeciesModel(BaseModel* parent, Species* species) : +Pokemodr::SpeciesModel::SpeciesModel(BaseModel* parent, Pokemod::Species* species) : GroupObjectModel(parent, species) { setupData(); } -SpeciesModel::~SpeciesModel() +Pokemodr::SpeciesModel::~SpeciesModel() { clearData(); } -QVariant SpeciesModel::data(int role) const +QVariant Pokemodr::SpeciesModel::data(int role) const { if (role == Qt::DisplayRole) - return static_cast<Species*>(m_object)->name(); - else if (role == BaseModel::XmlRole) + return static_cast<Pokemod::Species*>(m_object)->name(); + else if (role == Pokemodr::BaseModel::XmlRole) { QDomDocument xml(m_object->className()); xml.appendChild(m_object->save()); return xml.toString(); } - else if (role == BaseModel::WidgetRole) + else if (role == Pokemodr::BaseModel::WidgetRole) { - QWidget* widget = new SpeciesUI(static_cast<Species*>(m_object), NULL); + QWidget* widget = new SpeciesUI(static_cast<Pokemod::Species*>(m_object), NULL); return QVariant::fromValue(widget); } - else if (role == BaseModel::ContextMenuRole) + else if (role == Pokemodr::BaseModel::ContextMenuRole) { KMenu* menu = new KMenu; menu->addAction("Delete Species", this, SLOT(deleteSelf())); return QVariant::fromValue(static_cast<void*>(menu)); } - return GroupObjectModel::data(role); + return Pokemodr::GroupObjectModel::data(role); } -bool SpeciesModel::setData(const QVariant& value, int role) +bool Pokemodr::SpeciesModel::setData(const QVariant& value, int role) { - if (role == BaseModel::XmlRole) + if (role == Pokemodr::BaseModel::XmlRole) { if (value.canConvert<QString>()) { @@ -95,22 +95,22 @@ bool SpeciesModel::setData(const QVariant& value, int role) return false; } -void SpeciesModel::addObject(Object* /*object*/) +void Pokemodr::SpeciesModel::addObject(Pokemod::Object* /*object*/) { } -void SpeciesModel::deleteObject(BaseModel* /*model*/) +void Pokemodr::SpeciesModel::deleteObject(BaseModel* /*model*/) { } -void SpeciesModel::deleteSelf() +void Pokemodr::SpeciesModel::deleteSelf() { // static_cast<GroupModel*>(m_parent)->deleteObject(this); } -void SpeciesModel::setupData() +void Pokemodr::SpeciesModel::setupData() { - Species* species = static_cast<Species*>(m_object); + Pokemod::Species* species = static_cast<Pokemod::Species*>(m_object); m_objects.append(new SpeciesAbilityGroupModel(this, species)); m_objects.append(new SpeciesItemGroupModel(this, species)); m_objects.append(new SpeciesMoveGroupModel(this, species)); diff --git a/pokemodr/models/SpeciesModel.h b/pokemodr/models/SpeciesModel.h index 265a81e4..26094398 100644 --- a/pokemodr/models/SpeciesModel.h +++ b/pokemodr/models/SpeciesModel.h @@ -22,26 +22,32 @@ #include "GroupObjectModel.h" // Forward declarations +namespace Pokemod +{ class Species; +} +namespace Pokemodr +{ class SpeciesModel : public GroupObjectModel { Q_OBJECT public: - SpeciesModel(BaseModel* parent, Species* species); + SpeciesModel(BaseModel* parent, Pokemod::Species* species); ~SpeciesModel(); QVariant data(int role = Qt::DisplayRole) const; bool setData(const QVariant& value, int role = Qt::EditRole); public slots: - void addObject(Object* /*object = NULL*/); + void addObject(Pokemod::Object* /*object = NULL*/); void deleteObject(BaseModel* /*model*/); void deleteSelf(); protected: void setupData(); }; +} #endif diff --git a/pokemodr/models/SpeciesMoveGroupModel.cpp b/pokemodr/models/SpeciesMoveGroupModel.cpp index 60614e8e..63945062 100644 --- a/pokemodr/models/SpeciesMoveGroupModel.cpp +++ b/pokemodr/models/SpeciesMoveGroupModel.cpp @@ -31,31 +31,31 @@ // KDE includes #include <KMenu> -SpeciesMoveGroupModel::SpeciesMoveGroupModel(BaseModel* parent, Species* species) : +Pokemodr::SpeciesMoveGroupModel::SpeciesMoveGroupModel(BaseModel* parent, Pokemod::Species* species) : GroupModel(parent, species, "Moves") { for (int i = 0; i < species->moveCount(); ++i) addObject(species->move(i)); } -SpeciesMoveGroupModel::~SpeciesMoveGroupModel() +Pokemodr::SpeciesMoveGroupModel::~SpeciesMoveGroupModel() { } -QVariant SpeciesMoveGroupModel::data(const int role) const +QVariant Pokemodr::SpeciesMoveGroupModel::data(const int role) const { - if (role == BaseModel::ContextMenuRole) + if (role == Pokemodr::BaseModel::ContextMenuRole) { KMenu* menu = new KMenu; menu->addAction("Add Move", this, SLOT(addObject())); return QVariant::fromValue(static_cast<void*>(menu)); } - return GroupModel::data(role); + return Pokemodr::GroupModel::data(role); } -bool SpeciesMoveGroupModel::setData(const QVariant& value, int role) +bool Pokemodr::SpeciesMoveGroupModel::setData(const QVariant& value, int role) { - if (role == BaseModel::XmlRole) + if (role == Pokemodr::BaseModel::XmlRole) { if (value.canConvert<QString>()) { @@ -65,7 +65,7 @@ bool SpeciesMoveGroupModel::setData(const QVariant& value, int role) { if (xml.doctype().name() == "SpeciesMove") { - addObject(static_cast<Species*>(m_object)->newMove(xml.documentElement())); + addObject(static_cast<Pokemod::Species*>(m_object)->newMove(xml.documentElement())); return true; } file.close(); @@ -75,20 +75,20 @@ bool SpeciesMoveGroupModel::setData(const QVariant& value, int role) return false; } -void SpeciesMoveGroupModel::addObject(Object* object) +void Pokemodr::SpeciesMoveGroupModel::addObject(Pokemod::Object* object) { if (!object) - object = static_cast<Species*>(m_object)->newMove(); + object = static_cast<Pokemod::Species*>(m_object)->newMove(); if (object->className() == "SpeciesMove") - m_objects.append(new SpeciesMoveModel(this, static_cast<SpeciesMove*>(object))); + m_objects.append(new SpeciesMoveModel(this, static_cast<Pokemod::SpeciesMove*>(object))); } -void SpeciesMoveGroupModel::deleteObject(BaseObjectModel* model) +void Pokemodr::SpeciesMoveGroupModel::deleteObject(BaseObjectModel* model) { const int index = m_objects.indexOf(model); if (0 <= index) { - static_cast<Species*>(m_object)->deleteMove(index); + static_cast<Pokemod::Species*>(m_object)->deleteMove(index); m_objects[index]->deleteLater(); m_objects.removeAt(index); } diff --git a/pokemodr/models/SpeciesMoveGroupModel.h b/pokemodr/models/SpeciesMoveGroupModel.h index 8c08a205..21113a04 100644 --- a/pokemodr/models/SpeciesMoveGroupModel.h +++ b/pokemodr/models/SpeciesMoveGroupModel.h @@ -22,21 +22,27 @@ #include "GroupModel.h" // Forward declarations +namespace Pokemod +{ class Species; +} +namespace Pokemodr +{ class SpeciesMoveGroupModel : public GroupModel { Q_OBJECT public: - SpeciesMoveGroupModel(BaseModel* parent, Species* species); + SpeciesMoveGroupModel(BaseModel* parent, Pokemod::Species* species); ~SpeciesMoveGroupModel(); QVariant data(const int role = Qt::DisplayRole) const; bool setData(const QVariant& value, int role = Qt::EditRole); public slots: - void addObject(Object* object = NULL); + void addObject(Pokemod::Object* object = NULL); void deleteObject(BaseObjectModel* model); }; +} #endif diff --git a/pokemodr/models/SpeciesMoveModel.cpp b/pokemodr/models/SpeciesMoveModel.cpp index ab036ab5..9ae81cad 100644 --- a/pokemodr/models/SpeciesMoveModel.cpp +++ b/pokemodr/models/SpeciesMoveModel.cpp @@ -21,11 +21,12 @@ // Model includes #include "GroupModel.h" -// PokeModr includes +// Pokemodr includes #include "../SpeciesMoveUI.h" // Pokemod includes #include "../../pokemod/Move.h" +#include "../../pokemod/Pokemod.h" #include "../../pokemod/Species.h" #include "../../pokemod/SpeciesMove.h" @@ -35,47 +36,47 @@ // KDE includes #include <KMenu> -SpeciesMoveModel::SpeciesMoveModel(BaseModel* parent, SpeciesMove* move) : +Pokemodr::SpeciesMoveModel::SpeciesMoveModel(BaseModel* parent, Pokemod::SpeciesMove* move) : ObjectModel(parent, move) { } -SpeciesMoveModel::~SpeciesMoveModel() +Pokemodr::SpeciesMoveModel::~SpeciesMoveModel() { } -QVariant SpeciesMoveModel::data(int role) const +QVariant Pokemodr::SpeciesMoveModel::data(int role) const { if (role == Qt::DisplayRole) { - const Move* move = static_cast<const Pokemod*>(m_object->pokemod())->move(static_cast<SpeciesMove*>(m_object)->move()); + const Pokemod::Move* move = static_cast<const Pokemod::Pokemod*>(m_object->pokemod())->move(static_cast<Pokemod::SpeciesMove*>(m_object)->move()); if (move) return move->name(); return ""; } - else if (role == BaseModel::XmlRole) + else if (role == Pokemodr::BaseModel::XmlRole) { QDomDocument xml(m_object->className()); xml.appendChild(m_object->save()); return xml.toString(); } - else if (role == BaseModel::WidgetRole) + else if (role == Pokemodr::BaseModel::WidgetRole) { - QWidget* widget = new SpeciesMoveUI(static_cast<SpeciesMove*>(m_object), NULL); + QWidget* widget = new SpeciesMoveUI(static_cast<Pokemod::SpeciesMove*>(m_object), NULL); return QVariant::fromValue(widget); } - else if (role == BaseModel::ContextMenuRole) + else if (role == Pokemodr::BaseModel::ContextMenuRole) { KMenu* menu = new KMenu; menu->addAction("Delete Move", this, SLOT(deleteSelf())); return QVariant::fromValue(static_cast<void*>(menu)); } - return ObjectModel::data(role); + return Pokemodr::ObjectModel::data(role); } -bool SpeciesMoveModel::setData(const QVariant& value, int role) +bool Pokemodr::SpeciesMoveModel::setData(const QVariant& value, int role) { - if (role == BaseModel::XmlRole) + if (role == Pokemodr::BaseModel::XmlRole) { if (value.canConvert<QString>()) { @@ -95,7 +96,7 @@ bool SpeciesMoveModel::setData(const QVariant& value, int role) return false; } -void SpeciesMoveModel::deleteSelf() +void Pokemodr::SpeciesMoveModel::deleteSelf() { // static_cast<GroupModel*>(m_parent)->deleteObject(this); } diff --git a/pokemodr/models/SpeciesMoveModel.h b/pokemodr/models/SpeciesMoveModel.h index ccd73fb5..f7544280 100644 --- a/pokemodr/models/SpeciesMoveModel.h +++ b/pokemodr/models/SpeciesMoveModel.h @@ -22,14 +22,19 @@ #include "ObjectModel.h" // Forward declarations +namespace Pokemod +{ class SpeciesMove; +} +namespace Pokemodr +{ class SpeciesMoveModel : public ObjectModel { Q_OBJECT public: - SpeciesMoveModel(BaseModel* parent, SpeciesMove* move); + SpeciesMoveModel(BaseModel* parent, Pokemod::SpeciesMove* move); ~SpeciesMoveModel(); QVariant data(int role = Qt::DisplayRole) const; @@ -38,5 +43,6 @@ class SpeciesMoveModel : public ObjectModel public slots: void deleteSelf(); }; +} #endif diff --git a/pokemodr/models/SpriteGroupModel.cpp b/pokemodr/models/SpriteGroupModel.cpp index fc31dacc..f88c1e77 100644 --- a/pokemodr/models/SpriteGroupModel.cpp +++ b/pokemodr/models/SpriteGroupModel.cpp @@ -31,31 +31,31 @@ // KDE includes #include <KMenu> -SpriteGroupModel::SpriteGroupModel(BaseModel* parent, Pokemod* pokemod) : +Pokemodr::SpriteGroupModel::SpriteGroupModel(BaseModel* parent, Pokemod::Pokemod* pokemod) : GroupModel(parent, pokemod, "Sprites") { for (int i = 0; i < pokemod->spriteCount(); ++i) addObject(pokemod->sprite(i)); } -SpriteGroupModel::~SpriteGroupModel() +Pokemodr::SpriteGroupModel::~SpriteGroupModel() { } -QVariant SpriteGroupModel::data(const int role) const +QVariant Pokemodr::SpriteGroupModel::data(const int role) const { - if (role == BaseModel::ContextMenuRole) + if (role == Pokemodr::BaseModel::ContextMenuRole) { KMenu* menu = new KMenu; menu->addAction("Add Sprite", this, SLOT(addObject())); return QVariant::fromValue(static_cast<void*>(menu)); } - return GroupModel::data(role); + return Pokemodr::GroupModel::data(role); } -bool SpriteGroupModel::setData(const QVariant& value, int role) +bool Pokemodr::SpriteGroupModel::setData(const QVariant& value, int role) { - if (role == BaseModel::XmlRole) + if (role == Pokemodr::BaseModel::XmlRole) { if (value.canConvert<QString>()) { @@ -65,7 +65,7 @@ bool SpriteGroupModel::setData(const QVariant& value, int role) { if (xml.doctype().name() == "Sprite") { - addObject(static_cast<Pokemod*>(m_object)->newSprite(xml.documentElement())); + addObject(static_cast<Pokemod::Pokemod*>(m_object)->newSprite(xml.documentElement())); return true; } file.close(); @@ -75,20 +75,20 @@ bool SpriteGroupModel::setData(const QVariant& value, int role) return false; } -void SpriteGroupModel::addObject(Object* object) +void Pokemodr::SpriteGroupModel::addObject(Pokemod::Object* object) { if (!object) - object = static_cast<Pokemod*>(m_object)->newSprite(); + object = static_cast<Pokemod::Pokemod*>(m_object)->newSprite(); if (object->className() == "Sprite") - m_objects.append(new SpriteModel(this, static_cast<Sprite*>(object))); + m_objects.append(new SpriteModel(this, static_cast<Pokemod::Sprite*>(object))); } -void SpriteGroupModel::deleteObject(BaseObjectModel* model) +void Pokemodr::SpriteGroupModel::deleteObject(BaseObjectModel* model) { const int index = m_objects.indexOf(model); if (0 <= index) { - static_cast<Pokemod*>(m_object)->deleteSprite(index); + static_cast<Pokemod::Pokemod*>(m_object)->deleteSprite(index); m_objects[index]->deleteLater(); m_objects.removeAt(index); } diff --git a/pokemodr/models/SpriteGroupModel.h b/pokemodr/models/SpriteGroupModel.h index ae6cb468..1a0d15fb 100644 --- a/pokemodr/models/SpriteGroupModel.h +++ b/pokemodr/models/SpriteGroupModel.h @@ -22,21 +22,27 @@ #include "GroupModel.h" // Forward declarations +namespace Pokemod +{ class Pokemod; +} +namespace Pokemodr +{ class SpriteGroupModel : public GroupModel { Q_OBJECT public: - SpriteGroupModel(BaseModel* parent, Pokemod* pokemod); + SpriteGroupModel(BaseModel* parent, Pokemod::Pokemod* pokemod); ~SpriteGroupModel(); QVariant data(const int role = Qt::DisplayRole) const; bool setData(const QVariant& value, int role = Qt::EditRole); public slots: - void addObject(Object* object = NULL); + void addObject(Pokemod::Object* object = NULL); void deleteObject(BaseObjectModel* model); }; +} #endif diff --git a/pokemodr/models/SpriteModel.cpp b/pokemodr/models/SpriteModel.cpp index 1a2a66f4..492c4718 100644 --- a/pokemodr/models/SpriteModel.cpp +++ b/pokemodr/models/SpriteModel.cpp @@ -21,7 +21,7 @@ // Model includes #include "GroupModel.h" -// PokeModr includes +// Pokemodr includes #include "../SpriteUI.h" // Pokemod includes @@ -33,42 +33,42 @@ // KDE includes #include <KMenu> -SpriteModel::SpriteModel(BaseModel* parent, Sprite* sprite) : +Pokemodr::SpriteModel::SpriteModel(BaseModel* parent, Pokemod::Sprite* sprite) : ObjectModel(parent, sprite) { } -SpriteModel::~SpriteModel() +Pokemodr::SpriteModel::~SpriteModel() { } -QVariant SpriteModel::data(int role) const +QVariant Pokemodr::SpriteModel::data(int role) const { if (role == Qt::DisplayRole) - return static_cast<Sprite*>(m_object)->name(); - else if (role == BaseModel::XmlRole) + return static_cast<Pokemod::Sprite*>(m_object)->name(); + else if (role == Pokemodr::BaseModel::XmlRole) { QDomDocument xml(m_object->className()); xml.appendChild(m_object->save()); return xml.toString(); } - else if (role == BaseModel::WidgetRole) + else if (role == Pokemodr::BaseModel::WidgetRole) { - QWidget* widget = new SpriteUI(static_cast<Sprite*>(m_object), NULL); + QWidget* widget = new SpriteUI(static_cast<Pokemod::Sprite*>(m_object), NULL); return QVariant::fromValue(widget); } - else if (role == BaseModel::ContextMenuRole) + else if (role == Pokemodr::BaseModel::ContextMenuRole) { KMenu* menu = new KMenu; menu->addAction("Delete Sprite", this, SLOT(deleteSelf())); return QVariant::fromValue(static_cast<void*>(menu)); } - return ObjectModel::data(role); + return Pokemodr::ObjectModel::data(role); } -bool SpriteModel::setData(const QVariant& value, int role) +bool Pokemodr::SpriteModel::setData(const QVariant& value, int role) { - if (role == BaseModel::XmlRole) + if (role == Pokemodr::BaseModel::XmlRole) { if (value.canConvert<QString>()) { @@ -88,7 +88,7 @@ bool SpriteModel::setData(const QVariant& value, int role) return false; } -void SpriteModel::deleteSelf() +void Pokemodr::SpriteModel::deleteSelf() { // static_cast<GroupModel*>(m_parent)->deleteObject(this); } diff --git a/pokemodr/models/SpriteModel.h b/pokemodr/models/SpriteModel.h index 3066365d..26ab16aa 100644 --- a/pokemodr/models/SpriteModel.h +++ b/pokemodr/models/SpriteModel.h @@ -22,14 +22,19 @@ #include "ObjectModel.h" // Forward declarations +namespace Pokemod +{ class Sprite; +} +namespace Pokemodr +{ class SpriteModel : public ObjectModel { Q_OBJECT public: - SpriteModel(BaseModel* parent, Sprite* sprite); + SpriteModel(BaseModel* parent, Pokemod::Sprite* sprite); ~SpriteModel(); QVariant data(int role = Qt::DisplayRole) const; @@ -38,5 +43,6 @@ class SpriteModel : public ObjectModel public slots: void deleteSelf(); }; +} #endif diff --git a/pokemodr/models/StatusGroupModel.cpp b/pokemodr/models/StatusGroupModel.cpp index 7a5ee0d8..567d5f67 100644 --- a/pokemodr/models/StatusGroupModel.cpp +++ b/pokemodr/models/StatusGroupModel.cpp @@ -31,31 +31,31 @@ // KDE includes #include <KMenu> -StatusGroupModel::StatusGroupModel(BaseModel* parent, Pokemod* pokemod) : +Pokemodr::StatusGroupModel::StatusGroupModel(BaseModel* parent, Pokemod::Pokemod* pokemod) : GroupModel(parent, pokemod, "Status Effects") { for (int i = 0; i < pokemod->statusCount(); ++i) addObject(pokemod->status(i)); } -StatusGroupModel::~StatusGroupModel() +Pokemodr::StatusGroupModel::~StatusGroupModel() { } -QVariant StatusGroupModel::data(const int role) const +QVariant Pokemodr::StatusGroupModel::data(const int role) const { - if (role == BaseModel::ContextMenuRole) + if (role == Pokemodr::BaseModel::ContextMenuRole) { KMenu* menu = new KMenu; menu->addAction("Add Status", this, SLOT(addObject())); return QVariant::fromValue(static_cast<void*>(menu)); } - return GroupModel::data(role); + return Pokemodr::GroupModel::data(role); } -bool StatusGroupModel::setData(const QVariant& value, int role) +bool Pokemodr::StatusGroupModel::setData(const QVariant& value, int role) { - if (role == BaseModel::XmlRole) + if (role == Pokemodr::BaseModel::XmlRole) { if (value.canConvert<QString>()) { @@ -65,7 +65,7 @@ bool StatusGroupModel::setData(const QVariant& value, int role) { if (xml.doctype().name() == "Status") { - addObject(static_cast<Pokemod*>(m_object)->newStatus(xml.documentElement())); + addObject(static_cast<Pokemod::Pokemod*>(m_object)->newStatus(xml.documentElement())); return true; } file.close(); @@ -75,20 +75,20 @@ bool StatusGroupModel::setData(const QVariant& value, int role) return false; } -void StatusGroupModel::addObject(Object* object) +void Pokemodr::StatusGroupModel::addObject(Pokemod::Object* object) { if (!object) - object = static_cast<Pokemod*>(m_object)->newStatus(); + object = static_cast<Pokemod::Pokemod*>(m_object)->newStatus(); if (object->className() == "Status") - m_objects.append(new StatusModel(this, static_cast<Status*>(object))); + m_objects.append(new StatusModel(this, static_cast<Pokemod::Status*>(object))); } -void StatusGroupModel::deleteObject(BaseObjectModel* model) +void Pokemodr::StatusGroupModel::deleteObject(BaseObjectModel* model) { const int index = m_objects.indexOf(model); if (0 <= index) { - static_cast<Pokemod*>(m_object)->deleteStatus(index); + static_cast<Pokemod::Pokemod*>(m_object)->deleteStatus(index); m_objects[index]->deleteLater(); m_objects.removeAt(index); } diff --git a/pokemodr/models/StatusGroupModel.h b/pokemodr/models/StatusGroupModel.h index 7c916e31..ef6e8808 100644 --- a/pokemodr/models/StatusGroupModel.h +++ b/pokemodr/models/StatusGroupModel.h @@ -22,21 +22,27 @@ #include "GroupModel.h" // Forward declarations +namespace Pokemod +{ class Pokemod; +} +namespace Pokemodr +{ class StatusGroupModel : public GroupModel { Q_OBJECT public: - StatusGroupModel(BaseModel* parent, Pokemod* pokemod); + StatusGroupModel(BaseModel* parent, Pokemod::Pokemod* pokemod); ~StatusGroupModel(); QVariant data(const int role = Qt::DisplayRole) const; bool setData(const QVariant& value, int role = Qt::EditRole); public slots: - void addObject(Object* object = NULL); + void addObject(Pokemod::Object* object = NULL); void deleteObject(BaseObjectModel* model); }; +} #endif diff --git a/pokemodr/models/StatusModel.cpp b/pokemodr/models/StatusModel.cpp index c049c79f..0dca29fe 100644 --- a/pokemodr/models/StatusModel.cpp +++ b/pokemodr/models/StatusModel.cpp @@ -21,7 +21,7 @@ // Model includes #include "GroupModel.h" -// PokeModr includes +// Pokemodr includes #include "../StatusUI.h" // Pokemod includes @@ -33,42 +33,42 @@ // KDE includes #include <KMenu> -StatusModel::StatusModel(BaseModel* parent, Status* status) : +Pokemodr::StatusModel::StatusModel(BaseModel* parent, Pokemod::Status* status) : ObjectModel(parent, status) { } -StatusModel::~StatusModel() +Pokemodr::StatusModel::~StatusModel() { } -QVariant StatusModel::data(int role) const +QVariant Pokemodr::StatusModel::data(int role) const { if (role == Qt::DisplayRole) - return static_cast<Status*>(m_object)->name(); - else if (role == BaseModel::XmlRole) + return static_cast<Pokemod::Status*>(m_object)->name(); + else if (role == Pokemodr::BaseModel::XmlRole) { QDomDocument xml(m_object->className()); xml.appendChild(m_object->save()); return xml.toString(); } - else if (role == BaseModel::WidgetRole) + else if (role == Pokemodr::BaseModel::WidgetRole) { - QWidget* widget = new StatusUI(static_cast<Status*>(m_object), NULL); + QWidget* widget = new StatusUI(static_cast<Pokemod::Status*>(m_object), NULL); return QVariant::fromValue(widget); } - else if (role == BaseModel::ContextMenuRole) + else if (role == Pokemodr::BaseModel::ContextMenuRole) { KMenu* menu = new KMenu; menu->addAction("Delete Status", this, SLOT(deleteSelf())); return QVariant::fromValue(static_cast<void*>(menu)); } - return ObjectModel::data(role); + return Pokemodr::ObjectModel::data(role); } -bool StatusModel::setData(const QVariant& value, int role) +bool Pokemodr::StatusModel::setData(const QVariant& value, int role) { - if (role == BaseModel::XmlRole) + if (role == Pokemodr::BaseModel::XmlRole) { if (value.canConvert<QString>()) { @@ -88,7 +88,7 @@ bool StatusModel::setData(const QVariant& value, int role) return false; } -void StatusModel::deleteSelf() +void Pokemodr::StatusModel::deleteSelf() { // static_cast<GroupModel*>(m_parent)->deleteObject(this); } diff --git a/pokemodr/models/StatusModel.h b/pokemodr/models/StatusModel.h index 429da25a..857cf27d 100644 --- a/pokemodr/models/StatusModel.h +++ b/pokemodr/models/StatusModel.h @@ -22,14 +22,19 @@ #include "ObjectModel.h" // Forward declarations +namespace Pokemod +{ class Status; +} +namespace Pokemodr +{ class StatusModel : public ObjectModel { Q_OBJECT public: - StatusModel(BaseModel* parent, Status* status); + StatusModel(BaseModel* parent, Pokemod::Status* status); ~StatusModel(); QVariant data(int role = Qt::DisplayRole) const; @@ -38,5 +43,6 @@ class StatusModel : public ObjectModel public slots: void deleteSelf(); }; +} #endif diff --git a/pokemodr/models/StoreGroupModel.cpp b/pokemodr/models/StoreGroupModel.cpp index e4b245f7..f7793088 100644 --- a/pokemodr/models/StoreGroupModel.cpp +++ b/pokemodr/models/StoreGroupModel.cpp @@ -31,31 +31,31 @@ // KDE includes #include <KMenu> -StoreGroupModel::StoreGroupModel(BaseModel* parent, Pokemod* pokemod) : +Pokemodr::StoreGroupModel::StoreGroupModel(BaseModel* parent, Pokemod::Pokemod* pokemod) : GroupModel(parent, pokemod, "Stores") { for (int i = 0; i < pokemod->storeCount(); ++i) addObject(pokemod->store(i)); } -StoreGroupModel::~StoreGroupModel() +Pokemodr::StoreGroupModel::~StoreGroupModel() { } -QVariant StoreGroupModel::data(const int role) const +QVariant Pokemodr::StoreGroupModel::data(const int role) const { - if (role == BaseModel::ContextMenuRole) + if (role == Pokemodr::BaseModel::ContextMenuRole) { KMenu* menu = new KMenu; menu->addAction("Add Store", this, SLOT(addObject())); return QVariant::fromValue(static_cast<void*>(menu)); } - return GroupModel::data(role); + return Pokemodr::GroupModel::data(role); } -bool StoreGroupModel::setData(const QVariant& value, int role) +bool Pokemodr::StoreGroupModel::setData(const QVariant& value, int role) { - if (role == BaseModel::XmlRole) + if (role == Pokemodr::BaseModel::XmlRole) { if (value.canConvert<QString>()) { @@ -65,7 +65,7 @@ bool StoreGroupModel::setData(const QVariant& value, int role) { if (xml.doctype().name() == "Store") { - addObject(static_cast<Pokemod*>(m_object)->newStore(xml.documentElement())); + addObject(static_cast<Pokemod::Pokemod*>(m_object)->newStore(xml.documentElement())); return true; } file.close(); @@ -75,20 +75,20 @@ bool StoreGroupModel::setData(const QVariant& value, int role) return false; } -void StoreGroupModel::addObject(Object* object) +void Pokemodr::StoreGroupModel::addObject(Pokemod::Object* object) { if (!object) - object = static_cast<Pokemod*>(m_object)->newStore(); + object = static_cast<Pokemod::Pokemod*>(m_object)->newStore(); if (object->className() == "Store") - m_objects.append(new StoreModel(this, static_cast<Store*>(object))); + m_objects.append(new StoreModel(this, static_cast<Pokemod::Store*>(object))); } -void StoreGroupModel::deleteObject(BaseObjectModel* model) +void Pokemodr::StoreGroupModel::deleteObject(BaseObjectModel* model) { const int index = m_objects.indexOf(model); if (0 <= index) { - static_cast<Pokemod*>(m_object)->deleteStore(index); + static_cast<Pokemod::Pokemod*>(m_object)->deleteStore(index); m_objects[index]->deleteLater(); m_objects.removeAt(index); } diff --git a/pokemodr/models/StoreGroupModel.h b/pokemodr/models/StoreGroupModel.h index 8417275b..f1ac95df 100644 --- a/pokemodr/models/StoreGroupModel.h +++ b/pokemodr/models/StoreGroupModel.h @@ -22,21 +22,27 @@ #include "GroupModel.h" // Forward declarations +namespace Pokemod +{ class Pokemod; +} +namespace Pokemodr +{ class StoreGroupModel : public GroupModel { Q_OBJECT public: - StoreGroupModel(BaseModel* parent, Pokemod* pokemod); + StoreGroupModel(BaseModel* parent, Pokemod::Pokemod* pokemod); ~StoreGroupModel(); QVariant data(const int role = Qt::DisplayRole) const; bool setData(const QVariant& value, int role = Qt::EditRole); public slots: - void addObject(Object* object = NULL); + void addObject(Pokemod::Object* object = NULL); void deleteObject(BaseObjectModel* model); }; +} #endif diff --git a/pokemodr/models/StoreModel.cpp b/pokemodr/models/StoreModel.cpp index 0ce73054..b50c03c1 100644 --- a/pokemodr/models/StoreModel.cpp +++ b/pokemodr/models/StoreModel.cpp @@ -21,7 +21,7 @@ // Model includes #include "GroupModel.h" -// PokeModr includes +// Pokemodr includes #include "../StoreUI.h" // Pokemod includes @@ -34,42 +34,42 @@ // KDE includes #include <KMenu> -StoreModel::StoreModel(BaseModel* parent, Store* store) : +Pokemodr::StoreModel::StoreModel(BaseModel* parent, Pokemod::Store* store) : ObjectModel(parent, store) { } -StoreModel::~StoreModel() +Pokemodr::StoreModel::~StoreModel() { } -QVariant StoreModel::data(int role) const +QVariant Pokemodr::StoreModel::data(int role) const { if (role == Qt::DisplayRole) - return static_cast<Store*>(m_object)->name(); - else if (role == BaseModel::XmlRole) + return static_cast<Pokemod::Store*>(m_object)->name(); + else if (role == Pokemodr::BaseModel::XmlRole) { QDomDocument xml(m_object->className()); xml.appendChild(m_object->save()); return xml.toString(); } - else if (role == BaseModel::WidgetRole) + else if (role == Pokemodr::BaseModel::WidgetRole) { - QWidget* widget = new StoreUI(static_cast<Store*>(m_object), NULL); + QWidget* widget = new StoreUI(static_cast<Pokemod::Store*>(m_object), NULL); return QVariant::fromValue(widget); } - else if (role == BaseModel::ContextMenuRole) + else if (role == Pokemodr::BaseModel::ContextMenuRole) { KMenu* menu = new KMenu; menu->addAction("Delete Store", this, SLOT(deleteSelf())); return QVariant::fromValue(static_cast<void*>(menu)); } - return ObjectModel::data(role); + return Pokemodr::ObjectModel::data(role); } -bool StoreModel::setData(const QVariant& value, int role) +bool Pokemodr::StoreModel::setData(const QVariant& value, int role) { - if (role == BaseModel::XmlRole) + if (role == Pokemodr::BaseModel::XmlRole) { if (value.canConvert<QString>()) { @@ -89,7 +89,7 @@ bool StoreModel::setData(const QVariant& value, int role) return false; } -void StoreModel::deleteSelf() +void Pokemodr::StoreModel::deleteSelf() { // static_cast<GroupModel*>(m_parent)->deleteObject(this); } diff --git a/pokemodr/models/StoreModel.h b/pokemodr/models/StoreModel.h index 313db08e..b7ca4fae 100644 --- a/pokemodr/models/StoreModel.h +++ b/pokemodr/models/StoreModel.h @@ -22,14 +22,19 @@ #include "ObjectModel.h" // Forward declarations +namespace Pokemod +{ class Store; +} +namespace Pokemodr +{ class StoreModel : public ObjectModel { Q_OBJECT public: - StoreModel(BaseModel* parent, Store* store); + StoreModel(BaseModel* parent, Pokemod::Store* store); ~StoreModel(); QVariant data(int role = Qt::DisplayRole) const; @@ -38,5 +43,6 @@ class StoreModel : public ObjectModel public slots: void deleteSelf(); }; +} #endif diff --git a/pokemodr/models/TileGroupModel.cpp b/pokemodr/models/TileGroupModel.cpp index a782d47f..6d8d4deb 100644 --- a/pokemodr/models/TileGroupModel.cpp +++ b/pokemodr/models/TileGroupModel.cpp @@ -31,31 +31,31 @@ // KDE includes #include <KMenu> -TileGroupModel::TileGroupModel(BaseModel* parent, Pokemod* pokemod) : +Pokemodr::TileGroupModel::TileGroupModel(BaseModel* parent, Pokemod::Pokemod* pokemod) : GroupModel(parent, pokemod, "Tiles") { for (int i = 0; i < pokemod->tileCount(); ++i) addObject(pokemod->tile(i)); } -TileGroupModel::~TileGroupModel() +Pokemodr::TileGroupModel::~TileGroupModel() { } -QVariant TileGroupModel::data(const int role) const +QVariant Pokemodr::TileGroupModel::data(const int role) const { - if (role == BaseModel::ContextMenuRole) + if (role == Pokemodr::BaseModel::ContextMenuRole) { KMenu* menu = new KMenu; menu->addAction("Add Tile", this, SLOT(addObject())); return QVariant::fromValue(static_cast<void*>(menu)); } - return GroupModel::data(role); + return Pokemodr::GroupModel::data(role); } -bool TileGroupModel::setData(const QVariant& value, int role) +bool Pokemodr::TileGroupModel::setData(const QVariant& value, int role) { - if (role == BaseModel::XmlRole) + if (role == Pokemodr::BaseModel::XmlRole) { if (value.canConvert<QString>()) { @@ -65,7 +65,7 @@ bool TileGroupModel::setData(const QVariant& value, int role) { if (xml.doctype().name() == "Tile") { - addObject(static_cast<Pokemod*>(m_object)->newTile(xml.documentElement())); + addObject(static_cast<Pokemod::Pokemod*>(m_object)->newTile(xml.documentElement())); return true; } file.close(); @@ -75,20 +75,20 @@ bool TileGroupModel::setData(const QVariant& value, int role) return false; } -void TileGroupModel::addObject(Object* object) +void Pokemodr::TileGroupModel::addObject(Pokemod::Object* object) { if (!object) - object = static_cast<Pokemod*>(m_object)->newTile(); + object = static_cast<Pokemod::Pokemod*>(m_object)->newTile(); if (object->className() == "Tile") - m_objects.append(new TileModel(this, static_cast<Tile*>(object))); + m_objects.append(new TileModel(this, static_cast<Pokemod::Tile*>(object))); } -void TileGroupModel::deleteObject(BaseObjectModel* model) +void Pokemodr::TileGroupModel::deleteObject(BaseObjectModel* model) { const int index = m_objects.indexOf(model); if (0 <= index) { - static_cast<Pokemod*>(m_object)->deleteTile(index); + static_cast<Pokemod::Pokemod*>(m_object)->deleteTile(index); m_objects[index]->deleteLater(); m_objects.removeAt(index); } diff --git a/pokemodr/models/TileGroupModel.h b/pokemodr/models/TileGroupModel.h index f0764f76..817d3475 100644 --- a/pokemodr/models/TileGroupModel.h +++ b/pokemodr/models/TileGroupModel.h @@ -22,21 +22,27 @@ #include "GroupModel.h" // Forward declarations +namespace Pokemod +{ class Pokemod; +} +namespace Pokemodr +{ class TileGroupModel : public GroupModel { Q_OBJECT public: - TileGroupModel(BaseModel* parent, Pokemod* pokemod); + TileGroupModel(BaseModel* parent, Pokemod::Pokemod* pokemod); ~TileGroupModel(); QVariant data(const int role = Qt::DisplayRole) const; bool setData(const QVariant& value, int role = Qt::EditRole); public slots: - void addObject(Object* object = NULL); + void addObject(Pokemod::Object* object = NULL); void deleteObject(BaseObjectModel* model); }; +} #endif diff --git a/pokemodr/models/TileModel.cpp b/pokemodr/models/TileModel.cpp index f6be8941..3d17a8ad 100644 --- a/pokemodr/models/TileModel.cpp +++ b/pokemodr/models/TileModel.cpp @@ -21,7 +21,7 @@ // Model includes #include "GroupModel.h" -// PokeModr includes +// Pokemodr includes #include "../TileUI.h" // Pokemod includes @@ -34,42 +34,42 @@ // KDE includes #include <KMenu> -TileModel::TileModel(BaseModel* parent, Tile* tile) : +Pokemodr::TileModel::TileModel(BaseModel* parent, Pokemod::Tile* tile) : ObjectModel(parent, tile) { } -TileModel::~TileModel() +Pokemodr::TileModel::~TileModel() { } -QVariant TileModel::data(int role) const +QVariant Pokemodr::TileModel::data(int role) const { if (role == Qt::DisplayRole) - return static_cast<Tile*>(m_object)->name(); - else if (role == BaseModel::XmlRole) + return static_cast<Pokemod::Tile*>(m_object)->name(); + else if (role == Pokemodr::BaseModel::XmlRole) { QDomDocument xml(m_object->className()); xml.appendChild(m_object->save()); return xml.toString(); } - else if (role == BaseModel::WidgetRole) + else if (role == Pokemodr::BaseModel::WidgetRole) { - QWidget* widget = new TileUI(static_cast<Tile*>(m_object), NULL); + QWidget* widget = new TileUI(static_cast<Pokemod::Tile*>(m_object), NULL); return QVariant::fromValue(widget); } - else if (role == BaseModel::ContextMenuRole) + else if (role == Pokemodr::BaseModel::ContextMenuRole) { KMenu* menu = new KMenu; menu->addAction("Delete Tile", this, SLOT(deleteSelf())); return QVariant::fromValue(static_cast<void*>(menu)); } - return ObjectModel::data(role); + return Pokemodr::ObjectModel::data(role); } -bool TileModel::setData(const QVariant& value, int role) +bool Pokemodr::TileModel::setData(const QVariant& value, int role) { - if (role == BaseModel::XmlRole) + if (role == Pokemodr::BaseModel::XmlRole) { if (value.canConvert<QString>()) { @@ -89,7 +89,7 @@ bool TileModel::setData(const QVariant& value, int role) return false; } -void TileModel::deleteSelf() +void Pokemodr::TileModel::deleteSelf() { // static_cast<GroupModel*>(m_parent)->deleteObject(this); } diff --git a/pokemodr/models/TileModel.h b/pokemodr/models/TileModel.h index 1a635a40..d03e76c7 100644 --- a/pokemodr/models/TileModel.h +++ b/pokemodr/models/TileModel.h @@ -22,14 +22,19 @@ #include "ObjectModel.h" // Forward declarations +namespace Pokemod +{ class Tile; +} +namespace Pokemodr +{ class TileModel : public ObjectModel { Q_OBJECT public: - TileModel(BaseModel* parent, Tile* tile); + TileModel(BaseModel* parent, Pokemod::Tile* tile); ~TileModel(); QVariant data(int role = Qt::DisplayRole) const; @@ -38,5 +43,6 @@ class TileModel : public ObjectModel public slots: void deleteSelf(); }; +} #endif diff --git a/pokemodr/models/TimeGroupModel.cpp b/pokemodr/models/TimeGroupModel.cpp index 126aa606..016d6bab 100644 --- a/pokemodr/models/TimeGroupModel.cpp +++ b/pokemodr/models/TimeGroupModel.cpp @@ -31,31 +31,31 @@ // KDE includes #include <KMenu> -TimeGroupModel::TimeGroupModel(BaseModel* parent, Pokemod* pokemod) : +Pokemodr::TimeGroupModel::TimeGroupModel(BaseModel* parent, Pokemod::Pokemod* pokemod) : GroupModel(parent, pokemod, "Times") { for (int i = 0; i < pokemod->timeCount(); ++i) addObject(pokemod->time(i)); } -TimeGroupModel::~TimeGroupModel() +Pokemodr::TimeGroupModel::~TimeGroupModel() { } -QVariant TimeGroupModel::data(const int role) const +QVariant Pokemodr::TimeGroupModel::data(const int role) const { - if (role == BaseModel::ContextMenuRole) + if (role == Pokemodr::BaseModel::ContextMenuRole) { KMenu* menu = new KMenu; menu->addAction("Add Time", this, SLOT(addObject())); return QVariant::fromValue(static_cast<void*>(menu)); } - return GroupModel::data(role); + return Pokemodr::GroupModel::data(role); } -bool TimeGroupModel::setData(const QVariant& value, int role) +bool Pokemodr::TimeGroupModel::setData(const QVariant& value, int role) { - if (role == BaseModel::XmlRole) + if (role == Pokemodr::BaseModel::XmlRole) { if (value.canConvert<QString>()) { @@ -65,7 +65,7 @@ bool TimeGroupModel::setData(const QVariant& value, int role) { if (xml.doctype().name() == "Time") { - addObject(static_cast<Pokemod*>(m_object)->newTime(xml.documentElement())); + addObject(static_cast<Pokemod::Pokemod*>(m_object)->newTime(xml.documentElement())); return true; } file.close(); @@ -75,20 +75,20 @@ bool TimeGroupModel::setData(const QVariant& value, int role) return false; } -void TimeGroupModel::addObject(Object* object) +void Pokemodr::TimeGroupModel::addObject(Pokemod::Object* object) { if (!object) - object = static_cast<Pokemod*>(m_object)->newTime(); + object = static_cast<Pokemod::Pokemod*>(m_object)->newTime(); if (object->className() == "Time") - m_objects.append(new TimeModel(this, static_cast<Time*>(object))); + m_objects.append(new TimeModel(this, static_cast<Pokemod::Time*>(object))); } -void TimeGroupModel::deleteObject(BaseObjectModel* model) +void Pokemodr::TimeGroupModel::deleteObject(BaseObjectModel* model) { const int index = m_objects.indexOf(model); if (0 <= index) { - static_cast<Pokemod*>(m_object)->deleteTime(index); + static_cast<Pokemod::Pokemod*>(m_object)->deleteTime(index); m_objects[index]->deleteLater(); m_objects.removeAt(index); } diff --git a/pokemodr/models/TimeGroupModel.h b/pokemodr/models/TimeGroupModel.h index ecf3a6d3..de9c70be 100644 --- a/pokemodr/models/TimeGroupModel.h +++ b/pokemodr/models/TimeGroupModel.h @@ -22,21 +22,27 @@ #include "GroupModel.h" // Forward declarations +namespace Pokemod +{ class Pokemod; +} +namespace Pokemodr +{ class TimeGroupModel : public GroupModel { Q_OBJECT public: - TimeGroupModel(BaseModel* parent, Pokemod* pokemod); + TimeGroupModel(BaseModel* parent, Pokemod::Pokemod* pokemod); ~TimeGroupModel(); QVariant data(const int role = Qt::DisplayRole) const; bool setData(const QVariant& value, int role = Qt::EditRole); public slots: - void addObject(Object* object = NULL); + void addObject(Pokemod::Object* object = NULL); void deleteObject(BaseObjectModel* model); }; +} #endif diff --git a/pokemodr/models/TimeModel.cpp b/pokemodr/models/TimeModel.cpp index 05e45a15..66f5ed02 100644 --- a/pokemodr/models/TimeModel.cpp +++ b/pokemodr/models/TimeModel.cpp @@ -21,7 +21,7 @@ // Model includes #include "GroupModel.h" -// PokeModr includes +// Pokemodr includes #include "../TimeUI.h" // Pokemod includes @@ -34,42 +34,42 @@ // KDE includes #include <KMenu> -TimeModel::TimeModel(BaseModel* parent, Time* time) : +Pokemodr::TimeModel::TimeModel(BaseModel* parent, Pokemod::Time* time) : ObjectModel(parent, time) { } -TimeModel::~TimeModel() +Pokemodr::TimeModel::~TimeModel() { } -QVariant TimeModel::data(int role) const +QVariant Pokemodr::TimeModel::data(int role) const { if (role == Qt::DisplayRole) - return static_cast<Time*>(m_object)->name(); - else if (role == BaseModel::XmlRole) + return static_cast<Pokemod::Time*>(m_object)->name(); + else if (role == Pokemodr::BaseModel::XmlRole) { QDomDocument xml(m_object->className()); xml.appendChild(m_object->save()); return xml.toString(); } - else if (role == BaseModel::WidgetRole) + else if (role == Pokemodr::BaseModel::WidgetRole) { - QWidget* widget = new TimeUI(static_cast<Time*>(m_object), NULL); + QWidget* widget = new TimeUI(static_cast<Pokemod::Time*>(m_object), NULL); return QVariant::fromValue(widget); } - else if (role == BaseModel::ContextMenuRole) + else if (role == Pokemodr::BaseModel::ContextMenuRole) { KMenu* menu = new KMenu; menu->addAction("Delete Time", this, SLOT(deleteSelf())); return QVariant::fromValue(static_cast<void*>(menu)); } - return ObjectModel::data(role); + return Pokemodr::ObjectModel::data(role); } -bool TimeModel::setData(const QVariant& value, int role) +bool Pokemodr::TimeModel::setData(const QVariant& value, int role) { - if (role == BaseModel::XmlRole) + if (role == Pokemodr::BaseModel::XmlRole) { if (value.canConvert<QString>()) { @@ -89,7 +89,7 @@ bool TimeModel::setData(const QVariant& value, int role) return false; } -void TimeModel::deleteSelf() +void Pokemodr::TimeModel::deleteSelf() { // static_cast<GroupModel*>(m_parent)->deleteObject(this); } diff --git a/pokemodr/models/TimeModel.h b/pokemodr/models/TimeModel.h index 5513a957..2efdabc2 100644 --- a/pokemodr/models/TimeModel.h +++ b/pokemodr/models/TimeModel.h @@ -22,14 +22,19 @@ #include "ObjectModel.h" // Forward declarations +namespace Pokemod +{ class Time; +} +namespace Pokemodr +{ class TimeModel : public ObjectModel { Q_OBJECT public: - TimeModel(BaseModel* parent, Time* time); + TimeModel(BaseModel* parent, Pokemod::Time* time); ~TimeModel(); QVariant data(int role = Qt::DisplayRole) const; @@ -38,5 +43,6 @@ class TimeModel : public ObjectModel public slots: void deleteSelf(); }; +} #endif diff --git a/pokemodr/models/TrainerGroupModel.cpp b/pokemodr/models/TrainerGroupModel.cpp index d123f312..9d10460b 100644 --- a/pokemodr/models/TrainerGroupModel.cpp +++ b/pokemodr/models/TrainerGroupModel.cpp @@ -31,31 +31,31 @@ // KDE includes #include <KMenu> -TrainerGroupModel::TrainerGroupModel(BaseModel* parent, Pokemod* pokemod) : +Pokemodr::TrainerGroupModel::TrainerGroupModel(BaseModel* parent, Pokemod::Pokemod* pokemod) : GroupModel(parent, pokemod, "Trainers") { for (int i = 0; i < pokemod->trainerCount(); ++i) addObject(pokemod->trainer(i)); } -TrainerGroupModel::~TrainerGroupModel() +Pokemodr::TrainerGroupModel::~TrainerGroupModel() { } -QVariant TrainerGroupModel::data(const int role) const +QVariant Pokemodr::TrainerGroupModel::data(const int role) const { - if (role == BaseModel::ContextMenuRole) + if (role == Pokemodr::BaseModel::ContextMenuRole) { KMenu* menu = new KMenu; menu->addAction("Add Trainer", this, SLOT(addObject())); return QVariant::fromValue(static_cast<void*>(menu)); } - return GroupModel::data(role); + return Pokemodr::GroupModel::data(role); } -bool TrainerGroupModel::setData(const QVariant& value, int role) +bool Pokemodr::TrainerGroupModel::setData(const QVariant& value, int role) { - if (role == BaseModel::XmlRole) + if (role == Pokemodr::BaseModel::XmlRole) { if (value.canConvert<QString>()) { @@ -65,7 +65,7 @@ bool TrainerGroupModel::setData(const QVariant& value, int role) { if (xml.doctype().name() == "Trainer") { - addObject(static_cast<Pokemod*>(m_object)->newTrainer(xml.documentElement())); + addObject(static_cast<Pokemod::Pokemod*>(m_object)->newTrainer(xml.documentElement())); return true; } file.close(); @@ -75,20 +75,20 @@ bool TrainerGroupModel::setData(const QVariant& value, int role) return false; } -void TrainerGroupModel::addObject(Object* object) +void Pokemodr::TrainerGroupModel::addObject(Pokemod::Object* object) { if (!object) - object = static_cast<Pokemod*>(m_object)->newTrainer(); + object = static_cast<Pokemod::Pokemod*>(m_object)->newTrainer(); if (object->className() == "Trainer") - m_objects.append(new TrainerModel(this, static_cast<Trainer*>(object))); + m_objects.append(new TrainerModel(this, static_cast<Pokemod::Trainer*>(object))); } -void TrainerGroupModel::deleteObject(BaseObjectModel* model) +void Pokemodr::TrainerGroupModel::deleteObject(BaseObjectModel* model) { const int index = m_objects.indexOf(model); if (0 <= index) { - static_cast<Pokemod*>(m_object)->deleteTrainer(index); + static_cast<Pokemod::Pokemod*>(m_object)->deleteTrainer(index); m_objects[index]->deleteLater(); m_objects.removeAt(index); } diff --git a/pokemodr/models/TrainerGroupModel.h b/pokemodr/models/TrainerGroupModel.h index 4b47608a..7aa0f3e2 100644 --- a/pokemodr/models/TrainerGroupModel.h +++ b/pokemodr/models/TrainerGroupModel.h @@ -22,21 +22,27 @@ #include "GroupModel.h" // Forward declarations +namespace Pokemod +{ class Pokemod; +} +namespace Pokemodr +{ class TrainerGroupModel : public GroupModel { Q_OBJECT public: - TrainerGroupModel(BaseModel* parent, Pokemod* pokemod); + TrainerGroupModel(BaseModel* parent, Pokemod::Pokemod* pokemod); ~TrainerGroupModel(); QVariant data(const int role = Qt::DisplayRole) const; bool setData(const QVariant& value, int role = Qt::EditRole); public slots: - void addObject(Object* object = NULL); + void addObject(Pokemod::Object* object = NULL); void deleteObject(BaseObjectModel* model); }; +} #endif diff --git a/pokemodr/models/TrainerModel.cpp b/pokemodr/models/TrainerModel.cpp index 1849fe38..1d1aff54 100644 --- a/pokemodr/models/TrainerModel.cpp +++ b/pokemodr/models/TrainerModel.cpp @@ -21,7 +21,7 @@ // Model includes #include "GroupModel.h" -// PokeModr includes +// Pokemodr includes #include "../TrainerUI.h" // Pokemod includes @@ -34,42 +34,42 @@ // KDE includes #include <KMenu> -TrainerModel::TrainerModel(BaseModel* parent, Trainer* trainer) : +Pokemodr::TrainerModel::TrainerModel(BaseModel* parent, Pokemod::Trainer* trainer) : ObjectModel(parent, trainer) { } -TrainerModel::~TrainerModel() +Pokemodr::TrainerModel::~TrainerModel() { } -QVariant TrainerModel::data(int role) const +QVariant Pokemodr::TrainerModel::data(int role) const { if (role == Qt::DisplayRole) - return static_cast<Trainer*>(m_object)->name(); - else if (role == BaseModel::XmlRole) + return static_cast<Pokemod::Trainer*>(m_object)->name(); + else if (role == Pokemodr::BaseModel::XmlRole) { QDomDocument xml(m_object->className()); xml.appendChild(m_object->save()); return xml.toString(); } - else if (role == BaseModel::WidgetRole) + else if (role == Pokemodr::BaseModel::WidgetRole) { - QWidget* widget = new TrainerUI(static_cast<Trainer*>(m_object), NULL); + QWidget* widget = new TrainerUI(static_cast<Pokemod::Trainer*>(m_object), NULL); return QVariant::fromValue(widget); } - else if (role == BaseModel::ContextMenuRole) + else if (role == Pokemodr::BaseModel::ContextMenuRole) { KMenu* menu = new KMenu; menu->addAction("Delete Trainer", this, SLOT(deleteSelf())); return QVariant::fromValue(static_cast<void*>(menu)); } - return ObjectModel::data(role); + return Pokemodr::ObjectModel::data(role); } -bool TrainerModel::setData(const QVariant& value, int role) +bool Pokemodr::TrainerModel::setData(const QVariant& value, int role) { - if (role == BaseModel::XmlRole) + if (role == Pokemodr::BaseModel::XmlRole) { if (value.canConvert<QString>()) { @@ -89,7 +89,7 @@ bool TrainerModel::setData(const QVariant& value, int role) return false; } -void TrainerModel::deleteSelf() +void Pokemodr::TrainerModel::deleteSelf() { // static_cast<GroupModel*>(m_parent)->deleteObject(this); } diff --git a/pokemodr/models/TrainerModel.h b/pokemodr/models/TrainerModel.h index 84cf8d4d..58552a99 100644 --- a/pokemodr/models/TrainerModel.h +++ b/pokemodr/models/TrainerModel.h @@ -22,14 +22,19 @@ #include "ObjectModel.h" // Forward declarations +namespace Pokemod +{ class Trainer; +} +namespace Pokemodr +{ class TrainerModel : public ObjectModel { Q_OBJECT public: - TrainerModel(BaseModel* parent, Trainer* trainer); + TrainerModel(BaseModel* parent, Pokemod::Trainer* trainer); ~TrainerModel(); QVariant data(int role = Qt::DisplayRole) const; @@ -38,5 +43,6 @@ class TrainerModel : public ObjectModel public slots: void deleteSelf(); }; +} #endif diff --git a/pokemodr/models/TypeGroupModel.cpp b/pokemodr/models/TypeGroupModel.cpp index d445dfed..3f2c3b58 100644 --- a/pokemodr/models/TypeGroupModel.cpp +++ b/pokemodr/models/TypeGroupModel.cpp @@ -31,31 +31,31 @@ // KDE includes #include <KMenu> -TypeGroupModel::TypeGroupModel(BaseModel* parent, Pokemod* pokemod) : +Pokemodr::TypeGroupModel::TypeGroupModel(BaseModel* parent, Pokemod::Pokemod* pokemod) : GroupModel(parent, pokemod, "Types") { for (int i = 0; i < pokemod->typeCount(); ++i) addObject(pokemod->type(i)); } -TypeGroupModel::~TypeGroupModel() +Pokemodr::TypeGroupModel::~TypeGroupModel() { } -QVariant TypeGroupModel::data(const int role) const +QVariant Pokemodr::TypeGroupModel::data(const int role) const { - if (role == BaseModel::ContextMenuRole) + if (role == Pokemodr::BaseModel::ContextMenuRole) { KMenu* menu = new KMenu; menu->addAction("Add Type", this, SLOT(addObject())); return QVariant::fromValue(static_cast<void*>(menu)); } - return GroupModel::data(role); + return Pokemodr::GroupModel::data(role); } -bool TypeGroupModel::setData(const QVariant& value, int role) +bool Pokemodr::TypeGroupModel::setData(const QVariant& value, int role) { - if (role == BaseModel::XmlRole) + if (role == Pokemodr::BaseModel::XmlRole) { if (value.canConvert<QString>()) { @@ -65,7 +65,7 @@ bool TypeGroupModel::setData(const QVariant& value, int role) { if (xml.doctype().name() == "Type") { - addObject(static_cast<Pokemod*>(m_object)->newType(xml.documentElement())); + addObject(static_cast<Pokemod::Pokemod*>(m_object)->newType(xml.documentElement())); return true; } file.close(); @@ -75,20 +75,20 @@ bool TypeGroupModel::setData(const QVariant& value, int role) return false; } -void TypeGroupModel::addObject(Object* object) +void Pokemodr::TypeGroupModel::addObject(Pokemod::Object* object) { if (!object) - object = static_cast<Pokemod*>(m_object)->newType(); + object = static_cast<Pokemod::Pokemod*>(m_object)->newType(); if (object->className() == "Type") - m_objects.append(new TypeModel(this, static_cast<Type*>(object))); + m_objects.append(new TypeModel(this, static_cast<Pokemod::Type*>(object))); } -void TypeGroupModel::deleteObject(BaseObjectModel* model) +void Pokemodr::TypeGroupModel::deleteObject(BaseObjectModel* model) { const int index = m_objects.indexOf(model); if (0 <= index) { - static_cast<Pokemod*>(m_object)->deleteType(index); + static_cast<Pokemod::Pokemod*>(m_object)->deleteType(index); m_objects[index]->deleteLater(); m_objects.removeAt(index); } diff --git a/pokemodr/models/TypeGroupModel.h b/pokemodr/models/TypeGroupModel.h index 82eae980..6a06852f 100644 --- a/pokemodr/models/TypeGroupModel.h +++ b/pokemodr/models/TypeGroupModel.h @@ -22,21 +22,27 @@ #include "GroupModel.h" // Forward declarations +namespace Pokemod +{ class Pokemod; +} +namespace Pokemodr +{ class TypeGroupModel : public GroupModel { Q_OBJECT public: - TypeGroupModel(BaseModel* parent, Pokemod* pokemod); + TypeGroupModel(BaseModel* parent, Pokemod::Pokemod* pokemod); ~TypeGroupModel(); QVariant data(const int role = Qt::DisplayRole) const; bool setData(const QVariant& value, int role = Qt::EditRole); public slots: - void addObject(Object* object = NULL); + void addObject(Pokemod::Object* object = NULL); void deleteObject(BaseObjectModel* model); }; +} #endif diff --git a/pokemodr/models/TypeModel.cpp b/pokemodr/models/TypeModel.cpp index 7ecad48f..09ab1739 100644 --- a/pokemodr/models/TypeModel.cpp +++ b/pokemodr/models/TypeModel.cpp @@ -21,7 +21,7 @@ // Model includes #include "GroupModel.h" -// PokeModr includes +// Pokemodr includes #include "../TypeUI.h" // Pokemod includes @@ -34,42 +34,42 @@ // KDE includes #include <KMenu> -TypeModel::TypeModel(BaseModel* parent, Type* type) : +Pokemodr::TypeModel::TypeModel(BaseModel* parent, Pokemod::Type* type) : ObjectModel(parent, type) { } -TypeModel::~TypeModel() +Pokemodr::TypeModel::~TypeModel() { } -QVariant TypeModel::data(int role) const +QVariant Pokemodr::TypeModel::data(int role) const { if (role == Qt::DisplayRole) - return static_cast<Type*>(m_object)->name(); - else if (role == BaseModel::XmlRole) + return static_cast<Pokemod::Type*>(m_object)->name(); + else if (role == Pokemodr::BaseModel::XmlRole) { QDomDocument xml(m_object->className()); xml.appendChild(m_object->save()); return xml.toString(); } - else if (role == BaseModel::WidgetRole) + else if (role == Pokemodr::BaseModel::WidgetRole) { - QWidget* widget = new TypeUI(static_cast<Type*>(m_object), NULL); + QWidget* widget = new TypeUI(static_cast<Pokemod::Type*>(m_object), NULL); return QVariant::fromValue(widget); } - else if (role == BaseModel::ContextMenuRole) + else if (role == Pokemodr::BaseModel::ContextMenuRole) { KMenu* menu = new KMenu; menu->addAction("Delete Type", this, SLOT(deleteSelf())); return QVariant::fromValue(static_cast<void*>(menu)); } - return ObjectModel::data(role); + return Pokemodr::ObjectModel::data(role); } -bool TypeModel::setData(const QVariant& value, int role) +bool Pokemodr::TypeModel::setData(const QVariant& value, int role) { - if (role == BaseModel::XmlRole) + if (role == Pokemodr::BaseModel::XmlRole) { if (value.canConvert<QString>()) { @@ -89,7 +89,7 @@ bool TypeModel::setData(const QVariant& value, int role) return false; } -void TypeModel::deleteSelf() +void Pokemodr::TypeModel::deleteSelf() { // static_cast<GroupModel*>(m_parent)->deleteObject(this); } diff --git a/pokemodr/models/TypeModel.h b/pokemodr/models/TypeModel.h index 5ae2fe42..d5e4c58a 100644 --- a/pokemodr/models/TypeModel.h +++ b/pokemodr/models/TypeModel.h @@ -22,14 +22,19 @@ #include "ObjectModel.h" // Forward declarations +namespace Pokemod +{ class Type; +} +namespace Pokemodr +{ class TypeModel : public ObjectModel { Q_OBJECT public: - TypeModel(BaseModel* parent, Type* type); + TypeModel(BaseModel* parent, Pokemod::Type* type); ~TypeModel(); QVariant data(int role = Qt::DisplayRole) const; @@ -38,5 +43,6 @@ class TypeModel : public ObjectModel public slots: void deleteSelf(); }; +} #endif diff --git a/pokemodr/models/WeatherGroupModel.cpp b/pokemodr/models/WeatherGroupModel.cpp index 4faf3bf2..26f1c34e 100644 --- a/pokemodr/models/WeatherGroupModel.cpp +++ b/pokemodr/models/WeatherGroupModel.cpp @@ -31,31 +31,31 @@ // KDE includes #include <KMenu> -WeatherGroupModel::WeatherGroupModel(BaseModel* parent, Pokemod* pokemod) : +Pokemodr::WeatherGroupModel::WeatherGroupModel(BaseModel* parent, Pokemod::Pokemod* pokemod) : GroupModel(parent, pokemod, "Weathers") { for (int i = 0; i < pokemod->weatherCount(); ++i) addObject(pokemod->weather(i)); } -WeatherGroupModel::~WeatherGroupModel() +Pokemodr::WeatherGroupModel::~WeatherGroupModel() { } -QVariant WeatherGroupModel::data(const int role) const +QVariant Pokemodr::WeatherGroupModel::data(const int role) const { - if (role == BaseModel::ContextMenuRole) + if (role == Pokemodr::BaseModel::ContextMenuRole) { KMenu* menu = new KMenu; menu->addAction("Add Weather", this, SLOT(addObject())); return QVariant::fromValue(static_cast<void*>(menu)); } - return GroupModel::data(role); + return Pokemodr::GroupModel::data(role); } -bool WeatherGroupModel::setData(const QVariant& value, int role) +bool Pokemodr::WeatherGroupModel::setData(const QVariant& value, int role) { - if (role == BaseModel::XmlRole) + if (role == Pokemodr::BaseModel::XmlRole) { if (value.canConvert<QString>()) { @@ -65,7 +65,7 @@ bool WeatherGroupModel::setData(const QVariant& value, int role) { if (xml.doctype().name() == "Weather") { - addObject(static_cast<Pokemod*>(m_object)->newWeather(xml.documentElement())); + addObject(static_cast<Pokemod::Pokemod*>(m_object)->newWeather(xml.documentElement())); return true; } file.close(); @@ -75,20 +75,20 @@ bool WeatherGroupModel::setData(const QVariant& value, int role) return false; } -void WeatherGroupModel::addObject(Object* object) +void Pokemodr::WeatherGroupModel::addObject(Pokemod::Object* object) { if (!object) - object = static_cast<Pokemod*>(m_object)->newWeather(); + object = static_cast<Pokemod::Pokemod*>(m_object)->newWeather(); if (object->className() == "Weather") - m_objects.append(new WeatherModel(this, static_cast<Weather*>(object))); + m_objects.append(new WeatherModel(this, static_cast<Pokemod::Weather*>(object))); } -void WeatherGroupModel::deleteObject(BaseObjectModel* model) +void Pokemodr::WeatherGroupModel::deleteObject(BaseObjectModel* model) { const int index = m_objects.indexOf(model); if (0 <= index) { - static_cast<Pokemod*>(m_object)->deleteWeather(index); + static_cast<Pokemod::Pokemod*>(m_object)->deleteWeather(index); m_objects[index]->deleteLater(); m_objects.removeAt(index); } diff --git a/pokemodr/models/WeatherGroupModel.h b/pokemodr/models/WeatherGroupModel.h index 75baa607..eb48d21c 100644 --- a/pokemodr/models/WeatherGroupModel.h +++ b/pokemodr/models/WeatherGroupModel.h @@ -22,21 +22,27 @@ #include "GroupModel.h" // Forward declarations +namespace Pokemod +{ class Pokemod; +} +namespace Pokemodr +{ class WeatherGroupModel : public GroupModel { Q_OBJECT public: - WeatherGroupModel(BaseModel* parent, Pokemod* pokemod); + WeatherGroupModel(BaseModel* parent, Pokemod::Pokemod* pokemod); ~WeatherGroupModel(); QVariant data(const int role = Qt::DisplayRole) const; bool setData(const QVariant& value, int role = Qt::EditRole); public slots: - void addObject(Object* object = NULL); + void addObject(Pokemod::Object* object = NULL); void deleteObject(BaseObjectModel* model); }; +} #endif diff --git a/pokemodr/models/WeatherModel.cpp b/pokemodr/models/WeatherModel.cpp index 85e97100..a524d3a4 100644 --- a/pokemodr/models/WeatherModel.cpp +++ b/pokemodr/models/WeatherModel.cpp @@ -21,7 +21,7 @@ // Model includes #include "GroupModel.h" -// PokeModr includes +// Pokemodr includes #include "../WeatherUI.h" // Pokemod includes @@ -33,42 +33,42 @@ // KDE includes #include <KMenu> -WeatherModel::WeatherModel(BaseModel* parent, Weather* weather) : +Pokemodr::WeatherModel::WeatherModel(BaseModel* parent, Pokemod::Weather* weather) : ObjectModel(parent, weather) { } -WeatherModel::~WeatherModel() +Pokemodr::WeatherModel::~WeatherModel() { } -QVariant WeatherModel::data(int role) const +QVariant Pokemodr::WeatherModel::data(int role) const { if (role == Qt::DisplayRole) - return static_cast<Weather*>(m_object)->name(); - else if (role == BaseModel::XmlRole) + return static_cast<Pokemod::Weather*>(m_object)->name(); + else if (role == Pokemodr::BaseModel::XmlRole) { QDomDocument xml(m_object->className()); xml.appendChild(m_object->save()); return xml.toString(); } - else if (role == BaseModel::WidgetRole) + else if (role == Pokemodr::BaseModel::WidgetRole) { - QWidget* widget = new WeatherUI(static_cast<Weather*>(m_object), NULL); + QWidget* widget = new WeatherUI(static_cast<Pokemod::Weather*>(m_object), NULL); return QVariant::fromValue(widget); } - else if (role == BaseModel::ContextMenuRole) + else if (role == Pokemodr::BaseModel::ContextMenuRole) { KMenu* menu = new KMenu; menu->addAction("Delete Weather", this, SLOT(deleteSelf())); return QVariant::fromValue(static_cast<void*>(menu)); } - return ObjectModel::data(role); + return Pokemodr::ObjectModel::data(role); } -bool WeatherModel::setData(const QVariant& value, int role) +bool Pokemodr::WeatherModel::setData(const QVariant& value, int role) { - if (role == BaseModel::XmlRole) + if (role == Pokemodr::BaseModel::XmlRole) { if (value.canConvert<QString>()) { @@ -88,7 +88,7 @@ bool WeatherModel::setData(const QVariant& value, int role) return false; } -void WeatherModel::deleteSelf() +void Pokemodr::WeatherModel::deleteSelf() { // static_cast<GroupModel*>(m_parent)->deleteObject(this); } diff --git a/pokemodr/models/WeatherModel.h b/pokemodr/models/WeatherModel.h index 9c8007b7..a7334f36 100644 --- a/pokemodr/models/WeatherModel.h +++ b/pokemodr/models/WeatherModel.h @@ -22,14 +22,19 @@ #include "ObjectModel.h" // Forward declarations +namespace Pokemod +{ class Weather; +} +namespace Pokemodr +{ class WeatherModel : public ObjectModel { Q_OBJECT public: - WeatherModel(BaseModel* parent, Weather* weather); + WeatherModel(BaseModel* parent, Pokemod::Weather* weather); ~WeatherModel(); QVariant data(int role = Qt::DisplayRole) const; @@ -38,5 +43,6 @@ class WeatherModel : public ObjectModel public slots: void deleteSelf(); }; +} #endif diff --git a/pokemodr/pokemodr.pro b/pokemodr/pokemodr.pro index 12e28517..4f093b3d 100644 --- a/pokemodr/pokemodr.pro +++ b/pokemodr/pokemodr.pro @@ -59,9 +59,9 @@ SOURCES += AbilityUI.cpp \ PokemodTree.cpp \ PokemodTreeModel.cpp \ PokemodUI.cpp \ - PokeModr.cpp \ - PokeModrPreferences.cpp \ - PokeModrUI.cpp \ + Pokemodr.cpp \ + PokemodrPreferences.cpp \ + PokemodrUI.cpp \ RulesUI.cpp \ ScriptWidget.cpp \ SoundUI.cpp \ @@ -170,9 +170,9 @@ HEADERS += AbilityUI.h \ PokemodTree.h \ PokemodTreeModel.h \ PokemodUI.h \ - PokeModr.h \ - PokeModrPreferences.h \ - PokeModrUI.h \ + Pokemodr.h \ + PokemodrPreferences.h \ + PokemodrUI.h \ RulesUI.h \ ScriptWidget.h \ SoundUI.h \ diff --git a/version.pri b/version.pri index 10c8f5cc..71190b6d 100644 --- a/version.pri +++ b/version.pri @@ -1 +1 @@ -VERSION = 0.0.1 +VERSION = 0.0.2 |