Fixed sigencore to use namespaces in sources

1 files changed, 45 insertions, 41 deletions

diff --git a/sigencore/Arena.cpp b/sigencore/Arena.cpp
index 01577dfb..d2a5611f 100644
--- a/sigencore/Arena.cpp
+++ b/sigencore/Arena.cpp
@@ -44,23 +44,27 @@
 #include <QtCore/QtConcurrentRun>
 #include <QtCore/QUuid>
 
-const int Sigencore::Arena::Spectator = -1;
-const int Sigencore::Arena::Fighters = -2;
-const int Sigencore::Arena::AllTeams = -3;
-const int Sigencore::Arena::NoTeam = -4;
+using namespace Sigcore;
+using namespace Sigscript;
+using namespace Sigencore;
 
-Sigencore::TeamMember::RequestedAction Sigencore::requestDecision(Player* player, TeamMember* teamMember)
+const int Arena::Spectator = -1;
+const int Arena::Fighters = -2;
+const int Arena::AllTeams = -3;
+const int Arena::NoTeam = -4;
+
+TeamMember::RequestedAction Sigencore::requestDecision(Player* player, TeamMember* teamMember)
 {
     return TeamMember::RequestedAction(teamMember, QtConcurrent::run(decision, player, teamMember));
 }
 
-Sigencore::TeamMember::Action Sigencore::decision(Player* player, TeamMember* teamMember)
+TeamMember::Action Sigencore::decision(Player* player, TeamMember* teamMember)
 {
     return player->requestAction(teamMember);
 }
 
-Sigencore::Arena::Arena(Sigscript::GameWrapper* game, const bool isWild, Sigscript::Config* parent) :
-        Sigscript::Config(parent),
+Arena::Arena(GameWrapper* game, const bool isWild, Config* parent) :
+        Config(parent),
         m_game(game),
         m_isWild(isWild),
         m_state(Setup),
@@ -70,14 +74,14 @@ Sigencore::Arena::Arena(Sigscript::GameWrapper* game, const bool isWild, Sigscri
     m_actions = new Kross::ActionCollection(QString("arena-%1").arg(m_id.toString()), Kross::Manager::self().actionCollection());
 }
 
-Sigencore::Arena::~Arena()
+Arena::~Arena()
 {
     delete m_actions;
 }
 
-QList<Sigencore::TeamMember*> Sigencore::Arena::active(const int team) const
+QList<TeamMember*> Arena::active(const int team) const
 {
-    QList<Sigencore::TeamMember*> active;
+    QList<TeamMember*> active;
     QList<Client*> clients;
     if ((team == Fighters) || (team == AllTeams))
         clients = m_teams.keys();
@@ -92,16 +96,16 @@ QList<Sigencore::TeamMember*> Sigencore::Arena::active(const int team) const
     return active;
 }
 
-QList<Sigencore::TeamMember*> Sigencore::Arena::active(Client* client) const
+QList<TeamMember*> Arena::active(Client* client) const
 {
-    QList<Sigencore::TeamMember*> active;
+    QList<TeamMember*> active;
     Player* player = qobject_cast<Player*>(client);
     if (player)
         active += player->active();
     return active;
 }
 
-QList<Sigencore::Client*> Sigencore::Arena::teamPlayers(const int team) const
+QList<Client*> Arena::teamPlayers(const int team) const
 {
     switch (team)
     {
@@ -122,7 +126,7 @@ QList<Sigencore::Client*> Sigencore::Arena::teamPlayers(const int team) const
     }
 }
 
-Sigencore::Player* Sigencore::Arena::player(TeamMember* teamMember) const
+Player* Arena::player(TeamMember* teamMember) const
 {
     Team* team = qobject_cast<Team*>(teamMember->containment());
     if (team)
@@ -130,26 +134,26 @@ Sigencore::Player* Sigencore::Arena::player(TeamMember* teamMember) const
     return NULL;
 }
 
