Fixed Sigmodr widgets to use namespaces in sources

1 files changed, 35 insertions, 31 deletions

diff --git a/sigmodr/widgets/MapTrainerUI.cpp b/sigmodr/widgets/MapTrainerUI.cpp
index 455bbfae..4f3bda2f 100644
--- a/sigmodr/widgets/MapTrainerUI.cpp
+++ b/sigmodr/widgets/MapTrainerUI.cpp
@@ -30,24 +30,28 @@
 #include <QtGui/QListWidget>
 #include <QtGui/QListWidgetItem>
 
-Sigmodr::Widgets::MapTrainerUI::MapTrainerUI(Sigmod::MapTrainer* trainer, QWidget* parent) :
+using namespace Sigcore;
+using namespace Sigmod;
+using namespace Sigmodr::Widgets;
+
+MapTrainerUI::MapTrainerUI(MapTrainer* trainer, QWidget* parent) :
         ObjectUI(parent)
 {
     setupUi(this);
-    setObjects(trainer, new Sigmod::MapTrainer(*trainer));
+    setObjects(trainer, new MapTrainer(*trainer));
 }
 
-Sigmodr::Widgets::MapTrainerUI::~MapTrainerUI()
+MapTrainerUI::~MapTrainerUI()
 {
 }
 
