1 files changed, 53 insertions, 50 deletions

diff --git a/sigmodr/widgets/MapTrainerTeamMemberUI.cpp b/sigmodr/widgets/MapTrainerTeamMemberUI.cpp
index 48ac1b4d..c9e57491 100644
--- a/sigmodr/widgets/MapTrainerTeamMemberUI.cpp
+++ b/sigmodr/widgets/MapTrainerTeamMemberUI.cpp
@@ -31,29 +31,32 @@
 // Qt includes
 #include <QtGui/QListWidgetItem>
 
-Sigmodr::Widgets::MapTrainerTeamMemberUI::MapTrainerTeamMemberUI(Sigmod::MapTrainerTeamMember* teamMember, QWidget* parent) :
+using namespace Sigmod;
+using namespace Sigmodr::Widgets;
+
+MapTrainerTeamMemberUI::MapTrainerTeamMemberUI(MapTrainerTeamMember* teamMember, QWidget* parent) :
         ObjectUI(parent)
 {
     setupUi(this);
-    setObjects(teamMember, new Sigmod::MapTrainerTeamMember(*teamMember));
+    setObjects(teamMember, new MapTrainerTeamMember(*teamMember));
 }
 
-Sigmodr::Widgets::MapTrainerTeamMemberUI::~MapTrainerTeamMemberUI()
+MapTrainerTeamMemberUI::~MapTrainerTeamMemberUI()
 {
 }
 
-void Sigmodr::Widgets::MapTrainerTeamMemberUI::initGui()
+void MapTrainerTeamMemberUI::initGui()
 {
     connect(varItems->selectedListWidget(), SIGNAL(currentItemChanged(QListWidgetItem*, QListWidgetItem*)), this, SLOT(selectedItemChanged(QListWidgetItem*)));
 }
 
-void Sigmodr::Widgets::MapTrainerTeamMemberUI::refreshGui()
+void MapTrainerTeamMemberUI::refreshGui()
 {
     const bool blockedSpecies = varSpecies->blockSignals(true);
     varSpecies->clear();
     for (int i = 0; i < game()->speciesCount(); ++i)
     {
-        const Sigmod::Species* species = game()->species(i);
+        const Species* species = game()->species(i);
         varSpecies->addItem(species->name(), species->id());
     }
     varSpecies->blockSignals(blockedSpecies);
@@ -63,7 +66,7 @@ void Sigmodr::Widgets::MapTrainerTeamMemberUI::refreshGui()
     varAbilities->selectedListWidget()->clear();
     for (int i = 0; i < game()->abilityCount(); ++i)
     {
-        const Sigmod::Ability* ability = game()->ability(i);
+        const Ability* ability = game()->ability(i);
         QListWidgetItem* widgetItem = new QListWidgetItem(ability->name(), varAbilities->availableListWidget());
         widgetItem->setData(Qt::UserRole, ability->id());
     }
@@ -75,7 +78,7 @@ void Sigmodr::Widgets::MapTrainerTeamMemberUI::refreshGui()
     varItems->selectedListWidget()->clear();
     for (int i = 0; i < game()->itemCount(); ++i)
     {
-        const Sigmod::Item* item = game()->item(i);
+        const Item* item = game()->item(i);
         QListWidgetItem* widgetItem = new QListWidgetItem(item->name(), varItems->availableListWidget());
         widgetItem->setData(Qt::UserRole, item->id());
     }
@@ -87,7 +90,7 @@ void Sigmodr::Widgets::MapTrainerTeamMemberUI::refreshGui()
     varMoves->selectedListWidget()->clear();
     for (int i = 0; i < game()->moveCount(); ++i)
     {
-        const Sigmod::Move* move = game()->move(i);
+        const Move* move = game()->move(i);
         QListWidgetItem* widgetItem = new QListWidgetItem(move->name(), varMoves->availableListWidget());
         widgetItem->setData(Qt::UserRole, move->id());
     }
@@ -98,7 +101,7 @@ void Sigmodr::Widgets::MapTrainerTeamMemberUI::refreshGui()
     varNatures->selectedListWidget()->clear();
     for (int i = 0; i < game()->natureCount(); ++i)
     {
-        const Sigmod::Nature* nature = game()->nature(i);
+        const Nature* nature = game()->nature(i);
         QListWidgetItem* widgetItem = new QListWidgetItem(nature->name(), varNatures->availableListWidget());
         widgetItem->setData(Qt::UserRole, nature->id());
     }
@@ -107,149 +110,149 @@ void Sigmodr::Widgets::MapTrainerTeamMemberUI::refreshGui()
     boxNatures->setEnabled(game()->rules()->maxNatures());
 }
 