-int Sigencore::Arena::team(TeamMember* teamMember) const
+int Arena::team(TeamMember* teamMember) const
 {
     return team(player(teamMember));
 }
 
-int Sigencore::Arena::team(Client* client) const
+int Arena::team(Client* client) const
 {
     if (m_teams.contains(client))
         return m_teams[client];
     return NoTeam;
 }
 
-int Sigencore::Arena::numTeams() const
+int Arena::numTeams() const
 {
     QSet<int> teams = m_teams.values().toSet();
     teams.remove(Spectator);
     return teams.size();
 }
 
-int Sigencore::Arena::numPlayers() const
+int Arena::numPlayers() const
 {
     QList<Client*> clients = m_teams.keys();
     int players = 0;
@@ -158,7 +162,7 @@ int Sigencore::Arena::numPlayers() const
     return players;
 }
 
-int Sigencore::Arena::numTeamMembers() const
+int Arena::numTeamMembers() const
 {
     QList<Client*> clients = m_teams.keys();
     int teamMembers = 0;
@@ -171,17 +175,17 @@ int Sigencore::Arena::numTeamMembers() const
     return teamMembers;
 }
 
-Sigencore::Arena::State Sigencore::Arena::state() const
+Arena::State Arena::state() const
 {
     return m_state;
 }
 
-QList<Sigscript::WeatherWrapper*> Sigencore::Arena::weathers() const
+QList<WeatherWrapper*> Arena::weathers() const
 {
     return m_weathers.keys();
 }
 