-void Sigmodr::Widgets::MapTrainerUI::refreshGui()
+void MapTrainerUI::refreshGui()
 {
     const bool blockedTrainerClass = varTrainerClass->blockSignals(true);
     varTrainerClass->clear();
     for (int i = 0; i < game()->trainerCount(); ++i)
     {
-        const Sigmod::Trainer* trainer = game()->trainer(i);
+        const Trainer* trainer = game()->trainer(i);
         varTrainerClass->addItem(trainer->name(), trainer->id());
     }
     varTrainerClass->blockSignals(blockedTrainerClass);
@@ -55,11 +59,11 @@ void Sigmodr::Widgets::MapTrainerUI::refreshGui()
     const bool blockedLeadTeamMember = varLeadTeamMember->blockSignals(true);
     varLeadTeamMember->availableListWidget()->clear();
     varLeadTeamMember->selectedListWidget()->clear();
-    for (int i = 0; i < qobject_cast<Sigmod::MapTrainer*>(original())->teamMemberCount(); ++i)
+    for (int i = 0; i < qobject_cast<MapTrainer*>(original())->teamMemberCount(); ++i)
     {
         QString speciesName;
-        const Sigmod::MapTrainerTeamMember* teamMember = qobject_cast<Sigmod::MapTrainer*>(original())->teamMember(i);
-        const Sigmod::Species* species = game()->species(teamMember->species());
+        const MapTrainerTeamMember* teamMember = qobject_cast<MapTrainer*>(original())->teamMember(i);
+        const Species* species = game()->species(teamMember->species());
         speciesName = species ? species->name() : "(Invalid)";
         QListWidgetItem* widgetItem = new QListWidgetItem(QString("%1 level %2 (%3)").arg(speciesName, teamMember->level(), i), varLeadTeamMember->availableListWidget());
         widgetItem->setData(Qt::UserRole, teamMember->id());
@@ -68,70 +72,70 @@ void Sigmodr::Widgets::MapTrainerUI::refreshGui()
     varLeadTeamMember->setButtonsEnabled();
 }
 
-void Sigmodr::Widgets::MapTrainerUI::setGui()
+void MapTrainerUI::setGui()
 {
-    varName->setText(qobject_cast<Sigmod::MapTrainer*>(modified())->name());
-    varTrainerClass->setCurrentIndex(varTrainerClass->findData(qobject_cast<Sigmod::MapTrainer*>(modified())->trainerClass()));
-    varNumberFight->setValue(qobject_cast<Sigmod::MapTrainer*>(modified())->numberFight());
-    varScript->setValue(qobject_cast<Sigmod::MapTrainer*>(modified())->script());
+    varName->setText(qobject_cast<MapTrainer*>(modified())->name());
+    varTrainerClass->setCurrentIndex(varTrainerClass->findData(qobject_cast<MapTrainer*>(modified())->trainerClass()));
+    varNumberFight->setValue(qobject_cast<MapTrainer*>(modified())->numberFight());
+    varScript->setValue(qobject_cast<MapTrainer*>(modified())->script());
     for (int i = 0; i < varLeadTeamMember->availableListWidget()->count(); ++i)
     {
         QListWidgetItem* widgetItem = varLeadTeamMember->availableListWidget()->item(i);
-        if (qobject_cast<Sigmod::MapTrainer*>(modified())->leadTeamMember(widgetItem->data(Qt::UserRole).toInt()))
+        if (qobject_cast<MapTrainer*>(modified())->leadTeamMember(widgetItem->data(Qt::UserRole).toInt()))
             varLeadTeamMember->selectedListWidget()->addItem(varLeadTeamMember->availableListWidget()->takeItem(i--));
     }
     for (int i = 0; i < varLeadTeamMember->selectedListWidget()->count(); ++i)
     {
         QListWidgetItem* widgetItem = varLeadTeamMember->selectedListWidget()->item(i);
-        if (!qobject_cast<Sigmod::MapTrainer*>(modified())->leadTeamMember(widgetItem->data(Qt::UserRole).toInt()))
+        if (!qobject_cast<MapTrainer*>(modified())->leadTeamMember(widgetItem->data(Qt::UserRole).toInt()))
             varLeadTeamMember->availableListWidget()->addItem(varLeadTeamMember->selectedListWidget()->takeItem(i--));
     }
     varLeadTeamMember->setButtonsEnabled();
 }
 
-void Sigmodr::Widgets::MapTrainerUI::apply()
+void MapTrainerUI::apply()
 {
-    *qobject_cast<Sigmod::MapTrainer*>(original()) = *qobject_cast<Sigmod::MapTrainer*>(modified());
+    *qobject_cast<MapTrainer*>(original()) = *qobject_cast<MapTrainer*>(modified());
     emit(changed(false));
 }
 
-void Sigmodr::Widgets::MapTrainerUI::discard()
+void MapTrainerUI::discard()
 {
-    *qobject_cast<Sigmod::MapTrainer*>(modified()) = *qobject_cast<Sigmod::MapTrainer*>(original());
+    *qobject_cast<MapTrainer*>(modified()) = *qobject_cast<MapTrainer*>(original());
     setGui();
     emit(changed(false));
 }
 
-void Sigmodr::Widgets::MapTrainerUI::on_varName_textChanged(const QString& name)
+void MapTrainerUI::on_varName_textChanged(const QString& name)
 {
     const int cursor = varName->cursorPosition();
-    qobject_cast<Sigmod::MapTrainer*>(modified())->setName(name);
+    qobject_cast<MapTrainer*>(modified())->setName(name);
     varName->setCursorPosition(cursor);
 }
 
-void Sigmodr::Widgets::MapTrainerUI::on_varTrainerClass_activated(const int trainerClass)
+void MapTrainerUI::on_varTrainerClass_activated(const int trainerClass)
 {
-    qobject_cast<Sigmod::MapTrainer*>(modified())->setTrainerClass(varTrainerClass->itemData(trainerClass).toInt());
+    qobject_cast<MapTrainer*>(modified())->setTrainerClass(varTrainerClass->itemData(trainerClass).toInt());
 }
 
-void Sigmodr::Widgets::MapTrainerUI::on_varNumberFight_valueChanged(const int numberFight)
+void MapTrainerUI::on_varNumberFight_valueChanged(const int numberFight)
 {
-    qobject_cast<Sigmod::MapTrainer*>(modified())->setNumberFight(numberFight);
+    qobject_cast<MapTrainer*>(modified())->setNumberFight(numberFight);
 }
 
-void Sigmodr::Widgets::MapTrainerUI::on_varScript_valueChanged(const Sigcore::Script& script)
+void MapTrainerUI::on_varScript_valueChanged(const Script& script)
 {
-    qobject_cast<Sigmod::MapTrainer*>(modified())->setScript(script);
+    qobject_cast<MapTrainer*>(modified())->setScript(script);
 }
 
-void Sigmodr::Widgets::MapTrainerUI::on_varLeadTeamMember_added(QListWidgetItem* item)
+void MapTrainerUI::on_varLeadTeamMember_added(QListWidgetItem* item)
 {
-    qobject_cast<Sigmod::MapTrainer*>(modified())->setLeadTeamMember(item->data(Qt::UserRole).toInt(), true);
+    qobject_cast<MapTrainer*>(modified())->setLeadTeamMember(item->data(Qt::UserRole).toInt(), true);
     setGui();
 }
 
-void Sigmodr::Widgets::MapTrainerUI::on_varLeadTeamMember_removed(QListWidgetItem* item)
+void MapTrainerUI::on_varLeadTeamMember_removed(QListWidgetItem* item)
 {
-    qobject_cast<Sigmod::MapTrainer*>(modified())->setLeadTeamMember(item->data(Qt::UserRole).toInt(), false);
+    qobject_cast<MapTrainer*>(modified())->setLeadTeamMember(item->data(Qt::UserRole).toInt(), false);
     setGui();
 }