-void Sigmodr::Widgets::MapTrainerTeamMemberUI::setGui()
+void MapTrainerTeamMemberUI::setGui()
 {
-    varSpecies->setCurrentIndex(varSpecies->findData(qobject_cast<Sigmod::MapTrainerTeamMember*>(modified())->species()));
-    varLevel->setValue(qobject_cast<Sigmod::MapTrainerTeamMember*>(modified())->level());
+    varSpecies->setCurrentIndex(varSpecies->findData(qobject_cast<MapTrainerTeamMember*>(modified())->species()));
+    varLevel->setValue(qobject_cast<MapTrainerTeamMember*>(modified())->level());
     for (int i = 0; i < varAbilities->availableListWidget()->count(); ++i)
     {
         QListWidgetItem* widgetItem = varAbilities->availableListWidget()->item(i);
-        if (qobject_cast<Sigmod::MapTrainerTeamMember*>(modified())->ability(widgetItem->data(Qt::UserRole).toInt()))
+        if (qobject_cast<MapTrainerTeamMember*>(modified())->ability(widgetItem->data(Qt::UserRole).toInt()))
             varAbilities->selectedListWidget()->addItem(varAbilities->availableListWidget()->takeItem(i--));
     }
     for (int i = 0; i < varAbilities->selectedListWidget()->count(); ++i)
     {
         QListWidgetItem* widgetItem = varAbilities->selectedListWidget()->item(i);
-        if (!qobject_cast<Sigmod::MapTrainerTeamMember*>(modified())->ability(widgetItem->data(Qt::UserRole).toInt()))
+        if (!qobject_cast<MapTrainerTeamMember*>(modified())->ability(widgetItem->data(Qt::UserRole).toInt()))
             varAbilities->availableListWidget()->addItem(varAbilities->selectedListWidget()->takeItem(i--));
     }
     varAbilities->setButtonsEnabled();
     for (int i = 0; i < varItems->availableListWidget()->count(); ++i)
     {
         QListWidgetItem* widgetItem = varItems->availableListWidget()->item(i);
-        if (qobject_cast<Sigmod::MapTrainerTeamMember*>(modified())->item(widgetItem->data(Qt::UserRole).toInt()))
+        if (qobject_cast<MapTrainerTeamMember*>(modified())->item(widgetItem->data(Qt::UserRole).toInt()))
             varItems->selectedListWidget()->addItem(varItems->availableListWidget()->takeItem(i--));
     }
     for (int i = 0; i < varItems->selectedListWidget()->count(); ++i)
     {
         QListWidgetItem* widgetItem = varItems->selectedListWidget()->item(i);
-        if (!qobject_cast<Sigmod::MapTrainerTeamMember*>(modified())->item(widgetItem->data(Qt::UserRole).toInt()))
+        if (!qobject_cast<MapTrainerTeamMember*>(modified())->item(widgetItem->data(Qt::UserRole).toInt()))
             varItems->availableListWidget()->addItem(varItems->selectedListWidget()->takeItem(i--));
     }
     varItems->setButtonsEnabled();
     QListWidgetItem* selectedItem = varItems->selectedListWidget()->currentItem();
     if (selectedItem)
-        varItemCount->setValue(qobject_cast<Sigmod::MapTrainerTeamMember*>(modified())->item(selectedItem->data(Qt::UserRole).toInt()));
+        varItemCount->setValue(qobject_cast<MapTrainerTeamMember*>(modified())->item(selectedItem->data(Qt::UserRole).toInt()));
     for (int i = 0; i < varMoves->availableListWidget()->count(); ++i)
     {
         QListWidgetItem* widgetItem = varMoves->availableListWidget()->item(i);
-        if (qobject_cast<Sigmod::MapTrainerTeamMember*>(modified())->move(widgetItem->data(Qt::UserRole).toInt()))
+        if (qobject_cast<MapTrainerTeamMember*>(modified())->move(widgetItem->data(Qt::UserRole).toInt()))
             varMoves->selectedListWidget()->addItem(varMoves->availableListWidget()->takeItem(i--));
     }
     for (int i = 0; i < varMoves->selectedListWidget()->count(); ++i)
     {
         QListWidgetItem* widgetItem = varMoves->selectedListWidget()->item(i);
-        if (!qobject_cast<Sigmod::MapTrainerTeamMember*>(modified())->move(widgetItem->data(Qt::UserRole).toInt()))
+        if (!qobject_cast<MapTrainerTeamMember*>(modified())->move(widgetItem->data(Qt::UserRole).toInt()))
             varMoves->availableListWidget()->addItem(varMoves->selectedListWidget()->takeItem(i--));
     }
     varMoves->setButtonsEnabled();
     for (int i = 0; i < varNatures->availableListWidget()->count(); ++i)
     {
         QListWidgetItem* widgetItem = varNatures->availableListWidget()->item(i);
-        if (qobject_cast<Sigmod::MapTrainerTeamMember*>(modified())->nature(widgetItem->data(Qt::UserRole).toInt()))
+        if (qobject_cast<MapTrainerTeamMember*>(modified())->nature(widgetItem->data(Qt::UserRole).toInt()))
             varNatures->selectedListWidget()->addItem(varNatures->availableListWidget()->takeItem(i--));
     }
     for (int i = 0; i < varNatures->selectedListWidget()->count(); ++i)
     {
         QListWidgetItem* widgetItem = varNatures->selectedListWidget()->item(i);
-        if (!qobject_cast<Sigmod::MapTrainerTeamMember*>(modified())->nature(widgetItem->data(Qt::UserRole).toInt()))
+        if (!qobject_cast<MapTrainerTeamMember*>(modified())->nature(widgetItem->data(Qt::UserRole).toInt()))
             varNatures->availableListWidget()->addItem(varNatures->selectedListWidget()->takeItem(i--));
     }
     varNatures->setButtonsEnabled();
 }
 
