1 files changed, 30 insertions, 26 deletions

diff --git a/sigmodr/widgets/AbilityUI.cpp b/sigmodr/widgets/AbilityUI.cpp
index c545f9eb..d6bc1492 100644
--- a/sigmodr/widgets/AbilityUI.cpp
+++ b/sigmodr/widgets/AbilityUI.cpp
@@ -32,13 +32,17 @@
 #include <QtCore/QFile>
 #include <QtUiTools/QUiLoader>
 
-Sigmodr::Widgets::AbilityUI::AbilityUI(Sigmod::Ability* ability, QWidget* parent) :
+using namespace Sigcore;
+using namespace Sigmod;
+using namespace Sigmodr::Widgets;
+
+AbilityUI::AbilityUI(Ability* ability, QWidget* parent) :
         ObjectUI(parent)
 {
-    setObjects(ability, new Sigmod::Ability(*ability));
+    setObjects(ability, new Ability(*ability));
 }
 
-void Sigmodr::Widgets::AbilityUI::initGui()
+void AbilityUI::initGui()
 {
     QFile file(":/gui/ability.ui");
     file.open(QFile::ReadOnly);
@@ -58,59 +62,59 @@ void Sigmodr::Widgets::AbilityUI::initGui()
     connect(ui_priorityScript, SIGNAL(valueChanged(Sigcore::Script)), this, SLOT(priorityScriptChanged(Sigcore::Script)));
 }
 
-void Sigmodr::Widgets::AbilityUI::setGui()
+void AbilityUI::setGui()
 {
-    ui_name->setText(qobject_cast<Sigmod::Ability*>(modified())->name());
-    ui_priority->setValue(qobject_cast<Sigmod::Ability*>(modified())->priority());
-    ui_description->setText(qobject_cast<Sigmod::Ability*>(modified())->description());
-    ui_battleScript->setValue(qobject_cast<Sigmod::Ability*>(modified())->battleScript());
-    ui_worldScript->setValue(qobject_cast<Sigmod::Ability*>(modified())->worldScript());
-    ui_priorityScript->setValue(qobject_cast<Sigmod::Ability*>(modified())->priorityScript());
+    ui_name->setText(qobject_cast<Ability*>(modified())->name());
+    ui_priority->setValue(qobject_cast<Ability*>(modified())->priority());
+    ui_description->setText(qobject_cast<Ability*>(modified())->description());
+    ui_battleScript->setValue(qobject_cast<Ability*>(modified())->battleScript());
+    ui_worldScript->setValue(qobject_cast<Ability*>(modified())->worldScript());
+    ui_priorityScript->setValue(qobject_cast<Ability*>(modified())->priorityScript());
 }
 
-void Sigmodr::Widgets::AbilityUI::apply()
+void AbilityUI::apply()
 {
-    *qobject_cast<Sigmod::Ability*>(original()) = *qobject_cast<Sigmod::Ability*>(modified());
+    *qobject_cast<Ability*>(original()) = *qobject_cast<Ability*>(modified());
     emit(changed(false));
 }
 
-void Sigmodr::Widgets::AbilityUI::discard()
+void AbilityUI::discard()
 {
-    *qobject_cast<Sigmod::Ability*>(modified()) = *qobject_cast<Sigmod::Ability*>(original());
+    *qobject_cast<Ability*>(modified()) = *qobject_cast<Ability*>(original());
     setGui();
     emit(changed(false));
 }
 
-void Sigmodr::Widgets::AbilityUI::nameChanged(const QString& name)
+void AbilityUI::nameChanged(const QString& name)
 {
     const int cursor = ui_name->cursorPosition();
-    qobject_cast<Sigmod::Ability*>(modified())->setName(name);
+    qobject_cast<Ability*>(modified())->setName(name);
     ui_name->setCursorPosition(cursor);
 }
 
-void Sigmodr::Widgets::AbilityUI::priorityChanged(const int priority)
+void AbilityUI::priorityChanged(const int priority)
 {
-    qobject_cast<Sigmod::Ability*>(modified())->setPriority(priority);
+    qobject_cast<Ability*>(modified())->setPriority(priority);
 }
 
-void Sigmodr::Widgets::AbilityUI::descriptionChanged(const QString& description)
+void AbilityUI::descriptionChanged(const QString& description)
 {
     const int cursor = ui_description->cursorPosition();
-    qobject_cast<Sigmod::Ability*>(modified())->setDescription(description);
+    qobject_cast<Ability*>(modified())->setDescription(description);
     ui_description->setCursorPosition(cursor);
 }
 
-void Sigmodr::Widgets::AbilityUI::battleScriptChanged(const Sigcore::Script& battleScript)
+void AbilityUI::battleScriptChanged(const Script& battleScript)
 {
-    qobject_cast<Sigmod::Ability*>(modified())->setBattleScript(battleScript);
+    qobject_cast<Ability*>(modified())->setBattleScript(battleScript);
 }
 
-void Sigmodr::Widgets::AbilityUI::worldScriptChanged(const Sigcore::Script& worldScript)
+void AbilityUI::worldScriptChanged(const Script& worldScript)
 {
-    qobject_cast<Sigmod::Ability*>(modified())->setWorldScript(worldScript);
+    qobject_cast<Ability*>(modified())->setWorldScript(worldScript);
 }
 
-void Sigmodr::Widgets::AbilityUI::priorityScriptChanged(const Sigcore::Script& priorityScript)
+void AbilityUI::priorityScriptChanged(const Script& priorityScript)
 {
-    qobject_cast<Sigmod::Ability*>(modified())->setPriorityScript(priorityScript);
+    qobject_cast<Ability*>(modified())->setPriorityScript(priorityScript);
 }