1 files changed, 47 insertions, 43 deletions

diff --git a/sigmodr/widgets/MoveUI.cpp b/sigmodr/widgets/MoveUI.cpp
index f47ac965..4b0fb72d 100644
--- a/sigmodr/widgets/MoveUI.cpp
+++ b/sigmodr/widgets/MoveUI.cpp
@@ -23,112 +23,116 @@
 #include <sigmod/Move.h>
 #include <sigmod/Type.h>
 
-Sigmodr::Widgets::MoveUI::MoveUI(Sigmod::Move* move, QWidget* parent) :
+using namespace Sigcore;
+using namespace Sigmod;
+using namespace Sigmodr::Widgets;
+
+MoveUI::MoveUI(Move* move, QWidget* parent) :
         ObjectUI(parent)
 {
     setupUi(this);
-    setObjects(move, new Sigmod::Move(*move));
+    setObjects(move, new Move(*move));
 }
 
-Sigmodr::Widgets::MoveUI::~MoveUI()
+MoveUI::~MoveUI()
 {
 }
 
-void Sigmodr::Widgets::MoveUI::refreshGui()
+void MoveUI::refreshGui()
 {
     const bool blocked = varType->blockSignals(true);
     varType->clear();
     for (int i = 0; i < game()->typeCount(); ++i)
     {
-        const Sigmod::Type* type = game()->type(i);
+        const Type* type = game()->type(i);
         varType->addItem(type->name(), type->id());
     }
     varType->blockSignals(blocked);
 }
 
-void Sigmodr::Widgets::MoveUI::setGui()
+void MoveUI::setGui()
 {
-    varName->setText(qobject_cast<Sigmod::Move*>(modified())->name());
-    varPriority->setValue(qobject_cast<Sigmod::Move*>(modified())->priority());
-    varAccuracy->setValue(qobject_cast<Sigmod::Move*>(modified())->accuracy());
-    varPower->setValue(qobject_cast<Sigmod::Move*>(modified())->power());
-    varType->setCurrentIndex(varType->findData(qobject_cast<Sigmod::Move*>(modified())->type()));
-    varPowerPoints->setValue(qobject_cast<Sigmod::Move*>(modified())->powerPoints());
-    varSpecial->setChecked(qobject_cast<Sigmod::Move*>(modified())->special() ? Qt::Checked : Qt::Unchecked);
-    varDescription->setText(qobject_cast<Sigmod::Move*>(modified())->description());
-    varBattleScript->setValue(qobject_cast<Sigmod::Move*>(modified())->battleScript());
-    varWorldScript->setValue(qobject_cast<Sigmod::Move*>(modified())->worldScript());
-    varPriorityScript->setValue(qobject_cast<Sigmod::Move*>(modified())->priorityScript());
+    varName->setText(qobject_cast<Move*>(modified())->name());
+    varPriority->setValue(qobject_cast<Move*>(modified())->priority());
+    varAccuracy->setValue(qobject_cast<Move*>(modified())->accuracy());
+    varPower->setValue(qobject_cast<Move*>(modified())->power());
+    varType->setCurrentIndex(varType->findData(qobject_cast<Move*>(modified())->type()));
+    varPowerPoints->setValue(qobject_cast<Move*>(modified())->powerPoints());
+    varSpecial->setChecked(qobject_cast<Move*>(modified())->special() ? Qt::Checked : Qt::Unchecked);
+    varDescription->setText(qobject_cast<Move*>(modified())->description());
+    varBattleScript->setValue(qobject_cast<Move*>(modified())->battleScript());
+    varWorldScript->setValue(qobject_cast<Move*>(modified())->worldScript());
+    varPriorityScript->setValue(qobject_cast<Move*>(modified())->priorityScript());
 }
 
-void Sigmodr::Widgets::MoveUI::apply()
+void MoveUI::apply()
 {
-    *qobject_cast<Sigmod::Move*>(original()) = *qobject_cast<Sigmod::Move*>(modified());
+    *qobject_cast<Move*>(original()) = *qobject_cast<Move*>(modified());
     emit(changed(false));
 }
 
-void Sigmodr::Widgets::MoveUI::discard()
+void MoveUI::discard()
 {
-    *qobject_cast<Sigmod::Move*>(modified()) = *qobject_cast<Sigmod::Move*>(original());
+    *qobject_cast<Move*>(modified()) = *qobject_cast<Move*>(original());
     setGui();
     emit(changed(false));
 }
 