-void Sigencore::Arena::setWeather(TeamMember* teamMember, Sigscript::WeatherWrapper* weather)
+void Arena::setWeather(TeamMember* teamMember, WeatherWrapper* weather)
 {
     // FIXME: Loses memory if a weather is started again
     ObjectMap objects;
@@ -196,7 +200,7 @@ void Sigencore::Arena::setWeather(TeamMember* teamMember, Sigscript::WeatherWrap
     emit(weatherStarted(teamMember, weather));
 }
 
-bool Sigencore::Arena::unsetWeather(Sigscript::WeatherWrapper* weather)
+bool Arena::unsetWeather(WeatherWrapper* weather)
 {
     if (m_weathers.contains(weather))
     {
@@ -208,12 +212,12 @@ bool Sigencore::Arena::unsetWeather(Sigscript::WeatherWrapper* weather)
     return false;
 }
 
-Sigscript::GameWrapper* Sigencore::Arena::game() const
+GameWrapper* Arena::game() const
 {
     return m_game;
 }
 
-bool Sigencore::Arena::addClient(Client* client, const int team)
+bool Arena::addClient(Client* client, const int team)
 {
     if (0 <= team)
     {
@@ -228,7 +232,7 @@ bool Sigencore::Arena::addClient(Client* client, const int team)
     return true;
 }
 
-void Sigencore::Arena::removeClient(Client* client)
+void Arena::removeClient(Client* client)
 {
     Player* player = qobject_cast<Player*>(client);
     if (player && m_spoils.contains(player))
@@ -245,7 +249,7 @@ void Sigencore::Arena::removeClient(Client* client)
     emit(clientRemoved(client, team));
 }
 
-void Sigencore::Arena::registerScript(const Sigcore::Script& script)
+void Arena::registerScript(const Script& script)
 {
     if (!script.script().isEmpty())
     {
@@ -257,7 +261,7 @@ void Sigencore::Arena::registerScript(const Sigcore::Script& script)
     }
 }
 
-void Sigencore::Arena::cleanUp()
+void Arena::cleanUp()
 {
     emit(battleAboutToEnd());
     emit(aboutToClearActions());
@@ -271,7 +275,7 @@ void Sigencore::Arena::cleanUp()
         client->exitArena();
 }
 
-void Sigencore::Arena::handleAction(TeamMember* teamMember, TeamMember::Action action)
+void Arena::handleAction(TeamMember* teamMember, TeamMember::Action action)
 {
     TeamMember::ActionData data = action.second;
     switch (action.first)
@@ -283,10 +287,10 @@ void Sigencore::Arena::handleAction(TeamMember* teamMember, TeamMember::Action a
             break;
         case TeamMember::Attack:
         {
-            Sigscript::MoveWrapper* move = game()->move(data.first.toInt());
+            MoveWrapper* move = game()->move(data.first.toInt());
             if (move)
             {
-                const Sigcore::Script script = move->battleScript();
+                const Script script = move->battleScript();
                 if (!script.script().isEmpty())
                 {
                     ObjectMap objects;
@@ -303,10 +307,10 @@ void Sigencore::Arena::handleAction(TeamMember* teamMember, TeamMember::Action a
         }
         case TeamMember::Item:
         {
-            Sigscript::ItemWrapper* item = m_game->item(data.first.toInt());
+            ItemWrapper* item = m_game->item(data.first.toInt());
             if (item)
             {
-                const Sigcore::Script script = item->script();
+                const Script script = item->script();
                 if (!script.script().isEmpty())
                 {
                     ObjectMap objects;
@@ -333,7 +337,7 @@ void Sigencore::Arena::handleAction(TeamMember* teamMember, TeamMember::Action a
                 break;
             Player* self = player(teamMember);
             const int numFlee = self->active().size();
-            Sigcore::Fraction selfRunChance;
+            Fraction selfRunChance;
             self->valueOfType("runchance", &selfRunChance);
             bool canRun = true;
             self->valueOfType("canflee", &canRun);
@@ -345,7 +349,7 @@ void Sigencore::Arena::handleAction(TeamMember* teamMember, TeamMember::Action a
                 Player* player = qobject_cast<Player*>(client);
                 if (!player || (self == player) || (m_teams[self] == m_teams[player]))
                     continue;
-                Sigcore::Fraction playerRunChance;
+                Fraction playerRunChance;
                 player->valueOfType("fleechance", &playerRunChance);
                 if (!playerRunChance.poll())
                     canRun = false;
@@ -377,7 +381,7 @@ void Sigencore::Arena::handleAction(TeamMember* teamMember, TeamMember::Action a
     }
 }
 
-void Sigencore::Arena::setupBattle()
+void Arena::setupBattle()
 {
     emit(battleAboutToStart());
     QList<Client*> clients = m_teams.keys();
@@ -391,7 +395,7 @@ void Sigencore::Arena::setupBattle()
     emit(battleStarted());
 }
 
-void Sigencore::Arena::distributeWinnings()
+void Arena::distributeWinnings()
 {
     QList<Client*> clients = m_teams.keys();
     foreach (Client* client, clients)
@@ -405,7 +409,7 @@ void Sigencore::Arena::distributeWinnings()
     }
 }
 
-void Sigencore::Arena::checkForLosers()
+void Arena::checkForLosers()
 {
     QList<Client*> clients = m_teams.keys();
     QList<Player*> roundLosers;
@@ -425,7 +429,7 @@ void Sigencore::Arena::checkForLosers()
     foreach (Player* loser, roundLosers)
     {
         const int money = loser->money();
-        Sigcore::Fraction lossFactor(1, 2);
+        Fraction lossFactor(1, 2);
         m_game->valueOfType("lossFactor", &lossFactor);
         pot[m_teams[loser]] += money * lossFactor;
         m_spoils[loser].second = money * lossFactor;
@@ -455,7 +459,7 @@ void Sigencore::Arena::checkForLosers()
         cleanUp();
 }
 
-Sigencore::TeamMember* Sigencore::Arena::findMember(const QUuid& id)
+TeamMember* Arena::findMember(const QUuid& id)
 {
     QList<Client*> clients = m_teams.keys();
     foreach (Client* client, clients)