diff options
| author | Ben Boeckel <MathStuf@gmail.com> | 2008-09-06 04:12:30 +0000 |
|---|---|---|
| committer | Ben Boeckel <MathStuf@gmail.com> | 2008-09-06 04:12:30 +0000 |
| commit | 0b4b89cf8efdc15e5a8d4b6cb24a5c8a025227d9 (patch) | |
| tree | a2031b9d0016fcbd49a51c0d1a2292d1f2d8b566 /sigmod | |
| parent | b81f5bffa2772eb9bd3c67fb35485ab1ee2d96e7 (diff) | |
| download | sigen-0b4b89cf8efdc15e5a8d4b6cb24a5c8a025227d9.tar.gz sigen-0b4b89cf8efdc15e5a8d4b6cb24a5c8a025227d9.tar.xz sigen-0b4b89cf8efdc15e5a8d4b6cb24a5c8a025227d9.zip | |
[FIX] Renamed everything (in use) away from Poké- prefixes
git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@250 6ecfd1a5-f3ed-3746-8530-beee90d26b22
Diffstat (limited to 'sigmod')
78 files changed, 1599 insertions, 1599 deletions
diff --git a/sigmod/Ability.cpp b/sigmod/Ability.cpp index 02dc7280..ad862298 100644 --- a/sigmod/Ability.cpp +++ b/sigmod/Ability.cpp @@ -18,17 +18,17 @@ // Header include #include "Ability.h" -// Pokemod includes +// Sigmod includes #include "Macros.h" -#include "Pokemod.h" +#include "Sigmod.h" -Pokemod::Ability::Ability(const Ability& ability) : +Sigmod::Ability::Ability(const Ability& ability) : Object(ability.parent(), ability.id()) { *this = ability; } -Pokemod::Ability::Ability(const Pokemod* parent, const int id) : +Sigmod::Ability::Ability(const Sigmod* parent, const int id) : Object(parent, id), m_name(""), m_priority(0), @@ -38,20 +38,20 @@ Pokemod::Ability::Ability(const Pokemod* parent, const int id) : { } -Pokemod::Ability::Ability(const Ability& ability, const Pokemod* parent, const int id) : +Sigmod::Ability::Ability(const Ability& ability, const Sigmod* parent, const int id) : Object(parent, id) { *this = ability; } -Pokemod::Ability::Ability(const QDomElement& xml, const Pokemod* parent, const int id) : +Sigmod::Ability::Ability(const QDomElement& xml, const Sigmod* parent, const int id) : Object(parent, id) { LOAD_ID(); load(xml); } -void Pokemod::Ability::validate() +void Sigmod::Ability::validate() { TEST_BEGIN(); if (m_name.isEmpty()) @@ -59,7 +59,7 @@ void Pokemod::Ability::validate() TEST_END(); } -void Pokemod::Ability::load(const QDomElement& xml) +void Sigmod::Ability::load(const QDomElement& xml) { LOAD_BEGIN(); LOAD(name); @@ -69,7 +69,7 @@ void Pokemod::Ability::load(const QDomElement& xml) LOAD(worldScript); } -QDomElement Pokemod::Ability::save() const +QDomElement Sigmod::Ability::save() const { SAVE_CREATE(); SAVE(name); @@ -80,57 +80,57 @@ QDomElement Pokemod::Ability::save() const return xml; } -void Pokemod::Ability::setName(const QString& name) +void Sigmod::Ability::setName(const QString& name) { CHECK(name); } -void Pokemod::Ability::setPriority(const int priority) +void Sigmod::Ability::setPriority(const int priority) { CHECK(priority); } -void Pokemod::Ability::setDescription(const QString& description) +void Sigmod::Ability::setDescription(const QString& description) { CHECK(description); } -void Pokemod::Ability::setBattleScript(const Script& battleScript) +void Sigmod::Ability::setBattleScript(const Script& battleScript) { CHECK(battleScript); } -void Pokemod::Ability::setWorldScript(const Script& worldScript) +void Sigmod::Ability::setWorldScript(const Script& worldScript) { CHECK(worldScript); } -QString Pokemod::Ability::name() const +QString Sigmod::Ability::name() const { return m_name; } -int Pokemod::Ability::priority() const +int Sigmod::Ability::priority() const { return m_priority; } -QString Pokemod::Ability::description() const +QString Sigmod::Ability::description() const { return m_description; } -Pokemod::Script Pokemod::Ability::battleScript() const +Sigmod::Script Sigmod::Ability::battleScript() const { return m_battleScript; } -Pokemod::Script Pokemod::Ability::worldScript() const +Sigmod::Script Sigmod::Ability::worldScript() const { return m_worldScript; } -Pokemod::Ability& Pokemod::Ability::operator=(const Ability& rhs) +Sigmod::Ability& Sigmod::Ability::operator=(const Ability& rhs) { if (this == &rhs) return *this; diff --git a/sigmod/Ability.h b/sigmod/Ability.h index b654d990..d6ee0f82 100644 --- a/sigmod/Ability.h +++ b/sigmod/Ability.h @@ -15,27 +15,27 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __POKEMOD_ABILITY__ -#define __POKEMOD_ABILITY__ +#ifndef __SIGMOD_ABILITY__ +#define __SIGMOD_ABILITY__ -// Pokemod includes +// Sigmod includes #include "Object.h" #include "Script.h" -namespace Pokemod +namespace Sigmod { // Forward declarations -class Pokemod; +class Sigmod; -class POKEMOD_EXPORT Ability : public Object +class SIGMOD_EXPORT Ability : public Object { Q_OBJECT public: Ability(const Ability& ability); - Ability(const Pokemod* parent, const int id); - Ability(const Ability& ability, const Pokemod* parent, const int id); - Ability(const QDomElement& xml, const Pokemod* parent, const int id = -1); + Ability(const Sigmod* parent, const int id); + Ability(const Ability& ability, const Sigmod* parent, const int id); + Ability(const QDomElement& xml, const Sigmod* parent, const int id = -1); void validate(); diff --git a/sigmod/Author.cpp b/sigmod/Author.cpp index f5def288..2cca635f 100644 --- a/sigmod/Author.cpp +++ b/sigmod/Author.cpp @@ -18,20 +18,20 @@ // Header include #include "Author.h" -// Pokemod includes +// Sigmod includes #include "Macros.h" -#include "Pokemod.h" +#include "Sigmod.h" // Qt includes #include <QtCore/QRegExp> -Pokemod::Author::Author(const Author& author) : +Sigmod::Author::Author(const Author& author) : Object(author.parent(), author.id()) { *this = author; } -Pokemod::Author::Author(const Pokemod* parent, const int id) : +Sigmod::Author::Author(const Sigmod* parent, const int id) : Object(parent, id), m_name(""), m_email(""), @@ -39,20 +39,20 @@ Pokemod::Author::Author(const Pokemod* parent, const int id) : { } -Pokemod::Author::Author(const Author& author, const Pokemod* parent, const int id) : +Sigmod::Author::Author(const Author& author, const Sigmod* parent, const int id) : Object(parent, id) { *this = author; } -Pokemod::Author::Author(const QDomElement& xml, const Pokemod* parent, const int id) : +Sigmod::Author::Author(const QDomElement& xml, const Sigmod* parent, const int id) : Object(parent, id) { LOAD_ID(); load(xml); } -void Pokemod::Author::validate() +void Sigmod::Author::validate() { TEST_BEGIN(); if (m_name.isEmpty()) @@ -66,7 +66,7 @@ void Pokemod::Author::validate() TEST_END(); } -void Pokemod::Author::load(const QDomElement& xml) +void Sigmod::Author::load(const QDomElement& xml) { LOAD_BEGIN(); LOAD(name); @@ -74,7 +74,7 @@ void Pokemod::Author::load(const QDomElement& xml) LOAD(role); } -QDomElement Pokemod::Author::save() const +QDomElement Sigmod::Author::save() const { SAVE_CREATE(); SAVE(name); @@ -83,37 +83,37 @@ QDomElement Pokemod::Author::save() const return xml; } -void Pokemod::Author::setName(const QString& name) +void Sigmod::Author::setName(const QString& name) { CHECK(name); } -void Pokemod::Author::setEmail(const QString& email) +void Sigmod::Author::setEmail(const QString& email) { CHECK(email); } -void Pokemod::Author::setRole(const QString& role) +void Sigmod::Author::setRole(const QString& role) { CHECK(role); } -QString Pokemod::Author::name() const +QString Sigmod::Author::name() const { return m_name; } -QString Pokemod::Author::email() const +QString Sigmod::Author::email() const { return m_email; } -QString Pokemod::Author::role() const +QString Sigmod::Author::role() const { return m_role; } -Pokemod::Author& Pokemod::Author::operator=(const Author& rhs) +Sigmod::Author& Sigmod::Author::operator=(const Author& rhs) { if (this == &rhs) return *this; diff --git a/sigmod/Author.h b/sigmod/Author.h index 23f36b38..d5384ddb 100644 --- a/sigmod/Author.h +++ b/sigmod/Author.h @@ -15,26 +15,26 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __POKEMOD_AUTHOR__ -#define __POKEMOD_AUTHOR__ +#ifndef __SIGMOD_AUTHOR__ +#define __SIGMOD_AUTHOR__ -// Pokemod includes +// Sigmod includes #include "Object.h" -namespace Pokemod +namespace Sigmod { // Forward declarations -class Pokemod; +class Sigmod; -class POKEMOD_EXPORT Author : public Object +class SIGMOD_EXPORT Author : public Object { Q_OBJECT public: Author(const Author& author); - Author(const Pokemod* parent, const int id); - Author(const Author& author, const Pokemod* parent, const int id); - Author(const QDomElement& xml, const Pokemod* parent, const int id = -1); + Author(const Sigmod* parent, const int id); + Author(const Author& author, const Sigmod* parent, const int id); + Author(const QDomElement& xml, const Sigmod* parent, const int id = -1); void validate(); diff --git a/sigmod/Badge.cpp b/sigmod/Badge.cpp index 821720af..c1077934 100644 --- a/sigmod/Badge.cpp +++ b/sigmod/Badge.cpp @@ -18,20 +18,20 @@ // Header include #include "Badge.h" -// Pokemod includes +// Sigmod includes #include "Macros.h" -#include "Pokemod.h" #include "Rules.h" +#include "Sigmod.h" #include "Sprite.h" -Pokemod::Badge::Badge(const Badge& badge) : +Sigmod::Badge::Badge(const Badge& badge) : Object(badge.parent(), badge.id()), m_stat(ST_End_GSC - ST_No_HP_Start) { *this = badge; } -Pokemod::Badge::Badge(const Pokemod* parent, const int id) : +Sigmod::Badge::Badge(const Sigmod* parent, const int id) : Object(parent, id), m_name(""), m_face(-1), @@ -43,14 +43,14 @@ Pokemod::Badge::Badge(const Pokemod* parent, const int id) : m_stat[i].set(1, 1); } -Pokemod::Badge::Badge(const Badge& badge, const Pokemod* parent, const int id) : +Sigmod::Badge::Badge(const Badge& badge, const Sigmod* parent, const int id) : Object(parent, id), m_stat(ST_End_GSC - ST_No_HP_Start) { *this = badge; } -Pokemod::Badge::Badge(const QDomElement& xml, const Pokemod* parent, const int id) : +Sigmod::Badge::Badge(const QDomElement& xml, const Sigmod* parent, const int id) : Object(parent, id), m_stat(ST_End_GSC - ST_No_HP_Start) { @@ -58,7 +58,7 @@ Pokemod::Badge::Badge(const QDomElement& xml, const Pokemod* parent, const int i load(xml); } -void Pokemod::Badge::validate() +void Sigmod::Badge::validate() { TEST_BEGIN(); if (m_name.isEmpty()) @@ -70,7 +70,7 @@ void Pokemod::Badge::validate() TEST_END(); } -void Pokemod::Badge::load(const QDomElement& xml) +void Sigmod::Badge::load(const QDomElement& xml) { LOAD_BEGIN(); LOAD(name); @@ -80,7 +80,7 @@ void Pokemod::Badge::load(const QDomElement& xml) LOAD_ARRAY(stat); } -QDomElement Pokemod::Badge::save() const +QDomElement Sigmod::Badge::save() const { SAVE_CREATE(); SAVE(name); @@ -91,30 +91,30 @@ QDomElement Pokemod::Badge::save() const return xml; } -void Pokemod::Badge::setName(const QString& name) +void Sigmod::Badge::setName(const QString& name) { CHECK(name); } -void Pokemod::Badge::setFace(const int face) +void Sigmod::Badge::setFace(const int face) { - if (qobject_cast<const Pokemod*>(pokemod())->spriteIndex(face) == INT_MAX) + if (qobject_cast<const Sigmod*>(sigmod())->spriteIndex(face) == INT_MAX) emit(error(bounds("face"))); else CHECK(face); } -void Pokemod::Badge::setBadge(const int badge) +void Sigmod::Badge::setBadge(const int badge) { - if (qobject_cast<const Pokemod*>(pokemod())->spriteIndex(badge) == INT_MAX) + if (qobject_cast<const Sigmod*>(sigmod())->spriteIndex(badge) == INT_MAX) emit(error(bounds("badge"))); else CHECK(badge); } -void Pokemod::Badge::setObey(const int obey) +void Sigmod::Badge::setObey(const int obey) { - if (qobject_cast<const Pokemod*>(pokemod())->rules()->maxLevel() < obey) + if (qobject_cast<const Sigmod*>(sigmod())->rules()->maxLevel() < obey) { emit(error(bounds("obey"))); return; @@ -122,7 +122,7 @@ void Pokemod::Badge::setObey(const int obey) CHECK(obey); } -void Pokemod::Badge::setStat(const Stat stat, const Fraction& multiplier) +void Sigmod::Badge::setStat(const Stat stat, const Fraction& multiplier) { if (multiplier < 1) { @@ -132,7 +132,7 @@ void Pokemod::Badge::setStat(const Stat stat, const Fraction& multiplier) switch (stat) { case ST_SpecialDefense: - if (qobject_cast<const Pokemod*>(pokemod())->rules()->specialSplit()) + if (qobject_cast<const Sigmod*>(sigmod())->rules()->specialSplit()) case ST_Attack ... ST_Special: break; default: @@ -142,38 +142,38 @@ void Pokemod::Badge::setStat(const Stat stat, const Fraction& multiplier) CHECK_ARRAY(stat[stat - ST_No_HP_Start], multiplier); } -void Pokemod::Badge::setStat(const Fraction& multiplier) +void Sigmod::Badge::setStat(const Fraction& multiplier) { if (multiplier < 1) emit(error(bounds("stat multiplier"))); } -QString Pokemod::Badge::name() const +QString Sigmod::Badge::name() const { return m_name; } -int Pokemod::Badge::face() const +int Sigmod::Badge::face() const { return m_face; } -int Pokemod::Badge::badge() const +int Sigmod::Badge::badge() const { return m_badge; } -int Pokemod::Badge::obey() const +int Sigmod::Badge::obey() const { return m_obey; } -Pokemod::Fraction Pokemod::Badge::stat(const Stat stat) const +Sigmod::Fraction Sigmod::Badge::stat(const Stat stat) const { switch (stat) { case ST_SpecialDefense: - if (qobject_cast<const Pokemod*>(pokemod())->rules()->specialSplit()) + if (qobject_cast<const Sigmod*>(sigmod())->rules()->specialSplit()) case ST_Attack ... ST_Special: return m_stat[stat - ST_No_HP_Start]; default: @@ -182,7 +182,7 @@ Pokemod::Fraction Pokemod::Badge::stat(const Stat stat) const } } -Pokemod::Badge& Pokemod::Badge::operator=(const Badge& rhs) +Sigmod::Badge& Sigmod::Badge::operator=(const Badge& rhs) { if (this == &rhs) return *this; diff --git a/sigmod/Badge.h b/sigmod/Badge.h index 1ff97f90..42a9d8a2 100644 --- a/sigmod/Badge.h +++ b/sigmod/Badge.h @@ -15,27 +15,27 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __POKEMOD_BADGE__ -#define __POKEMOD_BADGE__ +#ifndef __SIGMOD_BADGE__ +#define __SIGMOD_BADGE__ -// Pokemod includes +// Sigmod includes #include "Fraction.h" #include "Object.h" -namespace Pokemod +namespace Sigmod { // Forward declarations -class Pokemod; +class Sigmod; -class POKEMOD_EXPORT Badge : public Object +class SIGMOD_EXPORT Badge : public Object { Q_OBJECT public: Badge(const Badge& badge); - Badge(const Pokemod* parent, const int id); - Badge(const Badge& badge, const Pokemod* parent, const int id); - Badge(const QDomElement& xml, const Pokemod* parent, const int id = -1); + Badge(const Sigmod* parent, const int id); + Badge(const Badge& badge, const Sigmod* parent, const int id); + Badge(const QDomElement& xml, const Sigmod* parent, const int id = -1); void validate(); diff --git a/sigmod/CMakeLists.txt b/sigmod/CMakeLists.txt index 06b16f29..b8eee63c 100644 --- a/sigmod/CMakeLists.txt +++ b/sigmod/CMakeLists.txt @@ -1,12 +1,12 @@ -PROJECT(pokemod) +PROJECT(sigmod) IF(NOT BUILT_FROM_ROOT) MESSAGE(FATAL_ERROR "Not built from source root") ENDIF(NOT BUILT_FROM_ROOT) -ADD_DEFINITIONS(-DMAKE_POKEMOD_LIB) +ADD_DEFINITIONS(-DMAKE_SIGMOD_LIB) -SET(pokemod_MOC_HEADERS +SET(sigmod_MOC_HEADERS Ability.h Author.h Badge.h @@ -26,8 +26,8 @@ SET(pokemod_MOC_HEADERS Move.h Nature.h Object.h - Pokemod.h Rules.h + Sigmod.h Skin.h Sound.h Species.h @@ -43,8 +43,8 @@ SET(pokemod_MOC_HEADERS Type.h Weather.h ) -QT4_WRAP_CPP(pokemod_MOC_SRCS ${pokemod_MOC_HEADERS}) -SET(pokemod_HEADERS +QT4_WRAP_CPP(sigmod_MOC_SRCS ${sigmod_MOC_HEADERS}) +SET(sigmod_HEADERS Fraction.h Global.h Hat.h @@ -52,11 +52,11 @@ SET(pokemod_HEADERS Matrix.h Script.h ) -SET(pokemod_DEVEL - ${pokemod_HEADERS} - ${pokemod_MOC_HEADERS} +SET(sigmod_DEVEL + ${sigmod_HEADERS} + ${sigmod_MOC_HEADERS} ) -SET(pokemod_SRCS +SET(sigmod_SRCS Ability.cpp Author.cpp Badge.cpp @@ -77,8 +77,8 @@ SET(pokemod_SRCS Move.cpp Nature.cpp Object.cpp - Pokemod.cpp Rules.cpp + Sigmod.cpp Skin.cpp Sound.cpp Species.cpp @@ -95,30 +95,30 @@ SET(pokemod_SRCS Weather.cpp ) -ADD_LIBRARY(pokemod - ${pokemod_SRCS} - ${pokemod_MOC_SRCS} +ADD_LIBRARY(sigmod + ${sigmod_SRCS} + ${sigmod_MOC_SRCS} ) -SET_TARGET_PROPERTIES(pokemod +SET_TARGET_PROPERTIES(sigmod PROPERTIES VERSION ${POKEGEN_VERSION} SOVERSION ${POKEGEN_SOVERSION} LINK_INTERFACE_LIBRARIES "" ) -TARGET_LINK_LIBRARIES(pokemod +TARGET_LINK_LIBRARIES(sigmod ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTXML_LIBRARY} ) INSTALL( - TARGETS pokemod + TARGETS sigmod DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} COMPONENT runtime ) INSTALL( - FILES ${pokemod_DEVEL} + FILES ${sigmod_DEVEL} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/${CMAKE_PROJECT_NAME}/${PROJECT_NAME} COMPONENT development ) diff --git a/sigmod/CoinList.cpp b/sigmod/CoinList.cpp index c19d325a..47c360cf 100644 --- a/sigmod/CoinList.cpp +++ b/sigmod/CoinList.cpp @@ -18,46 +18,46 @@ // Header include #include "CoinList.h" -// Pokemod includes +// Sigmod includes #include "CoinListObject.h" #include "Macros.h" -#include "Pokemod.h" +#include "Sigmod.h" // Qt includes #include <QtCore/QSet> -Pokemod::CoinList::CoinList(const CoinList& coinList) : +Sigmod::CoinList::CoinList(const CoinList& coinList) : Object(coinList.parent(), coinList.id()) { *this = coinList; } -Pokemod::CoinList::CoinList(const Pokemod* parent, const int id) : +Sigmod::CoinList::CoinList(const Sigmod* parent, const int id) : Object(parent, id), m_name(""), m_script("", "") { } -Pokemod::CoinList::CoinList(const CoinList& coinList, const Pokemod* parent, const int id) : +Sigmod::CoinList::CoinList(const CoinList& coinList, const Sigmod* parent, const int id) : Object(parent, id) { *this = coinList; } -Pokemod::CoinList::CoinList(const QDomElement& xml, const Pokemod* parent, const int id) : +Sigmod::CoinList::CoinList(const QDomElement& xml, const Sigmod* parent, const int id) : Object(parent, id) { LOAD_ID(); load(xml); } -Pokemod::CoinList::~CoinList() +Sigmod::CoinList::~CoinList() { clear(); } -void Pokemod::CoinList::validate() +void Sigmod::CoinList::validate() { TEST_BEGIN(); if (m_name.isEmpty()) @@ -100,7 +100,7 @@ void Pokemod::CoinList::validate() TEST_END(); } -void Pokemod::CoinList::load(const QDomElement& xml) +void Sigmod::CoinList::load(const QDomElement& xml) { LOAD_BEGIN(); LOAD(name); @@ -108,7 +108,7 @@ void Pokemod::CoinList::load(const QDomElement& xml) LOAD_SUB(newObject, CoinListObject); } -QDomElement Pokemod::CoinList::save() const +QDomElement Sigmod::CoinList::save() const { SAVE_CREATE(); SAVE(name); @@ -117,49 +117,49 @@ QDomElement Pokemod::CoinList::save() const return xml; } -void Pokemod::CoinList::setName(const QString& name) +void Sigmod::CoinList::setName(const QString& name) { CHECK(name); } -void Pokemod::CoinList::setScript(const Script& script) +void Sigmod::CoinList::setScript(const Script& script) { CHECK(script) } -QString Pokemod::CoinList::name() const +QString Sigmod::CoinList::name() const { return m_name; } -Pokemod::Script Pokemod::CoinList::script() const +Sigmod::Script Sigmod::CoinList::script() const { return m_script; } -const Pokemod::CoinListObject* Pokemod::CoinList::object(const int index) const +const Sigmod::CoinListObject* Sigmod::CoinList::object(const int index) const { Q_ASSERT(index < objectCount()); return m_objects.at(index); } -Pokemod::CoinListObject* Pokemod::CoinList::object(const int index) +Sigmod::CoinListObject* Sigmod::CoinList::object(const int index) { Q_ASSERT(index < objectCount()); return m_objects[index]; } -const Pokemod::CoinListObject* Pokemod::CoinList::objectById(const int id) const +const Sigmod::CoinListObject* Sigmod::CoinList::objectById(const int id) const { return object(objectIndex(id)); } -Pokemod::CoinListObject* Pokemod::CoinList::objectById(const int id) +Sigmod::CoinListObject* Sigmod::CoinList::objectById(const int id) { return object(objectIndex(id)); } -int Pokemod::CoinList::objectIndex(const int id) const +int Sigmod::CoinList::objectIndex(const int id) const { for (int i = 0; i < objectCount(); ++i) { @@ -169,45 +169,45 @@ int Pokemod::CoinList::objectIndex(const int id) const return INT_MAX; } -int Pokemod::CoinList::objectCount() const +int Sigmod::CoinList::objectCount() const { return m_objects.size(); } -Pokemod::CoinListObject* Pokemod::CoinList::newObject() +Sigmod::CoinListObject* Sigmod::CoinList::newObject() { return newObject(new CoinListObject(this, objectId())); } -Pokemod::CoinListObject* Pokemod::CoinList::newObject(const QDomElement& xml) +Sigmod::CoinListObject* Sigmod::CoinList::newObject(const QDomElement& xml) { return newObject(new CoinListObject(xml, this, objectId())); } -Pokemod::CoinListObject* Pokemod::CoinList::newObject(const CoinListObject& object) +Sigmod::CoinListObject* Sigmod::CoinList::newObject(const CoinListObject& object) { return newObject(new CoinListObject(object, this, objectId())); } -Pokemod::CoinListObject* Pokemod::CoinList::newObject(CoinListObject* object) +Sigmod::CoinListObject* Sigmod::CoinList::newObject(CoinListObject* object) { m_objects.append(object); return object; } -void Pokemod::CoinList::deleteObject(const int index) +void Sigmod::CoinList::deleteObject(const int index) { Q_ASSERT(index < objectCount()); delete m_objects[index]; m_objects.removeAt(index); } -void Pokemod::CoinList::deleteObjectById(const int id) +void Sigmod::CoinList::deleteObjectById(const int id) { deleteObject(objectIndex(id)); } -int Pokemod::CoinList::objectId() const +int Sigmod::CoinList::objectId() const { int i = 0; while ((i < objectCount()) && (objectIndex(i) != INT_MAX)) @@ -215,7 +215,7 @@ int Pokemod::CoinList::objectId() const return i; } -Pokemod::CoinList& Pokemod::CoinList::operator=(const CoinList& rhs) +Sigmod::CoinList& Sigmod::CoinList::operator=(const CoinList& rhs) { if (this == &rhs) return *this; @@ -226,7 +226,7 @@ Pokemod::CoinList& Pokemod::CoinList::operator=(const CoinList& rhs) return *this; } -void Pokemod::CoinList::clear() +void Sigmod::CoinList::clear() { while (objectCount()) deleteObject(0); diff --git a/sigmod/CoinList.h b/sigmod/CoinList.h index a04503cc..0cda0700 100644 --- a/sigmod/CoinList.h +++ b/sigmod/CoinList.h @@ -15,31 +15,31 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __POKEMOD_COINLIST__ -#define __POKEMOD_COINLIST__ +#ifndef __SIGMOD_COINLIST__ +#define __SIGMOD_COINLIST__ -// Pokemod includes +// Sigmod includes #include "Object.h" #include "Script.h" // Qt includes #include <QtCore/QList> -namespace Pokemod +namespace Sigmod { // Forward declarations class CoinListObject; -class Pokemod; +class Sigmod; -class POKEMOD_EXPORT CoinList : public Object +class SIGMOD_EXPORT CoinList : public Object { Q_OBJECT public: CoinList(const CoinList& coinList); - CoinList(const Pokemod* parent, const int id); - CoinList(const CoinList& coinList, const Pokemod* parent, const int id); - CoinList(const QDomElement& xml, const Pokemod* parent, const int id = -1); + CoinList(const Sigmod* parent, const int id); + CoinList(const CoinList& coinList, const Sigmod* parent, const int id); + CoinList(const QDomElement& xml, const Sigmod* parent, const int id = -1); ~CoinList(); void validate(); diff --git a/sigmod/CoinListObject.cpp b/sigmod/CoinListObject.cpp index 8ff85afb..a82c3b2a 100644 --- a/sigmod/CoinListObject.cpp +++ b/sigmod/CoinListObject.cpp @@ -18,20 +18,20 @@ // Header include #include "CoinListObject.h" -// Pokemod includes +// Sigmod includes #include "CoinList.h" #include "Macros.h" -#include "Pokemod.h" +#include "Sigmod.h" -const QStringList Pokemod::CoinListObject::TypeStr = QStringList() << "Item" << "Team Member"; +const QStringList Sigmod::CoinListObject::TypeStr = QStringList() << "Item" << "Team Member"; -Pokemod::CoinListObject::CoinListObject(const CoinListObject& object) : +Sigmod::CoinListObject::CoinListObject(const CoinListObject& object) : Object(object.parent(), object.id()) { *this = object; } -Pokemod::CoinListObject::CoinListObject(const CoinList* parent, const int id) : +Sigmod::CoinListObject::CoinListObject(const CoinList* parent, const int id) : Object(parent, id), m_type(Item), m_object(INT_MAX), @@ -40,20 +40,20 @@ Pokemod::CoinListObject::CoinListObject(const CoinList* parent, const int id) : { } -Pokemod::CoinListObject::CoinListObject(const CoinListObject& object, const CoinList* parent, const int id) : +Sigmod::CoinListObject::CoinListObject(const CoinListObject& object, const CoinList* parent, const int id) : Object(parent, id) { *this = object; } -Pokemod::CoinListObject::CoinListObject(const QDomElement& xml, const CoinList* parent, const int id) : +Sigmod::CoinListObject::CoinListObject(const QDomElement& xml, const CoinList* parent, const int id) : Object(parent, id) { LOAD_ID(); load(xml); } -void Pokemod::CoinListObject::validate() +void Sigmod::CoinListObject::validate() { TEST_BEGIN(); TEST(setObject, object); @@ -61,7 +61,7 @@ void Pokemod::CoinListObject::validate() TEST_END(); } -void Pokemod::CoinListObject::load(const QDomElement& xml) +void Sigmod::CoinListObject::load(const QDomElement& xml) { LOAD_BEGIN(); LOAD(type); @@ -70,7 +70,7 @@ void Pokemod::CoinListObject::load(const QDomElement& xml) LOAD(cost); } -QDomElement Pokemod::CoinListObject::save() const +QDomElement Sigmod::CoinListObject::save() const { SAVE_CREATE(); SAVE(type); @@ -80,20 +80,20 @@ QDomElement Pokemod::CoinListObject::save() const return xml; } -void Pokemod::CoinListObject::setType(const Type type) +void Sigmod::CoinListObject::setType(const Type type) { CHECK(type); } -void Pokemod::CoinListObject::setObject(const int object) +void Sigmod::CoinListObject::setObject(const int object) { - if (((Item == m_type) && (qobject_cast<const Pokemod*>(pokemod())->itemIndex(object) == INT_MAX)) || ((Species == m_type) && (qobject_cast<const Pokemod*>(pokemod())->speciesIndex(object) == INT_MAX))) + if (((Item == m_type) && (qobject_cast<const Sigmod*>(sigmod())->itemIndex(object) == INT_MAX)) || ((Species == m_type) && (qobject_cast<const Sigmod*>(sigmod())->speciesIndex(object) == INT_MAX))) emit(error(bounds("object"))); else CHECK(object); } -void Pokemod::CoinListObject::setAmount(const int amount) +void Sigmod::CoinListObject::setAmount(const int amount) { if (!amount || ((Species == m_type) && (1 < amount))) emit(error(bounds("amount"))); @@ -101,32 +101,32 @@ void Pokemod::CoinListObject::setAmount(const int amount) CHECK(amount); } -void Pokemod::CoinListObject::setCost(const int cost) +void Sigmod::CoinListObject::setCost(const int cost) { CHECK(cost); } -Pokemod::CoinListObject::Type Pokemod::CoinListObject::type() const +Sigmod::CoinListObject::Type Sigmod::CoinListObject::type() const { return m_type; } -int Pokemod::CoinListObject::object() const +int Sigmod::CoinListObject::object() const { return m_object; } -int Pokemod::CoinListObject::amount() const +int Sigmod::CoinListObject::amount() const { return m_amount; } -int Pokemod::CoinListObject::cost() const +int Sigmod::CoinListObject::cost() const { return m_cost; } -Pokemod::CoinListObject& Pokemod::CoinListObject::operator=(const CoinListObject& rhs) +Sigmod::CoinListObject& Sigmod::CoinListObject::operator=(const CoinListObject& rhs) { if (this == &rhs) return *this; diff --git a/sigmod/CoinListObject.h b/sigmod/CoinListObject.h index a1d9ab6b..d824a0ff 100644 --- a/sigmod/CoinListObject.h +++ b/sigmod/CoinListObject.h @@ -15,18 +15,18 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __POKEMOD_COINLISTOBJECT__ -#define __POKEMOD_COINLISTOBJECT__ +#ifndef __SIGMOD_COINLISTOBJECT__ +#define __SIGMOD_COINLISTOBJECT__ -// Pokemod includes +// Sigmod includes #include "Object.h" -namespace Pokemod +namespace Sigmod { // Forward declarations class CoinList; -class POKEMOD_EXPORT CoinListObject : public Object +class SIGMOD_EXPORT CoinListObject : public Object { Q_OBJECT Q_ENUMS(Type) @@ -67,6 +67,6 @@ class POKEMOD_EXPORT CoinListObject : public Object int m_cost; }; } -Q_DECLARE_METATYPE(Pokemod::CoinListObject::Type) +Q_DECLARE_METATYPE(Sigmod::CoinListObject::Type) #endif diff --git a/sigmod/EggGroup.cpp b/sigmod/EggGroup.cpp index 4f028611..db40b4de 100644 --- a/sigmod/EggGroup.cpp +++ b/sigmod/EggGroup.cpp @@ -18,36 +18,36 @@ // Header include #include "EggGroup.h" -// Pokemod includes +// Sigmod includes #include "Macros.h" -#include "Pokemod.h" +#include "Sigmod.h" -Pokemod::EggGroup::EggGroup(const EggGroup& eggGroup) : +Sigmod::EggGroup::EggGroup(const EggGroup& eggGroup) : Object(eggGroup.parent(), eggGroup.id()) { *this = eggGroup; } -Pokemod::EggGroup::EggGroup(const Pokemod* parent, const int id) : +Sigmod::EggGroup::EggGroup(const Sigmod* parent, const int id) : Object(parent, id), m_name("") { } -Pokemod::EggGroup::EggGroup(const EggGroup& eggGroup, const Pokemod* parent, const int id) : +Sigmod::EggGroup::EggGroup(const EggGroup& eggGroup, const Sigmod* parent, const int id) : Object(parent, id) { *this = eggGroup; } -Pokemod::EggGroup::EggGroup(const QDomElement& xml, const Pokemod* parent, const int id) : +Sigmod::EggGroup::EggGroup(const QDomElement& xml, const Sigmod* parent, const int id) : Object(parent, id) { LOAD_ID(); load(xml); } -void Pokemod::EggGroup::validate() +void Sigmod::EggGroup::validate() { TEST_BEGIN(); if (m_name.isEmpty()) @@ -55,30 +55,30 @@ void Pokemod::EggGroup::validate() TEST_END(); } -void Pokemod::EggGroup::load(const QDomElement& xml) +void Sigmod::EggGroup::load(const QDomElement& xml) { LOAD_BEGIN(); LOAD(name); } -QDomElement Pokemod::EggGroup::save() const +QDomElement Sigmod::EggGroup::save() const { SAVE_CREATE(); SAVE(name); return xml; } -void Pokemod::EggGroup::setName(const QString& name) +void Sigmod::EggGroup::setName(const QString& name) { CHECK(name); } -QString Pokemod::EggGroup::name() const +QString Sigmod::EggGroup::name() const { return m_name; } -Pokemod::EggGroup& Pokemod::EggGroup::operator=(const EggGroup& rhs) +Sigmod::EggGroup& Sigmod::EggGroup::operator=(const EggGroup& rhs) { if (this == &rhs) return *this; diff --git a/sigmod/EggGroup.h b/sigmod/EggGroup.h index 5d2927f7..e1377683 100644 --- a/sigmod/EggGroup.h +++ b/sigmod/EggGroup.h @@ -15,26 +15,26 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __POKEMOD_EGGGROUP__ -#define __POKEMOD_EGGGROUP__ +#ifndef __SIGMOD_EGGGROUP__ +#define __SIGMOD_EGGGROUP__ -// Pokemod includes +// Sigmod includes #include "Object.h" -namespace Pokemod +namespace Sigmod { // Forward declarations -class Pokemod; +class Sigmod; -class POKEMOD_EXPORT EggGroup : public Object +class SIGMOD_EXPORT EggGroup : public Object { Q_OBJECT public: EggGroup(const EggGroup& eggGroup); - EggGroup(const Pokemod* parent, const int id); - EggGroup(const EggGroup& eggGroup, const Pokemod* parent, const int id); - EggGroup(const QDomElement& xml, const Pokemod* parent, const int id = -1); + EggGroup(const Sigmod* parent, const int id); + EggGroup(const EggGroup& eggGroup, const Sigmod* parent, const int id); + EggGroup(const QDomElement& xml, const Sigmod* parent, const int id = -1); void validate(); diff --git a/sigmod/Fraction.cpp b/sigmod/Fraction.cpp index 33c9add0..d10ee376 100644 --- a/sigmod/Fraction.cpp +++ b/sigmod/Fraction.cpp @@ -18,46 +18,46 @@ // Header include #include "Fraction.h" -Pokemod::Fraction::Fraction(const int numerator, const int denominator) +Sigmod::Fraction::Fraction(const int numerator, const int denominator) { set(numerator, denominator); reduce(); } -Pokemod::Fraction::Fraction(const Fraction& fraction) +Sigmod::Fraction::Fraction(const Fraction& fraction) { set(fraction.numerator(), fraction.denominator()); reduce(); } -void Pokemod::Fraction::set(const int numerator, const int denominator) +void Sigmod::Fraction::set(const int numerator, const int denominator) { m_numerator = numerator; m_denominator = denominator; normalize(); } -void Pokemod::Fraction::setNumerator(const int numerator) +void Sigmod::Fraction::setNumerator(const int numerator) { set(numerator, m_denominator); } -void Pokemod::Fraction::setDenominator(const int denominator) +void Sigmod::Fraction::setDenominator(const int denominator) { set(m_numerator, denominator); } -int Pokemod::Fraction::numerator() const +int Sigmod::Fraction::numerator() const { return m_numerator; } -int Pokemod::Fraction::denominator() const +int Sigmod::Fraction::denominator() const { return m_denominator; } -void Pokemod::Fraction::reduce() +void Sigmod::Fraction::reduce() { if (!m_numerator || !m_denominator) return; @@ -71,12 +71,12 @@ void Pokemod::Fraction::reduce() m_denominator /= i; } -bool Pokemod::Fraction::poll() const +bool Sigmod::Fraction::poll() const { return (qrand() % m_denominator) < m_numerator; } -Pokemod::Fraction& Pokemod::Fraction::operator=(const Fraction& rhs) +Sigmod::Fraction& Sigmod::Fraction::operator=(const Fraction& rhs) { if (this == &rhs) return *this; @@ -85,62 +85,62 @@ Pokemod::Fraction& Pokemod::Fraction::operator=(const Fraction& rhs) return *this; } -Pokemod::Fraction::operator double() const +Sigmod::Fraction::operator double() const { return (double(m_numerator) / m_denominator); } -Pokemod::Fraction Pokemod::Fraction::operator+(const Fraction& rhs) const +Sigmod::Fraction Sigmod::Fraction::operator+(const Fraction& rhs) const { return Fraction((m_numerator * rhs.m_denominator) + (m_denominator * rhs.m_numerator), m_denominator * rhs.m_denominator); } -Pokemod::Fraction Pokemod::Fraction::operator-(const Fraction& rhs) const +Sigmod::Fraction Sigmod::Fraction::operator-(const Fraction& rhs) const { return Fraction((m_numerator * rhs.m_denominator) - (m_denominator * rhs.m_numerator), m_denominator * rhs.m_denominator); } -Pokemod::Fraction Pokemod::Fraction::operator*(const Fraction& rhs) const +Sigmod::Fraction Sigmod::Fraction::operator*(const Fraction& rhs) const { return Fraction(m_numerator * rhs.m_numerator, m_denominator * rhs.m_denominator); } -Pokemod::Fraction Pokemod::Fraction::operator/(const Fraction& rhs) const +Sigmod::Fraction Sigmod::Fraction::operator/(const Fraction& rhs) const { return Fraction(m_numerator * rhs.m_denominator, m_denominator * rhs.m_numerator); } -Pokemod::Fraction& Pokemod::Fraction::operator+=(const Fraction& rhs) +Sigmod::Fraction& Sigmod::Fraction::operator+=(const Fraction& rhs) { return *this = *this + rhs; } -Pokemod::Fraction& Pokemod::Fraction::operator-=(const Fraction& rhs) +Sigmod::Fraction& Sigmod::Fraction::operator-=(const Fraction& rhs) { return *this = *this - rhs; } -Pokemod::Fraction& Pokemod::Fraction::operator*=(const Fraction& rhs) +Sigmod::Fraction& Sigmod::Fraction::operator*=(const Fraction& rhs) { return *this = *this * rhs; } -Pokemod::Fraction& Pokemod::Fraction::operator/=(const Fraction& rhs) +Sigmod::Fraction& Sigmod::Fraction::operator/=(const Fraction& rhs) { return *this = *this / rhs; } -bool Pokemod::Fraction::operator==(const Fraction& rhs) const +bool Sigmod::Fraction::operator==(const Fraction& rhs) const { return ((m_numerator == rhs.m_numerator) && (m_denominator == rhs.m_denominator)); } -bool Pokemod::Fraction::operator!=(const Fraction& rhs) const +bool Sigmod::Fraction::operator!=(const Fraction& rhs) const { return !(*this == rhs); } -void Pokemod::Fraction::normalize() +void Sigmod::Fraction::normalize() { if (m_denominator < 0) { diff --git a/sigmod/Fraction.h b/sigmod/Fraction.h index 82f42c2e..0c627d57 100644 --- a/sigmod/Fraction.h +++ b/sigmod/Fraction.h @@ -15,18 +15,18 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __POKEMOD_FRACTION__ -#define __POKEMOD_FRACTION__ +#ifndef __SIGMOD_FRACTION__ +#define __SIGMOD_FRACTION__ -// Pokemod includes +// Sigmod includes #include "Global.h" // Qt includes #include <QtCore/QMetaType> -namespace Pokemod +namespace Sigmod { -class POKEMOD_EXPORT Fraction +class SIGMOD_EXPORT Fraction { public: explicit Fraction(const int numerator = 1, const int denominator = 1); @@ -63,6 +63,6 @@ class POKEMOD_EXPORT Fraction int m_denominator; }; } -Q_DECLARE_METATYPE(Pokemod::Fraction) +Q_DECLARE_METATYPE(Sigmod::Fraction) #endif diff --git a/sigmod/Global.h b/sigmod/Global.h index 4e81f860..5802f86b 100644 --- a/sigmod/Global.h +++ b/sigmod/Global.h @@ -15,8 +15,8 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __POKEMOD_GLOBAL__ -#define __POKEMOD_GLOBAL__ +#ifndef __SIGMOD_GLOBAL__ +#define __SIGMOD_GLOBAL__ // Qt includes #include <QtCore/QMetaType> @@ -25,21 +25,21 @@ // KDE includes #include <kdemacros.h> -#ifndef POKEMOD_EXPORT -# ifdef MAKE_POKEMOD_LIB +#ifndef SIGMOD_EXPORT +# ifdef MAKE_SIGMOD_LIB /* We are building this library */ -# define POKEMOD_EXPORT KDE_EXPORT +# define SIGMOD_EXPORT KDE_EXPORT # else /* We are using this library */ -# define POKEMOD_EXPORT KDE_IMPORT +# define SIGMOD_EXPORT KDE_IMPORT # endif #endif -# ifndef POKEMOD_EXPORT_DEPRECATED -# define POKEMOD_EXPORT_DEPRECATED KDE_DEPRECATED POKEMOD_EXPORT +# ifndef SIGMOD_EXPORT_DEPRECATED +# define SIGMOD_EXPORT_DEPRECATED KDE_DEPRECATED SIGMOD_EXPORT # endif -namespace Pokemod +namespace Sigmod { enum Stat { @@ -72,7 +72,7 @@ enum Direction const QStringList DirectionStr = QStringList() << "Up" << "Down" << "Left" << "Right" << "None"; } -Q_DECLARE_METATYPE(Pokemod::Stat) -Q_DECLARE_METATYPE(Pokemod::Direction) +Q_DECLARE_METATYPE(Sigmod::Stat) +Q_DECLARE_METATYPE(Sigmod::Direction) #endif diff --git a/sigmod/GlobalScript.cpp b/sigmod/GlobalScript.cpp index 7014c07d..2b80322b 100644 --- a/sigmod/GlobalScript.cpp +++ b/sigmod/GlobalScript.cpp @@ -18,41 +18,41 @@ // Header include #include "GlobalScript.h" -// Pokemod includes +// Sigmod includes #include "Macros.h" -#include "Pokemod.h" +#include "Sigmod.h" -Pokemod::GlobalScript::GlobalScript(const GlobalScript& globalScript) : +Sigmod::GlobalScript::GlobalScript(const GlobalScript& globalScript) : Object(globalScript.parent(), globalScript.id()) { *this = globalScript; } -Pokemod::GlobalScript::GlobalScript(const Pokemod* parent, const int id) : +Sigmod::GlobalScript::GlobalScript(const Sigmod* parent, const int id) : Object(parent, id), m_name(""), m_script("", "") { } -Pokemod::GlobalScript::GlobalScript(const GlobalScript& globalScript, const Pokemod* parent, const int id) : +Sigmod::GlobalScript::GlobalScript(const GlobalScript& globalScript, const Sigmod* parent, const int id) : Object(parent, id) { *this = globalScript; } -Pokemod::GlobalScript::GlobalScript(const QDomElement& xml, const Pokemod* parent, const int id) : +Sigmod::GlobalScript::GlobalScript(const QDomElement& xml, const Sigmod* parent, const int id) : Object(parent, id) { LOAD_ID(); load(xml); } -Pokemod::GlobalScript::~GlobalScript() +Sigmod::GlobalScript::~GlobalScript() { } -void Pokemod::GlobalScript::validate() +void Sigmod::GlobalScript::validate() { TEST_BEGIN(); if (m_name.isEmpty()) @@ -60,14 +60,14 @@ void Pokemod::GlobalScript::validate() TEST_END(); } -void Pokemod::GlobalScript::load(const QDomElement& xml) +void Sigmod::GlobalScript::load(const QDomElement& xml) { LOAD_BEGIN(); LOAD(name); LOAD(script); } -QDomElement Pokemod::GlobalScript::save() const +QDomElement Sigmod::GlobalScript::save() const { SAVE_CREATE(); SAVE(name); @@ -75,27 +75,27 @@ QDomElement Pokemod::GlobalScript::save() const return xml; } -void Pokemod::GlobalScript::setName(const QString& name) +void Sigmod::GlobalScript::setName(const QString& name) { CHECK(name); } -void Pokemod::GlobalScript::setScript(const Script& script) +void Sigmod::GlobalScript::setScript(const Script& script) { CHECK(script); } -QString Pokemod::GlobalScript::name() const +QString Sigmod::GlobalScript::name() const { return m_name; } -Pokemod::Script Pokemod::GlobalScript::script() const +Sigmod::Script Sigmod::GlobalScript::script() const { return m_script; } -Pokemod::GlobalScript& Pokemod::GlobalScript::operator=(const GlobalScript& rhs) +Sigmod::GlobalScript& Sigmod::GlobalScript::operator=(const GlobalScript& rhs) { if (this == &rhs) return *this; diff --git a/sigmod/GlobalScript.h b/sigmod/GlobalScript.h index 097cd8a5..0e8855e8 100644 --- a/sigmod/GlobalScript.h +++ b/sigmod/GlobalScript.h @@ -15,27 +15,27 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __POKEMOD_GLOBALSCRIPT__ -#define __POKEMOD_GLOBALSCRIPT__ +#ifndef __SIGMOD_GLOBALSCRIPT__ +#define __SIGMOD_GLOBALSCRIPT__ -// Pokemod includes +// Sigmod includes #include "Object.h" #include "Script.h" -namespace Pokemod +namespace Sigmod { // Forward declarations -class Pokemod; +class Sigmod; -class POKEMOD_EXPORT GlobalScript : public Object +class SIGMOD_EXPORT GlobalScript : public Object { Q_OBJECT public: GlobalScript(const GlobalScript& globalScript); - GlobalScript(const Pokemod* parent, const int id); - GlobalScript(const GlobalScript& globalScript, const Pokemod* parent, const int id); - GlobalScript(const QDomElement& xml, const Pokemod* parent, const int id = -1); + GlobalScript(const Sigmod* parent, const int id); + GlobalScript(const GlobalScript& globalScript, const Sigmod* parent, const int id); + GlobalScript(const QDomElement& xml, const Sigmod* parent, const int id = -1); ~GlobalScript(); void validate(); diff --git a/sigmod/Hat.h b/sigmod/Hat.h index 9fa1a71b..3acf4d58 100644 --- a/sigmod/Hat.h +++ b/sigmod/Hat.h @@ -15,17 +15,17 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __POKEMOD_HAT__ -#define __POKEMOD_HAT__ +#ifndef __SIGMOD_HAT__ +#define __SIGMOD_HAT__ -// Pokemod includes +// Sigmod includes #include "Global.h" // Qt includes #include <QtCore/QtGlobal> #include <QtCore/QMap> -namespace Pokemod +namespace Sigmod { template<class T> class Hat { diff --git a/sigmod/Item.cpp b/sigmod/Item.cpp index a2a64b0f..1f1fdca6 100644 --- a/sigmod/Item.cpp +++ b/sigmod/Item.cpp @@ -18,21 +18,21 @@ // Header include #include "Item.h" -// Pokemod includes +// Sigmod includes #include "Macros.h" -#include "Pokemod.h" #include "Rules.h" +#include "Sigmod.h" // Qt includes #include <QtCore/QSet> -Pokemod::Item::Item(const Item& item) : +Sigmod::Item::Item(const Item& item) : Object(item.parent(), item.id()) { *this = item; } -Pokemod::Item::Item(const Pokemod* parent, const int id) : +Sigmod::Item::Item(const Sigmod* parent, const int id) : Object(parent, id), m_name(""), m_sellable(false), @@ -43,24 +43,24 @@ Pokemod::Item::Item(const Pokemod* parent, const int id) : { } -Pokemod::Item::Item(const Item& item, const Pokemod* parent, const int id) : +Sigmod::Item::Item(const Item& item, const Sigmod* parent, const int id) : Object(parent, id) { *this = item; } -Pokemod::Item::Item(const QDomElement& xml, const Pokemod* parent, const int id) : +Sigmod::Item::Item(const QDomElement& xml, const Sigmod* parent, const int id) : Object(parent, id) { LOAD_ID(); load(xml); } -Pokemod::Item::~Item() +Sigmod::Item::~Item() { } -void Pokemod::Item::validate() +void Sigmod::Item::validate() { TEST_BEGIN(); if (m_name.isEmpty()) @@ -70,7 +70,7 @@ void Pokemod::Item::validate() TEST_END(); } -void Pokemod::Item::load(const QDomElement& xml) +void Sigmod::Item::load(const QDomElement& xml) { LOAD_BEGIN(); LOAD(name); @@ -81,7 +81,7 @@ void Pokemod::Item::load(const QDomElement& xml) LOAD(script); } -QDomElement Pokemod::Item::save() const +QDomElement Sigmod::Item::save() const { SAVE_CREATE(); SAVE(name); @@ -93,73 +93,73 @@ QDomElement Pokemod::Item::save() const return xml; } -void Pokemod::Item::setName(const QString& name) +void Sigmod::Item::setName(const QString& name) { CHECK(name); } -void Pokemod::Item::setSellable(const bool sellable) +void Sigmod::Item::setSellable(const bool sellable) { CHECK(sellable); } -void Pokemod::Item::setType(const int type) +void Sigmod::Item::setType(const int type) { - if (qobject_cast<const Pokemod*>(pokemod())->itemTypeIndex(type) == INT_MAX) + if (qobject_cast<const Sigmod*>(sigmod())->itemTypeIndex(type) == INT_MAX) emit(error(bounds("type"))); else CHECK(type); } -void Pokemod::Item::setPrice(const int price) +void Sigmod::Item::setPrice(const int price) { - if (qobject_cast<const Pokemod*>(pokemod())->rules()->maxMoney() < price) + if (qobject_cast<const Sigmod*>(sigmod())->rules()->maxMoney() < price) emit(error(bounds("price"))); else CHECK(price); } -void Pokemod::Item::setDescription(const QString& description) +void Sigmod::Item::setDescription(const QString& description) { CHECK(description); } -void Pokemod::Item::setScript(const Script& script) +void Sigmod::Item::setScript(const Script& script) { CHECK(script); } -QString Pokemod::Item::name() const +QString Sigmod::Item::name() const { return m_name; } -bool Pokemod::Item::sellable() const +bool Sigmod::Item::sellable() const { return m_sellable; } -int Pokemod::Item::type() const +int Sigmod::Item::type() const { return m_type; } -int Pokemod::Item::price() const +int Sigmod::Item::price() const { return m_price; } -QString Pokemod::Item::description() const +QString Sigmod::Item::description() const { return m_description; } -Pokemod::Script Pokemod::Item::script() const +Sigmod::Script Sigmod::Item::script() const { return m_script; } -Pokemod::Item& Pokemod::Item::operator=(const Item& rhs) +Sigmod::Item& Sigmod::Item::operator=(const Item& rhs) { if (this == &rhs) return *this; diff --git a/sigmod/Item.h b/sigmod/Item.h index 01583ef9..b05b1b25 100644 --- a/sigmod/Item.h +++ b/sigmod/Item.h @@ -15,27 +15,27 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __POKEMOD_ITEM__ -#define __POKEMOD_ITEM__ +#ifndef __SIGMOD_ITEM__ +#define __SIGMOD_ITEM__ -// Pokemod includes +// Sigmod includes #include "Object.h" #include "Script.h" -namespace Pokemod +namespace Sigmod { // Forward declarations -class Pokemod; +class Sigmod; -class POKEMOD_EXPORT Item : public Object +class SIGMOD_EXPORT Item : public Object { Q_OBJECT public: Item(const Item& item); - Item(const Pokemod* parent, const int id); - Item(const Item& item, const Pokemod* parent, const int id); - Item(const QDomElement& xml, const Pokemod* parent, const int id = -1); + Item(const Sigmod* parent, const int id); + Item(const Item& item, const Sigmod* parent, const int id); + Item(const QDomElement& xml, const Sigmod* parent, const int id = -1); ~Item(); void validate(); diff --git a/sigmod/ItemType.cpp b/sigmod/ItemType.cpp index 7c5ee9f1..525af757 100644 --- a/sigmod/ItemType.cpp +++ b/sigmod/ItemType.cpp @@ -18,19 +18,19 @@ // Header include #include "ItemType.h" -// Pokemod includes +// Sigmod includes #include "Macros.h" -#include "Pokemod.h" +#include "Sigmod.h" -QStringList Pokemod::ItemType::CountStr = QStringList() << "Distinct" << "Total"; +QStringList Sigmod::ItemType::CountStr = QStringList() << "Distinct" << "Total"; -Pokemod::ItemType::ItemType(const ItemType& itemType) : +Sigmod::ItemType::ItemType(const ItemType& itemType) : Object(itemType.parent(), itemType.id()) { *this = itemType; } -Pokemod::ItemType::ItemType(const Pokemod* parent, const int id) : +Sigmod::ItemType::ItemType(const Sigmod* parent, const int id) : Object(parent, id), m_name(""), m_computer(0), @@ -39,20 +39,20 @@ Pokemod::ItemType::ItemType(const Pokemod* parent, const int id) : { } -Pokemod::ItemType::ItemType(const ItemType& itemType, const Pokemod* parent, const int id) : +Sigmod::ItemType::ItemType(const ItemType& itemType, const Sigmod* parent, const int id) : Object(parent, id) { *this = itemType; } -Pokemod::ItemType::ItemType(const QDomElement& xml, const Pokemod* parent, const int id) : +Sigmod::ItemType::ItemType(const QDomElement& xml, const Sigmod* parent, const int id) : Object(parent, id) { LOAD_ID(); load(xml); } -void Pokemod::ItemType::validate() +void Sigmod::ItemType::validate() { TEST_BEGIN(); if (m_name.isEmpty()) @@ -61,7 +61,7 @@ void Pokemod::ItemType::validate() TEST_END(); } -void Pokemod::ItemType::load(const QDomElement& xml) +void Sigmod::ItemType::load(const QDomElement& xml) { LOAD_BEGIN(); LOAD(name); @@ -70,7 +70,7 @@ void Pokemod::ItemType::load(const QDomElement& xml) LOAD(count); } -QDomElement Pokemod::ItemType::save() const +QDomElement Sigmod::ItemType::save() const { SAVE_CREATE(); SAVE(name); @@ -80,17 +80,17 @@ QDomElement Pokemod::ItemType::save() const return xml; } -void Pokemod::ItemType::setName(const QString& name) +void Sigmod::ItemType::setName(const QString& name) { CHECK(name); } -void Pokemod::ItemType::setComputer(const int computer) +void Sigmod::ItemType::setComputer(const int computer) { CHECK(computer); } -void Pokemod::ItemType::setPlayer(const int player) +void Sigmod::ItemType::setPlayer(const int player) { if (!player) emit(error(bounds("player"))); @@ -98,32 +98,32 @@ void Pokemod::ItemType::setPlayer(const int player) CHECK(player); } -void Pokemod::ItemType::setCount(const Count count) +void Sigmod::ItemType::setCount(const Count count) { CHECK(count); } -QString Pokemod::ItemType::name() const +QString Sigmod::ItemType::name() const { return m_name; } -int Pokemod::ItemType::computer() const +int Sigmod::ItemType::computer() const { return m_computer; } -int Pokemod::ItemType::player() const +int Sigmod::ItemType::player() const { return m_player; } -Pokemod::ItemType::Count Pokemod::ItemType::count() const +Sigmod::ItemType::Count Sigmod::ItemType::count() const { return m_count; } -Pokemod::ItemType& Pokemod::ItemType::operator=(const ItemType& rhs) +Sigmod::ItemType& Sigmod::ItemType::operator=(const ItemType& rhs) { if (this == &rhs) return *this; diff --git a/sigmod/ItemType.h b/sigmod/ItemType.h index 15b16704..386ca209 100644 --- a/sigmod/ItemType.h +++ b/sigmod/ItemType.h @@ -15,18 +15,18 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __POKEMOD_ITEMTYPE__ -#define __POKEMOD_ITEMTYPE__ +#ifndef __SIGMOD_ITEMTYPE__ +#define __SIGMOD_ITEMTYPE__ -// Pokemod includes +// Sigmod includes #include "Object.h" -namespace Pokemod +namespace Sigmod { // Forward declarations -class Pokemod; +class Sigmod; -class POKEMOD_EXPORT ItemType : public Object +class SIGMOD_EXPORT ItemType : public Object { Q_OBJECT Q_ENUMS(Count) @@ -40,9 +40,9 @@ class POKEMOD_EXPORT ItemType : public Object static QStringList CountStr; ItemType(const ItemType& itemType); - ItemType(const Pokemod* parent, const int id); - ItemType(const ItemType& itemType, const Pokemod* parent, const int id); - ItemType(const QDomElement& xml, const Pokemod* parent, const int id = -1); + ItemType(const Sigmod* parent, const int id); + ItemType(const ItemType& itemType, const Sigmod* parent, const int id); + ItemType(const QDomElement& xml, const Sigmod* parent, const int id = -1); void validate(); @@ -67,6 +67,6 @@ class POKEMOD_EXPORT ItemType : public Object Count m_count; }; } -Q_DECLARE_METATYPE(Pokemod::ItemType::Count) +Q_DECLARE_METATYPE(Sigmod::ItemType::Count) #endif diff --git a/sigmod/Macros.h b/sigmod/Macros.h index bfd4f6c6..50c1085c 100644 --- a/sigmod/Macros.h +++ b/sigmod/Macros.h @@ -15,10 +15,10 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __POKEMOD_MACROS__ -#define __POKEMOD_MACROS__ +#ifndef __SIGMOD_MACROS__ +#define __SIGMOD_MACROS__ -#ifdef MAKE_POKEMOD_LIB +#ifdef MAKE_SIGMOD_LIB // TODO: The macros should probably be replaced by protected members of Object diff --git a/sigmod/Map.cpp b/sigmod/Map.cpp index 6cb92154..07509021 100644 --- a/sigmod/Map.cpp +++ b/sigmod/Map.cpp @@ -18,26 +18,26 @@ // Header include #include "Map.h" -// Pokemod includes +// Sigmod includes #include "Macros.h" #include "MapEffect.h" #include "MapTrainer.h" #include "MapWarp.h" #include "MapWildList.h" -#include "Pokemod.h" +#include "Sigmod.h" // Qt includes #include <QtCore/QSet> -const QStringList Pokemod::Map::TypeStr = QStringList() << "Outdoor" << "Dungeon" << "Building"; +const QStringList Sigmod::Map::TypeStr = QStringList() << "Outdoor" << "Dungeon" << "Building"; -Pokemod::Map::Map(const Map& map) : +Sigmod::Map::Map(const Map& map) : Object(map.parent(), map.id()) { *this = map; } -Pokemod::Map::Map(const Pokemod* parent, const int id) : +Sigmod::Map::Map(const Sigmod* parent, const int id) : Object(parent, id), m_name(""), m_flyWarp(-1), @@ -45,25 +45,25 @@ Pokemod::Map::Map(const Pokemod* parent, const int id) : { } -Pokemod::Map::Map(const Map& map, const Pokemod* parent, const int id) : +Sigmod::Map::Map(const Map& map, const Sigmod* parent, const int id) : Object(parent, id) { *this = map; } -Pokemod::Map::Map(const QDomElement& xml, const Pokemod* parent, const int id) : +Sigmod::Map::Map(const QDomElement& xml, const Sigmod* parent, const int id) : Object(parent, id) { LOAD_ID(); load(xml); } -Pokemod::Map::~Map() +Sigmod::Map::~Map() { clear(); } -void Pokemod::Map::validate() +void Sigmod::Map::validate() { TEST_BEGIN(); if (m_name.isEmpty()) @@ -104,7 +104,7 @@ void Pokemod::Map::validate() TEST_END(); } -void Pokemod::Map::load(const QDomElement& xml) +void Sigmod::Map::load(const QDomElement& xml) { LOAD_BEGIN(); LOAD(name); @@ -117,7 +117,7 @@ void Pokemod::Map::load(const QDomElement& xml) LOAD_SUB(newWildList, MapWildList); } -QDomElement Pokemod::Map::save() const +QDomElement Sigmod::Map::save() const { SAVE_CREATE(); SAVE(name); @@ -131,12 +131,12 @@ QDomElement Pokemod::Map::save() const return xml; } -void Pokemod::Map::setName(const QString& name) +void Sigmod::Map::setName(const QString& name) { CHECK(name); } -void Pokemod::Map::setFlyWarp(const int flyWarp) +void Sigmod::Map::setFlyWarp(const int flyWarp) { if ((flyWarp != -1) && (warpIndex(flyWarp) == INT_MAX)) emit(error(bounds("flyWarp"))); @@ -144,117 +144,117 @@ void Pokemod::Map::setFlyWarp(const int flyWarp) CHECK(flyWarp); } -void Pokemod::Map::setType(const Type type) +void Sigmod::Map::setType(const Type type) { CHECK(type); } -QString Pokemod::Map::name() const +QString Sigmod::Map::name() const { return m_name; } -int Pokemod::Map::flyWarp() const +int Sigmod::Map::flyWarp() const { return m_flyWarp; } -Pokemod::Map::Type Pokemod::Map::type() const +Sigmod::Map::Type Sigmod::Map::type() const { return m_type; } -void Pokemod::Map::setTile(const int row, const int column, const int tile) +void Sigmod::Map::setTile(const int row, const int column, const int tile) { - if (qobject_cast<const Pokemod*>(pokemod())->tileIndex(tile) == INT_MAX) + if (qobject_cast<const Sigmod*>(sigmod())->tileIndex(tile) == INT_MAX) emit(error(bounds("tile"))); else m_map.set(row, column, tile); } -void Pokemod::Map::insertColumn(const int column) +void Sigmod::Map::insertColumn(const int column) { m_map.insertColumn(column, 0); } -void Pokemod::Map::insertRow(const int row) +void Sigmod::Map::insertRow(const int row) { m_map.insertRow(row, 0); } -void Pokemod::Map::addColumn() +void Sigmod::Map::addColumn() { m_map.addColumn(0); } -void Pokemod::Map::addRow() +void Sigmod::Map::addRow() { m_map.addRow(0); } -void Pokemod::Map::deleteColumn(const int column) +void Sigmod::Map::deleteColumn(const int column) { m_map.deleteColumn(column); } -void Pokemod::Map::deleteRow(const int row) +void Sigmod::Map::deleteRow(const int row) { m_map.deleteRow(row); } -const Pokemod::Matrix<int>* Pokemod::Map::map() const +const Sigmod::Matrix<int>* Sigmod::Map::map() const { return &m_map; } -Pokemod::Matrix<int>* Pokemod::Map::map() +Sigmod::Matrix<int>* Sigmod::Map::map() { return &m_map; } -int Pokemod::Map::tile(const int row, const int column) const +int Sigmod::Map::tile(const int row, const int column) const { return m_map.at(row, column); } -int Pokemod::Map::width() const +int Sigmod::Map::width() const { return m_map.width(); } -int Pokemod::Map::height() const +int Sigmod::Map::height() const { return m_map.height(); } -QPoint Pokemod::Map::size() const +QPoint Sigmod::Map::size() const { return m_map.size(); } -const Pokemod::MapEffect* Pokemod::Map::effect(const int index) const +const Sigmod::MapEffect* Sigmod::Map::effect(const int index) const { Q_ASSERT(index < effectCount()); return m_effects.at(index); } -Pokemod::MapEffect* Pokemod::Map::effect(const int index) +Sigmod::MapEffect* Sigmod::Map::effect(const int index) { Q_ASSERT(index < effectCount()); return m_effects[index]; } -const Pokemod::MapEffect* Pokemod::Map::effectById(const int index) const +const Sigmod::MapEffect* Sigmod::Map::effectById(const int index) const { return effect(effectIndex(index)); } -Pokemod::MapEffect* Pokemod::Map::effectById(const int index) +Sigmod::MapEffect* Sigmod::Map::effectById(const int index) { return effect(effectIndex(index)); } -int Pokemod::Map::effectIndex(const int id) const +int Sigmod::Map::effectIndex(const int id) const { for (int i = 0; i < effectCount(); ++i) { @@ -264,45 +264,45 @@ int Pokemod::Map::effectIndex(const int id) const return INT_MAX; } -int Pokemod::Map::effectCount() const +int Sigmod::Map::effectCount() const { return m_effects.size(); } -Pokemod::MapEffect* Pokemod::Map::newEffect() +Sigmod::MapEffect* Sigmod::Map::newEffect() { return newEffect(new MapEffect(this, newEffectId())); } -Pokemod::MapEffect* Pokemod::Map::newEffect(const QDomElement& xml) +Sigmod::MapEffect* Sigmod::Map::newEffect(const QDomElement& xml) { return newEffect(new MapEffect(xml, this, newEffectId())); } -Pokemod::MapEffect* Pokemod::Map::newEffect(const MapEffect& effect) +Sigmod::MapEffect* Sigmod::Map::newEffect(const MapEffect& effect) { return newEffect(new MapEffect(effect, this, newEffectId())); } -Pokemod::MapEffect* Pokemod::Map::newEffect(MapEffect* effect) +Sigmod::MapEffect* Sigmod::Map::newEffect(MapEffect* effect) { m_effects.append(effect); return effect; } -void Pokemod::Map::deleteEffect(const int index) +void Sigmod::Map::deleteEffect(const int index) { Q_ASSERT(index < effectCount()); delete m_effects[index]; m_effects.removeAt(index); } -void Pokemod::Map::deleteEffectById(const int id) +void Sigmod::Map::deleteEffectById(const int id) { deleteEffect(effectIndex(id)); } -int Pokemod::Map::newEffectId() const +int Sigmod::Map::newEffectId() const { int i = 0; while ((i < effectCount()) && (effectIndex(i) != INT_MAX)) @@ -310,29 +310,29 @@ int Pokemod::Map::newEffectId() const return i; } -const Pokemod::MapTrainer* Pokemod::Map::trainer(const int index) const +const Sigmod::MapTrainer* Sigmod::Map::trainer(const int index) const { Q_ASSERT(index < trainerCount()); return m_trainers.at(index); } -Pokemod::MapTrainer* Pokemod::Map::trainer(const int index) +Sigmod::MapTrainer* Sigmod::Map::trainer(const int index) { Q_ASSERT(index < trainerCount()); return m_trainers[index]; } -const Pokemod::MapTrainer* Pokemod::Map::trainerById(const int id) const +const Sigmod::MapTrainer* Sigmod::Map::trainerById(const int id) const { return trainer(trainerIndex(id)); } -Pokemod::MapTrainer* Pokemod::Map::trainerById(const int id) +Sigmod::MapTrainer* Sigmod::Map::trainerById(const int id) { return trainer(trainerIndex(id)); } -int Pokemod::Map::trainerIndex(const int id) const +int Sigmod::Map::trainerIndex(const int id) const { for (int i = 0; i < trainerCount(); ++i) { @@ -342,45 +342,45 @@ int Pokemod::Map::trainerIndex(const int id) const return INT_MAX; } -int Pokemod::Map::trainerCount() const +int Sigmod::Map::trainerCount() const { return m_trainers.size(); } -Pokemod::MapTrainer* Pokemod::Map::newTrainer() +Sigmod::MapTrainer* Sigmod::Map::newTrainer() { return newTrainer(new MapTrainer(this, newTrainerId())); } -Pokemod::MapTrainer* Pokemod::Map::newTrainer(const QDomElement& xml) +Sigmod::MapTrainer* Sigmod::Map::newTrainer(const QDomElement& xml) { return newTrainer(new MapTrainer(xml, this, newTrainerId())); } -Pokemod::MapTrainer* Pokemod::Map::newTrainer(const MapTrainer& trainer) +Sigmod::MapTrainer* Sigmod::Map::newTrainer(const MapTrainer& trainer) { return newTrainer(new MapTrainer(trainer, this, newTrainerId())); } -Pokemod::MapTrainer* Pokemod::Map::newTrainer(MapTrainer* trainer) +Sigmod::MapTrainer* Sigmod::Map::newTrainer(MapTrainer* trainer) { m_trainers.append(trainer); return trainer; } -void Pokemod::Map::deleteTrainer(const int index) +void Sigmod::Map::deleteTrainer(const int index) { Q_ASSERT(index < trainerCount()); delete m_trainers[index]; m_trainers.removeAt(index); } -void Pokemod::Map::deleteTrainerById(const int id) +void Sigmod::Map::deleteTrainerById(const int id) { deleteTrainer(trainerIndex(id)); } -int Pokemod::Map::newTrainerId() const +int Sigmod::Map::newTrainerId() const { int i = 0; while ((i < trainerCount()) && (trainerIndex(i) != INT_MAX)) @@ -388,29 +388,29 @@ int Pokemod::Map::newTrainerId() const return i; } -const Pokemod::MapWarp* Pokemod::Map::warp(const int index) const +const Sigmod::MapWarp* Sigmod::Map::warp(const int index) const { Q_ASSERT(index < warpCount()); return m_warps.at(index); } -Pokemod::MapWarp* Pokemod::Map::warp(const int index) +Sigmod::MapWarp* Sigmod::Map::warp(const int index) { Q_ASSERT(index < warpCount()); return m_warps[index]; } -const Pokemod::MapWarp* Pokemod::Map::warpById(const int id) const +const Sigmod::MapWarp* Sigmod::Map::warpById(const int id) const { return warp(warpIndex(id)); } -Pokemod::MapWarp* Pokemod::Map::warpById(const int id) +Sigmod::MapWarp* Sigmod::Map::warpById(const int id) { return warp(warpIndex(id)); } -int Pokemod::Map::warpIndex(const int id) const +int Sigmod::Map::warpIndex(const int id) const { for (int i = 0; i < warpCount(); ++i) { @@ -420,45 +420,45 @@ int Pokemod::Map::warpIndex(const int id) const return INT_MAX; } -int Pokemod::Map::warpCount() const +int Sigmod::Map::warpCount() const { return m_warps.size(); } -Pokemod::MapWarp* Pokemod::Map::newWarp() +Sigmod::MapWarp* Sigmod::Map::newWarp() { return newWarp(new MapWarp(this, newWarpId())); } -Pokemod::MapWarp* Pokemod::Map::newWarp(const QDomElement& xml) +Sigmod::MapWarp* Sigmod::Map::newWarp(const QDomElement& xml) { return newWarp(new MapWarp(xml, this, newWarpId())); } -Pokemod::MapWarp* Pokemod::Map::newWarp(const MapWarp& warp) +Sigmod::MapWarp* Sigmod::Map::newWarp(const MapWarp& warp) { return newWarp(new MapWarp(warp, this, newWarpId())); } -Pokemod::MapWarp* Pokemod::Map::newWarp(MapWarp* warp) +Sigmod::MapWarp* Sigmod::Map::newWarp(MapWarp* warp) { m_warps.append(warp); return warp; } -void Pokemod::Map::deleteWarp(const int index) +void Sigmod::Map::deleteWarp(const int index) { Q_ASSERT(index < warpCount()); delete m_warps[index]; m_warps.removeAt(index); } -void Pokemod::Map::deleteWarpById(const int id) +void Sigmod::Map::deleteWarpById(const int id) { deleteWarp(warpIndex(id)); } -int Pokemod::Map::newWarpId() const +int Sigmod::Map::newWarpId() const { int i = 0; while ((i < warpCount()) && (warpIndex(i) != INT_MAX)) @@ -466,29 +466,29 @@ int Pokemod::Map::newWarpId() const return i; } -const Pokemod::MapWildList* Pokemod::Map::wildList(const int index) const +const Sigmod::MapWildList* Sigmod::Map::wildList(const int index) const { Q_ASSERT(index < wildListCount()); return m_wildLists.at(index); } -Pokemod::MapWildList* Pokemod::Map::wildList(const int index) +Sigmod::MapWildList* Sigmod::Map::wildList(const int index) { Q_ASSERT(index < wildListCount()); return m_wildLists[index]; } -const Pokemod::MapWildList* Pokemod::Map::wildListById(const int id) const +const Sigmod::MapWildList* Sigmod::Map::wildListById(const int id) const { return wildList(wildListIndex(id)); } -Pokemod::MapWildList* Pokemod::Map::wildListById(const int id) +Sigmod::MapWildList* Sigmod::Map::wildListById(const int id) { return wildList(wildListIndex(id)); } -int Pokemod::Map::wildListIndex(const int id) const +int Sigmod::Map::wildListIndex(const int id) const { for (int i = 0; i < wildListCount(); ++i) { @@ -498,45 +498,45 @@ int Pokemod::Map::wildListIndex(const int id) const return INT_MAX; } -int Pokemod::Map::wildListCount() const +int Sigmod::Map::wildListCount() const { return m_wildLists.size(); } -Pokemod::MapWildList* Pokemod::Map::newWildList() +Sigmod::MapWildList* Sigmod::Map::newWildList() { return newWildList(new MapWildList(this, newWildListId())); } -Pokemod::MapWildList* Pokemod::Map::newWildList(const QDomElement& xml) +Sigmod::MapWildList* Sigmod::Map::newWildList(const QDomElement& xml) { return newWildList(new MapWildList(xml, this, newWildListId())); } -Pokemod::MapWildList* Pokemod::Map::newWildList(const MapWildList& wildList) +Sigmod::MapWildList* Sigmod::Map::newWildList(const MapWildList& wildList) { return newWildList(new MapWildList(wildList, this, newWildListId())); } -Pokemod::MapWildList* Pokemod::Map::newWildList(MapWildList* wildList) +Sigmod::MapWildList* Sigmod::Map::newWildList(MapWildList* wildList) { m_wildLists.append(wildList); return wildList; } -void Pokemod::Map::deleteWildList(const int index) +void Sigmod::Map::deleteWildList(const int index) { Q_ASSERT(index < wildListCount()); delete m_wildLists[index]; m_wildLists.removeAt(index); } -void Pokemod::Map::deleteWildListById(const int id) +void Sigmod::Map::deleteWildListById(const int id) { deleteWildList(wildListIndex(id)); } -int Pokemod::Map::newWildListId() const +int Sigmod::Map::newWildListId() const { int i = 0; while ((i < warpCount()) && (warpIndex(i) != INT_MAX)) @@ -544,7 +544,7 @@ int Pokemod::Map::newWildListId() const return i; } -Pokemod::Map& Pokemod::Map::operator=(const Map& rhs) +Sigmod::Map& Sigmod::Map::operator=(const Map& rhs) { if (this == &rhs) return *this; @@ -560,7 +560,7 @@ Pokemod::Map& Pokemod::Map::operator=(const Map& rhs) return *this; } -void Pokemod::Map::clear() +void Sigmod::Map::clear() { while (effectCount()) deleteEffect(0); diff --git a/sigmod/Map.h b/sigmod/Map.h index 34b102df..345a00fb 100644 --- a/sigmod/Map.h +++ b/sigmod/Map.h @@ -15,26 +15,26 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __POKEMOD_MAP__ -#define __POKEMOD_MAP__ +#ifndef __SIGMOD_MAP__ +#define __SIGMOD_MAP__ -// Pokemod includes +// Sigmod includes #include "Matrix.h" #include "Object.h" // Qt includes #include <QtCore/QList> -namespace Pokemod +namespace Sigmod { // Forward declarations class MapEffect; class MapTrainer; class MapWarp; class MapWildList; -class Pokemod; +class Sigmod; -class POKEMOD_EXPORT Map : public Object +class SIGMOD_EXPORT Map : public Object { Q_OBJECT Q_ENUMS(Type) @@ -49,9 +49,9 @@ class POKEMOD_EXPORT Map : public Object static const QStringList TypeStr; Map(const Map& map); - Map(const Pokemod* parent, const int id); - Map(const Map& map, const Pokemod* parent, const int id); - Map(const QDomElement& xml, const Pokemod* parent, const int id = -1); + Map(const Sigmod* parent, const int id); + Map(const Map& map, const Sigmod* parent, const int id); + Map(const QDomElement& xml, const Sigmod* parent, const int id = -1); ~Map(); void validate(); @@ -156,6 +156,6 @@ class POKEMOD_EXPORT Map : public Object QList<MapWildList*> m_wildLists; }; } -Q_DECLARE_METATYPE(Pokemod::Map::Type) +Q_DECLARE_METATYPE(Sigmod::Map::Type) #endif diff --git a/sigmod/MapEffect.cpp b/sigmod/MapEffect.cpp index 558596f5..3c232118 100644 --- a/sigmod/MapEffect.cpp +++ b/sigmod/MapEffect.cpp @@ -18,18 +18,18 @@ // Header include #include "MapEffect.h" -// Pokemod includes +// Sigmod includes #include "Macros.h" #include "Map.h" -#include "Pokemod.h" +#include "Sigmod.h" -Pokemod::MapEffect::MapEffect(const MapEffect& effect) : +Sigmod::MapEffect::MapEffect(const MapEffect& effect) : Object(effect.parent(), effect.id()) { *this = effect; } -Pokemod::MapEffect::MapEffect(const Map* parent, const int id) : +Sigmod::MapEffect::MapEffect(const Map* parent, const int id) : Object(parent, id), m_name(""), m_coordinate(0, 0), @@ -39,20 +39,20 @@ Pokemod::MapEffect::MapEffect(const Map* parent, const int id) : { } -Pokemod::MapEffect::MapEffect(const MapEffect& effect, const Map* parent, const int id) : +Sigmod::MapEffect::MapEffect(const MapEffect& effect, const Map* parent, const int id) : Object(parent, id) { *this = effect; } -Pokemod::MapEffect::MapEffect(const QDomElement& xml, const Map* parent, const int id) : +Sigmod::MapEffect::MapEffect(const QDomElement& xml, const Map* parent, const int id) : Object(parent, id) { LOAD_ID(); load(xml); } -void Pokemod::MapEffect::validate() +void Sigmod::MapEffect::validate() { TEST_BEGIN(); if (m_name.isEmpty()) @@ -62,7 +62,7 @@ void Pokemod::MapEffect::validate() TEST_END(); } -void Pokemod::MapEffect::load(const QDomElement& xml) +void Sigmod::MapEffect::load(const QDomElement& xml) { LOAD_BEGIN(); LOAD(name); @@ -72,7 +72,7 @@ void Pokemod::MapEffect::load(const QDomElement& xml) LOAD(script); } -QDomElement Pokemod::MapEffect::save() const +QDomElement Sigmod::MapEffect::save() const { SAVE_CREATE(); SAVE(name); @@ -83,12 +83,12 @@ QDomElement Pokemod::MapEffect::save() const return xml; } -void Pokemod::MapEffect::setName(const QString& name) +void Sigmod::MapEffect::setName(const QString& name) { CHECK(name); } -void Pokemod::MapEffect::setCoordinate(const QPoint& coordinate) +void Sigmod::MapEffect::setCoordinate(const QPoint& coordinate) { if ((qobject_cast<const Map*>(parent())->width() <= coordinate.x()) || (qobject_cast<const Map*>(parent())->height() <= coordinate.y())) emit(error(bounds("coordinate"))); @@ -96,50 +96,50 @@ void Pokemod::MapEffect::setCoordinate(const QPoint& coordinate) CHECK(coordinate); } -void Pokemod::MapEffect::setSkin(const int skin) +void Sigmod::MapEffect::setSkin(const int skin) { - if (qobject_cast<const Pokemod*>(pokemod())->skinIndex(skin) == INT_MAX) + if (qobject_cast<const Sigmod*>(sigmod())->skinIndex(skin) == INT_MAX) emit(error(bounds("skin"))); else CHECK(skin); } -void Pokemod::MapEffect::setIsGhost(const bool isGhost) +void Sigmod::MapEffect::setIsGhost(const bool isGhost) { CHECK(isGhost); } -void Pokemod::MapEffect::setScript(const Script& script) +void Sigmod::MapEffect::setScript(const Script& script) { CHECK(script); } -QString Pokemod::MapEffect::name() const +QString Sigmod::MapEffect::name() const { return m_name; } -QPoint Pokemod::MapEffect::coordinate() const +QPoint Sigmod::MapEffect::coordinate() const { return m_coordinate; } -int Pokemod::MapEffect::skin() const +int Sigmod::MapEffect::skin() const { return m_skin; } -bool Pokemod::MapEffect::isGhost() const +bool Sigmod::MapEffect::isGhost() const { return m_isGhost; } -Pokemod::Script Pokemod::MapEffect::script() const +Sigmod::Script Sigmod::MapEffect::script() const { return m_script; } -Pokemod::MapEffect& Pokemod::MapEffect::operator=(const MapEffect& rhs) +Sigmod::MapEffect& Sigmod::MapEffect::operator=(const MapEffect& rhs) { if (this == &rhs) return *this; diff --git a/sigmod/MapEffect.h b/sigmod/MapEffect.h index 3c4d3f4a..3af1e0ef 100644 --- a/sigmod/MapEffect.h +++ b/sigmod/MapEffect.h @@ -15,22 +15,22 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __POKEMOD_MAPEFFECT__ -#define __POKEMOD_MAPEFFECT__ +#ifndef __SIGMOD_MAPEFFECT__ +#define __SIGMOD_MAPEFFECT__ -// Pokemod includes +// Sigmod includes #include "Object.h" #include "Script.h" // Qt includes #include <QtCore/QPoint> -namespace Pokemod +namespace Sigmod { // Forward declarations class Map; -class POKEMOD_EXPORT MapEffect : public Object +class SIGMOD_EXPORT MapEffect : public Object { Q_OBJECT diff --git a/sigmod/MapTrainer.cpp b/sigmod/MapTrainer.cpp index 4df1cbed..9e3f3e2d 100644 --- a/sigmod/MapTrainer.cpp +++ b/sigmod/MapTrainer.cpp @@ -18,23 +18,23 @@ // Header include #include "MapTrainer.h" -// Pokemod includes +// Sigmod includes #include "Macros.h" #include "Map.h" #include "MapTrainerTeamMember.h" -#include "Pokemod.h" #include "Rules.h" +#include "Sigmod.h" // Qt includes #include <QtCore/QSet> -Pokemod::MapTrainer::MapTrainer(const MapTrainer& trainer) : +Sigmod::MapTrainer::MapTrainer(const MapTrainer& trainer) : Object(trainer.parent(), trainer.id()) { *this = trainer; } -Pokemod::MapTrainer::MapTrainer(const Map* parent, const int id) : +Sigmod::MapTrainer::MapTrainer(const Map* parent, const int id) : Object(parent, id), m_name(""), m_trainerClass(INT_MAX), @@ -45,25 +45,25 @@ Pokemod::MapTrainer::MapTrainer(const Map* parent, const int id) : { } -Pokemod::MapTrainer::MapTrainer(const MapTrainer& trainer, const Map* parent, const int id) : +Sigmod::MapTrainer::MapTrainer(const MapTrainer& trainer, const Map* parent, const int id) : Object(parent, id) { *this = trainer; } -Pokemod::MapTrainer::MapTrainer(const QDomElement& xml, const Map* parent, const int id) : +Sigmod::MapTrainer::MapTrainer(const QDomElement& xml, const Map* parent, const int id) : Object(parent, id) { LOAD_ID(); load(xml); } -Pokemod::MapTrainer::~MapTrainer() +Sigmod::MapTrainer::~MapTrainer() { clear(); } -void Pokemod::MapTrainer::validate() +void Sigmod::MapTrainer::validate() { TEST_BEGIN(); if (m_name.isEmpty()) @@ -81,7 +81,7 @@ void Pokemod::MapTrainer::validate() TEST_END(); } -void Pokemod::MapTrainer::load(const QDomElement& xml) +void Sigmod::MapTrainer::load(const QDomElement& xml) { LOAD_BEGIN(); LOAD(name); @@ -93,7 +93,7 @@ void Pokemod::MapTrainer::load(const QDomElement& xml) LOAD(leadTeamMember); } -QDomElement Pokemod::MapTrainer::save() const +QDomElement Sigmod::MapTrainer::save() const { SAVE_CREATE(); SAVE(name); @@ -105,20 +105,20 @@ QDomElement Pokemod::MapTrainer::save() const return xml; } -void Pokemod::MapTrainer::setName(const QString& name) +void Sigmod::MapTrainer::setName(const QString& name) { CHECK(name); } -void Pokemod::MapTrainer::setTrainerClass(const int trainerClass) +void Sigmod::MapTrainer::setTrainerClass(const int trainerClass) { - if (qobject_cast<const Pokemod*>(pokemod())->trainerIndex(trainerClass) == INT_MAX) + if (qobject_cast<const Sigmod*>(sigmod())->trainerIndex(trainerClass) == INT_MAX) emit(error(bounds("trainerClass"))); else CHECK(trainerClass); } -void Pokemod::MapTrainer::setCoordinate(const QPoint& coordinate) +void Sigmod::MapTrainer::setCoordinate(const QPoint& coordinate) { if ((qobject_cast<const Map*>(parent())->width() <= coordinate.x()) || (qobject_cast<const Map*>(parent())->height() <= coordinate.y())) emit(error(bounds("coordinate"))); @@ -126,20 +126,20 @@ void Pokemod::MapTrainer::setCoordinate(const QPoint& coordinate) CHECK(coordinate); } -void Pokemod::MapTrainer::setNumberFight(const int numberFight) +void Sigmod::MapTrainer::setNumberFight(const int numberFight) { - if (!numberFight || (qobject_cast<const Pokemod*>(pokemod())->rules()->maxFight() < numberFight)) + if (!numberFight || (qobject_cast<const Sigmod*>(sigmod())->rules()->maxFight() < numberFight)) emit(error(bounds("numberFight"))); else CHECK(numberFight); } -void Pokemod::MapTrainer::setScript(const Script& script) +void Sigmod::MapTrainer::setScript(const Script& script) { CHECK(script); } -void Pokemod::MapTrainer::setLeadTeamMember(const int leadTeamMember) +void Sigmod::MapTrainer::setLeadTeamMember(const int leadTeamMember) { if (teamMemberIndex(leadTeamMember) == INT_MAX) emit(error(bounds("leadTeamMember"))); @@ -147,59 +147,59 @@ void Pokemod::MapTrainer::setLeadTeamMember(const int leadTeamMember) CHECK(leadTeamMember); } -QString Pokemod::MapTrainer::name() const +QString Sigmod::MapTrainer::name() const { return m_name; } -int Pokemod::MapTrainer::trainerClass() const +int Sigmod::MapTrainer::trainerClass() const { return m_trainerClass; } -QPoint Pokemod::MapTrainer::coordinate() const +QPoint Sigmod::MapTrainer::coordinate() const { return m_coordinate; } -int Pokemod::MapTrainer::numberFight() const +int Sigmod::MapTrainer::numberFight() const { return m_numberFight; } -Pokemod::Script Pokemod::MapTrainer::script() const +Sigmod::Script Sigmod::MapTrainer::script() const { return m_script; } -int Pokemod::MapTrainer::leadTeamMember() const +int Sigmod::MapTrainer::leadTeamMember() const { return m_leadTeamMember; } -const Pokemod::MapTrainerTeamMember* Pokemod::MapTrainer::teamMember(const int index) const +const Sigmod::MapTrainerTeamMember* Sigmod::MapTrainer::teamMember(const int index) const { Q_ASSERT(index < teamMemberCount()); return m_teamMembers.at(index); } -Pokemod::MapTrainerTeamMember* Pokemod::MapTrainer::teamMember(const int index) +Sigmod::MapTrainerTeamMember* Sigmod::MapTrainer::teamMember(const int index) { Q_ASSERT(index < teamMemberCount()); return m_teamMembers[index]; } -const Pokemod::MapTrainerTeamMember* Pokemod::MapTrainer::teamMemberById(const int id) const +const Sigmod::MapTrainerTeamMember* Sigmod::MapTrainer::teamMemberById(const int id) const { return teamMember(teamMemberIndex(id)); } -Pokemod::MapTrainerTeamMember* Pokemod::MapTrainer::teamMemberById(const int id) +Sigmod::MapTrainerTeamMember* Sigmod::MapTrainer::teamMemberById(const int id) { return teamMember(teamMemberIndex(id)); } -int Pokemod::MapTrainer::teamMemberIndex(const int id) const +int Sigmod::MapTrainer::teamMemberIndex(const int id) const { for (int i = 0; i < teamMemberCount(); ++i) { @@ -209,45 +209,45 @@ int Pokemod::MapTrainer::teamMemberIndex(const int id) const return INT_MAX; } -int Pokemod::MapTrainer::teamMemberCount() const +int Sigmod::MapTrainer::teamMemberCount() const { return m_teamMembers.size(); } -Pokemod::MapTrainerTeamMember* Pokemod::MapTrainer::newTeamMember() +Sigmod::MapTrainerTeamMember* Sigmod::MapTrainer::newTeamMember() { return newTeamMember(new MapTrainerTeamMember(this, newTeamMemberId())); } -Pokemod::MapTrainerTeamMember* Pokemod::MapTrainer::newTeamMember(const QDomElement& xml) +Sigmod::MapTrainerTeamMember* Sigmod::MapTrainer::newTeamMember(const QDomElement& xml) { return newTeamMember(new MapTrainerTeamMember(xml, this, newTeamMemberId())); } -Pokemod::MapTrainerTeamMember* Pokemod::MapTrainer::newTeamMember(const MapTrainerTeamMember& teamMember) +Sigmod::MapTrainerTeamMember* Sigmod::MapTrainer::newTeamMember(const MapTrainerTeamMember& teamMember) { return newTeamMember(new MapTrainerTeamMember(teamMember, this, newTeamMemberId())); } -Pokemod::MapTrainerTeamMember* Pokemod::MapTrainer::newTeamMember(MapTrainerTeamMember* teamMember) +Sigmod::MapTrainerTeamMember* Sigmod::MapTrainer::newTeamMember(MapTrainerTeamMember* teamMember) { m_teamMembers.append(teamMember); return teamMember; } -void Pokemod::MapTrainer::deleteTeamMember(const int index) +void Sigmod::MapTrainer::deleteTeamMember(const int index) { Q_ASSERT(index < teamMemberCount()); delete m_teamMembers[index]; m_teamMembers.removeAt(index); } -void Pokemod::MapTrainer::deleteTeamMemberById(const int id) +void Sigmod::MapTrainer::deleteTeamMemberById(const int id) { deleteTeamMember(teamMemberIndex(id)); } -int Pokemod::MapTrainer::newTeamMemberId() const +int Sigmod::MapTrainer::newTeamMemberId() const { int i = 0; while ((i < teamMemberCount()) && (teamMemberIndex(i) != INT_MAX)) @@ -255,7 +255,7 @@ int Pokemod::MapTrainer::newTeamMemberId() const return i; } -Pokemod::MapTrainer& Pokemod::MapTrainer::operator=(const MapTrainer& rhs) +Sigmod::MapTrainer& Sigmod::MapTrainer::operator=(const MapTrainer& rhs) { if (this == &rhs) return *this; @@ -270,7 +270,7 @@ Pokemod::MapTrainer& Pokemod::MapTrainer::operator=(const MapTrainer& rhs) return *this; } -void Pokemod::MapTrainer::clear() +void Sigmod::MapTrainer::clear() { while (teamMemberCount()) deleteTeamMember(0); diff --git a/sigmod/MapTrainer.h b/sigmod/MapTrainer.h index f77d0a97..2d8686bb 100644 --- a/sigmod/MapTrainer.h +++ b/sigmod/MapTrainer.h @@ -15,10 +15,10 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __POKEMOD_MAPTRAINER__ -#define __POKEMOD_MAPTRAINER__ +#ifndef __SIGMOD_MAPTRAINER__ +#define __SIGMOD_MAPTRAINER__ -// Pokemod includes +// Sigmod includes #include "Object.h" #include "Script.h" @@ -26,13 +26,13 @@ #include <QtCore/QList> #include <QtCore/QPoint> -namespace Pokemod +namespace Sigmod { // Forward declarations class Map; class MapTrainerTeamMember; -class POKEMOD_EXPORT MapTrainer : public Object +class SIGMOD_EXPORT MapTrainer : public Object { Q_OBJECT diff --git a/sigmod/MapTrainerTeamMember.cpp b/sigmod/MapTrainerTeamMember.cpp index d69411a5..beab6d54 100644 --- a/sigmod/MapTrainerTeamMember.cpp +++ b/sigmod/MapTrainerTeamMember.cpp @@ -18,65 +18,65 @@ // Header include #include "MapTrainerTeamMember.h" -// Pokemod includes +// Sigmod includes #include "Item.h" #include "Macros.h" #include "MapTrainer.h" -#include "Pokemod.h" #include "Rules.h" +#include "Sigmod.h" #include "Species.h" #include "SpeciesMove.h" // Qt includes #include <QtCore/QSet> -Pokemod::MapTrainerTeamMember::MapTrainerTeamMember(const MapTrainerTeamMember& teamMember) : +Sigmod::MapTrainerTeamMember::MapTrainerTeamMember(const MapTrainerTeamMember& teamMember) : Object(teamMember.parent(), teamMember.id()) { *this = teamMember; } -Pokemod::MapTrainerTeamMember::MapTrainerTeamMember(const MapTrainer* parent, const int id) : +Sigmod::MapTrainerTeamMember::MapTrainerTeamMember(const MapTrainer* parent, const int id) : Object(parent, id), m_species(INT_MAX), m_level(INT_MAX) { } -Pokemod::MapTrainerTeamMember::MapTrainerTeamMember(const MapTrainerTeamMember& teamMember, const MapTrainer* parent, const int id) : +Sigmod::MapTrainerTeamMember::MapTrainerTeamMember(const MapTrainerTeamMember& teamMember, const MapTrainer* parent, const int id) : Object(parent, id) { *this = teamMember; } -Pokemod::MapTrainerTeamMember::MapTrainerTeamMember(const QDomElement& xml, const MapTrainer* parent, const int id) : +Sigmod::MapTrainerTeamMember::MapTrainerTeamMember(const QDomElement& xml, const MapTrainer* parent, const int id) : Object(parent, id) { LOAD_ID(); load(xml); } -void Pokemod::MapTrainerTeamMember::validate() +void Sigmod::MapTrainerTeamMember::validate() { TEST_BEGIN(); TEST(setSpecies, species); TEST(setLevel, level); - if (qobject_cast<const Pokemod*>(pokemod())->rules()->maxAbilities() < m_ability.size()) + if (qobject_cast<const Sigmod*>(sigmod())->rules()->maxAbilities() < m_ability.size()) emit(error("Too many abilities")); TEST_LIST(setAbility, ability); - if (qobject_cast<const Pokemod*>(pokemod())->rules()->maxHeldItems() < m_item.size()) + if (qobject_cast<const Sigmod*>(sigmod())->rules()->maxHeldItems() < m_item.size()) emit(error("Too many held items")); TEST_LIST(setItem, item); - if (qobject_cast<const Pokemod*>(pokemod())->rules()->maxMoves() < m_move.size()) + if (qobject_cast<const Sigmod*>(sigmod())->rules()->maxMoves() < m_move.size()) emit(error("Too many moves")); TEST_LIST(setMove, move); - if (qobject_cast<const Pokemod*>(pokemod())->rules()->maxNatures() < m_nature.size()) + if (qobject_cast<const Sigmod*>(sigmod())->rules()->maxNatures() < m_nature.size()) emit(error("Too many natures")); TEST_LIST(setNature, nature); TEST_END(); } -void Pokemod::MapTrainerTeamMember::load(const QDomElement& xml) +void Sigmod::MapTrainerTeamMember::load(const QDomElement& xml) { LOAD_BEGIN(); LOAD(species); @@ -87,7 +87,7 @@ void Pokemod::MapTrainerTeamMember::load(const QDomElement& xml) LOAD_LIST(nature); } -QDomElement Pokemod::MapTrainerTeamMember::save() const +QDomElement Sigmod::MapTrainerTeamMember::save() const { SAVE_CREATE(); SAVE(species); @@ -99,29 +99,29 @@ QDomElement Pokemod::MapTrainerTeamMember::save() const return xml; } -void Pokemod::MapTrainerTeamMember::setSpecies(const int species) +void Sigmod::MapTrainerTeamMember::setSpecies(const int species) { - if (qobject_cast<const Pokemod*>(pokemod())->speciesIndex(species) == INT_MAX) + if (qobject_cast<const Sigmod*>(sigmod())->speciesIndex(species) == INT_MAX) emit(error(bounds("species"))); else CHECK(species); } -void Pokemod::MapTrainerTeamMember::setLevel(const int level) +void Sigmod::MapTrainerTeamMember::setLevel(const int level) { - if (qobject_cast<const Pokemod*>(pokemod())->rules()->maxLevel() < level) + if (qobject_cast<const Sigmod*>(sigmod())->rules()->maxLevel() < level) emit(error(bounds("level"))); else CHECK(level); } -void Pokemod::MapTrainerTeamMember::setAbility(const int ability, const bool state) +void Sigmod::MapTrainerTeamMember::setAbility(const int ability, const bool state) { - if (qobject_cast<const Pokemod*>(pokemod())->abilityIndex(ability) == INT_MAX) + if (qobject_cast<const Sigmod*>(sigmod())->abilityIndex(ability) == INT_MAX) emit(error(bounds("ability"))); else if (state && !m_ability.contains(ability)) { - if (m_ability.size() < qobject_cast<const Pokemod*>(pokemod())->rules()->maxAbilities()) + if (m_ability.size() < qobject_cast<const Sigmod*>(sigmod())->rules()->maxAbilities()) { m_ability.append(ability); emit(changed()); @@ -136,13 +136,13 @@ void Pokemod::MapTrainerTeamMember::setAbility(const int ability, const bool sta } } -void Pokemod::MapTrainerTeamMember::setItem(const int item, const bool state) +void Sigmod::MapTrainerTeamMember::setItem(const int item, const bool state) { - if (qobject_cast<const Pokemod*>(pokemod())->itemIndex(item) == INT_MAX) + if (qobject_cast<const Sigmod*>(sigmod())->itemIndex(item) == INT_MAX) emit(error(bounds("item"))); else if (state && !m_item.contains(item)) { - if (m_item.size() < qobject_cast<const Pokemod*>(pokemod())->rules()->maxHeldItems()) + if (m_item.size() < qobject_cast<const Sigmod*>(sigmod())->rules()->maxHeldItems()) { m_item.append(item); emit(changed()); @@ -157,19 +157,19 @@ void Pokemod::MapTrainerTeamMember::setItem(const int item, const bool state) } } -void Pokemod::MapTrainerTeamMember::setMove(const int move, const bool state) +void Sigmod::MapTrainerTeamMember::setMove(const int move, const bool state) { - if (qobject_cast<const Pokemod*>(pokemod())->moveIndex(move) == INT_MAX) + if (qobject_cast<const Sigmod*>(sigmod())->moveIndex(move) == INT_MAX) emit(error(bounds("move"))); else if (state && !m_move.contains(move)) { - const Species* species = qobject_cast<const Pokemod*>(pokemod())->speciesById(move); + const Species* species = qobject_cast<const Sigmod*>(sigmod())->speciesById(move); for (int i = 0; i < species->moveCount(); ++i) { const SpeciesMove* speciesMove = species->move(i); if (speciesMove->move() == move) { - if (m_move.size() < qobject_cast<const Pokemod*>(pokemod())->rules()->maxMoves()) + if (m_move.size() < qobject_cast<const Sigmod*>(sigmod())->rules()->maxMoves()) { m_move.append(move); emit(changed()); @@ -188,13 +188,13 @@ void Pokemod::MapTrainerTeamMember::setMove(const int move, const bool state) } } -void Pokemod::MapTrainerTeamMember::setNature(const int nature, const bool state) +void Sigmod::MapTrainerTeamMember::setNature(const int nature, const bool state) { - if (qobject_cast<const Pokemod*>(pokemod())->natureIndex(nature) == INT_MAX) + if (qobject_cast<const Sigmod*>(sigmod())->natureIndex(nature) == INT_MAX) emit(error(bounds("nature"))); else if (state && !m_nature.contains(nature)) { - if (m_nature.size() < qobject_cast<const Pokemod*>(pokemod())->rules()->maxNatures()) + if (m_nature.size() < qobject_cast<const Sigmod*>(sigmod())->rules()->maxNatures()) { m_nature.append(nature); emit(changed()); @@ -209,57 +209,57 @@ void Pokemod::MapTrainerTeamMember::setNature(const int nature, const bool state } } -int Pokemod::MapTrainerTeamMember::species() const +int Sigmod::MapTrainerTeamMember::species() const { return m_species; } -int Pokemod::MapTrainerTeamMember::level() const +int Sigmod::MapTrainerTeamMember::level() const { return m_level; } -bool Pokemod::MapTrainerTeamMember::ability(const int ability) const +bool Sigmod::MapTrainerTeamMember::ability(const int ability) const { return m_ability.contains(ability); } -QList<int> Pokemod::MapTrainerTeamMember::abilities() const +QList<int> Sigmod::MapTrainerTeamMember::abilities() const { return m_ability; } -bool Pokemod::MapTrainerTeamMember::item(const int item) const +bool Sigmod::MapTrainerTeamMember::item(const int item) const { return m_item.contains(item); } -QList<int> Pokemod::MapTrainerTeamMember::items() const +QList<int> Sigmod::MapTrainerTeamMember::items() const { return m_item; } -bool Pokemod::MapTrainerTeamMember::move(const int move) const +bool Sigmod::MapTrainerTeamMember::move(const int move) const { return m_move.contains(move); } -QList<int> Pokemod::MapTrainerTeamMember::moves() const +QList<int> Sigmod::MapTrainerTeamMember::moves() const { return m_move; } -bool Pokemod::MapTrainerTeamMember::nature(const int nature) const +bool Sigmod::MapTrainerTeamMember::nature(const int nature) const { return m_nature.contains(nature); } -QList<int> Pokemod::MapTrainerTeamMember::natures() const +QList<int> Sigmod::MapTrainerTeamMember::natures() const { return m_nature; } -Pokemod::MapTrainerTeamMember& Pokemod::MapTrainerTeamMember::operator=(const MapTrainerTeamMember& rhs) +Sigmod::MapTrainerTeamMember& Sigmod::MapTrainerTeamMember::operator=(const MapTrainerTeamMember& rhs) { if (this == &rhs) return *this; diff --git a/sigmod/MapTrainerTeamMember.h b/sigmod/MapTrainerTeamMember.h index f396c041..d1e5836c 100644 --- a/sigmod/MapTrainerTeamMember.h +++ b/sigmod/MapTrainerTeamMember.h @@ -15,21 +15,21 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __POKEMOD_MAPTRAINERTEAMMEMBER__ -#define __POKEMOD_MAPTRAINERTEAMMEMBER__ +#ifndef __SIGMOD_MAPTRAINERTEAMMEMBER__ +#define __SIGMOD_MAPTRAINERTEAMMEMBER__ -// Pokemod includes +// Sigmod includes #include "Object.h" // Qt includes #include <QtCore/QList> -namespace Pokemod +namespace Sigmod { // Forward dclarations class MapTrainer; -class POKEMOD_EXPORT MapTrainerTeamMember : public Object +class SIGMOD_EXPORT MapTrainerTeamMember : public Object { Q_OBJECT diff --git a/sigmod/MapWarp.cpp b/sigmod/MapWarp.cpp index cc922a33..9cd61065 100644 --- a/sigmod/MapWarp.cpp +++ b/sigmod/MapWarp.cpp @@ -18,20 +18,20 @@ // Header include #include "MapWarp.h" -// Pokemod includes +// Sigmod includes #include "Macros.h" #include "Map.h" -#include "Pokemod.h" +#include "Sigmod.h" -const QStringList Pokemod::MapWarp::TypeStr = QStringList() << "Door" << "Warp" << "Hole" << "Boundary"; +const QStringList Sigmod::MapWarp::TypeStr = QStringList() << "Door" << "Warp" << "Hole" << "Boundary"; -Pokemod::MapWarp::MapWarp(const MapWarp& warp) : +Sigmod::MapWarp::MapWarp(const MapWarp& warp) : Object(warp.parent(), warp.id()) { *this = warp; } -Pokemod::MapWarp::MapWarp(const Map* parent, const int id) : +Sigmod::MapWarp::MapWarp(const Map* parent, const int id) : Object(parent, id), m_name(""), m_coordinate(0, 0), @@ -42,20 +42,20 @@ Pokemod::MapWarp::MapWarp(const Map* parent, const int id) : { } -Pokemod::MapWarp::MapWarp(const MapWarp& warp, const Map* parent, const int id) : +Sigmod::MapWarp::MapWarp(const MapWarp& warp, const Map* parent, const int id) : Object(parent, id) { *this = warp; } -Pokemod::MapWarp::MapWarp(const QDomElement& xml, const Map* parent, const int id) : +Sigmod::MapWarp::MapWarp(const QDomElement& xml, const Map* parent, const int id) : Object(parent, id) { LOAD_ID(); load(xml); } -void Pokemod::MapWarp::validate() +void Sigmod::MapWarp::validate() { TEST_BEGIN(); if (m_name.isEmpty()) @@ -65,7 +65,7 @@ void Pokemod::MapWarp::validate() TEST_END(); } -void Pokemod::MapWarp::load(const QDomElement& xml) +void Sigmod::MapWarp::load(const QDomElement& xml) { LOAD_BEGIN(); LOAD(name); @@ -76,7 +76,7 @@ void Pokemod::MapWarp::load(const QDomElement& xml) LOAD(script); } -QDomElement Pokemod::MapWarp::save() const +QDomElement Sigmod::MapWarp::save() const { SAVE_CREATE(); SAVE(name); @@ -88,12 +88,12 @@ QDomElement Pokemod::MapWarp::save() const return xml; } -void Pokemod::MapWarp::setName(const QString& name) +void Sigmod::MapWarp::setName(const QString& name) { CHECK(name); } -void Pokemod::MapWarp::setCoordinate(const QPoint& coordinate) +void Sigmod::MapWarp::setCoordinate(const QPoint& coordinate) { if ((qobject_cast<const Map*>(parent())->width() <= coordinate.x()) || (qobject_cast<const Map*>(parent())->height() <= coordinate.y())) emit(error(bounds("coordinate"))); @@ -101,65 +101,65 @@ void Pokemod::MapWarp::setCoordinate(const QPoint& coordinate) CHECK(coordinate); } -void Pokemod::MapWarp::setType(const Type type) +void Sigmod::MapWarp::setType(const Type type) { CHECK(type); } -void Pokemod::MapWarp::setToMap(const int toMap) +void Sigmod::MapWarp::setToMap(const int toMap) { - if (qobject_cast<const Pokemod*>(pokemod())->mapIndex(toMap) == INT_MAX) + if (qobject_cast<const Sigmod*>(sigmod())->mapIndex(toMap) == INT_MAX) emit(error(bounds("toMap"))); else CHECK(toMap); } -void Pokemod::MapWarp::setToWarp(const int toWarp) +void Sigmod::MapWarp::setToWarp(const int toWarp) { - if (qobject_cast<const Pokemod*>(pokemod())->mapIndex(m_toMap) == INT_MAX) + if (qobject_cast<const Sigmod*>(sigmod())->mapIndex(m_toMap) == INT_MAX) emit(error(bounds("toMap"))); - else if (qobject_cast<const Pokemod*>(pokemod())->mapById(m_toMap)->warpIndex(toWarp) == INT_MAX) + else if (qobject_cast<const Sigmod*>(sigmod())->mapById(m_toMap)->warpIndex(toWarp) == INT_MAX) emit(error(bounds("toWarp"))); else CHECK(toWarp); } -void Pokemod::MapWarp::setScript(const Script& script) +void Sigmod::MapWarp::setScript(const Script& script) { CHECK(script); } -QString Pokemod::MapWarp::name() const +QString Sigmod::MapWarp::name() const { return m_name; } -QPoint Pokemod::MapWarp::coordinate() const +QPoint Sigmod::MapWarp::coordinate() const { return m_coordinate; } -Pokemod::MapWarp::Type Pokemod::MapWarp::type() const +Sigmod::MapWarp::Type Sigmod::MapWarp::type() const { return m_type; } -int Pokemod::MapWarp::toMap() const +int Sigmod::MapWarp::toMap() const { return m_toMap; } -int Pokemod::MapWarp::toWarp() const +int Sigmod::MapWarp::toWarp() const { return m_toWarp; } -Pokemod::Script Pokemod::MapWarp::script() const +Sigmod::Script Sigmod::MapWarp::script() const { return m_script; } -Pokemod::MapWarp& Pokemod::MapWarp::operator=(const MapWarp& rhs) +Sigmod::MapWarp& Sigmod::MapWarp::operator=(const MapWarp& rhs) { if (this == &rhs) return *this; diff --git a/sigmod/MapWarp.h b/sigmod/MapWarp.h index 0df7016f..44502a3e 100644 --- a/sigmod/MapWarp.h +++ b/sigmod/MapWarp.h @@ -15,22 +15,22 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __POKEMOD_MAPWARP__ -#define __POKEMOD_MAPWARP__ +#ifndef __SIGMOD_MAPWARP__ +#define __SIGMOD_MAPWARP__ -// Pokemod includes +// Sigmod includes #include "Object.h" #include "Script.h" // Qt includes #include <QtCore/QPoint> -namespace Pokemod +namespace Sigmod { // Forward declarations class Map; -class POKEMOD_EXPORT MapWarp : public Object +class SIGMOD_EXPORT MapWarp : public Object { Q_OBJECT Q_ENUMS(Type) @@ -79,6 +79,6 @@ class POKEMOD_EXPORT MapWarp : public Object Script m_script; }; } -Q_DECLARE_METATYPE(Pokemod::MapWarp::Type) +Q_DECLARE_METATYPE(Sigmod::MapWarp::Type) #endif diff --git a/sigmod/MapWildList.cpp b/sigmod/MapWildList.cpp index 30a7f56d..502b87ee 100644 --- a/sigmod/MapWildList.cpp +++ b/sigmod/MapWildList.cpp @@ -18,7 +18,7 @@ // Header include #include "MapWildList.h" -// Pokemod includes +// Sigmod includes #include "Macros.h" #include "Map.h" #include "MapWildListEncounter.h" @@ -26,37 +26,37 @@ // Qt includes #include <QtCore/QSet> -Pokemod::MapWildList::MapWildList(const MapWildList& wildList) : +Sigmod::MapWildList::MapWildList(const MapWildList& wildList) : Object(wildList.parent(), wildList.id()) { *this = wildList; } -Pokemod::MapWildList::MapWildList(const Map* parent, const int id) : +Sigmod::MapWildList::MapWildList(const Map* parent, const int id) : Object(parent, id), m_name("") { } -Pokemod::MapWildList::MapWildList(const MapWildList& wildList, const Map* parent, const int id) : +Sigmod::MapWildList::MapWildList(const MapWildList& wildList, const Map* parent, const int id) : Object(parent, id) { *this = wildList; } -Pokemod::MapWildList::MapWildList(const QDomElement& xml, const Map* parent, const int id) : +Sigmod::MapWildList::MapWildList(const QDomElement& xml, const Map* parent, const int id) : Object(parent, id) { LOAD_ID(); load(xml); } -Pokemod::MapWildList::~MapWildList() +Sigmod::MapWildList::~MapWildList() { clear(); } -void Pokemod::MapWildList::validate() +void Sigmod::MapWildList::validate() { TEST_BEGIN(); if (m_name.isEmpty()) @@ -70,14 +70,14 @@ void Pokemod::MapWildList::validate() TEST_END(); } -void Pokemod::MapWildList::load(const QDomElement& xml) +void Sigmod::MapWildList::load(const QDomElement& xml) { LOAD_BEGIN(); LOAD(name); LOAD_SUB(newEncounter, MapWildListEncounter); } -QDomElement Pokemod::MapWildList::save() const +QDomElement Sigmod::MapWildList::save() const { SAVE_CREATE(); SAVE(name); @@ -85,39 +85,39 @@ QDomElement Pokemod::MapWildList::save() const return xml; } -void Pokemod::MapWildList::setName(const QString& name) +void Sigmod::MapWildList::setName(const QString& name) { CHECK(name); } -QString Pokemod::MapWildList::name() const +QString Sigmod::MapWildList::name() const { return m_name; } -const Pokemod::MapWildListEncounter* Pokemod::MapWildList::encounter(const int index) const +const Sigmod::MapWildListEncounter* Sigmod::MapWildList::encounter(const int index) const { Q_ASSERT(index < encounterCount()); return m_encounters.at(index); } -Pokemod::MapWildListEncounter* Pokemod::MapWildList::encounter(const int index) +Sigmod::MapWildListEncounter* Sigmod::MapWildList::encounter(const int index) { Q_ASSERT(index < encounterCount()); return m_encounters[index]; } -const Pokemod::MapWildListEncounter* Pokemod::MapWildList::encounterById(const int id) const +const Sigmod::MapWildListEncounter* Sigmod::MapWildList::encounterById(const int id) const { return encounter(encounterIndex(id)); } -Pokemod::MapWildListEncounter* Pokemod::MapWildList::encounterById(const int id) +Sigmod::MapWildListEncounter* Sigmod::MapWildList::encounterById(const int id) { return encounter(encounterIndex(id)); } -int Pokemod::MapWildList::encounterIndex(const int id) const +int Sigmod::MapWildList::encounterIndex(const int id) const { for (int i = 0; i < encounterCount(); ++i) { @@ -127,45 +127,45 @@ int Pokemod::MapWildList::encounterIndex(const int id) const return INT_MAX; } -int Pokemod::MapWildList::encounterCount() const +int Sigmod::MapWildList::encounterCount() const { return m_encounters.size(); } -Pokemod::MapWildListEncounter* Pokemod::MapWildList::newEncounter() +Sigmod::MapWildListEncounter* Sigmod::MapWildList::newEncounter() { return newEncounter(new MapWildListEncounter(this, newEncounterId())); } -Pokemod::MapWildListEncounter* Pokemod::MapWildList::newEncounter(const QDomElement& xml) +Sigmod::MapWildListEncounter* Sigmod::MapWildList::newEncounter(const QDomElement& xml) { return newEncounter(new MapWildListEncounter(xml, this, newEncounterId())); } -Pokemod::MapWildListEncounter* Pokemod::MapWildList::newEncounter(const MapWildListEncounter& encounter) +Sigmod::MapWildListEncounter* Sigmod::MapWildList::newEncounter(const MapWildListEncounter& encounter) { return newEncounter(new MapWildListEncounter(encounter, this, newEncounterId())); } -Pokemod::MapWildListEncounter* Pokemod::MapWildList::newEncounter(MapWildListEncounter* encounter) +Sigmod::MapWildListEncounter* Sigmod::MapWildList::newEncounter(MapWildListEncounter* encounter) { m_encounters.append(encounter); return encounter; } -void Pokemod::MapWildList::deleteEncounter(const int index) +void Sigmod::MapWildList::deleteEncounter(const int index) { Q_ASSERT(index < encounterCount()); delete m_encounters[index]; m_encounters.removeAt(index); } -void Pokemod::MapWildList::deleteEncounterById(const int id) +void Sigmod::MapWildList::deleteEncounterById(const int id) { deleteEncounter(encounterIndex(id)); } -int Pokemod::MapWildList::newEncounterId() const +int Sigmod::MapWildList::newEncounterId() const { int i = 0; while ((i < encounterCount()) && (encounterIndex(i) != INT_MAX)) @@ -173,7 +173,7 @@ int Pokemod::MapWildList::newEncounterId() const return i; } -Pokemod::MapWildList& Pokemod::MapWildList::operator=(const MapWildList& rhs) +Sigmod::MapWildList& Sigmod::MapWildList::operator=(const MapWildList& rhs) { if (this == &rhs) return *this; @@ -183,7 +183,7 @@ Pokemod::MapWildList& Pokemod::MapWildList::operator=(const MapWildList& rhs) return *this; } -void Pokemod::MapWildList::clear() +void Sigmod::MapWildList::clear() { while (encounterCount()) deleteEncounter(0); diff --git a/sigmod/MapWildList.h b/sigmod/MapWildList.h index 35027fa7..87d69895 100644 --- a/sigmod/MapWildList.h +++ b/sigmod/MapWildList.h @@ -15,22 +15,22 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __POKEMOD_MAPWILDLIST__ -#define __POKEMOD_MAPWILDLIST__ +#ifndef __SIGMOD_MAPWILDLIST__ +#define __SIGMOD_MAPWILDLIST__ -// Pokemod includes +// Sigmod includes #include "Object.h" // Qt includes #include <QtCore/QList> -namespace Pokemod +namespace Sigmod { // Forward declarations class Map; class MapWildListEncounter; -class POKEMOD_EXPORT MapWildList : public Object +class SIGMOD_EXPORT MapWildList : public Object { Q_OBJECT diff --git a/sigmod/MapWildListEncounter.cpp b/sigmod/MapWildListEncounter.cpp index 4ff41f4a..17482f4f 100644 --- a/sigmod/MapWildListEncounter.cpp +++ b/sigmod/MapWildListEncounter.cpp @@ -18,20 +18,20 @@ // Header include #include "MapWildListEncounter.h" -// Pokemod includes +// Sigmod includes #include "Macros.h" #include "MapWildList.h" -#include "Pokemod.h" #include "Rules.h" +#include "Sigmod.h" #include "Species.h" -Pokemod::MapWildListEncounter::MapWildListEncounter(const MapWildListEncounter& encounter) : +Sigmod::MapWildListEncounter::MapWildListEncounter(const MapWildListEncounter& encounter) : Object(encounter.parent(), encounter.id()) { *this = encounter; } -Pokemod::MapWildListEncounter::MapWildListEncounter(const MapWildList* parent, const int id) : +Sigmod::MapWildListEncounter::MapWildListEncounter(const MapWildList* parent, const int id) : Object(parent, id), m_species(INT_MAX), m_level(1), @@ -39,20 +39,20 @@ Pokemod::MapWildListEncounter::MapWildListEncounter(const MapWildList* parent, c { } -Pokemod::MapWildListEncounter::MapWildListEncounter(const MapWildListEncounter& encounter, const MapWildList* parent, const int id) : +Sigmod::MapWildListEncounter::MapWildListEncounter(const MapWildListEncounter& encounter, const MapWildList* parent, const int id) : Object(parent, id) { *this = encounter; } -Pokemod::MapWildListEncounter::MapWildListEncounter(const QDomElement& xml, const MapWildList* parent, const int id) : +Sigmod::MapWildListEncounter::MapWildListEncounter(const QDomElement& xml, const MapWildList* parent, const int id) : Object(parent, id) { LOAD_ID(); load(xml); } -void Pokemod::MapWildListEncounter::validate() +void Sigmod::MapWildListEncounter::validate() { TEST_BEGIN(); TEST(setSpecies, species); @@ -61,7 +61,7 @@ void Pokemod::MapWildListEncounter::validate() TEST_END(); } -void Pokemod::MapWildListEncounter::load(const QDomElement& xml) +void Sigmod::MapWildListEncounter::load(const QDomElement& xml) { LOAD_BEGIN(); LOAD(species); @@ -69,7 +69,7 @@ void Pokemod::MapWildListEncounter::load(const QDomElement& xml) LOAD(weight); } -QDomElement Pokemod::MapWildListEncounter::save() const +QDomElement Sigmod::MapWildListEncounter::save() const { SAVE_CREATE(); SAVE(species); @@ -78,23 +78,23 @@ QDomElement Pokemod::MapWildListEncounter::save() const return xml; } -void Pokemod::MapWildListEncounter::setSpecies(const int species) +void Sigmod::MapWildListEncounter::setSpecies(const int species) { - if (qobject_cast<const Pokemod*>(pokemod())->speciesIndex(species) == INT_MAX) + if (qobject_cast<const Sigmod*>(sigmod())->speciesIndex(species) == INT_MAX) emit(error(bounds("species"))); else CHECK(species); } -void Pokemod::MapWildListEncounter::setLevel(const int level) +void Sigmod::MapWildListEncounter::setLevel(const int level) { - if (!level || (qobject_cast<const Pokemod*>(pokemod())->rules()->maxLevel() <= level)) + if (!level || (qobject_cast<const Sigmod*>(sigmod())->rules()->maxLevel() <= level)) emit(error(bounds("level"))); else CHECK(level); } -void Pokemod::MapWildListEncounter::setWeight(const int weight) +void Sigmod::MapWildListEncounter::setWeight(const int weight) { if (!weight) emit(error(bounds("weight"))); @@ -102,22 +102,22 @@ void Pokemod::MapWildListEncounter::setWeight(const int weight) CHECK(weight); } -int Pokemod::MapWildListEncounter::species() const +int Sigmod::MapWildListEncounter::species() const { return m_species; } -int Pokemod::MapWildListEncounter::level() const +int Sigmod::MapWildListEncounter::level() const { return m_level; } -int Pokemod::MapWildListEncounter::weight() const +int Sigmod::MapWildListEncounter::weight() const { return m_weight; } -Pokemod::MapWildListEncounter& Pokemod::MapWildListEncounter::operator=(const MapWildListEncounter& rhs) +Sigmod::MapWildListEncounter& Sigmod::MapWildListEncounter::operator=(const MapWildListEncounter& rhs) { if (this == &rhs) return *this; diff --git a/sigmod/MapWildListEncounter.h b/sigmod/MapWildListEncounter.h index f6c942b8..dfa3d4ce 100644 --- a/sigmod/MapWildListEncounter.h +++ b/sigmod/MapWildListEncounter.h @@ -15,18 +15,18 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __POKEMOD_MAPWILDLISTENCOUNTER__ -#define __POKEMOD_MAPWILDLISTENCOUNTER__ +#ifndef __SIGMOD_MAPWILDLISTENCOUNTER__ +#define __SIGMOD_MAPWILDLISTENCOUNTER__ -// Pokemod includes +// Sigmod includes #include "Object.h" -namespace Pokemod +namespace Sigmod { // Forward declarations class MapWildList; -class POKEMOD_EXPORT MapWildListEncounter: public Object +class SIGMOD_EXPORT MapWildListEncounter: public Object { Q_OBJECT diff --git a/sigmod/Matrix.h b/sigmod/Matrix.h index 8fe53fee..bd98353d 100644 --- a/sigmod/Matrix.h +++ b/sigmod/Matrix.h @@ -15,19 +15,19 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __POKEMOD_MATRIX__ -#define __POKEMOD_MATRIX__ +#ifndef __SIGMOD_MATRIX__ +#define __SIGMOD_MATRIX__ -// Pokemod includes +// Sigmod includes #include "Global.h" // Qt includes #include <QtCore/QPoint> #include <QtCore/QVector> -namespace Pokemod +namespace Sigmod { -template<class T> class POKEMOD_EXPORT Matrix +template<class T> class SIGMOD_EXPORT Matrix { public: Matrix(); diff --git a/sigmod/Move.cpp b/sigmod/Move.cpp index 823739e5..39cfef65 100644 --- a/sigmod/Move.cpp +++ b/sigmod/Move.cpp @@ -18,20 +18,20 @@ // Header include #include "Move.h" -// Pokemod includes +// Sigmod includes #include "Macros.h" -#include "Pokemod.h" +#include "Sigmod.h" // Qt includes #include <QtCore/QSet> -Pokemod::Move::Move(const Move& move) : +Sigmod::Move::Move(const Move& move) : Object(move.parent(), move.id()) { *this = move; } -Pokemod::Move::Move(const Pokemod* parent, const int id) : +Sigmod::Move::Move(const Sigmod* parent, const int id) : Object(parent, id), m_name(""), m_accuracy(1, 1), @@ -46,25 +46,25 @@ Pokemod::Move::Move(const Pokemod* parent, const int id) : { } -Pokemod::Move::Move(const Move& move, const Pokemod* parent, const int id) : +Sigmod::Move::Move(const Move& move, const Sigmod* parent, const int id) : Object(parent, id) { *this = move; } -Pokemod::Move::Move(const QDomElement& xml, const Pokemod* parent, const int id) : +Sigmod::Move::Move(const QDomElement& xml, const Sigmod* parent, const int id) : Object(parent, id) { LOAD_ID(); load(xml); } -Pokemod::Move::~Move() +Sigmod::Move::~Move() { clear(); } -void Pokemod::Move::validate() +void Sigmod::Move::validate() { TEST_BEGIN(); if (m_name.isEmpty()) @@ -75,7 +75,7 @@ void Pokemod::Move::validate() TEST_END(); } -void Pokemod::Move::load(const QDomElement& xml) +void Sigmod::Move::load(const QDomElement& xml) { LOAD_BEGIN(); LOAD(name); @@ -90,7 +90,7 @@ void Pokemod::Move::load(const QDomElement& xml) LOAD(worldScript); } -QDomElement Pokemod::Move::save() const +QDomElement Sigmod::Move::save() const { SAVE_CREATE(); SAVE(name); @@ -106,12 +106,12 @@ QDomElement Pokemod::Move::save() const return xml; } -void Pokemod::Move::setName(const QString& name) +void Sigmod::Move::setName(const QString& name) { CHECK(name); } -void Pokemod::Move::setAccuracy(const Fraction& accuracy) +void Sigmod::Move::setAccuracy(const Fraction& accuracy) { if (!accuracy || (1 < accuracy)) emit(error(bounds("accuracy"))); @@ -119,25 +119,25 @@ void Pokemod::Move::setAccuracy(const Fraction& accuracy) CHECK(accuracy); } -void Pokemod::Move::setPower(const int power) +void Sigmod::Move::setPower(const int power) { CHECK(power); } -void Pokemod::Move::setType(const int type) +void Sigmod::Move::setType(const int type) { - if (qobject_cast<const Pokemod*>(pokemod())->typeIndex(type) == INT_MAX) + if (qobject_cast<const Sigmod*>(sigmod())->typeIndex(type) == INT_MAX) emit(error(bounds("type"))); else CHECK(type); } -void Pokemod::Move::setSpecial(const bool special) +void Sigmod::Move::setSpecial(const bool special) { CHECK(special); } -void Pokemod::Move::setPowerPoints(const int powerPoints) +void Sigmod::Move::setPowerPoints(const int powerPoints) { if (!powerPoints) emit(error(bounds("powerPoints"))); @@ -145,77 +145,77 @@ void Pokemod::Move::setPowerPoints(const int powerPoints) CHECK(powerPoints); } -void Pokemod::Move::setPriority(const int priority) +void Sigmod::Move::setPriority(const int priority) { CHECK(priority); } -void Pokemod::Move::setDescription(const QString& description) +void Sigmod::Move::setDescription(const QString& description) { CHECK(description); } -void Pokemod::Move::setBattleScript(const Script& battleScript) +void Sigmod::Move::setBattleScript(const Script& battleScript) { CHECK(battleScript); } -void Pokemod::Move::setWorldScript(const Script& worldScript) +void Sigmod::Move::setWorldScript(const Script& worldScript) { CHECK(worldScript); } -QString Pokemod::Move::name() const +QString Sigmod::Move::name() const { return m_name; } -Pokemod::Fraction Pokemod::Move::accuracy() const +Sigmod::Fraction Sigmod::Move::accuracy() const { return m_accuracy; } -int Pokemod::Move::power() const +int Sigmod::Move::power() const { return m_power; } -int Pokemod::Move::type() const +int Sigmod::Move::type() const { return m_type; } -bool Pokemod::Move::special() const +bool Sigmod::Move::special() const { return m_special; } -int Pokemod::Move::powerPoints() const +int Sigmod::Move::powerPoints() const { return m_powerPoints; } -int Pokemod::Move::priority() const +int Sigmod::Move::priority() const { return m_priority; } -QString Pokemod::Move::description() const +QString Sigmod::Move::description() const { return m_description; } -Pokemod::Script Pokemod::Move::battleScript() const +Sigmod::Script Sigmod::Move::battleScript() const { return m_battleScript; } -Pokemod::Script Pokemod::Move::worldScript() const +Sigmod::Script Sigmod::Move::worldScript() const { return m_worldScript; } -Pokemod::Move& Pokemod::Move::operator=(const Move& rhs) +Sigmod::Move& Sigmod::Move::operator=(const Move& rhs) { if (this == &rhs) return *this; diff --git a/sigmod/Move.h b/sigmod/Move.h index 0fe9efa2..12e9f639 100644 --- a/sigmod/Move.h +++ b/sigmod/Move.h @@ -15,28 +15,28 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __POKEMOD_MOVE__ -#define __POKEMOD_MOVE__ +#ifndef __SIGMOD_MOVE__ +#define __SIGMOD_MOVE__ -// Pokemod includes +// Sigmod includes #include "Fraction.h" #include "Object.h" #include "Script.h" -namespace Pokemod +namespace Sigmod { // Forward declarations -class Pokemod; +class Sigmod; -class POKEMOD_EXPORT Move : public Object +class SIGMOD_EXPORT Move : public Object { Q_OBJECT public: Move(const Move& move); - Move(const Pokemod* parent, const int id); - Move(const Move& move, const Pokemod* parent, const int id); - Move(const QDomElement& xml, const Pokemod* parent, const int id = -1); + Move(const Sigmod* parent, const int id); + Move(const Move& move, const Sigmod* parent, const int id); + Move(const QDomElement& xml, const Sigmod* parent, const int id = -1); ~Move(); void validate(); diff --git a/sigmod/Nature.cpp b/sigmod/Nature.cpp index e3018dea..11a301e6 100644 --- a/sigmod/Nature.cpp +++ b/sigmod/Nature.cpp @@ -18,19 +18,19 @@ // Header include #include "Nature.h" -// Pokemod includes +// Sigmod includes #include "Macros.h" -#include "Pokemod.h" #include "Rules.h" +#include "Sigmod.h" -Pokemod::Nature::Nature(const Nature& nature) : +Sigmod::Nature::Nature(const Nature& nature) : Object(nature.parent(), nature.id()), m_stat(ST_End_GSC - ST_No_HP_Start) { *this = nature; } -Pokemod::Nature::Nature(const Pokemod* parent, const int id) : +Sigmod::Nature::Nature(const Sigmod* parent, const int id) : Object(parent, id), m_name(""), m_stat(ST_End_GSC - ST_No_HP_Start), @@ -40,14 +40,14 @@ Pokemod::Nature::Nature(const Pokemod* parent, const int id) : m_stat[i].set(1, 1); } -Pokemod::Nature::Nature(const Nature& nature, const Pokemod* parent, const int id) : +Sigmod::Nature::Nature(const Nature& nature, const Sigmod* parent, const int id) : Object(parent, id), m_stat(ST_End_GSC - ST_No_HP_Start) { *this = nature; } -Pokemod::Nature::Nature(const QDomElement& xml, const Pokemod* parent, const int id) : +Sigmod::Nature::Nature(const QDomElement& xml, const Sigmod* parent, const int id) : Object(parent, id), m_stat(ST_End_GSC - ST_No_HP_Start) { @@ -55,7 +55,7 @@ Pokemod::Nature::Nature(const QDomElement& xml, const Pokemod* parent, const int load(xml); } -void Pokemod::Nature::validate() +void Sigmod::Nature::validate() { TEST_BEGIN(); if (m_name.isEmpty()) @@ -64,7 +64,7 @@ void Pokemod::Nature::validate() TEST_END(); } -void Pokemod::Nature::load(const QDomElement& xml) +void Sigmod::Nature::load(const QDomElement& xml) { LOAD_BEGIN(); LOAD(name); @@ -72,7 +72,7 @@ void Pokemod::Nature::load(const QDomElement& xml) LOAD(weight); } -QDomElement Pokemod::Nature::save() const +QDomElement Sigmod::Nature::save() const { SAVE_CREATE(); SAVE(name); @@ -81,17 +81,17 @@ QDomElement Pokemod::Nature::save() const return xml; } -void Pokemod::Nature::setName(const QString& name) +void Sigmod::Nature::setName(const QString& name) { CHECK(name); } -void Pokemod::Nature::setStat(const Stat stat, const Fraction& multiplier) +void Sigmod::Nature::setStat(const Stat stat, const Fraction& multiplier) { switch (stat) { case ST_SpecialDefense: - if (qobject_cast<const Pokemod*>(pokemod())->rules()->specialSplit()) + if (qobject_cast<const Sigmod*>(sigmod())->rules()->specialSplit()) case ST_Attack ... ST_Special: break; default: @@ -101,7 +101,7 @@ void Pokemod::Nature::setStat(const Stat stat, const Fraction& multiplier) CHECK_ARRAY(stat[stat - ST_No_HP_Start], multiplier); } -void Pokemod::Nature::setWeight(const int weight) +void Sigmod::Nature::setWeight(const int weight) { if (!weight) emit(error(bounds("weight"))); @@ -109,17 +109,17 @@ void Pokemod::Nature::setWeight(const int weight) CHECK(weight); } -QString Pokemod::Nature::name() const +QString Sigmod::Nature::name() const { return m_name; } -Pokemod::Fraction Pokemod::Nature::stat(const Stat stat) const +Sigmod::Fraction Sigmod::Nature::stat(const Stat stat) const { switch (stat) { case ST_SpecialDefense: - if (qobject_cast<const Pokemod*>(pokemod())->rules()->specialSplit()) + if (qobject_cast<const Sigmod*>(sigmod())->rules()->specialSplit()) case ST_Attack ... ST_Special: return m_stat[stat - ST_No_HP_Start]; default: @@ -128,12 +128,12 @@ Pokemod::Fraction Pokemod::Nature::stat(const Stat stat) const } } -int Pokemod::Nature::weight() const +int Sigmod::Nature::weight() const { return m_weight; } -Pokemod::Nature& Pokemod::Nature::operator=(const Nature& rhs) +Sigmod::Nature& Sigmod::Nature::operator=(const Nature& rhs) { if (this == &rhs) return *this; diff --git a/sigmod/Nature.h b/sigmod/Nature.h index bb9931ca..67d82c91 100644 --- a/sigmod/Nature.h +++ b/sigmod/Nature.h @@ -15,27 +15,27 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __POKEMOD_NATURE__ -#define __POKEMOD_NATURE__ +#ifndef __SIGMOD_NATURE__ +#define __SIGMOD_NATURE__ -// Pokemod includes +// Sigmod includes #include "Fraction.h" #include "Object.h" -namespace Pokemod +namespace Sigmod { // Forward declarations -class Pokemod; +class Sigmod; -class POKEMOD_EXPORT Nature : public Object +class SIGMOD_EXPORT Nature : public Object { Q_OBJECT public: Nature(const Nature& nature); - Nature(const Pokemod* parent, const int id); - Nature(const Nature& nature, const Pokemod* parent, const int id); - Nature(const QDomElement& xml, const Pokemod* parent, const int id = -1); + Nature(const Sigmod* parent, const int id); + Nature(const Nature& nature, const Sigmod* parent, const int id); + Nature(const QDomElement& xml, const Sigmod* parent, const int id = -1); void validate(); diff --git a/sigmod/Object.cpp b/sigmod/Object.cpp index ce2425d8..803dadc5 100644 --- a/sigmod/Object.cpp +++ b/sigmod/Object.cpp @@ -18,77 +18,77 @@ // Header include #include "Object.h" -// Pokemod includes +// Sigmod includes #include "Macros.h" -Pokemod::Object::Object(const Object& object) : +Sigmod::Object::Object(const Object& object) : QObject(NULL), m_id(object.id()), m_parent(object.parent()) { } -Pokemod::Object::Object(const Object* parent, const int id) : +Sigmod::Object::Object(const Object* parent, const int id) : QObject(NULL), m_id(id), m_parent(parent) { } -const Pokemod::Object* Pokemod::Object::parent() const +const Sigmod::Object* Sigmod::Object::parent() const { return m_parent; } -const Pokemod::Object* Pokemod::Object::pokemod() const +const Sigmod::Object* Sigmod::Object::sigmod() const { if (m_parent) - return m_parent->pokemod(); + return m_parent->sigmod(); return this; } -int Pokemod::Object::id() const +int Sigmod::Object::id() const { return m_id; } -void Pokemod::Object::setId(const int id) +void Sigmod::Object::setId(const int id) { CHECK(id); } -QString Pokemod::Object::className() const +QString Sigmod::Object::className() const { return QString(metaObject()->className()).section(':', -1); } -QDomDocument Pokemod::Object::xml(const Object* object) +QDomDocument Sigmod::Object::xml(const Object* object) { QDomDocument xml(object->className()); xml.appendChild(object->save()); return xml; } -QString Pokemod::Object::unused(const QString& variable) +QString Sigmod::Object::unused(const QString& variable) { return QString("Setting unused variable %1").arg(variable); } -QString Pokemod::Object::bounds(const QString& variable) +QString Sigmod::Object::bounds(const QString& variable) { return QString("Value for %1 out-of-bounds").arg(variable); } -QString Pokemod::Object::subclass(const QString& subclass, const int id) +QString Sigmod::Object::subclass(const QString& subclass, const int id) { return QString("Duplicate %1 with id %2").arg(subclass, id); } -QString Pokemod::Object::subclass(const QString& subclass, const QString& name) +QString Sigmod::Object::subclass(const QString& subclass, const QString& name) { return QString("Duplicate %1 with name %2").arg(subclass, name); } -void Pokemod::Object::clear() +void Sigmod::Object::clear() { } diff --git a/sigmod/Object.h b/sigmod/Object.h index 441b1e0d..28496a00 100644 --- a/sigmod/Object.h +++ b/sigmod/Object.h @@ -15,10 +15,10 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __POKEMOD_OBJECT__ -#define __POKEMOD_OBJECT__ +#ifndef __SIGMOD_OBJECT__ +#define __SIGMOD_OBJECT__ -// Pokemod includes +// Sigmod includes #include "Fraction.h" #include "Global.h" #include "Matrix.h" @@ -36,9 +36,9 @@ // C includes #include <climits> -namespace Pokemod +namespace Sigmod { -class POKEMOD_EXPORT Object : public QObject +class SIGMOD_EXPORT Object : public QObject { Q_OBJECT @@ -48,7 +48,7 @@ class POKEMOD_EXPORT Object : public QObject virtual ~Object(); const Object* parent() const; - const Object* pokemod() const; + const Object* sigmod() const; int id() const; QString className() const; diff --git a/sigmod/Rules.cpp b/sigmod/Rules.cpp index b4a1836a..22402a03 100644 --- a/sigmod/Rules.cpp +++ b/sigmod/Rules.cpp @@ -18,19 +18,19 @@ // Header include #include "Rules.h" -// Pokemod includes +// Sigmod includes #include "Macros.h" -#include "Pokemod.h" +#include "Sigmod.h" -const QStringList Pokemod::Rules::DVStr = QStringList() << "16" << "32"; +const QStringList Sigmod::Rules::DVStr = QStringList() << "16" << "32"; -Pokemod::Rules::Rules(const Rules& rules) : +Sigmod::Rules::Rules(const Rules& rules) : Object(rules.parent(), 0) { *this = rules; } -Pokemod::Rules::Rules(const Pokemod* parent) : +Sigmod::Rules::Rules(const Sigmod* parent) : Object(parent, 0), m_genderAllowed(false), m_breedingAllowed(false), @@ -58,19 +58,19 @@ Pokemod::Rules::Rules(const Pokemod* parent) : { } -Pokemod::Rules::Rules(const Rules& rules, const Pokemod* parent) : +Sigmod::Rules::Rules(const Rules& rules, const Sigmod* parent) : Object(parent, 0) { *this = rules; } -Pokemod::Rules::Rules(const QDomElement& xml, const Pokemod* parent) : +Sigmod::Rules::Rules(const QDomElement& xml, const Sigmod* parent) : Object(parent, 0) { load(xml); } -void Pokemod::Rules::validate() +void Sigmod::Rules::validate() { TEST_BEGIN(); TEST(setBreedingAllowed, breedingAllowed); @@ -90,7 +90,7 @@ void Pokemod::Rules::validate() TEST_END(); } -void Pokemod::Rules::load(const QDomElement& xml) +void Sigmod::Rules::load(const QDomElement& xml) { LOAD_BEGIN(); LOAD(genderAllowed); @@ -118,7 +118,7 @@ void Pokemod::Rules::load(const QDomElement& xml) LOAD(maxEVPerStat); } -QDomElement Pokemod::Rules::save() const +QDomElement Sigmod::Rules::save() const { QDomElement xml = QDomDocument().createElement(className()); SAVE(genderAllowed); @@ -147,12 +147,12 @@ QDomElement Pokemod::Rules::save() const return xml; } -void Pokemod::Rules::setGenderAllowed(const bool genderAllowed) +void Sigmod::Rules::setGenderAllowed(const bool genderAllowed) { CHECK(genderAllowed); } -void Pokemod::Rules::setBreedingAllowed(const bool breedingAllowed) +void Sigmod::Rules::setBreedingAllowed(const bool breedingAllowed) { if (!m_genderAllowed && breedingAllowed) emit(error(bounds("breedingAllowed"))); @@ -160,22 +160,22 @@ void Pokemod::Rules::setBreedingAllowed(const bool breedingAllowed) CHECK(breedingAllowed); } -void Pokemod::Rules::setCriticalDomains(const bool criticalDomains) +void Sigmod::Rules::setCriticalDomains(const bool criticalDomains) { CHECK(criticalDomains); } -void Pokemod::Rules::setUseTurns(const bool useTurns) +void Sigmod::Rules::setUseTurns(const bool useTurns) { CHECK(useTurns); } -void Pokemod::Rules::setNumBoxes(const int numBoxes) +void Sigmod::Rules::setNumBoxes(const int numBoxes) { CHECK(numBoxes); } -void Pokemod::Rules::setBoxSize(const int boxSize) +void Sigmod::Rules::setBoxSize(const int boxSize) { if (m_numBoxes && !boxSize) emit(error(bounds("boxSize"))); @@ -183,7 +183,7 @@ void Pokemod::Rules::setBoxSize(const int boxSize) CHECK(boxSize); } -void Pokemod::Rules::setMaxParty(const int maxParty) +void Sigmod::Rules::setMaxParty(const int maxParty) { if (!maxParty) emit(error(bounds("maxParty"))); @@ -191,7 +191,7 @@ void Pokemod::Rules::setMaxParty(const int maxParty) CHECK(maxParty); } -void Pokemod::Rules::setMaxFight(const int maxFight) +void Sigmod::Rules::setMaxFight(const int maxFight) { if (m_maxParty < maxFight) emit(error(bounds("maxFight"))); @@ -199,7 +199,7 @@ void Pokemod::Rules::setMaxFight(const int maxFight) CHECK(maxFight); } -void Pokemod::Rules::setMaxPlayers(const int maxPlayers) +void Sigmod::Rules::setMaxPlayers(const int maxPlayers) { if (maxPlayers < 2) emit(error(bounds("maxPlayers"))); @@ -207,22 +207,22 @@ void Pokemod::Rules::setMaxPlayers(const int maxPlayers) CHECK(maxPlayers); } -void Pokemod::Rules::setMaxHeldItems(const int maxHeldItems) +void Sigmod::Rules::setMaxHeldItems(const int maxHeldItems) { CHECK(maxHeldItems); } -void Pokemod::Rules::setMaxAbilities(const int maxAbilities) +void Sigmod::Rules::setMaxAbilities(const int maxAbilities) { CHECK(maxAbilities); } -void Pokemod::Rules::setMaxNatures(const int maxNatures) +void Sigmod::Rules::setMaxNatures(const int maxNatures) { CHECK(maxNatures); } -void Pokemod::Rules::setMaxMoves(const int maxMoves) +void Sigmod::Rules::setMaxMoves(const int maxMoves) { if (!maxMoves) emit(error(bounds("maxMoves"))); @@ -230,7 +230,7 @@ void Pokemod::Rules::setMaxMoves(const int maxMoves) CHECK(maxMoves); } -void Pokemod::Rules::setMaxLevel(const int maxLevel) +void Sigmod::Rules::setMaxLevel(const int maxLevel) { if (!maxLevel) emit(error(bounds("maxLevel"))); @@ -238,32 +238,32 @@ void Pokemod::Rules::setMaxLevel(const int maxLevel) CHECK(maxLevel); } -void Pokemod::Rules::setMaxStages(const int maxStages) +void Sigmod::Rules::setMaxStages(const int maxStages) { CHECK(maxStages); } -void Pokemod::Rules::setMaxMoney(const int maxMoney) +void Sigmod::Rules::setMaxMoney(const int maxMoney) { CHECK(maxMoney); } -void Pokemod::Rules::setHardCash(const bool hardCash) +void Sigmod::Rules::setHardCash(const bool hardCash) { CHECK(hardCash); } -void Pokemod::Rules::setAllowSwitchStyle(const bool allowSwitchStyle) +void Sigmod::Rules::setAllowSwitchStyle(const bool allowSwitchStyle) { CHECK(allowSwitchStyle); } -void Pokemod::Rules::setSpecialSplit(const bool specialSplit) +void Sigmod::Rules::setSpecialSplit(const bool specialSplit) { CHECK(specialSplit); } -void Pokemod::Rules::setSpecialDVSplit(const bool specialDVSplit) +void Sigmod::Rules::setSpecialDVSplit(const bool specialDVSplit) { if (!specialDVSplit && m_specialSplit) emit(error(bounds("specialDVSplit"))); @@ -271,12 +271,12 @@ void Pokemod::Rules::setSpecialDVSplit(const bool specialDVSplit) CHECK(specialDVSplit); } -void Pokemod::Rules::setEffortValuesAllowed(const bool effortValuesAllowed) +void Sigmod::Rules::setEffortValuesAllowed(const bool effortValuesAllowed) { CHECK(effortValuesAllowed); } -void Pokemod::Rules::setMaxTotalEV(const int maxTotalEV) +void Sigmod::Rules::setMaxTotalEV(const int maxTotalEV) { if (!maxTotalEV) emit(error(bounds("maxTotalEV"))); @@ -284,7 +284,7 @@ void Pokemod::Rules::setMaxTotalEV(const int maxTotalEV) CHECK(maxTotalEV); } -void Pokemod::Rules::setMaxEVPerStat(const int maxEVPerStat) +void Sigmod::Rules::setMaxEVPerStat(const int maxEVPerStat) { if ((!maxEVPerStat && m_maxTotalEV) || (m_maxTotalEV < maxEVPerStat)) emit(error(bounds("maxEVPerStat"))); @@ -292,122 +292,122 @@ void Pokemod::Rules::setMaxEVPerStat(const int maxEVPerStat) CHECK(maxEVPerStat); } -bool Pokemod::Rules::genderAllowed() const +bool Sigmod::Rules::genderAllowed() const { return m_genderAllowed; } -bool Pokemod::Rules::breedingAllowed() const +bool Sigmod::Rules::breedingAllowed() const { return m_breedingAllowed; } -bool Pokemod::Rules::criticalDomains() const +bool Sigmod::Rules::criticalDomains() const { return m_criticalDomains; } -bool Pokemod::Rules::useTurns() const +bool Sigmod::Rules::useTurns() const { return m_useTurns; } -int Pokemod::Rules::numBoxes() const +int Sigmod::Rules::numBoxes() const { return m_numBoxes; } -int Pokemod::Rules::boxSize() const +int Sigmod::Rules::boxSize() const { return m_boxSize; } -int Pokemod::Rules::maxParty() const +int Sigmod::Rules::maxParty() const { return m_maxParty; } -int Pokemod::Rules::maxFight() const +int Sigmod::Rules::maxFight() const { return m_maxFight; } -int Pokemod::Rules::maxPlayers() const +int Sigmod::Rules::maxPlayers() const { return m_maxPlayers; } -int Pokemod::Rules::maxHeldItems() const +int Sigmod::Rules::maxHeldItems() const { return m_maxHeldItems; } -int Pokemod::Rules::maxAbilities() const +int Sigmod::Rules::maxAbilities() const { return m_maxAbilities; } -int Pokemod::Rules::maxNatures() const +int Sigmod::Rules::maxNatures() const { return m_maxNatures; } -int Pokemod::Rules::maxMoves() const +int Sigmod::Rules::maxMoves() const { return m_maxMoves; } -int Pokemod::Rules::maxLevel() const +int Sigmod::Rules::maxLevel() const { return m_maxLevel; } -int Pokemod::Rules::maxStages() const +int Sigmod::Rules::maxStages() const { return m_maxStages; } -int Pokemod::Rules::maxMoney() const +int Sigmod::Rules::maxMoney() const { return m_maxMoney; } -bool Pokemod::Rules::hardCash() const +bool Sigmod::Rules::hardCash() const { return m_hardCash; } -bool Pokemod::Rules::allowSwitchStyle() const +bool Sigmod::Rules::allowSwitchStyle() const { return m_allowSwitchStyle; } -bool Pokemod::Rules::specialSplit() const +bool Sigmod::Rules::specialSplit() const { return m_specialSplit; } -bool Pokemod::Rules::specialDVSplit() const +bool Sigmod::Rules::specialDVSplit() const { return m_specialDVSplit; } -bool Pokemod::Rules::effortValuesAllowed() const +bool Sigmod::Rules::effortValuesAllowed() const { return m_effortValuesAllowed; } -int Pokemod::Rules::maxTotalEV() const +int Sigmod::Rules::maxTotalEV() const { return m_maxTotalEV; } -int Pokemod::Rules::maxEVPerStat() const +int Sigmod::Rules::maxEVPerStat() const { return m_maxEVPerStat; } -Pokemod::Rules& Pokemod::Rules::operator=(const Rules& rhs) +Sigmod::Rules& Sigmod::Rules::operator=(const Rules& rhs) { if (this == &rhs) return *this; diff --git a/sigmod/Rules.h b/sigmod/Rules.h index 54287ce0..02fbbadf 100644 --- a/sigmod/Rules.h +++ b/sigmod/Rules.h @@ -15,18 +15,18 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __POKEMOD_RULES__ -#define __POKEMOD_RULES__ +#ifndef __SIGMOD_RULES__ +#define __SIGMOD_RULES__ -// Pokemod includes +// Sigmod includes #include "Object.h" -namespace Pokemod +namespace Sigmod { // Forward declarations -class Pokemod; +class Sigmod; -class POKEMOD_EXPORT Rules : public Object +class SIGMOD_EXPORT Rules : public Object { Q_OBJECT @@ -34,9 +34,9 @@ class POKEMOD_EXPORT Rules : public Object static const QStringList DVStr; Rules(const Rules& rules); - Rules(const Pokemod* parent); - Rules(const Rules& rules, const Pokemod* parent); - Rules(const QDomElement& xml, const Pokemod* parent); + Rules(const Sigmod* parent); + Rules(const Rules& rules, const Sigmod* parent); + Rules(const QDomElement& xml, const Sigmod* parent); void validate(); diff --git a/sigmod/Script.h b/sigmod/Script.h index 3633e0d3..bf9312ce 100644 --- a/sigmod/Script.h +++ b/sigmod/Script.h @@ -15,18 +15,18 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __POKEMOD_SCRIPT__ -#define __POKEMOD_SCRIPT__ +#ifndef __SIGMOD_SCRIPT__ +#define __SIGMOD_SCRIPT__ -// Pokemod includes +// Sigmod includes #include "Global.h" // Qt includes #include <QtCore/QString> -namespace Pokemod +namespace Sigmod { -class POKEMOD_EXPORT Script +class SIGMOD_EXPORT Script { public: Script(); @@ -98,6 +98,6 @@ inline bool Script::operator!=(const Script& rhs) const } } -Q_DECLARE_METATYPE(Pokemod::Script) +Q_DECLARE_METATYPE(Sigmod::Script) #endif diff --git a/sigmod/Pokemod.cpp b/sigmod/Sigmod.cpp index 67355553..cebd5f8d 100644 --- a/sigmod/Pokemod.cpp +++ b/sigmod/Sigmod.cpp @@ -16,9 +16,9 @@ */ // Header include -#include "Pokemod.h" +#include "Sigmod.h" -// Pokemod includes +// Sigmod includes #include "Ability.h" #include "Author.h" #include "Badge.h" @@ -47,7 +47,7 @@ // Qt includes #include <QtCore/QSet> -Pokemod::Pokemod::Pokemod() : +Sigmod::Sigmod::Sigmod() : Object(NULL, 0), m_title(""), m_version(""), @@ -59,27 +59,27 @@ Pokemod::Pokemod::Pokemod() : { } -Pokemod::Pokemod::Pokemod(const Pokemod& pokemod) : +Sigmod::Sigmod::Sigmod(const Sigmod& sigmod) : Object(NULL, 0), m_rules(new Rules(this)) { - *this = pokemod; + *this = sigmod; } -Pokemod::Pokemod::Pokemod(const QDomElement& xml) : +Sigmod::Sigmod::Sigmod(const QDomElement& xml) : Object(NULL, 0), m_rules(new Rules(this)) { load(xml); } -Pokemod::Pokemod::~Pokemod() +Sigmod::Sigmod::~Sigmod() { delete m_rules; clear(); } -void Pokemod::Pokemod::validate() +void Sigmod::Sigmod::validate() { TEST_BEGIN(); if (m_title.isEmpty()) @@ -271,7 +271,7 @@ void Pokemod::Pokemod::validate() TEST_END(); } -void Pokemod::Pokemod::load(const QDomElement& xml) +void Sigmod::Sigmod::load(const QDomElement& xml) { LOAD_BEGIN(); LOAD(title); @@ -306,7 +306,7 @@ void Pokemod::Pokemod::load(const QDomElement& xml) m_typechart.resize(typeCount(), typeCount()); } -QDomElement Pokemod::Pokemod::save() const +QDomElement Sigmod::Sigmod::save() const { QDomElement xml = QDomDocument().createElement(className()); SAVE(title); @@ -341,22 +341,22 @@ QDomElement Pokemod::Pokemod::save() const return xml; } -void Pokemod::Pokemod::setTitle(const QString& title) +void Sigmod::Sigmod::setTitle(const QString& title) { CHECK(title); } -void Pokemod::Pokemod::setVersion(const QString& version) +void Sigmod::Sigmod::setVersion(const QString& version) { CHECK(version); } -void Pokemod::Pokemod::setDescription(const QString& description) +void Sigmod::Sigmod::setDescription(const QString& description) { CHECK(description); } -void Pokemod::Pokemod::setStartMap(const int startMap) +void Sigmod::Sigmod::setStartMap(const int startMap) { if (mapIndex(startMap) == INT_MAX) emit(error(bounds("startMap"))); @@ -364,7 +364,7 @@ void Pokemod::Pokemod::setStartMap(const int startMap) CHECK(startMap); } -void Pokemod::Pokemod::setStartWarp(const int startWarp) +void Sigmod::Sigmod::setStartWarp(const int startWarp) { if (mapIndex(m_startMap) == INT_MAX) emit(error(bounds("startMap"))); @@ -374,94 +374,94 @@ void Pokemod::Pokemod::setStartWarp(const int startWarp) CHECK(startWarp); } -void Pokemod::Pokemod::setTypechart(const int attack, const int defense, const Fraction& multiplier) +void Sigmod::Sigmod::setTypechart(const int attack, const int defense, const Fraction& multiplier) { CHECK_ARRAY(typechart(attack, defense), multiplier); } -void Pokemod::Pokemod::setRules(const Rules& rules) +void Sigmod::Sigmod::setRules(const Rules& rules) { *m_rules = rules; } -void Pokemod::Pokemod::setRules(const QDomElement& xml) +void Sigmod::Sigmod::setRules(const QDomElement& xml) { m_rules->load(xml); } -QString Pokemod::Pokemod::title() const +QString Sigmod::Sigmod::title() const { return m_title; } -QString Pokemod::Pokemod::version() const +QString Sigmod::Sigmod::version() const { return m_version; } -QString Pokemod::Pokemod::description() const +QString Sigmod::Sigmod::description() const { return m_description; } -int Pokemod::Pokemod::startMap() const +int Sigmod::Sigmod::startMap() const { return m_startMap; } -int Pokemod::Pokemod::startWarp() const +int Sigmod::Sigmod::startWarp() const { return m_startWarp; } -const Pokemod::Matrix<Pokemod::Fraction>* Pokemod::Pokemod::typechart() const +const Sigmod::Matrix<Sigmod::Fraction>* Sigmod::Sigmod::typechart() const { return &m_typechart; } -Pokemod::Matrix<Pokemod::Fraction>* Pokemod::Pokemod::typechart() +Sigmod::Matrix<Sigmod::Fraction>* Sigmod::Sigmod::typechart() { return &m_typechart; } -Pokemod::Fraction Pokemod::Pokemod::typechart(const int attack, const int defense) const +Sigmod::Fraction Sigmod::Sigmod::typechart(const int attack, const int defense) const { return m_typechart(attack, defense); } -const Pokemod::Rules* Pokemod::Pokemod::rules() const +const Sigmod::Rules* Sigmod::Sigmod::rules() const { return m_rules; } -Pokemod::Rules* Pokemod::Pokemod::rules() +Sigmod::Rules* Sigmod::Sigmod::rules() { return m_rules; } -const Pokemod::Ability* Pokemod::Pokemod::ability(const int index) const +const Sigmod::Ability* Sigmod::Sigmod::ability(const int index) const { Q_ASSERT(index < abilityCount()); return m_abilities.at(index); } -Pokemod::Ability* Pokemod::Pokemod::ability(const int index) +Sigmod::Ability* Sigmod::Sigmod::ability(const int index) { Q_ASSERT(index < abilityCount()); return m_abilities[index]; } -const Pokemod::Ability* Pokemod::Pokemod::abilityById(const int id) const +const Sigmod::Ability* Sigmod::Sigmod::abilityById(const int id) const { return ability(abilityIndex(id)); } -Pokemod::Ability* Pokemod::Pokemod::abilityById(const int id) +Sigmod::Ability* Sigmod::Sigmod::abilityById(const int id) { return ability(abilityIndex(id)); } -int Pokemod::Pokemod::abilityIndex(const int id) const +int Sigmod::Sigmod::abilityIndex(const int id) const { for (int i = 0; i < abilityCount(); ++i) { @@ -471,45 +471,45 @@ int Pokemod::Pokemod::abilityIndex(const int id) const return INT_MAX; } -int Pokemod::Pokemod::abilityCount() const +int Sigmod::Sigmod::abilityCount() const { return m_abilities.size(); } -Pokemod::Ability* Pokemod::Pokemod::newAbility() +Sigmod::Ability* Sigmod::Sigmod::newAbility() { return newAbility(new Ability(this, newAbilityId())); } -Pokemod::Ability* Pokemod::Pokemod::newAbility(const QDomElement& xml) +Sigmod::Ability* Sigmod::Sigmod::newAbility(const QDomElement& xml) { return newAbility(new Ability(xml, this, newAbilityId())); } -Pokemod::Ability* Pokemod::Pokemod::newAbility(const Ability& ability) +Sigmod::Ability* Sigmod::Sigmod::newAbility(const Ability& ability) { return newAbility(new Ability(ability, this, newAbilityId())); } -Pokemod::Ability* Pokemod::Pokemod::newAbility(Ability* ability) +Sigmod::Ability* Sigmod::Sigmod::newAbility(Ability* ability) { m_abilities.append(ability); return ability; } -void Pokemod::Pokemod::deleteAbility(const int index) +void Sigmod::Sigmod::deleteAbility(const int index) { Q_ASSERT(index < abilityCount()); delete m_abilities[index]; m_abilities.removeAt(index); } -void Pokemod::Pokemod::deleteAbilityById(const int id) +void Sigmod::Sigmod::deleteAbilityById(const int id) { deleteAbility(abilityIndex(id)); } -int Pokemod::Pokemod::newAbilityId() const +int Sigmod::Sigmod::newAbilityId() const { int i = 0; while ((i < abilityCount()) && (abilityIndex(i) != INT_MAX)) @@ -517,29 +517,29 @@ int Pokemod::Pokemod::newAbilityId() const return i; } -const Pokemod::Author* Pokemod::Pokemod::author(const int index) const +const Sigmod::Author* Sigmod::Sigmod::author(const int index) const { Q_ASSERT(index < authorCount()); return m_authors.at(index); } -Pokemod::Author* Pokemod::Pokemod::author(const int index) +Sigmod::Author* Sigmod::Sigmod::author(const int index) { Q_ASSERT(index < authorCount()); return m_authors[index]; } -const Pokemod::Author* Pokemod::Pokemod::authorById(const int id) const +const Sigmod::Author* Sigmod::Sigmod::authorById(const int id) const { return author(authorIndex(id)); } -Pokemod::Author* Pokemod::Pokemod::authorById(const int id) +Sigmod::Author* Sigmod::Sigmod::authorById(const int id) { return author(authorIndex(id)); } -int Pokemod::Pokemod::authorIndex(const int id) const +int Sigmod::Sigmod::authorIndex(const int id) const { for (int i = 0; i < authorCount(); ++i) { @@ -549,45 +549,45 @@ int Pokemod::Pokemod::authorIndex(const int id) const return INT_MAX; } -int Pokemod::Pokemod::authorCount() const +int Sigmod::Sigmod::authorCount() const { return m_authors.size(); } -Pokemod::Author* Pokemod::Pokemod::newAuthor() +Sigmod::Author* Sigmod::Sigmod::newAuthor() { return newAuthor(new Author(this, newAuthorId())); } -Pokemod::Author* Pokemod::Pokemod::newAuthor(const QDomElement& xml) +Sigmod::Author* Sigmod::Sigmod::newAuthor(const QDomElement& xml) { return newAuthor(new Author(xml, this, newAuthorId())); } -Pokemod::Author* Pokemod::Pokemod::newAuthor(const Author& author) +Sigmod::Author* Sigmod::Sigmod::newAuthor(const Author& author) { return newAuthor(new Author(author, this, newAuthorId())); } -Pokemod::Author* Pokemod::Pokemod::newAuthor(Author* author) +Sigmod::Author* Sigmod::Sigmod::newAuthor(Author* author) { m_authors.append(author); return author; } -void Pokemod::Pokemod::deleteAuthor(const int index) +void Sigmod::Sigmod::deleteAuthor(const int index) { Q_ASSERT(index < authorCount()); delete m_authors[index]; m_authors.removeAt(index); } -void Pokemod::Pokemod::deleteAuthorById(const int id) +void Sigmod::Sigmod::deleteAuthorById(const int id) { deleteAuthor(authorIndex(id)); } -int Pokemod::Pokemod::newAuthorId() const +int Sigmod::Sigmod::newAuthorId() const { int i = 0; while ((i < authorCount()) && (authorIndex(i) != INT_MAX)) @@ -595,29 +595,29 @@ int Pokemod::Pokemod::newAuthorId() const return i; } -const Pokemod::Badge* Pokemod::Pokemod::badge(const int index) const +const Sigmod::Badge* Sigmod::Sigmod::badge(const int index) const { Q_ASSERT(index < badgeCount()); return m_badges.at(index); } -Pokemod::Badge* Pokemod::Pokemod::badge(const int index) +Sigmod::Badge* Sigmod::Sigmod::badge(const int index) { Q_ASSERT(index < badgeCount()); return m_badges[index]; } -const Pokemod::Badge* Pokemod::Pokemod::badgeById(const int id) const +const Sigmod::Badge* Sigmod::Sigmod::badgeById(const int id) const { return badge(badgeIndex(id)); } -Pokemod::Badge* Pokemod::Pokemod::badgeById(const int id) +Sigmod::Badge* Sigmod::Sigmod::badgeById(const int id) { return badge(badgeIndex(id)); } -int Pokemod::Pokemod::badgeIndex(const int id) const +int Sigmod::Sigmod::badgeIndex(const int id) const { for (int i = 0; i < badgeCount(); ++i) { @@ -627,45 +627,45 @@ int Pokemod::Pokemod::badgeIndex(const int id) const return INT_MAX; } -int Pokemod::Pokemod::badgeCount() const +int Sigmod::Sigmod::badgeCount() const { return m_badges.size(); } -Pokemod::Badge* Pokemod::Pokemod::newBadge() +Sigmod::Badge* Sigmod::Sigmod::newBadge() { return newBadge(new Badge(this, newBadgeId())); } -Pokemod::Badge* Pokemod::Pokemod::newBadge(const QDomElement& xml) +Sigmod::Badge* Sigmod::Sigmod::newBadge(const QDomElement& xml) { return newBadge(new Badge(xml, this, newBadgeId())); } -Pokemod::Badge* Pokemod::Pokemod::newBadge(const Badge& badge) +Sigmod::Badge* Sigmod::Sigmod::newBadge(const Badge& badge) { return newBadge(new Badge(badge, this, newBadgeId())); } -Pokemod::Badge* Pokemod::Pokemod::newBadge(Badge* badge) +Sigmod::Badge* Sigmod::Sigmod::newBadge(Badge* badge) { m_badges.append(badge); return badge; } -void Pokemod::Pokemod::deleteBadge(const int index) +void Sigmod::Sigmod::deleteBadge(const int index) { Q_ASSERT(index < badgeCount()); delete m_badges[index]; m_badges.removeAt(index); } -void Pokemod::Pokemod::deleteBadgeById(const int id) +void Sigmod::Sigmod::deleteBadgeById(const int id) { deleteBadge(badgeIndex(id)); } -int Pokemod::Pokemod::newBadgeId() const +int Sigmod::Sigmod::newBadgeId() const { int i = 0; while ((i < badgeCount()) && (badgeIndex(i) != INT_MAX)) @@ -673,29 +673,29 @@ int Pokemod::Pokemod::newBadgeId() const return i; } -const Pokemod::CoinList* Pokemod::Pokemod::coinList(const int index) const +const Sigmod::CoinList* Sigmod::Sigmod::coinList(const int index) const { Q_ASSERT(index < coinListCount()); return m_coinLists.at(index); } -Pokemod::CoinList* Pokemod::Pokemod::coinList(const int index) +Sigmod::CoinList* Sigmod::Sigmod::coinList(const int index) { Q_ASSERT(index < coinListCount()); return m_coinLists[index]; } -const Pokemod::CoinList* Pokemod::Pokemod::coinListById(const int id) const +const Sigmod::CoinList* Sigmod::Sigmod::coinListById(const int id) const { return coinList(coinListIndex(id)); } -Pokemod::CoinList* Pokemod::Pokemod::coinListById(const int id) +Sigmod::CoinList* Sigmod::Sigmod::coinListById(const int id) { return coinList(coinListIndex(id)); } -int Pokemod::Pokemod::coinListIndex(const int id) const +int Sigmod::Sigmod::coinListIndex(const int id) const { for (int i = 0; i < coinListCount(); ++i) { @@ -705,45 +705,45 @@ int Pokemod::Pokemod::coinListIndex(const int id) const return INT_MAX; } -int Pokemod::Pokemod::coinListCount() const +int Sigmod::Sigmod::coinListCount() const { return m_coinLists.size(); } -Pokemod::CoinList* Pokemod::Pokemod::newCoinList() +Sigmod::CoinList* Sigmod::Sigmod::newCoinList() { return newCoinList(new CoinList(this, newCoinListId())); } -Pokemod::CoinList* Pokemod::Pokemod::newCoinList(const QDomElement& xml) +Sigmod::CoinList* Sigmod::Sigmod::newCoinList(const QDomElement& xml) { return newCoinList(new CoinList(xml, this, newCoinListId())); } -Pokemod::CoinList* Pokemod::Pokemod::newCoinList(const CoinList& coinList) +Sigmod::CoinList* Sigmod::Sigmod::newCoinList(const CoinList& coinList) { return newCoinList(new CoinList(coinList, this, newCoinListId())); } -Pokemod::CoinList* Pokemod::Pokemod::newCoinList(CoinList* coinList) +Sigmod::CoinList* Sigmod::Sigmod::newCoinList(CoinList* coinList) { m_coinLists.append(coinList); return coinList; } -void Pokemod::Pokemod::deleteCoinList(const int index) +void Sigmod::Sigmod::deleteCoinList(const int index) { Q_ASSERT(index < coinListCount()); delete m_coinLists[index]; m_coinLists.removeAt(index); } -void Pokemod::Pokemod::deleteCoinListById(const int id) +void Sigmod::Sigmod::deleteCoinListById(const int id) { deleteCoinList(coinListIndex(id)); } -int Pokemod::Pokemod::newCoinListId() const +int Sigmod::Sigmod::newCoinListId() const { int i = 0; while ((i < coinListCount()) && (coinListIndex(i) != INT_MAX)) @@ -751,29 +751,29 @@ int Pokemod::Pokemod::newCoinListId() const return i; } -const Pokemod::EggGroup* Pokemod::Pokemod::eggGroup(const int index) const +const Sigmod::EggGroup* Sigmod::Sigmod::eggGroup(const int index) const { Q_ASSERT(index < eggGroupCount()); return m_eggGroups.at(index); } -Pokemod::EggGroup* Pokemod::Pokemod::eggGroup(const int index) +Sigmod::EggGroup* Sigmod::Sigmod::eggGroup(const int index) { Q_ASSERT(index < eggGroupCount()); return m_eggGroups[index]; } -const Pokemod::EggGroup* Pokemod::Pokemod::eggGroupById(const int id) const +const Sigmod::EggGroup* Sigmod::Sigmod::eggGroupById(const int id) const { return eggGroup(eggGroupIndex(id)); } -Pokemod::EggGroup* Pokemod::Pokemod::eggGroupById(const int id) +Sigmod::EggGroup* Sigmod::Sigmod::eggGroupById(const int id) { return eggGroup(eggGroupIndex(id)); } -int Pokemod::Pokemod::eggGroupIndex(const int id) const +int Sigmod::Sigmod::eggGroupIndex(const int id) const { for (int i = 0; i < eggGroupCount(); ++i) { @@ -783,45 +783,45 @@ int Pokemod::Pokemod::eggGroupIndex(const int id) const return INT_MAX; } -int Pokemod::Pokemod::eggGroupCount() const +int Sigmod::Sigmod::eggGroupCount() const { return m_eggGroups.size(); } -Pokemod::EggGroup* Pokemod::Pokemod::newEggGroup() +Sigmod::EggGroup* Sigmod::Sigmod::newEggGroup() { return newEggGroup(new EggGroup(this, newEggGroupId())); } -Pokemod::EggGroup* Pokemod::Pokemod::newEggGroup(const QDomElement& xml) +Sigmod::EggGroup* Sigmod::Sigmod::newEggGroup(const QDomElement& xml) { return newEggGroup(new EggGroup(xml, this, newEggGroupId())); } -Pokemod::EggGroup* Pokemod::Pokemod::newEggGroup(const EggGroup& eggGroup) +Sigmod::EggGroup* Sigmod::Sigmod::newEggGroup(const EggGroup& eggGroup) { return newEggGroup(new EggGroup(eggGroup, this, newEggGroupId())); } -Pokemod::EggGroup* Pokemod::Pokemod::newEggGroup(EggGroup* eggGroup) +Sigmod::EggGroup* Sigmod::Sigmod::newEggGroup(EggGroup* eggGroup) { m_eggGroups.append(eggGroup); return eggGroup; } -void Pokemod::Pokemod::deleteEggGroup(const int index) +void Sigmod::Sigmod::deleteEggGroup(const int index) { Q_ASSERT(index < eggGroupCount()); delete m_eggGroups[index]; m_eggGroups.removeAt(index); } -void Pokemod::Pokemod::deleteEggGroupById(const int id) +void Sigmod::Sigmod::deleteEggGroupById(const int id) { deleteEggGroup(eggGroupIndex(id)); } -int Pokemod::Pokemod::newEggGroupId() const +int Sigmod::Sigmod::newEggGroupId() const { int i = 0; while ((i < eggGroupCount()) && (eggGroupIndex(i) != INT_MAX)) @@ -829,29 +829,29 @@ int Pokemod::Pokemod::newEggGroupId() const return i; } -const Pokemod::GlobalScript* Pokemod::Pokemod::globalScript(const int index) const +const Sigmod::GlobalScript* Sigmod::Sigmod::globalScript(const int index) const { Q_ASSERT(index < globalScriptCount()); return m_globalScripts.at(index); } -Pokemod::GlobalScript* Pokemod::Pokemod::globalScript(const int index) +Sigmod::GlobalScript* Sigmod::Sigmod::globalScript(const int index) { Q_ASSERT(index < globalScriptCount()); return m_globalScripts[index]; } -const Pokemod::GlobalScript* Pokemod::Pokemod::globalScriptById(const int id) const +const Sigmod::GlobalScript* Sigmod::Sigmod::globalScriptById(const int id) const { return globalScript(globalScriptIndex(id)); } -Pokemod::GlobalScript* Pokemod::Pokemod::globalScriptById(const int id) +Sigmod::GlobalScript* Sigmod::Sigmod::globalScriptById(const int id) { return globalScript(globalScriptIndex(id)); } -int Pokemod::Pokemod::globalScriptIndex(const int id) const +int Sigmod::Sigmod::globalScriptIndex(const int id) const { for (int i = 0; i < globalScriptCount(); ++i) { @@ -861,45 +861,45 @@ int Pokemod::Pokemod::globalScriptIndex(const int id) const return INT_MAX; } -int Pokemod::Pokemod::globalScriptCount() const +int Sigmod::Sigmod::globalScriptCount() const { return m_globalScripts.size(); } -Pokemod::GlobalScript* Pokemod::Pokemod::newGlobalScript() +Sigmod::GlobalScript* Sigmod::Sigmod::newGlobalScript() { return newGlobalScript(new GlobalScript(this, newGlobalScriptId())); } -Pokemod::GlobalScript* Pokemod::Pokemod::newGlobalScript(const QDomElement& xml) +Sigmod::GlobalScript* Sigmod::Sigmod::newGlobalScript(const QDomElement& xml) { return newGlobalScript(new GlobalScript(xml, this, newGlobalScriptId())); } -Pokemod::GlobalScript* Pokemod::Pokemod::newGlobalScript(const GlobalScript& globalScript) +Sigmod::GlobalScript* Sigmod::Sigmod::newGlobalScript(const GlobalScript& globalScript) { return newGlobalScript(new GlobalScript(globalScript, this, newGlobalScriptId())); } -Pokemod::GlobalScript* Pokemod::Pokemod::newGlobalScript(GlobalScript* globalScript) +Sigmod::GlobalScript* Sigmod::Sigmod::newGlobalScript(GlobalScript* globalScript) { m_globalScripts.append(globalScript); return globalScript; } -void Pokemod::Pokemod::deleteGlobalScript(const int index) +void Sigmod::Sigmod::deleteGlobalScript(const int index) { Q_ASSERT(index < globalScriptCount()); delete m_globalScripts[index]; m_globalScripts.removeAt(index); } -void Pokemod::Pokemod::deleteGlobalScriptById(const int id) +void Sigmod::Sigmod::deleteGlobalScriptById(const int id) { deleteGlobalScript(globalScriptIndex(id)); } -int Pokemod::Pokemod::newGlobalScriptId() const +int Sigmod::Sigmod::newGlobalScriptId() const { int i = 0; while ((i < globalScriptCount()) && (globalScriptIndex(i) != INT_MAX)) @@ -907,29 +907,29 @@ int Pokemod::Pokemod::newGlobalScriptId() const return i; } -const Pokemod::Item* Pokemod::Pokemod::item(const int index) const +const Sigmod::Item* Sigmod::Sigmod::item(const int index) const { Q_ASSERT(index < itemCount()); return m_items.at(index); } -Pokemod::Item* Pokemod::Pokemod::item(const int index) +Sigmod::Item* Sigmod::Sigmod::item(const int index) { Q_ASSERT(index < itemCount()); return m_items[index]; } -const Pokemod::Item* Pokemod::Pokemod::itemById(const int id) const +const Sigmod::Item* Sigmod::Sigmod::itemById(const int id) const { return item(itemIndex(id)); } -Pokemod::Item* Pokemod::Pokemod::itemById(const int id) +Sigmod::Item* Sigmod::Sigmod::itemById(const int id) { return item(itemIndex(id)); } -int Pokemod::Pokemod::itemIndex(const int id) const +int Sigmod::Sigmod::itemIndex(const int id) const { for (int i = 0; i < itemCount(); ++i) { @@ -939,45 +939,45 @@ int Pokemod::Pokemod::itemIndex(const int id) const return INT_MAX; } -int Pokemod::Pokemod::itemCount() const +int Sigmod::Sigmod::itemCount() const { return m_items.size(); } -Pokemod::Item* Pokemod::Pokemod::newItem() +Sigmod::Item* Sigmod::Sigmod::newItem() { return newItem(new Item(this, newItemId())); } -Pokemod::Item* Pokemod::Pokemod::newItem(const QDomElement& xml) +Sigmod::Item* Sigmod::Sigmod::newItem(const QDomElement& xml) { return newItem(new Item(xml, this, newItemId())); } -Pokemod::Item* Pokemod::Pokemod::newItem(const Item& item) +Sigmod::Item* Sigmod::Sigmod::newItem(const Item& item) { return newItem(new Item(item, this, newItemId())); } -Pokemod::Item* Pokemod::Pokemod::newItem(Item* item) +Sigmod::Item* Sigmod::Sigmod::newItem(Item* item) { m_items.append(item); return item; } -void Pokemod::Pokemod::deleteItem(const int index) +void Sigmod::Sigmod::deleteItem(const int index) { Q_ASSERT(index < itemCount()); delete m_items[index]; m_items.removeAt(index); } -void Pokemod::Pokemod::deleteItemById(const int id) +void Sigmod::Sigmod::deleteItemById(const int id) { deleteItem(itemIndex(id)); } -int Pokemod::Pokemod::newItemId() const +int Sigmod::Sigmod::newItemId() const { int i = 0; for (; (i < itemCount()) && (itemIndex(i) != INT_MAX); ++i) @@ -985,29 +985,29 @@ int Pokemod::Pokemod::newItemId() const return i; } -const Pokemod::ItemType* Pokemod::Pokemod::itemType(const int index) const +const Sigmod::ItemType* Sigmod::Sigmod::itemType(const int index) const { Q_ASSERT(index < itemTypeCount()); return m_itemTypes.at(index); } -Pokemod::ItemType* Pokemod::Pokemod::itemType(const int index) +Sigmod::ItemType* Sigmod::Sigmod::itemType(const int index) { Q_ASSERT(index < itemTypeCount()); return m_itemTypes[index]; } -const Pokemod::ItemType* Pokemod::Pokemod::itemTypeById(const int id) const +const Sigmod::ItemType* Sigmod::Sigmod::itemTypeById(const int id) const { return itemType(itemTypeIndex(id)); } -Pokemod::ItemType* Pokemod::Pokemod::itemTypeById(const int id) +Sigmod::ItemType* Sigmod::Sigmod::itemTypeById(const int id) { return itemType(itemTypeIndex(id)); } -int Pokemod::Pokemod::itemTypeIndex(const int id) const +int Sigmod::Sigmod::itemTypeIndex(const int id) const { for (int i = 0; i < itemTypeCount(); ++i) { @@ -1017,45 +1017,45 @@ int Pokemod::Pokemod::itemTypeIndex(const int id) const return INT_MAX; } -int Pokemod::Pokemod::itemTypeCount() const +int Sigmod::Sigmod::itemTypeCount() const { return m_itemTypes.size(); } -Pokemod::ItemType* Pokemod::Pokemod::newItemType() +Sigmod::ItemType* Sigmod::Sigmod::newItemType() { return newItemType(new ItemType(this, newItemTypeId())); } -Pokemod::ItemType* Pokemod::Pokemod::newItemType(const QDomElement& xml) +Sigmod::ItemType* Sigmod::Sigmod::newItemType(const QDomElement& xml) { return newItemType(new ItemType(xml, this, newItemTypeId())); } -Pokemod::ItemType* Pokemod::Pokemod::newItemType(const ItemType& itemType) +Sigmod::ItemType* Sigmod::Sigmod::newItemType(const ItemType& itemType) { return newItemType(new ItemType(itemType, this, newItemTypeId())); } -Pokemod::ItemType* Pokemod::Pokemod::newItemType(ItemType* itemType) +Sigmod::ItemType* Sigmod::Sigmod::newItemType(ItemType* itemType) { m_itemTypes.append(itemType); return itemType; } -void Pokemod::Pokemod::deleteItemType(const int index) +void Sigmod::Sigmod::deleteItemType(const int index) { Q_ASSERT(index < itemTypeCount()); delete m_itemTypes[index]; m_itemTypes.removeAt(index); } -void Pokemod::Pokemod::deleteItemTypeById(const int id) +void Sigmod::Sigmod::deleteItemTypeById(const int id) { deleteItemType(itemTypeIndex(id)); } -int Pokemod::Pokemod::newItemTypeId() const +int Sigmod::Sigmod::newItemTypeId() const { int i = 0; while ((i < itemTypeCount()) && (itemTypeIndex(i) != INT_MAX)) @@ -1063,29 +1063,29 @@ int Pokemod::Pokemod::newItemTypeId() const return i; } -const Pokemod::Map* Pokemod::Pokemod::map(const int index) const +const Sigmod::Map* Sigmod::Sigmod::map(const int index) const { Q_ASSERT(index < mapCount()); return m_maps.at(index); } -Pokemod::Map* Pokemod::Pokemod::map(const int index) +Sigmod::Map* Sigmod::Sigmod::map(const int index) { Q_ASSERT(index < mapCount()); return m_maps[index]; } -const Pokemod::Map* Pokemod::Pokemod::mapById(const int id) const +const Sigmod::Map* Sigmod::Sigmod::mapById(const int id) const { return map(mapIndex(id)); } -Pokemod::Map* Pokemod::Pokemod::mapById(const int id) +Sigmod::Map* Sigmod::Sigmod::mapById(const int id) { return map(mapIndex(id)); } -int Pokemod::Pokemod::mapIndex(const int id) const +int Sigmod::Sigmod::mapIndex(const int id) const { for (int i = 0; i < mapCount(); ++i) { @@ -1095,45 +1095,45 @@ int Pokemod::Pokemod::mapIndex(const int id) const return INT_MAX; } -int Pokemod::Pokemod::mapCount() const +int Sigmod::Sigmod::mapCount() const { return m_maps.size(); } -Pokemod::Map* Pokemod::Pokemod::newMap() +Sigmod::Map* Sigmod::Sigmod::newMap() { return newMap(new Map(this, newMapId())); } -Pokemod::Map* Pokemod::Pokemod::newMap(const QDomElement& xml) +Sigmod::Map* Sigmod::Sigmod::newMap(const QDomElement& xml) { return newMap(new Map(xml, this, newMapId())); } -Pokemod::Map* Pokemod::Pokemod::newMap(const Map& map) +Sigmod::Map* Sigmod::Sigmod::newMap(const Map& map) { return newMap(new Map(map, this, newMapId())); } -Pokemod::Map* Pokemod::Pokemod::newMap(Map* map) +Sigmod::Map* Sigmod::Sigmod::newMap(Map* map) { m_maps.append(map); return map; } -void Pokemod::Pokemod::deleteMap(const int index) +void Sigmod::Sigmod::deleteMap(const int index) { Q_ASSERT(index < mapCount()); delete m_maps[index]; m_maps.removeAt(index); } -void Pokemod::Pokemod::deleteMapById(const int id) +void Sigmod::Sigmod::deleteMapById(const int id) { deleteMap(mapIndex(id)); } -int Pokemod::Pokemod::newMapId() const +int Sigmod::Sigmod::newMapId() const { int i = 0; while ((i < mapCount()) && (mapIndex(i) != INT_MAX)) @@ -1141,29 +1141,29 @@ int Pokemod::Pokemod::newMapId() const return i; } -const Pokemod::Move* Pokemod::Pokemod::move(const int index) const +const Sigmod::Move* Sigmod::Sigmod::move(const int index) const { Q_ASSERT(index < moveCount()); return m_moves.at(index); } -Pokemod::Move* Pokemod::Pokemod::move(const int index) +Sigmod::Move* Sigmod::Sigmod::move(const int index) { Q_ASSERT(index < moveCount()); return m_moves[index]; } -const Pokemod::Move* Pokemod::Pokemod::moveById(const int id) const +const Sigmod::Move* Sigmod::Sigmod::moveById(const int id) const { return move(moveIndex(id)); } -Pokemod::Move* Pokemod::Pokemod::moveById(const int id) +Sigmod::Move* Sigmod::Sigmod::moveById(const int id) { return move(moveIndex(id)); } -int Pokemod::Pokemod::moveIndex(const int id) const +int Sigmod::Sigmod::moveIndex(const int id) const { for (int i = 0; i < moveCount(); ++i) { @@ -1173,45 +1173,45 @@ int Pokemod::Pokemod::moveIndex(const int id) const return INT_MAX; } -int Pokemod::Pokemod::moveCount() const +int Sigmod::Sigmod::moveCount() const { return m_moves.size(); } -Pokemod::Move* Pokemod::Pokemod::newMove() +Sigmod::Move* Sigmod::Sigmod::newMove() { return newMove(new Move(this, newMoveId())); } -Pokemod::Move* Pokemod::Pokemod::newMove(const QDomElement& xml) +Sigmod::Move* Sigmod::Sigmod::newMove(const QDomElement& xml) { return newMove(new Move(xml, this, newMoveId())); } -Pokemod::Move* Pokemod::Pokemod::newMove(const Move& move) +Sigmod::Move* Sigmod::Sigmod::newMove(const Move& move) { return newMove(new Move(move, this, newMoveId())); } -Pokemod::Move* Pokemod::Pokemod::newMove(Move* move) +Sigmod::Move* Sigmod::Sigmod::newMove(Move* move) { m_moves.append(move); return move; } -void Pokemod::Pokemod::deleteMove(const int index) +void Sigmod::Sigmod::deleteMove(const int index) { Q_ASSERT(index < moveCount()); delete m_moves[index]; m_moves.removeAt(index); } -void Pokemod::Pokemod::deleteMoveById(const int id) +void Sigmod::Sigmod::deleteMoveById(const int id) { deleteMove(moveIndex(id)); } -int Pokemod::Pokemod::newMoveId() const +int Sigmod::Sigmod::newMoveId() const { int i = 0; while ((i < moveCount()) && (moveIndex(i) != INT_MAX)) @@ -1219,29 +1219,29 @@ int Pokemod::Pokemod::newMoveId() const return i; } -const Pokemod::Nature* Pokemod::Pokemod::nature(const int index) const +const Sigmod::Nature* Sigmod::Sigmod::nature(const int index) const { Q_ASSERT(index < natureCount()); return m_natures.at(index); } -Pokemod::Nature* Pokemod::Pokemod::nature(const int index) +Sigmod::Nature* Sigmod::Sigmod::nature(const int index) { Q_ASSERT(index < natureCount()); return m_natures[index]; } -const Pokemod::Nature* Pokemod::Pokemod::natureById(const int id) const +const Sigmod::Nature* Sigmod::Sigmod::natureById(const int id) const { return nature(natureIndex(id)); } -Pokemod::Nature* Pokemod::Pokemod::natureById(const int id) +Sigmod::Nature* Sigmod::Sigmod::natureById(const int id) { return nature(natureIndex(id)); } -int Pokemod::Pokemod::natureIndex(const int id) const +int Sigmod::Sigmod::natureIndex(const int id) const { for (int i = 0; i < natureCount(); ++i) { @@ -1251,45 +1251,45 @@ int Pokemod::Pokemod::natureIndex(const int id) const return INT_MAX; } -int Pokemod::Pokemod::natureCount() const +int Sigmod::Sigmod::natureCount() const { return m_natures.size(); } -Pokemod::Nature* Pokemod::Pokemod::newNature() +Sigmod::Nature* Sigmod::Sigmod::newNature() { return newNature(new Nature(this, newNatureId())); } -Pokemod::Nature* Pokemod::Pokemod::newNature(const QDomElement& xml) +Sigmod::Nature* Sigmod::Sigmod::newNature(const QDomElement& xml) { return newNature(new Nature(xml, this, newNatureId())); } -Pokemod::Nature* Pokemod::Pokemod::newNature(const Nature& nature) +Sigmod::Nature* Sigmod::Sigmod::newNature(const Nature& nature) { return newNature(new Nature(nature, this, newNatureId())); } -Pokemod::Nature* Pokemod::Pokemod::newNature(Nature* nature) +Sigmod::Nature* Sigmod::Sigmod::newNature(Nature* nature) { m_natures.append(nature); return nature; } -void Pokemod::Pokemod::deleteNature(const int index) +void Sigmod::Sigmod::deleteNature(const int index) { Q_ASSERT(index < natureCount()); delete m_natures[index]; m_natures.removeAt(index); } -void Pokemod::Pokemod::deleteNatureById(const int id) +void Sigmod::Sigmod::deleteNatureById(const int id) { deleteNature(natureIndex(id)); } -int Pokemod::Pokemod::newNatureId() const +int Sigmod::Sigmod::newNatureId() const { int i = 0; while ((i < natureCount()) && (natureIndex(i) != INT_MAX)) @@ -1297,29 +1297,29 @@ int Pokemod::Pokemod::newNatureId() const return i; } -const Pokemod::Skin* Pokemod::Pokemod::skin(const int index) const +const Sigmod::Skin* Sigmod::Sigmod::skin(const int index) const { Q_ASSERT(index < skinCount()); return m_skins.at(index); } -Pokemod::Skin* Pokemod::Pokemod::skin(const int index) +Sigmod::Skin* Sigmod::Sigmod::skin(const int index) { Q_ASSERT(index < skinCount()); return m_skins[index]; } -const Pokemod::Skin* Pokemod::Pokemod::skinById(const int id) const +const Sigmod::Skin* Sigmod::Sigmod::skinById(const int id) const { return skin(skinIndex(id)); } -Pokemod::Skin* Pokemod::Pokemod::skinById(const int id) +Sigmod::Skin* Sigmod::Sigmod::skinById(const int id) { return skin(skinIndex(id)); } -int Pokemod::Pokemod::skinIndex(const int id) const +int Sigmod::Sigmod::skinIndex(const int id) const { for (int i = 0; i < skinCount(); ++i) { @@ -1329,45 +1329,45 @@ int Pokemod::Pokemod::skinIndex(const int id) const return INT_MAX; } -int Pokemod::Pokemod::skinCount() const +int Sigmod::Sigmod::skinCount() const { return m_skins.size(); } -Pokemod::Skin* Pokemod::Pokemod::newSkin() +Sigmod::Skin* Sigmod::Sigmod::newSkin() { return newSkin(new Skin(this, newSkinId())); } -Pokemod::Skin* Pokemod::Pokemod::newSkin(const QDomElement& xml) +Sigmod::Skin* Sigmod::Sigmod::newSkin(const QDomElement& xml) { return newSkin(new Skin(xml, this, newSkinId())); } -Pokemod::Skin* Pokemod::Pokemod::newSkin(const Skin& skin) +Sigmod::Skin* Sigmod::Sigmod::newSkin(const Skin& skin) { return newSkin(new Skin(skin, this, newSkinId())); } -Pokemod::Skin* Pokemod::Pokemod::newSkin(Skin* skin) +Sigmod::Skin* Sigmod::Sigmod::newSkin(Skin* skin) { m_skins.append(skin); return skin; } -void Pokemod::Pokemod::deleteSkin(const int index) +void Sigmod::Sigmod::deleteSkin(const int index) { Q_ASSERT(index < skinCount()); delete m_skins[index]; m_skins.removeAt(index); } -void Pokemod::Pokemod::deleteSkinById(const int id) +void Sigmod::Sigmod::deleteSkinById(const int id) { deleteSkin(skinIndex(id)); } -int Pokemod::Pokemod::newSkinId() const +int Sigmod::Sigmod::newSkinId() const { int i = 0; while ((i < skinCount()) && (skinIndex(i) != INT_MAX)) @@ -1375,29 +1375,29 @@ int Pokemod::Pokemod::newSkinId() const return i; } -const Pokemod::Sound* Pokemod::Pokemod::sound(const int index) const +const Sigmod::Sound* Sigmod::Sigmod::sound(const int index) const { Q_ASSERT(index < soundCount()); return m_sounds.at(index); } -Pokemod::Sound* Pokemod::Pokemod::sound(const int index) +Sigmod::Sound* Sigmod::Sigmod::sound(const int index) { Q_ASSERT(index < soundCount()); return m_sounds[index]; } -const Pokemod::Sound* Pokemod::Pokemod::soundById(const int id) const +const Sigmod::Sound* Sigmod::Sigmod::soundById(const int id) const { return sound(soundIndex(id)); } -Pokemod::Sound* Pokemod::Pokemod::soundById(const int id) +Sigmod::Sound* Sigmod::Sigmod::soundById(const int id) { return sound(soundIndex(id)); } -int Pokemod::Pokemod::soundIndex(const int id) const +int Sigmod::Sigmod::soundIndex(const int id) const { for (int i = 0; i < soundCount(); ++i) { @@ -1407,45 +1407,45 @@ int Pokemod::Pokemod::soundIndex(const int id) const return INT_MAX; } -int Pokemod::Pokemod::soundCount() const +int Sigmod::Sigmod::soundCount() const { return m_sounds.size(); } -Pokemod::Sound* Pokemod::Pokemod::newSound() +Sigmod::Sound* Sigmod::Sigmod::newSound() { return newSound(new Sound(this, newSoundId())); } -Pokemod::Sound* Pokemod::Pokemod::newSound(const QDomElement& xml) +Sigmod::Sound* Sigmod::Sigmod::newSound(const QDomElement& xml) { return newSound(new Sound(xml, this, newSoundId())); } -Pokemod::Sound* Pokemod::Pokemod::newSound(const Sound& sound) +Sigmod::Sound* Sigmod::Sigmod::newSound(const Sound& sound) { return newSound(new Sound(sound, this, newSoundId())); } -Pokemod::Sound* Pokemod::Pokemod::newSound(Sound* sound) +Sigmod::Sound* Sigmod::Sigmod::newSound(Sound* sound) { m_sounds.append(sound); return sound; } -void Pokemod::Pokemod::deleteSound(const int index) +void Sigmod::Sigmod::deleteSound(const int index) { Q_ASSERT(index < soundCount()); delete m_sounds[index]; m_sounds.removeAt(index); } -void Pokemod::Pokemod::deleteSoundById(const int id) +void Sigmod::Sigmod::deleteSoundById(const int id) { deleteSound(soundIndex(id)); } -int Pokemod::Pokemod::newSoundId() const +int Sigmod::Sigmod::newSoundId() const { int i = 0; while ((i < soundCount()) && (soundIndex(i) != INT_MAX)) @@ -1453,29 +1453,29 @@ int Pokemod::Pokemod::newSoundId() const return i; } -const Pokemod::Species* Pokemod::Pokemod::species(const int index) const +const Sigmod::Species* Sigmod::Sigmod::species(const int index) const { Q_ASSERT(index < speciesCount()); return m_species.at(index); } -Pokemod::Species* Pokemod::Pokemod::species(const int index) +Sigmod::Species* Sigmod::Sigmod::species(const int index) { Q_ASSERT(index < speciesCount()); return m_species[index]; } -const Pokemod::Species* Pokemod::Pokemod::speciesById(const int id) const +const Sigmod::Species* Sigmod::Sigmod::speciesById(const int id) const { return species(speciesIndex(id)); } -Pokemod::Species* Pokemod::Pokemod::speciesById(const int id) +Sigmod::Species* Sigmod::Sigmod::speciesById(const int id) { return species(speciesIndex(id)); } -int Pokemod::Pokemod::speciesIndex(const int id) const +int Sigmod::Sigmod::speciesIndex(const int id) const { for (int i = 0; i < speciesCount(); ++i) { @@ -1485,45 +1485,45 @@ int Pokemod::Pokemod::speciesIndex(const int id) const return INT_MAX; } -int Pokemod::Pokemod::speciesCount() const +int Sigmod::Sigmod::speciesCount() const { return m_species.size(); } -Pokemod::Species* Pokemod::Pokemod::newSpecies() +Sigmod::Species* Sigmod::Sigmod::newSpecies() { return newSpecies(new Species(this, newSpeciesId())); } -Pokemod::Species* Pokemod::Pokemod::newSpecies(const QDomElement& xml) +Sigmod::Species* Sigmod::Sigmod::newSpecies(const QDomElement& xml) { return newSpecies(new Species(xml, this, newSpeciesId())); } -Pokemod::Species* Pokemod::Pokemod::newSpecies(const Species& species) +Sigmod::Species* Sigmod::Sigmod::newSpecies(const Species& species) { return newSpecies(new Species(species, this, newSpeciesId())); } -Pokemod::Species* Pokemod::Pokemod::newSpecies(Species* species) +Sigmod::Species* Sigmod::Sigmod::newSpecies(Species* species) { m_species.append(species); return species; } -void Pokemod::Pokemod::deleteSpecies(const int index) +void Sigmod::Sigmod::deleteSpecies(const int index) { Q_ASSERT(index < speciesCount()); delete m_species[index]; m_species.removeAt(index); } -void Pokemod::Pokemod::deleteSpeciesById(const int id) +void Sigmod::Sigmod::deleteSpeciesById(const int id) { deleteSpecies(speciesIndex(id)); } -int Pokemod::Pokemod::newSpeciesId() const +int Sigmod::Sigmod::newSpeciesId() const { int i = 0; while ((i < speciesCount()) && (speciesIndex(i) != INT_MAX)) @@ -1531,29 +1531,29 @@ int Pokemod::Pokemod::newSpeciesId() const return i; } -const Pokemod::Sprite* Pokemod::Pokemod::sprite(const int index) const +const Sigmod::Sprite* Sigmod::Sigmod::sprite(const int index) const { Q_ASSERT(index < spriteCount()); return m_sprites.at(index); } -Pokemod::Sprite* Pokemod::Pokemod::sprite(const int index) +Sigmod::Sprite* Sigmod::Sigmod::sprite(const int index) { Q_ASSERT(index < spriteCount()); return m_sprites[index]; } -const Pokemod::Sprite* Pokemod::Pokemod::spriteById(const int id) const +const Sigmod::Sprite* Sigmod::Sigmod::spriteById(const int id) const { return sprite(spriteIndex(id)); } -Pokemod::Sprite* Pokemod::Pokemod::spriteById(const int id) +Sigmod::Sprite* Sigmod::Sigmod::spriteById(const int id) { return sprite(spriteIndex(id)); } -int Pokemod::Pokemod::spriteIndex(const int id) const +int Sigmod::Sigmod::spriteIndex(const int id) const { for (int i = 0; i < spriteCount(); ++i) { @@ -1563,45 +1563,45 @@ int Pokemod::Pokemod::spriteIndex(const int id) const return INT_MAX; } -int Pokemod::Pokemod::spriteCount() const +int Sigmod::Sigmod::spriteCount() const { return m_sprites.size(); } -Pokemod::Sprite* Pokemod::Pokemod::newSprite() +Sigmod::Sprite* Sigmod::Sigmod::newSprite() { return newSprite(new Sprite(this, newSpriteId())); } -Pokemod::Sprite* Pokemod::Pokemod::newSprite(const QDomElement& xml) +Sigmod::Sprite* Sigmod::Sigmod::newSprite(const QDomElement& xml) { return newSprite(new Sprite(xml, this, newSpriteId())); } -Pokemod::Sprite* Pokemod::Pokemod::newSprite(const Sprite& sprite) +Sigmod::Sprite* Sigmod::Sigmod::newSprite(const Sprite& sprite) { return newSprite(new Sprite(sprite, this, newSpriteId())); } -Pokemod::Sprite* Pokemod::Pokemod::newSprite(Sprite* sprite) +Sigmod::Sprite* Sigmod::Sigmod::newSprite(Sprite* sprite) { m_sprites.append(sprite); return sprite; } -void Pokemod::Pokemod::deleteSprite(const int index) +void Sigmod::Sigmod::deleteSprite(const int index) { Q_ASSERT(index < spriteCount()); delete m_sprites[index]; m_sprites.removeAt(index); } -void Pokemod::Pokemod::deleteSpriteById(const int id) +void Sigmod::Sigmod::deleteSpriteById(const int id) { deleteSprite(spriteIndex(id)); } -int Pokemod::Pokemod::newSpriteId() const +int Sigmod::Sigmod::newSpriteId() const { int i = 0; while ((i < spriteCount()) && (spriteIndex(i) != INT_MAX)) @@ -1609,29 +1609,29 @@ int Pokemod::Pokemod::newSpriteId() const return i; } -const Pokemod::Status* Pokemod::Pokemod::status(const int index) const +const Sigmod::Status* Sigmod::Sigmod::status(const int index) const { Q_ASSERT(index < statusCount()); return m_status.at(index); } -Pokemod::Status* Pokemod::Pokemod::status(const int index) +Sigmod::Status* Sigmod::Sigmod::status(const int index) { Q_ASSERT(index < statusCount()); return m_status[index]; } -const Pokemod::Status* Pokemod::Pokemod::statusById(const int id) const +const Sigmod::Status* Sigmod::Sigmod::statusById(const int id) const { return status(statusIndex(id)); } -Pokemod::Status* Pokemod::Pokemod::statusById(const int id) +Sigmod::Status* Sigmod::Sigmod::statusById(const int id) { return status(statusIndex(id)); } -int Pokemod::Pokemod::statusIndex(const int id) const +int Sigmod::Sigmod::statusIndex(const int id) const { for (int i = 0; i < statusCount(); ++i) { @@ -1641,45 +1641,45 @@ int Pokemod::Pokemod::statusIndex(const int id) const return INT_MAX; } -int Pokemod::Pokemod::statusCount() const +int Sigmod::Sigmod::statusCount() const { return m_status.size(); } -Pokemod::Status* Pokemod::Pokemod::newStatus() +Sigmod::Status* Sigmod::Sigmod::newStatus() { return newStatus(new Status(this, newStatusId())); } -Pokemod::Status* Pokemod::Pokemod::newStatus(const QDomElement& xml) +Sigmod::Status* Sigmod::Sigmod::newStatus(const QDomElement& xml) { return newStatus(new Status(xml, this, newStatusId())); } -Pokemod::Status* Pokemod::Pokemod::newStatus(const Status& status) +Sigmod::Status* Sigmod::Sigmod::newStatus(const Status& status) { return newStatus(new Status(status, this, newStatusId())); } -Pokemod::Status* Pokemod::Pokemod::newStatus(Status* status) +Sigmod::Status* Sigmod::Sigmod::newStatus(Status* status) { m_status.append(status); return status; } -void Pokemod::Pokemod::deleteStatus(const int index) +void Sigmod::Sigmod::deleteStatus(const int index) { Q_ASSERT(index < statusCount()); delete m_status[index]; m_status.removeAt(index); } -void Pokemod::Pokemod::deleteStatusById(const int id) +void Sigmod::Sigmod::deleteStatusById(const int id) { deleteStatus(statusIndex(id)); } -int Pokemod::Pokemod::newStatusId() const +int Sigmod::Sigmod::newStatusId() const { int i = 0; while ((i < statusCount()) && (statusIndex(i) != INT_MAX)) @@ -1687,29 +1687,29 @@ int Pokemod::Pokemod::newStatusId() const return i; } -const Pokemod::Store* Pokemod::Pokemod::store(const int index) const +const Sigmod::Store* Sigmod::Sigmod::store(const int index) const { Q_ASSERT(index < storeCount()); return m_stores.at(index); } -Pokemod::Store* Pokemod::Pokemod::store(const int index) +Sigmod::Store* Sigmod::Sigmod::store(const int index) { Q_ASSERT(index < storeCount()); return m_stores[index]; } -const Pokemod::Store* Pokemod::Pokemod::storeById(const int id) const +const Sigmod::Store* Sigmod::Sigmod::storeById(const int id) const { return store(storeIndex(id)); } -Pokemod::Store* Pokemod::Pokemod::storeById(const int id) +Sigmod::Store* Sigmod::Sigmod::storeById(const int id) { return store(storeIndex(id)); } -int Pokemod::Pokemod::storeIndex(const int id) const +int Sigmod::Sigmod::storeIndex(const int id) const { for (int i = 0; i < storeCount(); ++i) { @@ -1719,45 +1719,45 @@ int Pokemod::Pokemod::storeIndex(const int id) const return INT_MAX; } -int Pokemod::Pokemod::storeCount() const +int Sigmod::Sigmod::storeCount() const { return m_stores.size(); } -Pokemod::Store* Pokemod::Pokemod::newStore() +Sigmod::Store* Sigmod::Sigmod::newStore() { return newStore(new Store(this, newStoreId())); } -Pokemod::Store* Pokemod::Pokemod::newStore(const QDomElement& xml) +Sigmod::Store* Sigmod::Sigmod::newStore(const QDomElement& xml) { return newStore(new Store(xml, this, newStoreId())); } -Pokemod::Store* Pokemod::Pokemod::newStore(const Store& store) +Sigmod::Store* Sigmod::Sigmod::newStore(const Store& store) { return newStore(new Store(store, this, newStoreId())); } -Pokemod::Store* Pokemod::Pokemod::newStore(Store* store) +Sigmod::Store* Sigmod::Sigmod::newStore(Store* store) { m_stores.append(store); return store; } -void Pokemod::Pokemod::deleteStore(const int index) +void Sigmod::Sigmod::deleteStore(const int index) { Q_ASSERT(index < storeCount()); delete m_stores[index]; m_stores.removeAt(index); } -void Pokemod::Pokemod::deleteStoreById(const int id) +void Sigmod::Sigmod::deleteStoreById(const int id) { deleteStore(storeIndex(id)); } -int Pokemod::Pokemod::newStoreId() const +int Sigmod::Sigmod::newStoreId() const { int i = 0; while ((i < storeCount()) && (storeIndex(i) != INT_MAX)) @@ -1765,29 +1765,29 @@ int Pokemod::Pokemod::newStoreId() const return i; } -const Pokemod::Tile* Pokemod::Pokemod::tile(const int index) const +const Sigmod::Tile* Sigmod::Sigmod::tile(const int index) const { Q_ASSERT(index < tileCount()); return m_tiles.at(index); } -Pokemod::Tile* Pokemod::Pokemod::tile(const int index) +Sigmod::Tile* Sigmod::Sigmod::tile(const int index) { Q_ASSERT(index < tileCount()); return m_tiles[index]; } -const Pokemod::Tile* Pokemod::Pokemod::tileById(const int id) const +const Sigmod::Tile* Sigmod::Sigmod::tileById(const int id) const { return tile(tileIndex(id)); } -Pokemod::Tile* Pokemod::Pokemod::tileById(const int id) +Sigmod::Tile* Sigmod::Sigmod::tileById(const int id) { return tile(tileIndex(id)); } -int Pokemod::Pokemod::tileIndex(const int id) const +int Sigmod::Sigmod::tileIndex(const int id) const { for (int i = 0; i < tileCount(); ++i) { @@ -1797,45 +1797,45 @@ int Pokemod::Pokemod::tileIndex(const int id) const return INT_MAX; } -int Pokemod::Pokemod::tileCount() const +int Sigmod::Sigmod::tileCount() const { return m_tiles.size(); } -Pokemod::Tile* Pokemod::Pokemod::newTile() +Sigmod::Tile* Sigmod::Sigmod::newTile() { return newTile(new Tile(this, newTileId())); } -Pokemod::Tile* Pokemod::Pokemod::newTile(const QDomElement& xml) +Sigmod::Tile* Sigmod::Sigmod::newTile(const QDomElement& xml) { return newTile(new Tile(xml, this, newTileId())); } -Pokemod::Tile* Pokemod::Pokemod::newTile(const Tile& tile) +Sigmod::Tile* Sigmod::Sigmod::newTile(const Tile& tile) { return newTile(new Tile(tile, this, newTileId())); } -Pokemod::Tile* Pokemod::Pokemod::newTile(Tile* tile) +Sigmod::Tile* Sigmod::Sigmod::newTile(Tile* tile) { m_tiles.append(tile); return tile; } -void Pokemod::Pokemod::deleteTile(const int index) +void Sigmod::Sigmod::deleteTile(const int index) { Q_ASSERT(index < tileCount()); delete m_tiles[index]; m_tiles.removeAt(index); } -void Pokemod::Pokemod::deleteTileById(const int id) +void Sigmod::Sigmod::deleteTileById(const int id) { deleteTile(tileIndex(id)); } -int Pokemod::Pokemod::newTileId() const +int Sigmod::Sigmod::newTileId() const { int i = 0; while ((i < tileCount()) && (tileIndex(i) != INT_MAX)) @@ -1843,29 +1843,29 @@ int Pokemod::Pokemod::newTileId() const return i; } -const Pokemod::Time* Pokemod::Pokemod::time(const int index) const +const Sigmod::Time* Sigmod::Sigmod::time(const int index) const { Q_ASSERT(index < timeCount()); return m_times.at(index); } -Pokemod::Time* Pokemod::Pokemod::time(const int index) +Sigmod::Time* Sigmod::Sigmod::time(const int index) { Q_ASSERT(index < timeCount()); return m_times[index]; } -const Pokemod::Time* Pokemod::Pokemod::timeById(const int id) const +const Sigmod::Time* Sigmod::Sigmod::timeById(const int id) const { return time(timeIndex(id)); } -Pokemod::Time* Pokemod::Pokemod::timeById(const int id) +Sigmod::Time* Sigmod::Sigmod::timeById(const int id) { return time(timeIndex(id)); } -int Pokemod::Pokemod::timeIndex(const int id) const +int Sigmod::Sigmod::timeIndex(const int id) const { for (int i = 0; i < timeCount(); ++i) { @@ -1875,45 +1875,45 @@ int Pokemod::Pokemod::timeIndex(const int id) const return INT_MAX; } -int Pokemod::Pokemod::timeCount() const +int Sigmod::Sigmod::timeCount() const { return m_times.size(); } -Pokemod::Time* Pokemod::Pokemod::newTime() +Sigmod::Time* Sigmod::Sigmod::newTime() { return newTime(new Time(this, newTimeId())); } -Pokemod::Time* Pokemod::Pokemod::newTime(const QDomElement& xml) +Sigmod::Time* Sigmod::Sigmod::newTime(const QDomElement& xml) { return newTime(new Time(xml, this, newTimeId())); } -Pokemod::Time* Pokemod::Pokemod::newTime(const Time& time) +Sigmod::Time* Sigmod::Sigmod::newTime(const Time& time) { return newTime(new Time(time, this, newTimeId())); } -Pokemod::Time* Pokemod::Pokemod::newTime(Time* time) +Sigmod::Time* Sigmod::Sigmod::newTime(Time* time) { m_times.append(time); return time; } -void Pokemod::Pokemod::deleteTime(const int index) +void Sigmod::Sigmod::deleteTime(const int index) { Q_ASSERT(index < timeCount()); delete m_times[index]; m_times.removeAt(index); } -void Pokemod::Pokemod::deleteTimeById(const int id) +void Sigmod::Sigmod::deleteTimeById(const int id) { deleteTime(timeIndex(id)); } -int Pokemod::Pokemod::newTimeId() const +int Sigmod::Sigmod::newTimeId() const { int i = 0; while ((i < timeCount()) && (timeIndex(i) != INT_MAX)) @@ -1921,29 +1921,29 @@ int Pokemod::Pokemod::newTimeId() const return i; } -const Pokemod::Trainer* Pokemod::Pokemod::trainer(const int index) const +const Sigmod::Trainer* Sigmod::Sigmod::trainer(const int index) const { Q_ASSERT(index < trainerCount()); return m_trainers.at(index); } -Pokemod::Trainer* Pokemod::Pokemod::trainer(const int index) +Sigmod::Trainer* Sigmod::Sigmod::trainer(const int index) { Q_ASSERT(index < trainerCount()); return m_trainers[index]; } -const Pokemod::Trainer* Pokemod::Pokemod::trainerById(const int id) const +const Sigmod::Trainer* Sigmod::Sigmod::trainerById(const int id) const { return trainer(trainerIndex(id)); } -Pokemod::Trainer* Pokemod::Pokemod::trainerById(const int id) +Sigmod::Trainer* Sigmod::Sigmod::trainerById(const int id) { return trainer(trainerIndex(id)); } -int Pokemod::Pokemod::trainerIndex(const int id) const +int Sigmod::Sigmod::trainerIndex(const int id) const { for (int i = 0; i < trainerCount(); ++i) { @@ -1953,45 +1953,45 @@ int Pokemod::Pokemod::trainerIndex(const int id) const return INT_MAX; } -int Pokemod::Pokemod::trainerCount() const +int Sigmod::Sigmod::trainerCount() const { return m_trainers.size(); } -Pokemod::Trainer* Pokemod::Pokemod::newTrainer() +Sigmod::Trainer* Sigmod::Sigmod::newTrainer() { return newTrainer(new Trainer(this, newTrainerId())); } -Pokemod::Trainer* Pokemod::Pokemod::newTrainer(const QDomElement& xml) +Sigmod::Trainer* Sigmod::Sigmod::newTrainer(const QDomElement& xml) { return newTrainer(new Trainer(xml, this, newTrainerId())); } -Pokemod::Trainer* Pokemod::Pokemod::newTrainer(const Trainer& trainer) +Sigmod::Trainer* Sigmod::Sigmod::newTrainer(const Trainer& trainer) { return newTrainer(new Trainer(trainer, this, newTrainerId())); } -Pokemod::Trainer* Pokemod::Pokemod::newTrainer(Trainer* trainer) +Sigmod::Trainer* Sigmod::Sigmod::newTrainer(Trainer* trainer) { m_trainers.append(trainer); return trainer; } -void Pokemod::Pokemod::deleteTrainer(const int index) +void Sigmod::Sigmod::deleteTrainer(const int index) { Q_ASSERT(index < trainerCount()); delete m_trainers[index]; m_trainers.removeAt(index); } -void Pokemod::Pokemod::deleteTrainerById(const int id) +void Sigmod::Sigmod::deleteTrainerById(const int id) { deleteTrainer(trainerIndex(id)); } -int Pokemod::Pokemod::newTrainerId() const +int Sigmod::Sigmod::newTrainerId() const { int i = 0; while ((i < trainerCount()) && (trainerIndex(i) != INT_MAX)) @@ -1999,29 +1999,29 @@ int Pokemod::Pokemod::newTrainerId() const return i; } -const Pokemod::Type* Pokemod::Pokemod::type(const int index) const +const Sigmod::Type* Sigmod::Sigmod::type(const int index) const { Q_ASSERT(index < typeCount()); return m_types.at(index); } -Pokemod::Type* Pokemod::Pokemod::type(const int index) +Sigmod::Type* Sigmod::Sigmod::type(const int index) { Q_ASSERT(index < typeCount()); return m_types[index]; } -const Pokemod::Type* Pokemod::Pokemod::typeById(const int id) const +const Sigmod::Type* Sigmod::Sigmod::typeById(const int id) const { return type(typeIndex(id)); } -Pokemod::Type* Pokemod::Pokemod::typeById(const int id) +Sigmod::Type* Sigmod::Sigmod::typeById(const int id) { return type(typeIndex(id)); } -int Pokemod::Pokemod::typeIndex(const int id) const +int Sigmod::Sigmod::typeIndex(const int id) const { for (int i = 0; i < typeCount(); ++i) { @@ -2031,34 +2031,34 @@ int Pokemod::Pokemod::typeIndex(const int id) const return INT_MAX; } -int Pokemod::Pokemod::typeCount() const +int Sigmod::Sigmod::typeCount() const { return m_types.size(); } -Pokemod::Type* Pokemod::Pokemod::newType() +Sigmod::Type* Sigmod::Sigmod::newType() { return newType(new Type(this, newTypeId())); } -Pokemod::Type* Pokemod::Pokemod::newType(const QDomElement& xml) +Sigmod::Type* Sigmod::Sigmod::newType(const QDomElement& xml) { return newType(new Type(xml, this, newTypeId())); } -Pokemod::Type* Pokemod::Pokemod::newType(const Type& type) +Sigmod::Type* Sigmod::Sigmod::newType(const Type& type) { return newType(new Type(type, this, newTypeId())); } -Pokemod::Type* Pokemod::Pokemod::newType(Type* type) +Sigmod::Type* Sigmod::Sigmod::newType(Type* type) { m_types.append(type); m_typechart.resize(typeCount(), typeCount(), Fraction(1, 1)); return type; } -void Pokemod::Pokemod::deleteType(const int index) +void Sigmod::Sigmod::deleteType(const int index) { Q_ASSERT(index < typeCount()); delete m_types[index]; @@ -2066,12 +2066,12 @@ void Pokemod::Pokemod::deleteType(const int index) m_typechart.resize(typeCount(), typeCount(), Fraction(1, 1)); } -void Pokemod::Pokemod::deleteTypeById(const int id) +void Sigmod::Sigmod::deleteTypeById(const int id) { deleteType(typeIndex(id)); } -int Pokemod::Pokemod::newTypeId() const +int Sigmod::Sigmod::newTypeId() const { int i = 0; while ((i < typeCount()) && (typeIndex(i) != INT_MAX)) @@ -2079,29 +2079,29 @@ int Pokemod::Pokemod::newTypeId() const return i; } -const Pokemod::Weather* Pokemod::Pokemod::weather(const int index) const +const Sigmod::Weather* Sigmod::Sigmod::weather(const int index) const { Q_ASSERT(index < weatherCount()); return m_weathers.at(index); } -Pokemod::Weather* Pokemod::Pokemod::weather(const int index) +Sigmod::Weather* Sigmod::Sigmod::weather(const int index) { Q_ASSERT(index < weatherCount()); return m_weathers[index]; } -const Pokemod::Weather* Pokemod::Pokemod::weatherById(const int id) const +const Sigmod::Weather* Sigmod::Sigmod::weatherById(const int id) const { return weather(weatherIndex(id)); } -Pokemod::Weather* Pokemod::Pokemod::weatherById(const int id) +Sigmod::Weather* Sigmod::Sigmod::weatherById(const int id) { return weather(weatherIndex(id)); } -int Pokemod::Pokemod::weatherIndex(const int id) const +int Sigmod::Sigmod::weatherIndex(const int id) const { for (int i = 0; i < weatherCount(); ++i) { @@ -2111,45 +2111,45 @@ int Pokemod::Pokemod::weatherIndex(const int id) const return INT_MAX; } -int Pokemod::Pokemod::weatherCount() const +int Sigmod::Sigmod::weatherCount() const { return m_weathers.size(); } -Pokemod::Weather* Pokemod::Pokemod::newWeather() +Sigmod::Weather* Sigmod::Sigmod::newWeather() { return newWeather(new Weather(this, newWeatherId())); } -Pokemod::Weather* Pokemod::Pokemod::newWeather(const QDomElement& xml) +Sigmod::Weather* Sigmod::Sigmod::newWeather(const QDomElement& xml) { return newWeather(new Weather(xml, this, newWeatherId())); } -Pokemod::Weather* Pokemod::Pokemod::newWeather(const Weather& weather) +Sigmod::Weather* Sigmod::Sigmod::newWeather(const Weather& weather) { return newWeather(new Weather(weather, this, newWeatherId())); } -Pokemod::Weather* Pokemod::Pokemod::newWeather(Weather* weather) +Sigmod::Weather* Sigmod::Sigmod::newWeather(Weather* weather) { m_weathers.append(weather); return weather; } -void Pokemod::Pokemod::deleteWeather(const int index) +void Sigmod::Sigmod::deleteWeather(const int index) { Q_ASSERT(index < weatherCount()); delete m_weathers[index]; m_weathers.removeAt(index); } -void Pokemod::Pokemod::deleteWeatherById(const int id) +void Sigmod::Sigmod::deleteWeatherById(const int id) { deleteWeather(weatherIndex(id)); } -int Pokemod::Pokemod::newWeatherId() const +int Sigmod::Sigmod::newWeatherId() const { int i = 0; while ((i < weatherCount()) && (weatherIndex(i) != INT_MAX)) @@ -2157,7 +2157,7 @@ int Pokemod::Pokemod::newWeatherId() const return i; } -Pokemod::Pokemod& Pokemod::Pokemod::operator=(const Pokemod& rhs) +Sigmod::Sigmod& Sigmod::Sigmod::operator=(const Sigmod& rhs) { if (this == &rhs) return *this; @@ -2195,7 +2195,7 @@ Pokemod::Pokemod& Pokemod::Pokemod::operator=(const Pokemod& rhs) return *this; } -void Pokemod::Pokemod::clear() +void Sigmod::Sigmod::clear() { while (abilityCount()) deleteAbility(0); diff --git a/sigmod/Pokemod.h b/sigmod/Sigmod.h index d5539d21..ac5b96ed 100644 --- a/sigmod/Pokemod.h +++ b/sigmod/Sigmod.h @@ -15,10 +15,10 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __POKEMOD_POKEMOD__ -#define __POKEMOD_POKEMOD__ +#ifndef __SIGMOD_SIGMOD__ +#define __SIGMOD_SIGMOD__ -// Pokemod includes +// Sigmod includes #include "Fraction.h" #include "Matrix.h" #include "Object.h" @@ -26,7 +26,7 @@ // Qt includes #include <QtCore/QList> -namespace Pokemod +namespace Sigmod { // Forward declarations class Ability; @@ -53,15 +53,15 @@ class Trainer; class Type; class Weather; -class POKEMOD_EXPORT Pokemod : public Object +class SIGMOD_EXPORT Sigmod : public Object { Q_OBJECT public: - Pokemod(); - Pokemod(const Pokemod& pokemod); - Pokemod(const QDomElement& xml); - ~Pokemod(); + Sigmod(); + Sigmod(const Sigmod& sigmod); + Sigmod(const QDomElement& xml); + ~Sigmod(); void load(const QDomElement& xml); QDomElement save() const; @@ -350,7 +350,7 @@ class POKEMOD_EXPORT Pokemod : public Object void deleteWeather(const int index); void deleteWeatherById(const int id); - Pokemod& operator=(const Pokemod& rhs); + Sigmod& operator=(const Sigmod& rhs); private: void validate(); diff --git a/sigmod/Skin.cpp b/sigmod/Skin.cpp index b352acd6..a2b46263 100644 --- a/sigmod/Skin.cpp +++ b/sigmod/Skin.cpp @@ -18,38 +18,38 @@ // Header include #include "Skin.h" -// Pokemod includes +// Sigmod includes #include "Macros.h" -#include "Pokemod.h" +#include "Sigmod.h" #include "Script.h" -Pokemod::Skin::Skin(const Skin& skin) : +Sigmod::Skin::Skin(const Skin& skin) : Object(skin.parent(), skin.id()) { *this = skin; } -Pokemod::Skin::Skin(const Pokemod* parent, const int id) : +Sigmod::Skin::Skin(const Sigmod* parent, const int id) : Object(parent, id), m_name(""), m_script("", "") { } -Pokemod::Skin::Skin(const Skin& skin, const Pokemod* parent, const int id) : +Sigmod::Skin::Skin(const Skin& skin, const Sigmod* parent, const int id) : Object(parent, id) { *this = skin; } -Pokemod::Skin::Skin(const QDomElement& xml, const Pokemod* parent, const int id) : +Sigmod::Skin::Skin(const QDomElement& xml, const Sigmod* parent, const int id) : Object(parent, id) { LOAD_ID(); load(xml); } -void Pokemod::Skin::validate() +void Sigmod::Skin::validate() { TEST_BEGIN(); if (m_name.isEmpty()) @@ -57,14 +57,14 @@ void Pokemod::Skin::validate() TEST_END(); } -void Pokemod::Skin::load(const QDomElement& xml) +void Sigmod::Skin::load(const QDomElement& xml) { LOAD_BEGIN(); LOAD(name); LOAD(script); } -QDomElement Pokemod::Skin::save() const +QDomElement Sigmod::Skin::save() const { SAVE_CREATE(); SAVE(name); @@ -72,27 +72,27 @@ QDomElement Pokemod::Skin::save() const return xml; } -void Pokemod::Skin::setName(const QString& name) +void Sigmod::Skin::setName(const QString& name) { CHECK(name); } -void Pokemod::Skin::setScript(const Script& script) +void Sigmod::Skin::setScript(const Script& script) { CHECK(script); } -QString Pokemod::Skin::name() const +QString Sigmod::Skin::name() const { return m_name; } -Pokemod::Script Pokemod::Skin::script() const +Sigmod::Script Sigmod::Skin::script() const { return m_script; } -Pokemod::Skin& Pokemod::Skin::operator=(const Skin& rhs) +Sigmod::Skin& Sigmod::Skin::operator=(const Skin& rhs) { if (this == &rhs) return *this; diff --git a/sigmod/Skin.h b/sigmod/Skin.h index b3bfd2d2..a911fb15 100644 --- a/sigmod/Skin.h +++ b/sigmod/Skin.h @@ -15,27 +15,27 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __POKEMOD_SKIN__ -#define __POKEMOD_SKIN__ +#ifndef __SIGMOD_SKIN__ +#define __SIGMOD_SKIN__ -// Pokemod includes +// Sigmod includes #include "Object.h" #include "Script.h" -namespace Pokemod +namespace Sigmod { // Forward declarations -class Pokemod; +class Sigmod; -class POKEMOD_EXPORT Skin : public Object +class SIGMOD_EXPORT Skin : public Object { Q_OBJECT public: Skin(const Skin& skin); - Skin(const Pokemod* parent, const int id); - Skin(const Skin& skin, const Pokemod* parent, const int id); - Skin(const QDomElement& xml, const Pokemod* parent, const int id = -1); + Skin(const Sigmod* parent, const int id); + Skin(const Skin& skin, const Sigmod* parent, const int id); + Skin(const QDomElement& xml, const Sigmod* parent, const int id = -1); void validate(); diff --git a/sigmod/Sound.cpp b/sigmod/Sound.cpp index a625274f..ff1f0706 100644 --- a/sigmod/Sound.cpp +++ b/sigmod/Sound.cpp @@ -18,19 +18,19 @@ // Header include #include "Sound.h" -// Pokemod includes +// Sigmod includes #include "Macros.h" -#include "Pokemod.h" +#include "Sigmod.h" -const QStringList Pokemod::Sound::TypeStr = QStringList() << "Sound Effect" << "Music"; +const QStringList Sigmod::Sound::TypeStr = QStringList() << "Sound Effect" << "Music"; -Pokemod::Sound::Sound(const Sound& sound) : +Sigmod::Sound::Sound(const Sound& sound) : Object(sound.parent(), sound.id()) { *this = sound; } -Pokemod::Sound::Sound(const Pokemod* parent, const int id) : +Sigmod::Sound::Sound(const Sigmod* parent, const int id) : Object(parent, id), m_name(""), m_type(SoundEffect), @@ -38,20 +38,20 @@ Pokemod::Sound::Sound(const Pokemod* parent, const int id) : { } -Pokemod::Sound::Sound(const Sound& sound, const Pokemod* parent, const int id) : +Sigmod::Sound::Sound(const Sound& sound, const Sigmod* parent, const int id) : Object(parent, id) { *this = sound; } -Pokemod::Sound::Sound(const QDomElement& xml, const Pokemod* parent, const int id) : +Sigmod::Sound::Sound(const QDomElement& xml, const Sigmod* parent, const int id) : Object(parent, id) { LOAD_ID(); load(xml); } -void Pokemod::Sound::validate() +void Sigmod::Sound::validate() { TEST_BEGIN(); if (m_name.isEmpty()) @@ -61,7 +61,7 @@ void Pokemod::Sound::validate() TEST_END(); } -void Pokemod::Sound::load(const QDomElement& xml) +void Sigmod::Sound::load(const QDomElement& xml) { LOAD_BEGIN(); LOAD(name); @@ -69,7 +69,7 @@ void Pokemod::Sound::load(const QDomElement& xml) LOAD(data); } -QDomElement Pokemod::Sound::save() const +QDomElement Sigmod::Sound::save() const { SAVE_CREATE(); SAVE(name); @@ -78,37 +78,37 @@ QDomElement Pokemod::Sound::save() const return xml; } -void Pokemod::Sound::setName(const QString& name) +void Sigmod::Sound::setName(const QString& name) { CHECK(name); } -void Pokemod::Sound::setType(const Type type) +void Sigmod::Sound::setType(const Type type) { CHECK(type); } -void Pokemod::Sound::setData(const QByteArray& data) +void Sigmod::Sound::setData(const QByteArray& data) { CHECK(data); } -QString Pokemod::Sound::name() const +QString Sigmod::Sound::name() const { return m_name; } -Pokemod::Sound::Type Pokemod::Sound::type() const +Sigmod::Sound::Type Sigmod::Sound::type() const { return m_type; } -QByteArray Pokemod::Sound::data() const +QByteArray Sigmod::Sound::data() const { return m_data; } -Pokemod::Sound& Pokemod::Sound::operator=(const Sound& rhs) +Sigmod::Sound& Sigmod::Sound::operator=(const Sound& rhs) { if (this == &rhs) return *this; diff --git a/sigmod/Sound.h b/sigmod/Sound.h index 0f4033ce..789718b3 100644 --- a/sigmod/Sound.h +++ b/sigmod/Sound.h @@ -15,22 +15,22 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __POKEMOD_SOUND__ -#define __POKEMOD_SOUND__ +#ifndef __SIGMOD_SOUND__ +#define __SIGMOD_SOUND__ -// Pokemod includes +// Sigmod includes #include "Object.h" // Qt includes #include <QtCore/QByteArray> #include <QtCore/QString> -namespace Pokemod +namespace Sigmod { // Forward declarations -class Pokemod; +class Sigmod; -class POKEMOD_EXPORT Sound : public Object +class SIGMOD_EXPORT Sound : public Object { Q_OBJECT Q_ENUMS(Type) @@ -44,9 +44,9 @@ class POKEMOD_EXPORT Sound : public Object static const QStringList TypeStr; Sound(const Sound& sound); - Sound(const Pokemod* parent, const int id); - Sound(const Sound& sound, const Pokemod* parent, const int id); - Sound(const QDomElement& xml, const Pokemod* parent, const int id = -1); + Sound(const Sigmod* parent, const int id); + Sound(const Sound& sound, const Sigmod* parent, const int id); + Sound(const QDomElement& xml, const Sigmod* parent, const int id = -1); void validate(); @@ -68,6 +68,6 @@ class POKEMOD_EXPORT Sound : public Object QByteArray m_data; }; } -Q_DECLARE_METATYPE(Pokemod::Sound::Type) +Q_DECLARE_METATYPE(Sigmod::Sound::Type) #endif diff --git a/sigmod/Species.cpp b/sigmod/Species.cpp index bab59446..3fc72932 100644 --- a/sigmod/Species.cpp +++ b/sigmod/Species.cpp @@ -18,10 +18,10 @@ // Header include #include "Species.h" -// Pokemod includes +// Sigmod includes #include "Macros.h" -#include "Pokemod.h" #include "Rules.h" +#include "Sigmod.h" #include "SpeciesAbility.h" #include "SpeciesItem.h" #include "SpeciesMove.h" @@ -29,9 +29,9 @@ // Qt includes #include <QtCore/QSet> -const QStringList Pokemod::Species::StyleStr = QStringList() << "Fluctuating" << "Fading" << "Slow" << "Normal" << "Fast" << "Erratic"; +const QStringList Sigmod::Species::StyleStr = QStringList() << "Fluctuating" << "Fading" << "Slow" << "Normal" << "Fast" << "Erratic"; -Pokemod::Species::Species(const Species& species) : +Sigmod::Species::Species(const Species& species) : Object(species.parent(), species.id()), m_baseStat(ST_End_GSC), m_effortValue(ST_End_GSC) @@ -39,7 +39,7 @@ Pokemod::Species::Species(const Species& species) : *this = species; } -Pokemod::Species::Species(const Pokemod* parent, const int id) : +Sigmod::Species::Species(const Sigmod* parent, const int id) : Object(parent, id), m_name(""), m_baseStat(ST_End_GSC), @@ -49,7 +49,7 @@ Pokemod::Species::Species(const Pokemod* parent, const int id) : m_runChance(1, 1), m_fleeChance(1, 1), m_itemChance(1, 1), - m_pokedexNumber(INT_MAX), + m_encyclopediaNumber(INT_MAX), m_weight(0), m_height(0), m_frontMaleSprite(-1), @@ -57,7 +57,7 @@ Pokemod::Species::Species(const Pokemod* parent, const int id) : m_frontFemaleSprite(-1), m_backFemaleSprite(-1), m_skin(-1), - m_pokedexEntry(""), + m_encyclopediaEntry(""), m_genderFactor(1, 1), m_eggSpecies(INT_MAX), m_eggSteps(0), @@ -69,7 +69,7 @@ Pokemod::Species::Species(const Pokemod* parent, const int id) : m_effortValue[i] = 0; } -Pokemod::Species::Species(const Species& species, const Pokemod* parent, const int id) : +Sigmod::Species::Species(const Species& species, const Sigmod* parent, const int id) : Object(parent, id), m_baseStat(ST_End_GSC), m_effortValue(ST_End_GSC) @@ -77,7 +77,7 @@ Pokemod::Species::Species(const Species& species, const Pokemod* parent, const i *this = species; } -Pokemod::Species::Species(const QDomElement& xml, const Pokemod* parent, const int id) : +Sigmod::Species::Species(const QDomElement& xml, const Sigmod* parent, const int id) : Object(parent, id), m_baseStat(ST_End_GSC), m_effortValue(ST_End_GSC) @@ -86,12 +86,12 @@ Pokemod::Species::Species(const QDomElement& xml, const Pokemod* parent, const i load(xml); } -Pokemod::Species::~Species() +Sigmod::Species::~Species() { clear(); } -void Pokemod::Species::validate() +void Sigmod::Species::validate() { TEST_BEGIN(); if (m_name.isEmpty()) @@ -107,16 +107,16 @@ void Pokemod::Species::validate() TEST(setFrontFemaleSprite, frontFemaleSprite); TEST(setBackFemaleSprite, backFemaleSprite); TEST(setSkin, skin); - if ((m_pokedexNumber != INT_MAX) && m_pokedexEntry.isEmpty()) - emit(error("Pokedex entry is empty")); + if ((m_encyclopediaNumber != INT_MAX) && m_encyclopediaEntry.isEmpty()) + emit(error("Encyclopedia entry is empty")); TEST(setGenderFactor, genderFactor); - if (qobject_cast<const Pokemod*>(pokemod())->rules()->breedingAllowed()) + if (qobject_cast<const Sigmod*>(sigmod())->rules()->breedingAllowed()) { - if (qobject_cast<const Pokemod*>(pokemod())->speciesIndex(m_eggSpecies) == INT_MAX) + if (qobject_cast<const Sigmod*>(sigmod())->speciesIndex(m_eggSpecies) == INT_MAX) emit(error(bounds("egg species"))); else { - if (qobject_cast<const Pokemod*>(pokemod())->species(m_eggSpecies)->growth() != m_growth) + if (qobject_cast<const Sigmod*>(sigmod())->species(m_eggSpecies)->growth() != m_growth) emit(error("Growth mismatch with egg species")); TEST(setEggSteps, eggSteps); } @@ -125,7 +125,7 @@ void Pokemod::Species::validate() TEST_LIST(setEggGroup, eggGroup); QSet<int> idChecker; QSet<int> valueChecker; - if (abilityCount() < qobject_cast<const Pokemod*>(pokemod())->rules()->maxAbilities()) + if (abilityCount() < qobject_cast<const Sigmod*>(sigmod())->rules()->maxAbilities()) emit(warning("There are too few abilities")); TEST_SUB_BEGIN(SpeciesAbility, abilities); TEST_SUB("ability", id); @@ -133,7 +133,7 @@ void Pokemod::Species::validate() TEST_SUB_END(); idChecker.clear(); valueChecker.clear(); - if (qobject_cast<const Pokemod*>(pokemod())->rules()->maxHeldItems() && !itemCount()) + if (qobject_cast<const Sigmod*>(sigmod())->rules()->maxHeldItems() && !itemCount()) emit(warning("There are no items")); TEST_SUB_BEGIN(SpeciesItem, items); TEST_SUB("item", id); @@ -150,7 +150,7 @@ void Pokemod::Species::validate() TEST_END(); } -void Pokemod::Species::load(const QDomElement& xml) +void Sigmod::Species::load(const QDomElement& xml) { LOAD_BEGIN(); LOAD(name); @@ -162,7 +162,7 @@ void Pokemod::Species::load(const QDomElement& xml) LOAD(runChance); LOAD(fleeChance); LOAD(itemChance); - LOAD(pokedexNumber); + LOAD(encyclopediaNumber); LOAD(weight); LOAD(height); LOAD(frontMaleSprite); @@ -170,7 +170,7 @@ void Pokemod::Species::load(const QDomElement& xml) LOAD(frontFemaleSprite); LOAD(backFemaleSprite); LOAD(skin); - LOAD(pokedexEntry); + LOAD(encyclopediaEntry); LOAD(genderFactor); LOAD(eggSpecies); LOAD(eggSteps); @@ -182,7 +182,7 @@ void Pokemod::Species::load(const QDomElement& xml) LOAD_SUB(newMove, SpeciesMove); } -QDomElement Pokemod::Species::save() const +QDomElement Sigmod::Species::save() const { SAVE_CREATE(); SAVE(name); @@ -194,7 +194,7 @@ QDomElement Pokemod::Species::save() const SAVE(runChance); SAVE(fleeChance); SAVE(itemChance); - SAVE(pokedexNumber); + SAVE(encyclopediaNumber); SAVE(weight); SAVE(height); SAVE(frontMaleSprite); @@ -202,7 +202,7 @@ QDomElement Pokemod::Species::save() const SAVE(frontFemaleSprite); SAVE(backFemaleSprite); SAVE(skin); - SAVE(pokedexEntry); + SAVE(encyclopediaEntry); SAVE(genderFactor); SAVE(eggSpecies); SAVE(eggSteps); @@ -215,17 +215,17 @@ QDomElement Pokemod::Species::save() const return xml; } -void Pokemod::Species::setName(const QString& name) +void Sigmod::Species::setName(const QString& name) { CHECK(name); } -void Pokemod::Species::setBaseStat(const Stat stat, const int baseStat) +void Sigmod::Species::setBaseStat(const Stat stat, const int baseStat) { switch (stat) { case ST_SpecialDefense: - if (qobject_cast<const Pokemod*>(pokemod())->rules()->specialSplit()) + if (qobject_cast<const Sigmod*>(sigmod())->rules()->specialSplit()) case ST_HP ... ST_Special: break; default: @@ -235,16 +235,16 @@ void Pokemod::Species::setBaseStat(const Stat stat, const int baseStat) CHECK_ARRAY(baseStat[stat], baseStat); } -void Pokemod::Species::setEffortValue(const Stat stat, const int effortValue) +void Sigmod::Species::setEffortValue(const Stat stat, const int effortValue) { - if (!qobject_cast<const Pokemod*>(pokemod())->rules()->effortValuesAllowed()) + if (!qobject_cast<const Sigmod*>(sigmod())->rules()->effortValuesAllowed()) emit(error("Effort Values not allowed")); - else if (qobject_cast<const Pokemod*>(pokemod())->rules()->maxEVPerStat() < effortValue) + else if (qobject_cast<const Sigmod*>(sigmod())->rules()->maxEVPerStat() < effortValue) emit(error(bounds("effortValue"))); switch (stat) { case ST_SpecialDefense: - if (qobject_cast<const Pokemod*>(pokemod())->rules()->specialSplit()) + if (qobject_cast<const Sigmod*>(sigmod())->rules()->specialSplit()) case ST_HP ... ST_Special: break; default: @@ -254,23 +254,23 @@ void Pokemod::Species::setEffortValue(const Stat stat, const int effortValue) CHECK_ARRAY(effortValue[stat], effortValue); } -void Pokemod::Species::setEffortValue(const int effortValue) +void Sigmod::Species::setEffortValue(const int effortValue) { - if (qobject_cast<const Pokemod*>(pokemod())->rules()->effortValuesAllowed() && qobject_cast<const Pokemod*>(pokemod())->rules()->maxEVPerStat() < effortValue) + if (qobject_cast<const Sigmod*>(sigmod())->rules()->effortValuesAllowed() && qobject_cast<const Sigmod*>(sigmod())->rules()->maxEVPerStat() < effortValue) emit(error(bounds("effortValue"))); } -void Pokemod::Species::setGrowth(const Style growth) +void Sigmod::Species::setGrowth(const Style growth) { CHECK(growth); } -void Pokemod::Species::setExperienceValue(const int experienceValue) +void Sigmod::Species::setExperienceValue(const int experienceValue) { CHECK(experienceValue); } -void Pokemod::Species::setCatchValue(const int catchValue) +void Sigmod::Species::setCatchValue(const int catchValue) { if (255 < catchValue) emit(error(bounds("catchValue"))); @@ -278,7 +278,7 @@ void Pokemod::Species::setCatchValue(const int catchValue) CHECK(catchValue); } -void Pokemod::Species::setRunChance(const Fraction& runChance) +void Sigmod::Species::setRunChance(const Fraction& runChance) { if (1 < runChance) emit(error(bounds("runChance"))); @@ -286,7 +286,7 @@ void Pokemod::Species::setRunChance(const Fraction& runChance) CHECK(runChance); } -void Pokemod::Species::setFleeChance(const Fraction& fleeChance) +void Sigmod::Species::setFleeChance(const Fraction& fleeChance) { if (1 < fleeChance) emit(error(bounds("fleeChance"))); @@ -294,7 +294,7 @@ void Pokemod::Species::setFleeChance(const Fraction& fleeChance) CHECK(fleeChance); } -void Pokemod::Species::setItemChance(const Fraction& itemChance) +void Sigmod::Species::setItemChance(const Fraction& itemChance) { if (1 < itemChance) emit(error(bounds("itemChance"))); @@ -302,103 +302,103 @@ void Pokemod::Species::setItemChance(const Fraction& itemChance) CHECK(itemChance); } -void Pokemod::Species::setPokedexNumber(const int pokedexNumber) +void Sigmod::Species::setEncyclopediaNumber(const int encyclopediaNumber) { - CHECK(pokedexNumber); + CHECK(encyclopediaNumber); } -void Pokemod::Species::setWeight(const int weight) +void Sigmod::Species::setWeight(const int weight) { CHECK(weight); } -void Pokemod::Species::setHeight(const int height) +void Sigmod::Species::setHeight(const int height) { CHECK(height); } -void Pokemod::Species::setPokedexEntry(const QString& pokedexEntry) +void Sigmod::Species::setEncyclopediaEntry(const QString& encyclopediaEntry) { - CHECK(pokedexEntry); + CHECK(encyclopediaEntry); } -void Pokemod::Species::setFrontMaleSprite(const int frontMaleSprite) +void Sigmod::Species::setFrontMaleSprite(const int frontMaleSprite) { if (m_genderFactor.numerator() == m_genderFactor.denominator()) emit(error("Cannot be male")); - else if (qobject_cast<const Pokemod*>(pokemod())->spriteIndex(frontMaleSprite) == INT_MAX) + else if (qobject_cast<const Sigmod*>(sigmod())->spriteIndex(frontMaleSprite) == INT_MAX) emit(error(bounds("frontMaleSprite"))); else CHECK(frontMaleSprite); } -void Pokemod::Species::setBackMaleSprite(const int backMaleSprite) +void Sigmod::Species::setBackMaleSprite(const int backMaleSprite) { if (m_genderFactor.numerator() == m_genderFactor.denominator()) emit(error("Cannot be male")); - else if (qobject_cast<const Pokemod*>(pokemod())->spriteIndex(backMaleSprite) == INT_MAX) + else if (qobject_cast<const Sigmod*>(sigmod())->spriteIndex(backMaleSprite) == INT_MAX) emit(error(bounds("backMaleSprite"))); else CHECK(backMaleSprite); } -void Pokemod::Species::setFrontFemaleSprite(const int frontFemaleSprite) +void Sigmod::Species::setFrontFemaleSprite(const int frontFemaleSprite) { - if (!qobject_cast<const Pokemod*>(pokemod())->rules()->genderAllowed()) + if (!qobject_cast<const Sigmod*>(sigmod())->rules()->genderAllowed()) emit(error("Gender is not allowed")); else if (!m_genderFactor.numerator()) emit(error("Cannot be female")); else if (1 < m_genderFactor) emit(error("Genderless uses male sprites")); - else if (qobject_cast<const Pokemod*>(pokemod())->spriteIndex(frontFemaleSprite) == INT_MAX) + else if (qobject_cast<const Sigmod*>(sigmod())->spriteIndex(frontFemaleSprite) == INT_MAX) emit(error(bounds("frontFemaleSprite"))); else CHECK(frontFemaleSprite); } -void Pokemod::Species::setBackFemaleSprite(const int backFemaleSprite) +void Sigmod::Species::setBackFemaleSprite(const int backFemaleSprite) { - if (!qobject_cast<const Pokemod*>(pokemod())->rules()->genderAllowed()) + if (!qobject_cast<const Sigmod*>(sigmod())->rules()->genderAllowed()) emit(error("Gender is not allowed")); else if (!m_genderFactor.numerator()) emit(error("Cannot be female")); else if (1 < m_genderFactor) emit(error("Genderless uses male sprites")); - else if (qobject_cast<const Pokemod*>(pokemod())->spriteIndex(backFemaleSprite) == INT_MAX) + else if (qobject_cast<const Sigmod*>(sigmod())->spriteIndex(backFemaleSprite) == INT_MAX) emit(error(bounds("backFemaleSprite"))); else CHECK(backFemaleSprite); } -void Pokemod::Species::setSkin(const int skin) +void Sigmod::Species::setSkin(const int skin) { - if (qobject_cast<const Pokemod*>(pokemod())->skinIndex(skin) == INT_MAX) + if (qobject_cast<const Sigmod*>(sigmod())->skinIndex(skin) == INT_MAX) emit(error(bounds("skin"))); else CHECK(skin); } -void Pokemod::Species::setGenderFactor(const Fraction& genderFactor) +void Sigmod::Species::setGenderFactor(const Fraction& genderFactor) { CHECK(genderFactor); } -void Pokemod::Species::setEggSpecies(const int eggSpecies) +void Sigmod::Species::setEggSpecies(const int eggSpecies) { - if (qobject_cast<const Pokemod*>(pokemod())->speciesIndex(eggSpecies) == INT_MAX) + if (qobject_cast<const Sigmod*>(sigmod())->speciesIndex(eggSpecies) == INT_MAX) emit(error(bounds("eggSpecies"))); else CHECK(eggSpecies); } -void Pokemod::Species::setEggSteps(const int eggSteps) +void Sigmod::Species::setEggSteps(const int eggSteps) { CHECK(eggSteps); } -void Pokemod::Species::setType(const int type, const bool state) +void Sigmod::Species::setType(const int type, const bool state) { - if (qobject_cast<const Pokemod*>(pokemod())->typeIndex(type) == INT_MAX) + if (qobject_cast<const Sigmod*>(sigmod())->typeIndex(type) == INT_MAX) emit(error(bounds("type"))); else if (state && !m_type.contains(type)) { @@ -412,9 +412,9 @@ void Pokemod::Species::setType(const int type, const bool state) } } -void Pokemod::Species::setEggGroup(const int eggGroup, const bool state) +void Sigmod::Species::setEggGroup(const int eggGroup, const bool state) { - if (qobject_cast<const Pokemod*>(pokemod())->eggGroupIndex(eggGroup) == INT_MAX) + if (qobject_cast<const Sigmod*>(sigmod())->eggGroupIndex(eggGroup) == INT_MAX) emit(error(bounds("egg group"))); else if (state && !m_eggGroup.contains(eggGroup)) { @@ -428,22 +428,22 @@ void Pokemod::Species::setEggGroup(const int eggGroup, const bool state) } } -void Pokemod::Species::setEvolution(const Script& evolution) +void Sigmod::Species::setEvolution(const Script& evolution) { CHECK(evolution); } -QString Pokemod::Species::name() const +QString Sigmod::Species::name() const { return m_name; } -int Pokemod::Species::baseStat(const Stat stat) const +int Sigmod::Species::baseStat(const Stat stat) const { switch (stat) { case ST_SpecialDefense: - if (qobject_cast<const Pokemod*>(pokemod())->rules()->specialSplit()) + if (qobject_cast<const Sigmod*>(sigmod())->rules()->specialSplit()) case ST_HP ... ST_Special: return m_effortValue[stat]; default: @@ -452,12 +452,12 @@ int Pokemod::Species::baseStat(const Stat stat) const } } -int Pokemod::Species::effortValue(const Stat stat) const +int Sigmod::Species::effortValue(const Stat stat) const { switch (stat) { case ST_SpecialDefense: - if (qobject_cast<const Pokemod*>(pokemod())->rules()->specialSplit()) + if (qobject_cast<const Sigmod*>(sigmod())->rules()->specialSplit()) case ST_HP ... ST_Special: return m_effortValue[stat]; default: @@ -466,144 +466,144 @@ int Pokemod::Species::effortValue(const Stat stat) const } } -Pokemod::Species::Style Pokemod::Species::growth() const +Sigmod::Species::Style Sigmod::Species::growth() const { return m_growth; } -int Pokemod::Species::experienceValue() const +int Sigmod::Species::experienceValue() const { return m_experienceValue; } -int Pokemod::Species::catchValue() const +int Sigmod::Species::catchValue() const { return m_catchValue; } -Pokemod::Fraction Pokemod::Species::runChance() const +Sigmod::Fraction Sigmod::Species::runChance() const { return m_runChance; } -Pokemod::Fraction Pokemod::Species::fleeChance() const +Sigmod::Fraction Sigmod::Species::fleeChance() const { return m_fleeChance; } -Pokemod::Fraction Pokemod::Species::itemChance() const +Sigmod::Fraction Sigmod::Species::itemChance() const { return m_itemChance; } -int Pokemod::Species::pokedexNumber() const +int Sigmod::Species::encyclopediaNumber() const { - return m_pokedexNumber; + return m_encyclopediaNumber; } -int Pokemod::Species::weight() const +int Sigmod::Species::weight() const { return m_weight; } -int Pokemod::Species::height() const +int Sigmod::Species::height() const { return m_height; } -QString Pokemod::Species::pokedexEntry() const +QString Sigmod::Species::encyclopediaEntry() const { - return m_pokedexEntry; + return m_encyclopediaEntry; } -int Pokemod::Species::frontMaleSprite() const +int Sigmod::Species::frontMaleSprite() const { return m_frontMaleSprite; } -int Pokemod::Species::backMaleSprite() const +int Sigmod::Species::backMaleSprite() const { return m_backMaleSprite; } -int Pokemod::Species::frontFemaleSprite() const +int Sigmod::Species::frontFemaleSprite() const { return m_frontFemaleSprite; } -int Pokemod::Species::backFemaleSprite() const +int Sigmod::Species::backFemaleSprite() const { return m_backFemaleSprite; } -int Pokemod::Species::skin() const +int Sigmod::Species::skin() const { return m_skin; } -Pokemod::Fraction Pokemod::Species::genderFactor() const +Sigmod::Fraction Sigmod::Species::genderFactor() const { return m_genderFactor; } -int Pokemod::Species::eggSpecies() const +int Sigmod::Species::eggSpecies() const { return m_eggSpecies; } -int Pokemod::Species::eggSteps() const +int Sigmod::Species::eggSteps() const { return m_eggSteps; } -bool Pokemod::Species::type(const int type) const +bool Sigmod::Species::type(const int type) const { return m_type.contains(type); } -QList<int> Pokemod::Species::types() const +QList<int> Sigmod::Species::types() const { return m_type; } -bool Pokemod::Species::eggGroup(const int eggGroup) const +bool Sigmod::Species::eggGroup(const int eggGroup) const { return m_eggGroup.contains(eggGroup); } -QList<int> Pokemod::Species::eggGroups() const +QList<int> Sigmod::Species::eggGroups() const { return m_eggGroup; } -Pokemod::Script Pokemod::Species::evolution() const +Sigmod::Script Sigmod::Species::evolution() const { return m_evolution; } -const Pokemod::SpeciesAbility* Pokemod::Species::ability(const int index) const +const Sigmod::SpeciesAbility* Sigmod::Species::ability(const int index) const { Q_ASSERT(index < abilityCount()); return m_abilities.at(index); } -Pokemod::SpeciesAbility* Pokemod::Species::ability(const int index) +Sigmod::SpeciesAbility* Sigmod::Species::ability(const int index) { Q_ASSERT(index < abilityCount()); return m_abilities[index]; } -const Pokemod::SpeciesAbility* Pokemod::Species::abilityById(const int id) const +const Sigmod::SpeciesAbility* Sigmod::Species::abilityById(const int id) const { return ability(abilityIndex(id)); } -Pokemod::SpeciesAbility* Pokemod::Species::abilityById(const int id) +Sigmod::SpeciesAbility* Sigmod::Species::abilityById(const int id) { return ability(abilityIndex(id)); } -int Pokemod::Species::abilityIndex(const int id) const +int Sigmod::Species::abilityIndex(const int id) const { for (int i = 0; i < abilityCount(); ++i) { @@ -613,45 +613,45 @@ int Pokemod::Species::abilityIndex(const int id) const return INT_MAX; } -int Pokemod::Species::abilityCount() const +int Sigmod::Species::abilityCount() const { return m_abilities.size(); } -Pokemod::SpeciesAbility* Pokemod::Species::newAbility() +Sigmod::SpeciesAbility* Sigmod::Species::newAbility() { return newAbility(new SpeciesAbility(this, newAbilityId())); } -Pokemod::SpeciesAbility* Pokemod::Species::newAbility(const QDomElement& xml) +Sigmod::SpeciesAbility* Sigmod::Species::newAbility(const QDomElement& xml) { return newAbility(new SpeciesAbility(xml, this, newAbilityId())); } -Pokemod::SpeciesAbility* Pokemod::Species::newAbility(const SpeciesAbility& ability) +Sigmod::SpeciesAbility* Sigmod::Species::newAbility(const SpeciesAbility& ability) { return newAbility(new SpeciesAbility(ability, this, newAbilityId())); } -Pokemod::SpeciesAbility* Pokemod::Species::newAbility(SpeciesAbility* ability) +Sigmod::SpeciesAbility* Sigmod::Species::newAbility(SpeciesAbility* ability) { m_abilities.append(ability); return ability; } -void Pokemod::Species::deleteAbility(const int index) +void Sigmod::Species::deleteAbility(const int index) { Q_ASSERT(index < abilityCount()); delete m_abilities[index]; m_abilities.removeAt(index); } -void Pokemod::Species::deleteAbilityById(const int id) +void Sigmod::Species::deleteAbilityById(const int id) { deleteAbility(abilityIndex(id)); } -int Pokemod::Species::newAbilityId() const +int Sigmod::Species::newAbilityId() const { int i = 0; while ((i < abilityCount()) && (abilityIndex(i) != INT_MAX)) @@ -659,29 +659,29 @@ int Pokemod::Species::newAbilityId() const return i; } -const Pokemod::SpeciesItem* Pokemod::Species::item(const int index) const +const Sigmod::SpeciesItem* Sigmod::Species::item(const int index) const { Q_ASSERT(index < itemCount()); return m_items.at(index); } -Pokemod::SpeciesItem* Pokemod::Species::item(const int index) +Sigmod::SpeciesItem* Sigmod::Species::item(const int index) { Q_ASSERT(index < itemCount()); return m_items[index]; } -const Pokemod::SpeciesItem* Pokemod::Species::itemById(const int id) const +const Sigmod::SpeciesItem* Sigmod::Species::itemById(const int id) const { return item(itemIndex(id)); } -Pokemod::SpeciesItem* Pokemod::Species::itemById(const int id) +Sigmod::SpeciesItem* Sigmod::Species::itemById(const int id) { return item(itemIndex(id)); } -int Pokemod::Species::itemIndex(const int id) const +int Sigmod::Species::itemIndex(const int id) const { for (int i = 0; i < itemCount(); ++i) { @@ -691,45 +691,45 @@ int Pokemod::Species::itemIndex(const int id) const return INT_MAX; } -int Pokemod::Species::itemCount() const +int Sigmod::Species::itemCount() const { return m_items.size(); } -Pokemod::SpeciesItem* Pokemod::Species::newItem() +Sigmod::SpeciesItem* Sigmod::Species::newItem() { return newItem(new SpeciesItem(this, newItemId())); } -Pokemod::SpeciesItem* Pokemod::Species::newItem(const QDomElement& xml) +Sigmod::SpeciesItem* Sigmod::Species::newItem(const QDomElement& xml) { return newItem(new SpeciesItem(xml, this, newItemId())); } -Pokemod::SpeciesItem* Pokemod::Species::newItem(const SpeciesItem& item) +Sigmod::SpeciesItem* Sigmod::Species::newItem(const SpeciesItem& item) { return newItem(new SpeciesItem(item, this, newItemId())); } -Pokemod::SpeciesItem* Pokemod::Species::newItem(SpeciesItem* item) +Sigmod::SpeciesItem* Sigmod::Species::newItem(SpeciesItem* item) { m_items.append(item); return item; } -void Pokemod::Species::deleteItem(const int index) +void Sigmod::Species::deleteItem(const int index) { Q_ASSERT(index < itemCount()); delete m_items[index]; m_items.removeAt(index); } -void Pokemod::Species::deleteItemById(const int id) +void Sigmod::Species::deleteItemById(const int id) { deleteItem(itemIndex(id)); } -int Pokemod::Species::newItemId() const +int Sigmod::Species::newItemId() const { int i = 0; while ((i < itemCount()) && (itemIndex(i) != INT_MAX)) @@ -737,29 +737,29 @@ int Pokemod::Species::newItemId() const return i; } -const Pokemod::SpeciesMove* Pokemod::Species::move(const int index) const +const Sigmod::SpeciesMove* Sigmod::Species::move(const int index) const { Q_ASSERT(index < moveCount()); return m_moves.at(index); } -Pokemod::SpeciesMove* Pokemod::Species::move(const int index) +Sigmod::SpeciesMove* Sigmod::Species::move(const int index) { Q_ASSERT(index < moveCount()); return m_moves[index]; } -const Pokemod::SpeciesMove* Pokemod::Species::moveById(const int id) const +const Sigmod::SpeciesMove* Sigmod::Species::moveById(const int id) const { return move(moveIndex(id)); } -Pokemod::SpeciesMove* Pokemod::Species::moveById(const int id) +Sigmod::SpeciesMove* Sigmod::Species::moveById(const int id) { return move(moveIndex(id)); } -int Pokemod::Species::moveIndex(const int id) const +int Sigmod::Species::moveIndex(const int id) const { for (int i = 0; i < moveCount(); ++i) { @@ -769,45 +769,45 @@ int Pokemod::Species::moveIndex(const int id) const return INT_MAX; } -int Pokemod::Species::moveCount() const +int Sigmod::Species::moveCount() const { return m_moves.size(); } -Pokemod::SpeciesMove* Pokemod::Species::newMove() +Sigmod::SpeciesMove* Sigmod::Species::newMove() { return newMove(new SpeciesMove(this, newMoveId())); } -Pokemod::SpeciesMove* Pokemod::Species::newMove(const QDomElement& xml) +Sigmod::SpeciesMove* Sigmod::Species::newMove(const QDomElement& xml) { return newMove(new SpeciesMove(xml, this, newMoveId())); } -Pokemod::SpeciesMove* Pokemod::Species::newMove(const SpeciesMove& move) +Sigmod::SpeciesMove* Sigmod::Species::newMove(const SpeciesMove& move) { return newMove(new SpeciesMove(move, this, newMoveId())); } -Pokemod::SpeciesMove* Pokemod::Species::newMove(SpeciesMove* move) +Sigmod::SpeciesMove* Sigmod::Species::newMove(SpeciesMove* move) { m_moves.append(move); return move; } -void Pokemod::Species::deleteMove(const int index) +void Sigmod::Species::deleteMove(const int index) { Q_ASSERT(index < moveCount()); delete m_moves[index]; m_moves.removeAt(index); } -void Pokemod::Species::deleteMoveById(const int id) +void Sigmod::Species::deleteMoveById(const int id) { deleteMove(moveIndex(id)); } -int Pokemod::Species::newMoveId() const +int Sigmod::Species::newMoveId() const { int i = 0; while ((i < moveCount()) && (moveIndex(i) != INT_MAX)) @@ -815,7 +815,7 @@ int Pokemod::Species::newMoveId() const return i; } -Pokemod::Species& Pokemod::Species::operator=(const Species& rhs) +Sigmod::Species& Sigmod::Species::operator=(const Species& rhs) { if (this == &rhs) return *this; @@ -829,7 +829,7 @@ Pokemod::Species& Pokemod::Species::operator=(const Species& rhs) COPY(runChance); COPY(fleeChance); COPY(itemChance); - COPY(pokedexNumber); + COPY(encyclopediaNumber); COPY(weight); COPY(height); COPY(frontMaleSprite); @@ -837,7 +837,7 @@ Pokemod::Species& Pokemod::Species::operator=(const Species& rhs) COPY(frontFemaleSprite); COPY(backFemaleSprite); COPY(skin); - COPY(pokedexEntry); + COPY(encyclopediaEntry); COPY(genderFactor); COPY(eggSpecies); COPY(eggSteps); @@ -850,7 +850,7 @@ Pokemod::Species& Pokemod::Species::operator=(const Species& rhs) return *this; } -void Pokemod::Species::clear() +void Sigmod::Species::clear() { while (abilityCount()) deleteAbility(0); diff --git a/sigmod/Species.h b/sigmod/Species.h index d63fb4ec..8bf59bb4 100644 --- a/sigmod/Species.h +++ b/sigmod/Species.h @@ -15,10 +15,10 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __POKEMOD_SPECIES__ -#define __POKEMOD_SPECIES__ +#ifndef __SIGMOD_SPECIES__ +#define __SIGMOD_SPECIES__ -// Pokemod includes +// Sigmod includes #include "Fraction.h" #include "Object.h" #include "Script.h" @@ -26,15 +26,15 @@ // Qt includes #include <QtCore/QList> -namespace Pokemod +namespace Sigmod { // Forward declarations -class Pokemod; +class Sigmod; class SpeciesAbility; class SpeciesItem; class SpeciesMove; -class POKEMOD_EXPORT Species : public Object +class SIGMOD_EXPORT Species : public Object { Q_OBJECT Q_ENUMS(Style) @@ -52,9 +52,9 @@ class POKEMOD_EXPORT Species : public Object static const QStringList StyleStr; Species(const Species& species); - Species(const Pokemod* parent, const int id); - Species(const Species& species, const Pokemod* parent, const int id); - Species(const QDomElement& xml, const Pokemod* parent, const int id = -1); + Species(const Sigmod* parent, const int id); + Species(const Species& species, const Sigmod* parent, const int id); + Species(const QDomElement& xml, const Sigmod* parent, const int id = -1); ~Species(); void validate(); @@ -71,10 +71,10 @@ class POKEMOD_EXPORT Species : public Object void setRunChance(const Fraction& runChance); void setFleeChance(const Fraction& fleeChance); void setItemChance(const Fraction& itemChance); - void setPokedexNumber(const int pokedexNumber); + void setEncyclopediaNumber(const int encyclopediaNumber); void setWeight(const int weight); void setHeight(const int height); - void setPokedexEntry(const QString& pokedexEntry); + void setEncyclopediaEntry(const QString& encyclopediaEntry); void setFrontMaleSprite(const int frontMaleSprite); void setBackMaleSprite(const int backMaleSprite); void setFrontFemaleSprite(const int frontFemaleSprite); @@ -96,10 +96,10 @@ class POKEMOD_EXPORT Species : public Object Fraction runChance() const; Fraction fleeChance() const; Fraction itemChance() const; - int pokedexNumber() const; + int encyclopediaNumber() const; int weight() const; int height() const; - QString pokedexEntry() const; + QString encyclopediaEntry() const; int frontMaleSprite() const; int backMaleSprite() const; int frontFemaleSprite() const; @@ -174,7 +174,7 @@ class POKEMOD_EXPORT Species : public Object Fraction m_runChance; Fraction m_fleeChance; Fraction m_itemChance; - int m_pokedexNumber; + int m_encyclopediaNumber; int m_weight; int m_height; int m_frontMaleSprite; @@ -182,7 +182,7 @@ class POKEMOD_EXPORT Species : public Object int m_frontFemaleSprite; int m_backFemaleSprite; int m_skin; - QString m_pokedexEntry; + QString m_encyclopediaEntry; Fraction m_genderFactor; int m_eggSpecies; int m_eggSteps; @@ -194,6 +194,6 @@ class POKEMOD_EXPORT Species : public Object QList<SpeciesMove*> m_moves; }; } -Q_DECLARE_METATYPE(Pokemod::Species::Style) +Q_DECLARE_METATYPE(Sigmod::Species::Style) #endif diff --git a/sigmod/SpeciesAbility.cpp b/sigmod/SpeciesAbility.cpp index a95e0358..4afc6785 100644 --- a/sigmod/SpeciesAbility.cpp +++ b/sigmod/SpeciesAbility.cpp @@ -18,38 +18,38 @@ // Header include #include "SpeciesAbility.h" -// Pokemod includes +// Sigmod includes #include "Macros.h" -#include "Pokemod.h" +#include "Sigmod.h" #include "Species.h" -Pokemod::SpeciesAbility::SpeciesAbility(const SpeciesAbility& ability) : +Sigmod::SpeciesAbility::SpeciesAbility(const SpeciesAbility& ability) : Object(ability.parent(), ability.id()) { *this = ability; } -Pokemod::SpeciesAbility::SpeciesAbility(const Species* parent, const int id) : +Sigmod::SpeciesAbility::SpeciesAbility(const Species* parent, const int id) : Object(parent, id), m_ability(INT_MAX), m_weight(1) { } -Pokemod::SpeciesAbility::SpeciesAbility(const SpeciesAbility& ability, const Species* parent, const int id) : +Sigmod::SpeciesAbility::SpeciesAbility(const SpeciesAbility& ability, const Species* parent, const int id) : Object(parent, id) { *this = ability; } -Pokemod::SpeciesAbility::SpeciesAbility(const QDomElement& xml, const Species* parent, const int id) : +Sigmod::SpeciesAbility::SpeciesAbility(const QDomElement& xml, const Species* parent, const int id) : Object(parent, id) { LOAD_ID(); load(xml); } -void Pokemod::SpeciesAbility::validate() +void Sigmod::SpeciesAbility::validate() { TEST_BEGIN(); TEST(setAbility, ability); @@ -57,14 +57,14 @@ void Pokemod::SpeciesAbility::validate() TEST_END(); } -void Pokemod::SpeciesAbility::load(const QDomElement& xml) +void Sigmod::SpeciesAbility::load(const QDomElement& xml) { LOAD_BEGIN(); LOAD(ability); LOAD(weight); } -QDomElement Pokemod::SpeciesAbility::save() const +QDomElement Sigmod::SpeciesAbility::save() const { SAVE_CREATE(); SAVE(ability); @@ -72,15 +72,15 @@ QDomElement Pokemod::SpeciesAbility::save() const return xml; } -void Pokemod::SpeciesAbility::setAbility(const int ability) +void Sigmod::SpeciesAbility::setAbility(const int ability) { - if (qobject_cast<const Pokemod*>(pokemod())->abilityIndex(ability) == INT_MAX) + if (qobject_cast<const Sigmod*>(sigmod())->abilityIndex(ability) == INT_MAX) emit(error(bounds("ability"))); else CHECK(ability); } -void Pokemod::SpeciesAbility::setWeight(const int weight) +void Sigmod::SpeciesAbility::setWeight(const int weight) { if (!weight) emit(error(bounds("weight"))); @@ -88,17 +88,17 @@ void Pokemod::SpeciesAbility::setWeight(const int weight) CHECK(weight); } -int Pokemod::SpeciesAbility::ability() const +int Sigmod::SpeciesAbility::ability() const { return m_ability; } -int Pokemod::SpeciesAbility::weight() const +int Sigmod::SpeciesAbility::weight() const { return m_weight; } -Pokemod::SpeciesAbility& Pokemod::SpeciesAbility::operator=(const SpeciesAbility& rhs) +Sigmod::SpeciesAbility& Sigmod::SpeciesAbility::operator=(const SpeciesAbility& rhs) { if (this == &rhs) return *this; diff --git a/sigmod/SpeciesAbility.h b/sigmod/SpeciesAbility.h index 346f974a..7c17a525 100644 --- a/sigmod/SpeciesAbility.h +++ b/sigmod/SpeciesAbility.h @@ -15,18 +15,18 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __POKEMOD_SPECIESABILITY__ -#define __POKEMOD_SPECIESABILITY__ +#ifndef __SIGMOD_SPECIESABILITY__ +#define __SIGMOD_SPECIESABILITY__ -// Pokemod includes +// Sigmod includes #include "Object.h" -namespace Pokemod +namespace Sigmod { // Forward declarations class Species; -class POKEMOD_EXPORT SpeciesAbility : public Object +class SIGMOD_EXPORT SpeciesAbility : public Object { Q_OBJECT diff --git a/sigmod/SpeciesItem.cpp b/sigmod/SpeciesItem.cpp index 4cc27088..ba7733f2 100644 --- a/sigmod/SpeciesItem.cpp +++ b/sigmod/SpeciesItem.cpp @@ -18,38 +18,38 @@ // Header include #include "SpeciesItem.h" -// Pokemod includes +// Sigmod includes #include "Macros.h" -#include "Pokemod.h" +#include "Sigmod.h" #include "Species.h" -Pokemod::SpeciesItem::SpeciesItem(const SpeciesItem& item) : +Sigmod::SpeciesItem::SpeciesItem(const SpeciesItem& item) : Object(item.parent(), item.id()) { *this = item; } -Pokemod::SpeciesItem::SpeciesItem(const Species* parent, const int id) : +Sigmod::SpeciesItem::SpeciesItem(const Species* parent, const int id) : Object(parent, id), m_item(INT_MAX), m_weight(1) { } -Pokemod::SpeciesItem::SpeciesItem(const SpeciesItem& item, const Species* parent, const int id) : +Sigmod::SpeciesItem::SpeciesItem(const SpeciesItem& item, const Species* parent, const int id) : Object(parent, id) { *this = item; } -Pokemod::SpeciesItem::SpeciesItem(const QDomElement& xml, const Species* parent, const int id) : +Sigmod::SpeciesItem::SpeciesItem(const QDomElement& xml, const Species* parent, const int id) : Object(parent, id) { LOAD_ID(); load(xml); } -void Pokemod::SpeciesItem::validate() +void Sigmod::SpeciesItem::validate() { TEST_BEGIN(); TEST(setItem, item); @@ -57,14 +57,14 @@ void Pokemod::SpeciesItem::validate() TEST_END(); } -void Pokemod::SpeciesItem::load(const QDomElement& xml) +void Sigmod::SpeciesItem::load(const QDomElement& xml) { LOAD_BEGIN(); LOAD(item); LOAD(weight); } -QDomElement Pokemod::SpeciesItem::save() const +QDomElement Sigmod::SpeciesItem::save() const { SAVE_CREATE(); SAVE(item); @@ -72,15 +72,15 @@ QDomElement Pokemod::SpeciesItem::save() const return xml; } -void Pokemod::SpeciesItem::setItem(const int item) +void Sigmod::SpeciesItem::setItem(const int item) { - if (qobject_cast<const Pokemod*>(pokemod())->itemIndex(item) == INT_MAX) + if (qobject_cast<const Sigmod*>(sigmod())->itemIndex(item) == INT_MAX) emit(error(bounds("item"))); else CHECK(item); } -void Pokemod::SpeciesItem::setWeight(const int weight) +void Sigmod::SpeciesItem::setWeight(const int weight) { if (!weight) emit(error(bounds("weight"))); @@ -88,17 +88,17 @@ void Pokemod::SpeciesItem::setWeight(const int weight) CHECK(weight); } -int Pokemod::SpeciesItem::item() const +int Sigmod::SpeciesItem::item() const { return m_item; } -int Pokemod::SpeciesItem::weight() const +int Sigmod::SpeciesItem::weight() const { return m_weight; } -Pokemod::SpeciesItem& Pokemod::SpeciesItem::operator=(const SpeciesItem& rhs) +Sigmod::SpeciesItem& Sigmod::SpeciesItem::operator=(const SpeciesItem& rhs) { if (this == &rhs) return *this; diff --git a/sigmod/SpeciesItem.h b/sigmod/SpeciesItem.h index 93f4fc3c..680d95de 100644 --- a/sigmod/SpeciesItem.h +++ b/sigmod/SpeciesItem.h @@ -15,18 +15,18 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __POKEMOD_SPECIESITEM__ -#define __POKEMOD_SPECIESITEM__ +#ifndef __SIGMOD_SPECIESITEM__ +#define __SIGMOD_SPECIESITEM__ -// Pokemod includes +// Sigmod includes #include "Object.h" -namespace Pokemod +namespace Sigmod { // Forward declarations class Species; -class POKEMOD_EXPORT SpeciesItem : public Object +class SIGMOD_EXPORT SpeciesItem : public Object { Q_OBJECT diff --git a/sigmod/SpeciesMove.cpp b/sigmod/SpeciesMove.cpp index da1ae662..1764ba99 100644 --- a/sigmod/SpeciesMove.cpp +++ b/sigmod/SpeciesMove.cpp @@ -18,19 +18,19 @@ // Header include #include "SpeciesMove.h" -// Pokemod includes +// Sigmod includes #include "Macros.h" -#include "Pokemod.h" #include "Rules.h" +#include "Sigmod.h" #include "Species.h" -Pokemod::SpeciesMove::SpeciesMove(const SpeciesMove& move) : +Sigmod::SpeciesMove::SpeciesMove(const SpeciesMove& move) : Object(move.parent(), move.id()) { *this = move; } -Pokemod::SpeciesMove::SpeciesMove(const Species* parent, const int id) : +Sigmod::SpeciesMove::SpeciesMove(const Species* parent, const int id) : Object(parent, id), m_move(INT_MAX), m_level(0), @@ -38,20 +38,20 @@ Pokemod::SpeciesMove::SpeciesMove(const Species* parent, const int id) : { } -Pokemod::SpeciesMove::SpeciesMove(const SpeciesMove& move, const Species* parent, const int id) : +Sigmod::SpeciesMove::SpeciesMove(const SpeciesMove& move, const Species* parent, const int id) : Object(parent, id) { *this = move; } -Pokemod::SpeciesMove::SpeciesMove(const QDomElement& xml, const Species* parent, const int id) : +Sigmod::SpeciesMove::SpeciesMove(const QDomElement& xml, const Species* parent, const int id) : Object(parent, id) { LOAD_ID(); load(xml); } -void Pokemod::SpeciesMove::validate() +void Sigmod::SpeciesMove::validate() { TEST_BEGIN(); TEST(setMove, move); @@ -60,7 +60,7 @@ void Pokemod::SpeciesMove::validate() TEST_END(); } -void Pokemod::SpeciesMove::load(const QDomElement& xml) +void Sigmod::SpeciesMove::load(const QDomElement& xml) { LOAD_BEGIN(); LOAD(move); @@ -68,7 +68,7 @@ void Pokemod::SpeciesMove::load(const QDomElement& xml) LOAD(wild); } -QDomElement Pokemod::SpeciesMove::save() const +QDomElement Sigmod::SpeciesMove::save() const { SAVE_CREATE(); SAVE(move); @@ -77,46 +77,46 @@ QDomElement Pokemod::SpeciesMove::save() const return xml; } -void Pokemod::SpeciesMove::setMove(const int move) +void Sigmod::SpeciesMove::setMove(const int move) { - if (qobject_cast<const Pokemod*>(pokemod())->moveIndex(move) == INT_MAX) + if (qobject_cast<const Sigmod*>(sigmod())->moveIndex(move) == INT_MAX) emit(error(bounds("move"))); else CHECK(move); } -void Pokemod::SpeciesMove::setLevel(const int level) +void Sigmod::SpeciesMove::setLevel(const int level) { - if (qobject_cast<const Pokemod*>(pokemod())->rules()->maxLevel() <= level) + if (qobject_cast<const Sigmod*>(sigmod())->rules()->maxLevel() <= level) emit(error(bounds("level"))); else CHECK(level); } -void Pokemod::SpeciesMove::setWild(const int wild) +void Sigmod::SpeciesMove::setWild(const int wild) { - if (!wild || (qobject_cast<const Pokemod*>(pokemod())->rules()->maxLevel() <= wild)) + if (!wild || (qobject_cast<const Sigmod*>(sigmod())->rules()->maxLevel() <= wild)) emit(error(bounds("wild"))); else CHECK(wild); } -int Pokemod::SpeciesMove::move() const +int Sigmod::SpeciesMove::move() const { return m_move; } -int Pokemod::SpeciesMove::level() const +int Sigmod::SpeciesMove::level() const { return m_level; } -int Pokemod::SpeciesMove::wild() const +int Sigmod::SpeciesMove::wild() const { return m_wild; } -Pokemod::SpeciesMove& Pokemod::SpeciesMove::operator=(const SpeciesMove& rhs) +Sigmod::SpeciesMove& Sigmod::SpeciesMove::operator=(const SpeciesMove& rhs) { if (this == &rhs) return *this; diff --git a/sigmod/SpeciesMove.h b/sigmod/SpeciesMove.h index affc9530..2d479d69 100644 --- a/sigmod/SpeciesMove.h +++ b/sigmod/SpeciesMove.h @@ -15,18 +15,18 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __POKEMOD_SPECIESMOVE__ -#define __POKEMOD_SPECIESMOVE__ +#ifndef __SIGMOD_SPECIESMOVE__ +#define __SIGMOD_SPECIESMOVE__ -// Pokemod includes +// Sigmod includes #include "Object.h" -namespace Pokemod +namespace Sigmod { // Forward declarations class Species; -class POKEMOD_EXPORT SpeciesMove : public Object +class SIGMOD_EXPORT SpeciesMove : public Object { Q_OBJECT diff --git a/sigmod/Sprite.cpp b/sigmod/Sprite.cpp index 2000bf86..0261385a 100644 --- a/sigmod/Sprite.cpp +++ b/sigmod/Sprite.cpp @@ -18,41 +18,41 @@ // Header include #include "Sprite.h" -// Pokemod includes +// Sigmod includes #include "Macros.h" -#include "Pokemod.h" +#include "Sigmod.h" -Pokemod::Sprite::Sprite(const Sprite& sprite) : +Sigmod::Sprite::Sprite(const Sprite& sprite) : Object(sprite.parent(), sprite.id()) { *this = sprite; } -Pokemod::Sprite::Sprite(const Pokemod* parent, const int id) : +Sigmod::Sprite::Sprite(const Sigmod* parent, const int id) : Object(parent, id), m_name(""), m_sprite() { } -Pokemod::Sprite::Sprite(const Sprite& sprite, const Pokemod* parent, const int id) : +Sigmod::Sprite::Sprite(const Sprite& sprite, const Sigmod* parent, const int id) : Object(parent, id) { *this = sprite; } -Pokemod::Sprite::Sprite(const QDomElement& xml, const Pokemod* parent, const int id) : +Sigmod::Sprite::Sprite(const QDomElement& xml, const Sigmod* parent, const int id) : Object(parent, id) { LOAD_ID(); load(xml); } -Pokemod::Sprite::~Sprite() +Sigmod::Sprite::~Sprite() { } -void Pokemod::Sprite::validate() +void Sigmod::Sprite::validate() { TEST_BEGIN(); if (m_name.isEmpty()) @@ -60,14 +60,14 @@ void Pokemod::Sprite::validate() TEST_END(); } -void Pokemod::Sprite::load(const QDomElement& xml) +void Sigmod::Sprite::load(const QDomElement& xml) { LOAD_BEGIN(); LOAD(name); LOAD(sprite); } -QDomElement Pokemod::Sprite::save() const +QDomElement Sigmod::Sprite::save() const { SAVE_CREATE(); SAVE(name); @@ -75,28 +75,28 @@ QDomElement Pokemod::Sprite::save() const return xml; } -void Pokemod::Sprite::setName(const QString& name) +void Sigmod::Sprite::setName(const QString& name) { CHECK(name); } -void Pokemod::Sprite::setSprite(const QImage& sprite) +void Sigmod::Sprite::setSprite(const QImage& sprite) { m_sprite = sprite; emit(changed()); } -QString Pokemod::Sprite::name() const +QString Sigmod::Sprite::name() const { return m_name; } -QImage Pokemod::Sprite::sprite() const +QImage Sigmod::Sprite::sprite() const { return m_sprite; } -Pokemod::Sprite& Pokemod::Sprite::operator=(const Sprite& rhs) +Sigmod::Sprite& Sigmod::Sprite::operator=(const Sprite& rhs) { if (this == &rhs) return *this; diff --git a/sigmod/Sprite.h b/sigmod/Sprite.h index f23422a0..014ca8eb 100644 --- a/sigmod/Sprite.h +++ b/sigmod/Sprite.h @@ -15,29 +15,29 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __POKEMOD_SPRITE__ -#define __POKEMOD_SPRITE__ +#ifndef __SIGMOD_SPRITE__ +#define __SIGMOD_SPRITE__ -// Pokemod includes +// Sigmod includes #include "Object.h" // Qt includes #include <QtGui/QImage> -namespace Pokemod +namespace Sigmod { // Forward declarations -class Pokemod; +class Sigmod; -class POKEMOD_EXPORT Sprite : public Object +class SIGMOD_EXPORT Sprite : public Object { Q_OBJECT public: Sprite(const Sprite& sprite); - Sprite(const Pokemod* parent, const int id); - Sprite(const Sprite& sprite, const Pokemod* parent, const int id); - Sprite(const QDomElement& xml, const Pokemod* parent, const int id = -1); + Sprite(const Sigmod* parent, const int id); + Sprite(const Sprite& sprite, const Sigmod* parent, const int id); + Sprite(const QDomElement& xml, const Sigmod* parent, const int id = -1); ~Sprite(); void validate(); diff --git a/sigmod/Status.cpp b/sigmod/Status.cpp index 04702d48..fccb85d0 100644 --- a/sigmod/Status.cpp +++ b/sigmod/Status.cpp @@ -18,18 +18,18 @@ // Header include #include "Status.h" -// Pokemod includes +// Sigmod includes #include "Macros.h" -#include "Pokemod.h" +#include "Sigmod.h" #include "Script.h" -Pokemod::Status::Status(const Status& status) : +Sigmod::Status::Status(const Status& status) : Object(status.parent(), status.id()) { *this = status; } -Pokemod::Status::Status(const Pokemod* parent, const int id) : +Sigmod::Status::Status(const Sigmod* parent, const int id) : Object(parent, id), m_name(""), m_battleScript("", ""), @@ -37,24 +37,24 @@ Pokemod::Status::Status(const Pokemod* parent, const int id) : { } -Pokemod::Status::Status(const Status& status, const Pokemod* parent, const int id) : +Sigmod::Status::Status(const Status& status, const Sigmod* parent, const int id) : Object(parent, id) { *this = status; } -Pokemod::Status::Status(const QDomElement& xml, const Pokemod* parent, const int id) : +Sigmod::Status::Status(const QDomElement& xml, const Sigmod* parent, const int id) : Object(parent, id) { LOAD_ID(); load(xml); } -Pokemod::Status::~Status() +Sigmod::Status::~Status() { } -void Pokemod::Status::validate() +void Sigmod::Status::validate() { TEST_BEGIN(); if (m_name.isEmpty()) @@ -62,7 +62,7 @@ void Pokemod::Status::validate() TEST_END(); } -void Pokemod::Status::load(const QDomElement& xml) +void Sigmod::Status::load(const QDomElement& xml) { LOAD_BEGIN(); LOAD(name); @@ -70,7 +70,7 @@ void Pokemod::Status::load(const QDomElement& xml) LOAD(worldScript); } -QDomElement Pokemod::Status::save() const +QDomElement Sigmod::Status::save() const { SAVE_CREATE(); SAVE(name); @@ -79,37 +79,37 @@ QDomElement Pokemod::Status::save() const return xml; } -void Pokemod::Status::setName(const QString& name) +void Sigmod::Status::setName(const QString& name) { CHECK(name); } -void Pokemod::Status::setBattleScript(const Script& battleScript) +void Sigmod::Status::setBattleScript(const Script& battleScript) { CHECK(battleScript); } -void Pokemod::Status::setWorldScript(const Script& worldScript) +void Sigmod::Status::setWorldScript(const Script& worldScript) { CHECK(worldScript); } -QString Pokemod::Status::name() const +QString Sigmod::Status::name() const { return m_name; } -Pokemod::Script Pokemod::Status::battleScript() const +Sigmod::Script Sigmod::Status::battleScript() const { return m_battleScript; } -Pokemod::Script Pokemod::Status::worldScript() const +Sigmod::Script Sigmod::Status::worldScript() const { return m_worldScript; } -Pokemod::Status& Pokemod::Status::operator=(const Status& rhs) +Sigmod::Status& Sigmod::Status::operator=(const Status& rhs) { if (this == &rhs) return *this; diff --git a/sigmod/Status.h b/sigmod/Status.h index af801957..e6c96f02 100644 --- a/sigmod/Status.h +++ b/sigmod/Status.h @@ -15,27 +15,27 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __POKEMOD_STATUS__ -#define __POKEMOD_STATUS__ +#ifndef __SIGMOD_STATUS__ +#define __SIGMOD_STATUS__ -// Pokemod includes +// Sigmod includes #include "Object.h" #include "Script.h" -namespace Pokemod +namespace Sigmod { // Forward declarations -class Pokemod; +class Sigmod; -class POKEMOD_EXPORT Status : public Object +class SIGMOD_EXPORT Status : public Object { Q_OBJECT public: Status(const Status& status); - Status(const Pokemod* parent, const int id); - Status(const Status& status, const Pokemod* parent, const int id); - Status(const QDomElement& xml, const Pokemod* parent, const int id = -1); + Status(const Sigmod* parent, const int id); + Status(const Status& status, const Sigmod* parent, const int id); + Status(const QDomElement& xml, const Sigmod* parent, const int id = -1); ~Status(); void validate(); diff --git a/sigmod/Store.cpp b/sigmod/Store.cpp index 977bf6a9..bee0cd36 100644 --- a/sigmod/Store.cpp +++ b/sigmod/Store.cpp @@ -18,36 +18,36 @@ // Header include #include "Store.h" -// Pokemod includes +// Sigmod includes #include "Macros.h" -#include "Pokemod.h" +#include "Sigmod.h" -Pokemod::Store::Store(const Store& store) : +Sigmod::Store::Store(const Store& store) : Object(store.parent(), store.id()) { *this = store; } -Pokemod::Store::Store(const Pokemod* parent, const int id) : +Sigmod::Store::Store(const Sigmod* parent, const int id) : Object(parent, id), m_name("") { } -Pokemod::Store::Store(const Store& store, const Pokemod* parent, const int id) : +Sigmod::Store::Store(const Store& store, const Sigmod* parent, const int id) : Object(parent, id) { *this = store; } -Pokemod::Store::Store(const QDomElement& xml, const Pokemod* parent, const int id) : +Sigmod::Store::Store(const QDomElement& xml, const Sigmod* parent, const int id) : Object(parent, id) { LOAD_ID(); load(xml); } -void Pokemod::Store::validate() +void Sigmod::Store::validate() { TEST_BEGIN(); if (m_name.isEmpty()) @@ -59,27 +59,27 @@ void Pokemod::Store::validate() TEST_END(); } -void Pokemod::Store::load(const QDomElement& xml) +void Sigmod::Store::load(const QDomElement& xml) { LOAD_BEGIN(); LOAD_LIST(item); } -QDomElement Pokemod::Store::save() const +QDomElement Sigmod::Store::save() const { SAVE_CREATE(); SAVE_LIST(item); return xml; } -void Pokemod::Store::setName(const QString& name) +void Sigmod::Store::setName(const QString& name) { CHECK(name); } -void Pokemod::Store::setItem(const int item, const bool state) +void Sigmod::Store::setItem(const int item, const bool state) { - if (qobject_cast<const Pokemod*>(pokemod())->itemIndex(item) == INT_MAX) + if (qobject_cast<const Sigmod*>(sigmod())->itemIndex(item) == INT_MAX) emit(error(bounds("item"))); else if (state && !m_item.contains(item)) { @@ -93,22 +93,22 @@ void Pokemod::Store::setItem(const int item, const bool state) } } -QString Pokemod::Store::name() const +QString Sigmod::Store::name() const { return m_name; } -bool Pokemod::Store::item(const int item) const +bool Sigmod::Store::item(const int item) const { return m_item.contains(item); } -QList<int> Pokemod::Store::items() const +QList<int> Sigmod::Store::items() const { return m_item; } -Pokemod::Store& Pokemod::Store::operator=(const Store& rhs) +Sigmod::Store& Sigmod::Store::operator=(const Store& rhs) { if (this == &rhs) return *this; diff --git a/sigmod/Store.h b/sigmod/Store.h index 48ae4342..881ce304 100644 --- a/sigmod/Store.h +++ b/sigmod/Store.h @@ -15,29 +15,29 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __POKEMOD_STORE__ -#define __POKEMOD_STORE__ +#ifndef __SIGMOD_STORE__ +#define __SIGMOD_STORE__ -// Pokemod includes +// Sigmod includes #include "Object.h" // Qt includes #include <QtCore/QList> -namespace Pokemod +namespace Sigmod { // Forward declarations -class Pokemod; +class Sigmod; -class POKEMOD_EXPORT Store : public Object +class SIGMOD_EXPORT Store : public Object { Q_OBJECT public: Store(const Store& store); - Store(const Pokemod* parent, const int id); - Store(const Store& store, const Pokemod* parent, const int id); - Store(const QDomElement& xml, const Pokemod* parent, const int id = -1); + Store(const Sigmod* parent, const int id); + Store(const Store& store, const Sigmod* parent, const int id); + Store(const QDomElement& xml, const Sigmod* parent, const int id = -1); void validate(); diff --git a/sigmod/Tile.cpp b/sigmod/Tile.cpp index c58f7e01..37854648 100644 --- a/sigmod/Tile.cpp +++ b/sigmod/Tile.cpp @@ -18,18 +18,18 @@ // Header include #include "Tile.h" -// Pokemod includes +// Sigmod includes #include "Macros.h" -#include "Pokemod.h" +#include "Sigmod.h" #include "Sprite.h" -Pokemod::Tile::Tile(const Tile& tile) : +Sigmod::Tile::Tile(const Tile& tile) : Object(tile.parent(), tile.id()) { *this = tile; } -Pokemod::Tile::Tile(const Pokemod* parent, const int id) : +Sigmod::Tile::Tile(const Sigmod* parent, const int id) : Object(parent, id), m_name(""), m_sprite(-1), @@ -40,20 +40,20 @@ Pokemod::Tile::Tile(const Pokemod* parent, const int id) : m_from[i] = false; } -Pokemod::Tile::Tile(const Tile& tile, const Pokemod* parent, const int id) : +Sigmod::Tile::Tile(const Tile& tile, const Sigmod* parent, const int id) : Object(parent, id) { *this = tile; } -Pokemod::Tile::Tile(const QDomElement& xml, const Pokemod* parent, const int id) : +Sigmod::Tile::Tile(const QDomElement& xml, const Sigmod* parent, const int id) : Object(parent, id) { LOAD_ID(); load(xml); } -void Pokemod::Tile::validate() +void Sigmod::Tile::validate() { TEST_BEGIN(); if (m_name.isEmpty()) @@ -62,7 +62,7 @@ void Pokemod::Tile::validate() TEST_END(); } -void Pokemod::Tile::load(const QDomElement& xml) +void Sigmod::Tile::load(const QDomElement& xml) { LOAD_BEGIN(); LOAD(name); @@ -71,7 +71,7 @@ void Pokemod::Tile::load(const QDomElement& xml) LOAD(script); } -QDomElement Pokemod::Tile::save() const +QDomElement Sigmod::Tile::save() const { SAVE_CREATE(); SAVE(name); @@ -81,53 +81,53 @@ QDomElement Pokemod::Tile::save() const return xml; } -void Pokemod::Tile::setName(const QString& name) +void Sigmod::Tile::setName(const QString& name) { CHECK(name); } -void Pokemod::Tile::setSprite(const int sprite) +void Sigmod::Tile::setSprite(const int sprite) { - if (qobject_cast<const Pokemod*>(pokemod())->spriteIndex(sprite) == INT_MAX) + if (qobject_cast<const Sigmod*>(sigmod())->spriteIndex(sprite) == INT_MAX) emit(error(bounds("sprite"))); // FIXME: remove if doing collaging - else if (qobject_cast<const Pokemod*>(pokemod())->spriteById(sprite)->sprite().size() != QSize(64, 64)) + else if (qobject_cast<const Sigmod*>(sigmod())->spriteById(sprite)->sprite().size() != QSize(64, 64)) emit(error("Sprite is the wrong dimensions")); else CHECK(sprite); } -void Pokemod::Tile::setFrom(const Direction direction, const bool state) +void Sigmod::Tile::setFrom(const Direction direction, const bool state) { CHECK_ARRAY(from[direction], state); } -void Pokemod::Tile::setScript(const Script& script) +void Sigmod::Tile::setScript(const Script& script) { CHECK(script); } -QString Pokemod::Tile::name() const +QString Sigmod::Tile::name() const { return m_name; } -int Pokemod::Tile::sprite() const +int Sigmod::Tile::sprite() const { return m_sprite; } -bool Pokemod::Tile::from(const Direction direction) const +bool Sigmod::Tile::from(const Direction direction) const { return m_from[direction]; } -Pokemod::Script Pokemod::Tile::script() const +Sigmod::Script Sigmod::Tile::script() const { return m_script; } -Pokemod::Tile& Pokemod::Tile::operator=(const Tile& rhs) +Sigmod::Tile& Sigmod::Tile::operator=(const Tile& rhs) { if (this == &rhs) return *this; diff --git a/sigmod/Tile.h b/sigmod/Tile.h index 0cba7563..2475bd68 100644 --- a/sigmod/Tile.h +++ b/sigmod/Tile.h @@ -15,27 +15,27 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __POKEMOD_TILE__ -#define __POKEMOD_TILE__ +#ifndef __SIGMOD_TILE__ +#define __SIGMOD_TILE__ -// Pokemod includes +// Sigmod includes #include "Object.h" #include "Script.h" -namespace Pokemod +namespace Sigmod { // Forward declarations -class Pokemod; +class Sigmod; -class POKEMOD_EXPORT Tile : public Object +class SIGMOD_EXPORT Tile : public Object { Q_OBJECT public: Tile(const Tile& tile); - Tile(const Pokemod* parent, const int id); - Tile(const Tile& tile, const Pokemod* parent, const int id); - Tile(const QDomElement& xml, const Pokemod* parent, const int id = -1); + Tile(const Sigmod* parent, const int id); + Tile(const Tile& tile, const Sigmod* parent, const int id); + Tile(const QDomElement& xml, const Sigmod* parent, const int id = -1); void validate(); diff --git a/sigmod/Time.cpp b/sigmod/Time.cpp index e1ced90a..32939e92 100644 --- a/sigmod/Time.cpp +++ b/sigmod/Time.cpp @@ -18,17 +18,17 @@ // Header include #include "Time.h" -// Pokemod includes +// Sigmod includes #include "Macros.h" -#include "Pokemod.h" +#include "Sigmod.h" -Pokemod::Time::Time(const Time& time) : +Sigmod::Time::Time(const Time& time) : Object(time.parent(), time.id()) { *this = time; } -Pokemod::Time::Time(const Pokemod* parent, const int id) : +Sigmod::Time::Time(const Sigmod* parent, const int id) : Object(parent, id), m_name(""), m_hour(0), @@ -36,20 +36,20 @@ Pokemod::Time::Time(const Pokemod* parent, const int id) : { } -Pokemod::Time::Time(const Time& time, const Pokemod* parent, const int id) : +Sigmod::Time::Time(const Time& time, const Sigmod* parent, const int id) : Object(parent, id) { *this = time; } -Pokemod::Time::Time(const QDomElement& xml, const Pokemod* parent, const int id) : +Sigmod::Time::Time(const QDomElement& xml, const Sigmod* parent, const int id) : Object(parent, id) { LOAD_ID(); load(xml); } -void Pokemod::Time::validate() +void Sigmod::Time::validate() { TEST_BEGIN(); if (m_name.isEmpty()) @@ -59,7 +59,7 @@ void Pokemod::Time::validate() TEST_END(); } -void Pokemod::Time::load(const QDomElement& xml) +void Sigmod::Time::load(const QDomElement& xml) { LOAD_BEGIN(); LOAD(name); @@ -67,7 +67,7 @@ void Pokemod::Time::load(const QDomElement& xml) LOAD(minute); } -QDomElement Pokemod::Time::save() const +QDomElement Sigmod::Time::save() const { SAVE_CREATE(); SAVE(name); @@ -76,12 +76,12 @@ QDomElement Pokemod::Time::save() const return xml; } -void Pokemod::Time::setName(const QString& name) +void Sigmod::Time::setName(const QString& name) { CHECK(name); } -void Pokemod::Time::setHour(const int hour) +void Sigmod::Time::setHour(const int hour) { if (24 <= hour) emit(error(bounds("hour"))); @@ -89,7 +89,7 @@ void Pokemod::Time::setHour(const int hour) CHECK(hour); } -void Pokemod::Time::setMinute(const int minute) +void Sigmod::Time::setMinute(const int minute) { if (60 <= minute) emit(error(bounds("minute"))); @@ -97,22 +97,22 @@ void Pokemod::Time::setMinute(const int minute) CHECK(minute); } -QString Pokemod::Time::name() const +QString Sigmod::Time::name() const { return m_name; } -int Pokemod::Time::hour() const +int Sigmod::Time::hour() const { return m_hour; } -int Pokemod::Time::minute() const +int Sigmod::Time::minute() const { return m_minute; } -Pokemod::Time& Pokemod::Time::operator=(const Time& rhs) +Sigmod::Time& Sigmod::Time::operator=(const Time& rhs) { if (this == &rhs) return *this; diff --git a/sigmod/Time.h b/sigmod/Time.h index 9799f328..015fd8d1 100644 --- a/sigmod/Time.h +++ b/sigmod/Time.h @@ -15,26 +15,26 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __POKEMOD_TIME__ -#define __POKEMOD_TIME__ +#ifndef __SIGMOD_TIME__ +#define __SIGMOD_TIME__ -// Pokemod includes +// Sigmod includes #include "Object.h" -namespace Pokemod +namespace Sigmod { // Forward declarations -class Pokemod; +class Sigmod; -class POKEMOD_EXPORT Time : public Object +class SIGMOD_EXPORT Time : public Object { Q_OBJECT public: Time(const Time& time); - Time(const Pokemod* parent, const int id); - Time(const Time& time, const Pokemod* parent, const int id); - Time(const QDomElement& xml, const Pokemod* parent, const int id = -1); + Time(const Sigmod* parent, const int id); + Time(const Time& time, const Sigmod* parent, const int id); + Time(const QDomElement& xml, const Sigmod* parent, const int id = -1); void validate(); diff --git a/sigmod/Trainer.cpp b/sigmod/Trainer.cpp index 0c80fc57..d169d2d6 100644 --- a/sigmod/Trainer.cpp +++ b/sigmod/Trainer.cpp @@ -18,19 +18,19 @@ // Header include #include "Trainer.h" -// Pokemod includes +// Sigmod includes #include "Macros.h" -#include "Pokemod.h" +#include "Sigmod.h" -const QStringList Pokemod::Trainer::IntelligenceStr = QStringList() << "Ignorant" << "Remember" << "Cheating"; +const QStringList Sigmod::Trainer::IntelligenceStr = QStringList() << "Ignorant" << "Remember" << "Cheating"; -Pokemod::Trainer::Trainer(const Trainer& trainer) : +Sigmod::Trainer::Trainer(const Trainer& trainer) : Object(trainer.parent(), trainer.id()) { *this = trainer; } -Pokemod::Trainer::Trainer(const Pokemod* parent, const int id) : +Sigmod::Trainer::Trainer(const Sigmod* parent, const int id) : Object(parent, id), m_name(""), m_moneyFactor(0), @@ -44,20 +44,20 @@ Pokemod::Trainer::Trainer(const Pokemod* parent, const int id) : { } -Pokemod::Trainer::Trainer(const Trainer& trainer, const Pokemod* parent, const int id) : +Sigmod::Trainer::Trainer(const Trainer& trainer, const Sigmod* parent, const int id) : Object(parent, id) { *this = trainer; } -Pokemod::Trainer::Trainer(const QDomElement& xml, const Pokemod* parent, const int id) : +Sigmod::Trainer::Trainer(const QDomElement& xml, const Sigmod* parent, const int id) : Object(parent, id) { LOAD_ID(); load(xml); } -void Pokemod::Trainer::validate() +void Sigmod::Trainer::validate() { TEST_BEGIN(); if (m_name.isEmpty()) @@ -67,7 +67,7 @@ void Pokemod::Trainer::validate() TEST_END(); } -void Pokemod::Trainer::load(const QDomElement& xml) +void Sigmod::Trainer::load(const QDomElement& xml) { LOAD_BEGIN(); LOAD(name); @@ -81,7 +81,7 @@ void Pokemod::Trainer::load(const QDomElement& xml) LOAD(statIntel); } -QDomElement Pokemod::Trainer::save() const +QDomElement Sigmod::Trainer::save() const { SAVE_CREATE(); SAVE(name); @@ -96,12 +96,12 @@ QDomElement Pokemod::Trainer::save() const return xml; } -void Pokemod::Trainer::setName(const QString& name) +void Sigmod::Trainer::setName(const QString& name) { CHECK(name); } -void Pokemod::Trainer::setMoneyFactor(const int moneyFactor) +void Sigmod::Trainer::setMoneyFactor(const int moneyFactor) { if (moneyFactor < 0) emit(error(bounds("moneyFactor"))); @@ -109,90 +109,90 @@ void Pokemod::Trainer::setMoneyFactor(const int moneyFactor) CHECK(moneyFactor); } -void Pokemod::Trainer::setSkin(const int skin) +void Sigmod::Trainer::setSkin(const int skin) { - if (qobject_cast<const Pokemod*>(pokemod())->skinIndex(skin) == INT_MAX) + if (qobject_cast<const Sigmod*>(sigmod())->skinIndex(skin) == INT_MAX) emit(error(bounds("skin"))); else CHECK(skin); } -void Pokemod::Trainer::setDepth(const int depth) +void Sigmod::Trainer::setDepth(const int depth) { CHECK(depth); } -void Pokemod::Trainer::setTeamIntel(const Intelligence teamIntel) +void Sigmod::Trainer::setTeamIntel(const Intelligence teamIntel) { CHECK(teamIntel); } -void Pokemod::Trainer::setMoveIntel(const Intelligence moveIntel) +void Sigmod::Trainer::setMoveIntel(const Intelligence moveIntel) { CHECK(moveIntel); } -void Pokemod::Trainer::setItemIntel(const Intelligence itemIntel) +void Sigmod::Trainer::setItemIntel(const Intelligence itemIntel) { CHECK(itemIntel); } -void Pokemod::Trainer::setAbilityIntel(const Intelligence abilityIntel) +void Sigmod::Trainer::setAbilityIntel(const Intelligence abilityIntel) { CHECK(abilityIntel); } -void Pokemod::Trainer::setStatIntel(const Intelligence statIntel) +void Sigmod::Trainer::setStatIntel(const Intelligence statIntel) { CHECK(statIntel); } -QString Pokemod::Trainer::name() const +QString Sigmod::Trainer::name() const { return m_name; } -int Pokemod::Trainer::moneyFactor() const +int Sigmod::Trainer::moneyFactor() const { return m_moneyFactor; } -int Pokemod::Trainer::skin() const +int Sigmod::Trainer::skin() const { return m_skin; } -int Pokemod::Trainer::depth() const +int Sigmod::Trainer::depth() const { return m_depth; } -Pokemod::Trainer::Intelligence Pokemod::Trainer::teamIntel() const +Sigmod::Trainer::Intelligence Sigmod::Trainer::teamIntel() const { return m_teamIntel; } -Pokemod::Trainer::Intelligence Pokemod::Trainer::moveIntel() const +Sigmod::Trainer::Intelligence Sigmod::Trainer::moveIntel() const { return m_moveIntel; } -Pokemod::Trainer::Intelligence Pokemod::Trainer::itemIntel() const +Sigmod::Trainer::Intelligence Sigmod::Trainer::itemIntel() const { return m_itemIntel; } -Pokemod::Trainer::Intelligence Pokemod::Trainer::abilityIntel() const +Sigmod::Trainer::Intelligence Sigmod::Trainer::abilityIntel() const { return m_abilityIntel; } -Pokemod::Trainer::Intelligence Pokemod::Trainer::statIntel() const +Sigmod::Trainer::Intelligence Sigmod::Trainer::statIntel() const { return m_statIntel; } -Pokemod::Trainer& Pokemod::Trainer::operator=(const Trainer& rhs) +Sigmod::Trainer& Sigmod::Trainer::operator=(const Trainer& rhs) { if (this == &rhs) return *this; diff --git a/sigmod/Trainer.h b/sigmod/Trainer.h index 8d4caa89..224743dd 100644 --- a/sigmod/Trainer.h +++ b/sigmod/Trainer.h @@ -15,21 +15,21 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __POKEMOD_TRAINER__ -#define __POKEMOD_TRAINER__ +#ifndef __SIGMOD_TRAINER__ +#define __SIGMOD_TRAINER__ -// Pokemod includes +// Sigmod includes #include "Object.h" // Qt includes #include <QtCore/QStringList> -namespace Pokemod +namespace Sigmod { // Forward declarations -class Pokemod; +class Sigmod; -class POKEMOD_EXPORT Trainer : public Object +class SIGMOD_EXPORT Trainer : public Object { Q_OBJECT Q_ENUMS(Intelligence) @@ -45,9 +45,9 @@ class POKEMOD_EXPORT Trainer : public Object static const QStringList IntelligenceStr; Trainer(const Trainer& trainer); - Trainer(const Pokemod* parent, const int id); - Trainer(const Trainer& trainer, const Pokemod* parent, const int id); - Trainer(const QDomElement& xml, const Pokemod* parent, const int id = -1); + Trainer(const Sigmod* parent, const int id); + Trainer(const Trainer& trainer, const Sigmod* parent, const int id); + Trainer(const QDomElement& xml, const Sigmod* parent, const int id = -1); void validate(); @@ -87,6 +87,6 @@ class POKEMOD_EXPORT Trainer : public Object Intelligence m_statIntel; }; } -Q_DECLARE_METATYPE(Pokemod::Trainer::Intelligence) +Q_DECLARE_METATYPE(Sigmod::Trainer::Intelligence) #endif diff --git a/sigmod/Type.cpp b/sigmod/Type.cpp index 2eb9202a..9be9c0ac 100644 --- a/sigmod/Type.cpp +++ b/sigmod/Type.cpp @@ -18,37 +18,37 @@ // Header include #include "Type.h" -// Pokemod includes +// Sigmod includes #include "Macros.h" -#include "Pokemod.h" +#include "Sigmod.h" -Pokemod::Type::Type(const Type& type) : +Sigmod::Type::Type(const Type& type) : Object(type.parent(), type.id()) { *this = type; } -Pokemod::Type::Type(const Pokemod* parent, const int id) : +Sigmod::Type::Type(const Sigmod* parent, const int id) : Object(parent, id), m_name(""), m_stab(1, 1) { } -Pokemod::Type::Type(const Type& type, const Pokemod* parent, const int id) : +Sigmod::Type::Type(const Type& type, const Sigmod* parent, const int id) : Object(parent, id) { *this = type; } -Pokemod::Type::Type(const QDomElement& xml, const Pokemod* parent, const int id) : +Sigmod::Type::Type(const QDomElement& xml, const Sigmod* parent, const int id) : Object(parent, id) { LOAD_ID(); load(xml); } -void Pokemod::Type::validate() +void Sigmod::Type::validate() { TEST_BEGIN(); if (m_name.isEmpty()) @@ -56,14 +56,14 @@ void Pokemod::Type::validate() TEST_END(); } -void Pokemod::Type::load(const QDomElement& xml) +void Sigmod::Type::load(const QDomElement& xml) { LOAD_BEGIN(); LOAD(name); LOAD(stab); } -QDomElement Pokemod::Type::save() const +QDomElement Sigmod::Type::save() const { SAVE_CREATE(); SAVE(name); @@ -71,12 +71,12 @@ QDomElement Pokemod::Type::save() const return xml; } -void Pokemod::Type::setName(const QString& name) +void Sigmod::Type::setName(const QString& name) { CHECK(name); } -void Pokemod::Type::setStab(const Fraction& stab) +void Sigmod::Type::setStab(const Fraction& stab) { if (stab < 1) emit(error(bounds("stab"))); @@ -84,17 +84,17 @@ void Pokemod::Type::setStab(const Fraction& stab) CHECK(stab); } -QString Pokemod::Type::name() const +QString Sigmod::Type::name() const { return m_name; } -Pokemod::Fraction Pokemod::Type::stab() const +Sigmod::Fraction Sigmod::Type::stab() const { return m_stab; } -Pokemod::Type& Pokemod::Type::operator=(const Type& rhs) +Sigmod::Type& Sigmod::Type::operator=(const Type& rhs) { if (this == &rhs) return *this; diff --git a/sigmod/Type.h b/sigmod/Type.h index 374537f6..a6c57d73 100644 --- a/sigmod/Type.h +++ b/sigmod/Type.h @@ -15,27 +15,27 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __POKEMOD_TYPE__ -#define __POKEMOD_TYPE__ +#ifndef __SIGMOD_TYPE__ +#define __SIGMOD_TYPE__ -// Pokemod includes +// Sigmod includes #include "Fraction.h" #include "Object.h" -namespace Pokemod +namespace Sigmod { // Forward declarations -class Pokemod; +class Sigmod; -class POKEMOD_EXPORT Type : public Object +class SIGMOD_EXPORT Type : public Object { Q_OBJECT public: Type(const Type& type); - Type(const Pokemod* parent, const int id); - Type(const Type& type, const Pokemod* parent, const int id); - Type(const QDomElement& xml, const Pokemod* parent, const int id = -1); + Type(const Sigmod* parent, const int id); + Type(const Type& type, const Sigmod* parent, const int id); + Type(const QDomElement& xml, const Sigmod* parent, const int id = -1); void validate(); diff --git a/sigmod/Weather.cpp b/sigmod/Weather.cpp index 05d70d1c..5f8ac537 100644 --- a/sigmod/Weather.cpp +++ b/sigmod/Weather.cpp @@ -18,42 +18,42 @@ // Header include #include "Weather.h" -// Pokemod includes +// Sigmod includes #include "Macros.h" -#include "Pokemod.h" +#include "Sigmod.h" #include "Script.h" -Pokemod::Weather::Weather(const Weather& weather) : +Sigmod::Weather::Weather(const Weather& weather) : Object(weather.parent(), weather.id()) { *this = weather; } -Pokemod::Weather::Weather(const Pokemod* parent, const int id) : +Sigmod::Weather::Weather(const Sigmod* parent, const int id) : Object(parent, id), m_name(""), m_script("", "") { } -Pokemod::Weather::Weather(const Weather& weather, const Pokemod* parent, const int id) : +Sigmod::Weather::Weather(const Weather& weather, const Sigmod* parent, const int id) : Object(parent, id) { *this = weather; } -Pokemod::Weather::Weather(const QDomElement& xml, const Pokemod* parent, const int id) : +Sigmod::Weather::Weather(const QDomElement& xml, const Sigmod* parent, const int id) : Object(parent, id) { LOAD_ID(); load(xml); } -Pokemod::Weather::~Weather() +Sigmod::Weather::~Weather() { } -void Pokemod::Weather::validate() +void Sigmod::Weather::validate() { TEST_BEGIN(); if (m_name.isEmpty()) @@ -61,14 +61,14 @@ void Pokemod::Weather::validate() TEST_END(); } -void Pokemod::Weather::load(const QDomElement& xml) +void Sigmod::Weather::load(const QDomElement& xml) { LOAD_BEGIN(); LOAD(name); LOAD(script); } -QDomElement Pokemod::Weather::save() const +QDomElement Sigmod::Weather::save() const { SAVE_CREATE(); SAVE(name); @@ -76,27 +76,27 @@ QDomElement Pokemod::Weather::save() const return xml; } -void Pokemod::Weather::setName(const QString& name) +void Sigmod::Weather::setName(const QString& name) { CHECK(name); } -void Pokemod::Weather::setScript(const Script& script) +void Sigmod::Weather::setScript(const Script& script) { CHECK(script); } -QString Pokemod::Weather::name() const +QString Sigmod::Weather::name() const { return m_name; } -Pokemod::Script Pokemod::Weather::script() const +Sigmod::Script Sigmod::Weather::script() const { return m_script; } -Pokemod::Weather& Pokemod::Weather::operator=(const Weather& rhs) +Sigmod::Weather& Sigmod::Weather::operator=(const Weather& rhs) { if (this == &rhs) return *this; diff --git a/sigmod/Weather.h b/sigmod/Weather.h index cd9fa874..a5a4e6b0 100644 --- a/sigmod/Weather.h +++ b/sigmod/Weather.h @@ -15,27 +15,27 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __POKEMOD_WEATHER__ -#define __POKEMOD_WEATHER__ +#ifndef __SIGMOD_WEATHER__ +#define __SIGMOD_WEATHER__ -// Pokemod includes +// Sigmod includes #include "Object.h" #include "Script.h" -namespace Pokemod +namespace Sigmod { // Forward declarations -class Pokemod; +class Sigmod; -class POKEMOD_EXPORT Weather : public Object +class SIGMOD_EXPORT Weather : public Object { Q_OBJECT public: Weather(const Weather& weather); - Weather(const Pokemod* parent, const int id); - Weather(const Weather& weather, const Pokemod* parent, const int id); - Weather(const QDomElement& xml, const Pokemod* parent, const int id = -1); + Weather(const Sigmod* parent, const int id); + Weather(const Weather& weather, const Sigmod* parent, const int id); + Weather(const QDomElement& xml, const Sigmod* parent, const int id = -1); ~Weather(); void validate(); |