-void Sigmodr::Widgets::MoveUI::on_varName_textChanged(const QString& name)
+void MoveUI::on_varName_textChanged(const QString& name)
 {
     const int cursor = varName->cursorPosition();
-    qobject_cast<Sigmod::Move*>(modified())->setName(name);
+    qobject_cast<Move*>(modified())->setName(name);
     varName->setCursorPosition(cursor);
 }
 
-void Sigmodr::Widgets::MoveUI::on_varPriority_valueChanged(const int priority)
+void MoveUI::on_varPriority_valueChanged(const int priority)
 {
-    qobject_cast<Sigmod::Move*>(modified())->setPriority(priority);
+    qobject_cast<Move*>(modified())->setPriority(priority);
 }
 
-void Sigmodr::Widgets::MoveUI::on_varAccuracy_valueChanged(const Sigcore::Fraction& accuracy)
+void MoveUI::on_varAccuracy_valueChanged(const Fraction& accuracy)
 {
-    qobject_cast<Sigmod::Move*>(modified())->setAccuracy(accuracy);
+    qobject_cast<Move*>(modified())->setAccuracy(accuracy);
 }
 
-void Sigmodr::Widgets::MoveUI::on_varPower_valueChanged(const int power)
+void MoveUI::on_varPower_valueChanged(const int power)
 {
-    qobject_cast<Sigmod::Move*>(modified())->setPower(power);
+    qobject_cast<Move*>(modified())->setPower(power);
 }
 
-void Sigmodr::Widgets::MoveUI::on_varType_activated(const int type)
+void MoveUI::on_varType_activated(const int type)
 {
-    qobject_cast<Sigmod::Move*>(modified())->setType(varType->itemData(type).toInt());
+    qobject_cast<Move*>(modified())->setType(varType->itemData(type).toInt());
 }
 
-void Sigmodr::Widgets::MoveUI::on_varPowerPoints_valueChanged(const int powerPoints)
+void MoveUI::on_varPowerPoints_valueChanged(const int powerPoints)
 {
-    qobject_cast<Sigmod::Move*>(modified())->setPowerPoints(powerPoints);
+    qobject_cast<Move*>(modified())->setPowerPoints(powerPoints);
 }
 
-void Sigmodr::Widgets::MoveUI::on_varSpecial_toggled(const bool special)
+void MoveUI::on_varSpecial_toggled(const bool special)
 {
-    qobject_cast<Sigmod::Move*>(modified())->setSpecial(special);
+    qobject_cast<Move*>(modified())->setSpecial(special);
 }
 
-void Sigmodr::Widgets::MoveUI::on_varDescription_textChanged(const QString& description)
+void MoveUI::on_varDescription_textChanged(const QString& description)
 {
     const int cursor = varDescription->cursorPosition();
-    qobject_cast<Sigmod::Move*>(modified())->setDescription(description);
+    qobject_cast<Move*>(modified())->setDescription(description);
     varDescription->setCursorPosition(cursor);
 }
 
-void Sigmodr::Widgets::MoveUI::on_varBattleScript_valueChanged(const Sigcore::Script& battleScript)
+void MoveUI::on_varBattleScript_valueChanged(const Script& battleScript)
 {
-    qobject_cast<Sigmod::Move*>(modified())->setBattleScript(battleScript);
+    qobject_cast<Move*>(modified())->setBattleScript(battleScript);
 }
 
-void Sigmodr::Widgets::MoveUI::on_varWorldScript_valueChanged(const Sigcore::Script& worldScript)
+void MoveUI::on_varWorldScript_valueChanged(const Script& worldScript)
 {
-    qobject_cast<Sigmod::Move*>(modified())->setWorldScript(worldScript);
+    qobject_cast<Move*>(modified())->setWorldScript(worldScript);
 }
 
-void Sigmodr::Widgets::MoveUI::on_varPriorityScript_valueChanged(const Sigcore::Script& priorityScript)
+void MoveUI::on_varPriorityScript_valueChanged(const Script& priorityScript)
 {
-    qobject_cast<Sigmod::Move*>(modified())->setPriorityScript(priorityScript);
+    qobject_cast<Move*>(modified())->setPriorityScript(priorityScript);
 }