-void Sigmodr::Widgets::MapTrainerTeamMemberUI::apply()
+void MapTrainerTeamMemberUI::apply()
 {
-    *qobject_cast<Sigmod::MapTrainerTeamMember*>(original()) = *qobject_cast<Sigmod::MapTrainerTeamMember*>(modified());
+    *qobject_cast<MapTrainerTeamMember*>(original()) = *qobject_cast<MapTrainerTeamMember*>(modified());
     emit(changed(false));
 }
 
-void Sigmodr::Widgets::MapTrainerTeamMemberUI::discard()
+void MapTrainerTeamMemberUI::discard()
 {
-    *qobject_cast<Sigmod::MapTrainerTeamMember*>(modified()) = *qobject_cast<Sigmod::MapTrainerTeamMember*>(original());
+    *qobject_cast<MapTrainerTeamMember*>(modified()) = *qobject_cast<MapTrainerTeamMember*>(original());
     setGui();
     emit(changed(false));
 }
 
-void Sigmodr::Widgets::MapTrainerTeamMemberUI::on_varSpecies_activated(const int species)
+void MapTrainerTeamMemberUI::on_varSpecies_activated(const int species)
 {
-    qobject_cast<Sigmod::MapTrainerTeamMember*>(modified())->setSpecies(varSpecies->itemData(species).toInt());
+    qobject_cast<MapTrainerTeamMember*>(modified())->setSpecies(varSpecies->itemData(species).toInt());
 }
 
-void Sigmodr::Widgets::MapTrainerTeamMemberUI::on_varLevel_valueChanged(const int level)
+void MapTrainerTeamMemberUI::on_varLevel_valueChanged(const int level)
 {
-    qobject_cast<Sigmod::MapTrainerTeamMember*>(modified())->setLevel(level);
+    qobject_cast<MapTrainerTeamMember*>(modified())->setLevel(level);
 }
 
-void Sigmodr::Widgets::MapTrainerTeamMemberUI::on_varAbilities_added(QListWidgetItem* item)
+void MapTrainerTeamMemberUI::on_varAbilities_added(QListWidgetItem* item)
 {
-    qobject_cast<Sigmod::MapTrainerTeamMember*>(modified())->setAbility(item->data(Qt::UserRole).toInt(), true);
+    qobject_cast<MapTrainerTeamMember*>(modified())->setAbility(item->data(Qt::UserRole).toInt(), true);
     setGui();
 }
 
-void Sigmodr::Widgets::MapTrainerTeamMemberUI::on_varAbilities_removed(QListWidgetItem* item)
+void MapTrainerTeamMemberUI::on_varAbilities_removed(QListWidgetItem* item)
 {
-    qobject_cast<Sigmod::MapTrainerTeamMember*>(modified())->setAbility(item->data(Qt::UserRole).toInt(), false);
+    qobject_cast<MapTrainerTeamMember*>(modified())->setAbility(item->data(Qt::UserRole).toInt(), false);
     setGui();
 }
 
