1 files changed, 44 insertions, 41 deletions

diff --git a/sigmodr/widgets/TrainerUI.cpp b/sigmodr/widgets/TrainerUI.cpp
index 565f6b3f..75e48033 100644
--- a/sigmodr/widgets/TrainerUI.cpp
+++ b/sigmodr/widgets/TrainerUI.cpp
@@ -33,13 +33,16 @@
 #include <QtCore/QFile>
 #include <QtUiTools/QUiLoader>
 
-Sigmodr::Widgets::TrainerUI::TrainerUI(Sigmod::Trainer* trainer, QWidget* parent) :
+using namespace Sigmod;
+using namespace Sigmodr::Widgets;
+
+TrainerUI::TrainerUI(Trainer* trainer, QWidget* parent) :
         ObjectUI(parent)
 {
-    setObjects(trainer, new Sigmod::Trainer(*trainer));
+    setObjects(trainer, new Trainer(*trainer));
 }
 
-void Sigmodr::Widgets::TrainerUI::initGui()
+void TrainerUI::initGui()
 {
     QFile file(":/gui/trainer.ui");
     file.open(QFile::ReadOnly);
@@ -63,14 +66,14 @@ void Sigmodr::Widgets::TrainerUI::initGui()
     connect(ui_itemIntel, SIGNAL(currentIndexChanged(int)), this, SLOT(itemIntelChanged(int)));
     connect(ui_abilityIntel, SIGNAL(currentIndexChanged(int)), this, SLOT(abilityIntelChanged(int)));
     connect(ui_statIntel, SIGNAL(currentIndexChanged(int)), this, SLOT(statIntelChanged(int)));
-    ui_teamIntel->addItems(Sigmod::Trainer::IntelligenceStr);
-    ui_moveIntel->addItems(Sigmod::Trainer::IntelligenceStr);
-    ui_itemIntel->addItems(Sigmod::Trainer::IntelligenceStr);
-    ui_abilityIntel->addItems(Sigmod::Trainer::IntelligenceStr);
-    ui_statIntel->addItems(Sigmod::Trainer::IntelligenceStr);
+    ui_teamIntel->addItems(Trainer::IntelligenceStr);
+    ui_moveIntel->addItems(Trainer::IntelligenceStr);
+    ui_itemIntel->addItems(Trainer::IntelligenceStr);
+    ui_abilityIntel->addItems(Trainer::IntelligenceStr);
+    ui_statIntel->addItems(Trainer::IntelligenceStr);
 }
 
-void Sigmodr::Widgets::TrainerUI::refreshGui()
+void TrainerUI::refreshGui()
 {
     for (int i = 0; i < game()->skinCount(); ++i)
         ui_skin->addItem(game()->skin(i)->name());
@@ -78,74 +81,74 @@ void Sigmodr::Widgets::TrainerUI::refreshGui()
     ui_abilityIntel->setEnabled(game()->rules()->maxAbilities());
 }
 
-void Sigmodr::Widgets::TrainerUI::setGui()
+void TrainerUI::setGui()
 {
-    ui_name->setText(qobject_cast<Sigmod::Trainer*>(modified())->name());
-    ui_moneyFactor->setValue(qobject_cast<Sigmod::Trainer*>(modified())->moneyFactor());
-    ui_skin->setCurrentIndex(game()->skinIndex(qobject_cast<Sigmod::Trainer*>(modified())->skin()));
-    ui_depth->setValue(qobject_cast<Sigmod::Trainer*>(modified())->depth());
-    ui_teamIntel->setCurrentIndex(qobject_cast<Sigmod::Trainer*>(modified())->teamIntel());
-    ui_moveIntel->setCurrentIndex(qobject_cast<Sigmod::Trainer*>(modified())->moveIntel());
-    ui_itemIntel->setCurrentIndex(qobject_cast<Sigmod::Trainer*>(modified())->itemIntel());
-    ui_abilityIntel->setCurrentIndex(qobject_cast<Sigmod::Trainer*>(modified())->abilityIntel());
-    ui_statIntel->setCurrentIndex(qobject_cast<Sigmod::Trainer*>(modified())->statIntel());
+    ui_name->setText(qobject_cast<Trainer*>(modified())->name());
+    ui_moneyFactor->setValue(qobject_cast<Trainer*>(modified())->moneyFactor());
+    ui_skin->setCurrentIndex(game()->skinIndex(qobject_cast<Trainer*>(modified())->skin()));
+    ui_depth->setValue(qobject_cast<Trainer*>(modified())->depth());
+    ui_teamIntel->setCurrentIndex(qobject_cast<Trainer*>(modified())->teamIntel());
+    ui_moveIntel->setCurrentIndex(qobject_cast<Trainer*>(modified())->moveIntel());
+    ui_itemIntel->setCurrentIndex(qobject_cast<Trainer*>(modified())->itemIntel());
+    ui_abilityIntel->setCurrentIndex(qobject_cast<Trainer*>(modified())->abilityIntel());
+    ui_statIntel->setCurrentIndex(qobject_cast<Trainer*>(modified())->statIntel());
 }
 