-void Sigmodr::Widgets::MapTrainerTeamMemberUI::on_varItems_added(QListWidgetItem* item)
+void MapTrainerTeamMemberUI::on_varItems_added(QListWidgetItem* item)
 {
-    qobject_cast<Sigmod::MapTrainerTeamMember*>(modified())->setItem(item->data(Qt::UserRole).toInt(), 1);
+    qobject_cast<MapTrainerTeamMember*>(modified())->setItem(item->data(Qt::UserRole).toInt(), 1);
     setGui();
 }
 
-void Sigmodr::Widgets::MapTrainerTeamMemberUI::on_varItems_removed(QListWidgetItem* item)
+void MapTrainerTeamMemberUI::on_varItems_removed(QListWidgetItem* item)
 {
-    qobject_cast<Sigmod::MapTrainerTeamMember*>(modified())->setItem(item->data(Qt::UserRole).toInt(), 0);
+    qobject_cast<MapTrainerTeamMember*>(modified())->setItem(item->data(Qt::UserRole).toInt(), 0);
     setGui();
 }
 
-void Sigmodr::Widgets::MapTrainerTeamMemberUI::selectedItemChanged(QListWidgetItem* item)
+void MapTrainerTeamMemberUI::selectedItemChanged(QListWidgetItem* item)
 {
     if (item)
-        varItemCount->setValue(qobject_cast<Sigmod::MapTrainerTeamMember*>(modified())->item(item->data(Qt::UserRole).toInt()));
+        varItemCount->setValue(qobject_cast<MapTrainerTeamMember*>(modified())->item(item->data(Qt::UserRole).toInt()));
     else
         varItemCount->setEnabled(false);
 }
 
-void Sigmodr::Widgets::MapTrainerTeamMemberUI::on_varItemCount_valueChanged(const int itemCount)
+void MapTrainerTeamMemberUI::on_varItemCount_valueChanged(const int itemCount)
 {
     QListWidgetItem* item = varItems->selectedListWidget()->currentItem();
-    qobject_cast<Sigmod::MapTrainerTeamMember*>(modified())->setItem(item->data(Qt::UserRole).toInt(), itemCount);
+    qobject_cast<MapTrainerTeamMember*>(modified())->setItem(item->data(Qt::UserRole).toInt(), itemCount);
     setGui();
 }
 
-void Sigmodr::Widgets::MapTrainerTeamMemberUI::on_varMoves_added(QListWidgetItem* item)
+void MapTrainerTeamMemberUI::on_varMoves_added(QListWidgetItem* item)
 {
-    qobject_cast<Sigmod::MapTrainerTeamMember*>(modified())->setMove(item->data(Qt::UserRole).toInt(), true);
+    qobject_cast<MapTrainerTeamMember*>(modified())->setMove(item->data(Qt::UserRole).toInt(), true);
     setGui();
 }
 
-void Sigmodr::Widgets::MapTrainerTeamMemberUI::on_varMoves_removed(QListWidgetItem* item)
+void MapTrainerTeamMemberUI::on_varMoves_removed(QListWidgetItem* item)
 {
-    qobject_cast<Sigmod::MapTrainerTeamMember*>(modified())->setMove(item->data(Qt::UserRole).toInt(), false);
+    qobject_cast<MapTrainerTeamMember*>(modified())->setMove(item->data(Qt::UserRole).toInt(), false);
     setGui();
 }
 
-void Sigmodr::Widgets::MapTrainerTeamMemberUI::on_varNatures_added(QListWidgetItem* item)
+void MapTrainerTeamMemberUI::on_varNatures_added(QListWidgetItem* item)
 {
-    qobject_cast<Sigmod::MapTrainerTeamMember*>(modified())->setNature(item->data(Qt::UserRole).toInt(), true);
+    qobject_cast<MapTrainerTeamMember*>(modified())->setNature(item->data(Qt::UserRole).toInt(), true);
     setGui();
 }
 
-void Sigmodr::Widgets::MapTrainerTeamMemberUI::on_varNatures_removed(QListWidgetItem* item)
+void MapTrainerTeamMemberUI::on_varNatures_removed(QListWidgetItem* item)
 {
-    qobject_cast<Sigmod::MapTrainerTeamMember*>(modified())->setNature(item->data(Qt::UserRole).toInt(), false);
+    qobject_cast<MapTrainerTeamMember*>(modified())->setNature(item->data(Qt::UserRole).toInt(), false);
     setGui();
 }