-void Sigmodr::Widgets::TrainerUI::apply()
+void TrainerUI::apply()
 {
-    *qobject_cast<Sigmod::Trainer*>(original()) = *qobject_cast<Sigmod::Trainer*>(modified());
+    *qobject_cast<Trainer*>(original()) = *qobject_cast<Trainer*>(modified());
     emit(changed(false));
 }
 
-void Sigmodr::Widgets::TrainerUI::discard()
+void TrainerUI::discard()
 {
-    *qobject_cast<Sigmod::Trainer*>(modified()) = *qobject_cast<Sigmod::Trainer*>(original());
+    *qobject_cast<Trainer*>(modified()) = *qobject_cast<Trainer*>(original());
     emit(changed(false));
 }
 
-void Sigmodr::Widgets::TrainerUI::nameChanged(const QString& name)
+void TrainerUI::nameChanged(const QString& name)
 {
     const int cursor = ui_name->cursorPosition();
-    qobject_cast<Sigmod::Trainer*>(modified())->setName(name);
+    qobject_cast<Trainer*>(modified())->setName(name);
     ui_name->setCursorPosition(cursor);
 }
 
-void Sigmodr::Widgets::TrainerUI::moneyFactorChanged(const int moneyFactor)
+void TrainerUI::moneyFactorChanged(const int moneyFactor)
 {
-    qobject_cast<Sigmod::Trainer*>(modified())->setMoneyFactor(moneyFactor);
+    qobject_cast<Trainer*>(modified())->setMoneyFactor(moneyFactor);
 }
 
-void Sigmodr::Widgets::TrainerUI::skinChanged(const int skin)
+void TrainerUI::skinChanged(const int skin)
 {
-    qobject_cast<Sigmod::Trainer*>(modified())->setSkin(game()->skin(skin)->id());
+    qobject_cast<Trainer*>(modified())->setSkin(game()->skin(skin)->id());
 }
 
-void Sigmodr::Widgets::TrainerUI::depthChanged(const int depth)
+void TrainerUI::depthChanged(const int depth)
 {
-    qobject_cast<Sigmod::Trainer*>(modified())->setDepth(depth);
+    qobject_cast<Trainer*>(modified())->setDepth(depth);
 }
 
-void Sigmodr::Widgets::TrainerUI::teamIntelChanged(const int teamIntel)
+void TrainerUI::teamIntelChanged(const int teamIntel)
 {
-    qobject_cast<Sigmod::Trainer*>(modified())->setTeamIntel(static_cast<Sigmod::Trainer::Intelligence>(teamIntel));
+    qobject_cast<Trainer*>(modified())->setTeamIntel(static_cast<Trainer::Intelligence>(teamIntel));
 }
 
-void Sigmodr::Widgets::TrainerUI::moveIntelChanged(const int moveIntel)
+void TrainerUI::moveIntelChanged(const int moveIntel)
 {
-    qobject_cast<Sigmod::Trainer*>(modified())->setMoveIntel(static_cast<Sigmod::Trainer::Intelligence>(moveIntel));
+    qobject_cast<Trainer*>(modified())->setMoveIntel(static_cast<Trainer::Intelligence>(moveIntel));
 }
 
-void Sigmodr::Widgets::TrainerUI::itemIntelChanged(const int itemIntel)
+void TrainerUI::itemIntelChanged(const int itemIntel)
 {
-    qobject_cast<Sigmod::Trainer*>(modified())->setItemIntel(static_cast<Sigmod::Trainer::Intelligence>(itemIntel));
+    qobject_cast<Trainer*>(modified())->setItemIntel(static_cast<Trainer::Intelligence>(itemIntel));
 }
 
-void Sigmodr::Widgets::TrainerUI::abilityIntelChanged(const int abilityIntel)
+void TrainerUI::abilityIntelChanged(const int abilityIntel)
 {
-    qobject_cast<Sigmod::Trainer*>(modified())->setAbilityIntel(static_cast<Sigmod::Trainer::Intelligence>(abilityIntel));
+    qobject_cast<Trainer*>(modified())->setAbilityIntel(static_cast<Trainer::Intelligence>(abilityIntel));
 }
 
-void Sigmodr::Widgets::TrainerUI::statIntelChanged(const int statIntel)
+void TrainerUI::statIntelChanged(const int statIntel)
 {
-    qobject_cast<Sigmod::Trainer*>(modified())->setStatIntel(static_cast<Sigmod::Trainer::Intelligence>(statIntel));
+    qobject_cast<Trainer*>(modified())->setStatIntel(static_cast<Trainer::Intelligence>(statIntel));
 }