1 files changed, 21 insertions, 17 deletions

diff --git a/sigmodr/widgets/StatusUI.cpp b/sigmodr/widgets/StatusUI.cpp
index f4b2ae22..bb4b19d0 100644
--- a/sigmodr/widgets/StatusUI.cpp
+++ b/sigmodr/widgets/StatusUI.cpp
@@ -31,13 +31,17 @@
 #include <QtCore/QFile>
 #include <QtUiTools/QUiLoader>
 
-Sigmodr::Widgets::StatusUI::StatusUI(Sigmod::Status* status, QWidget* parent) :
+using namespace Sigcore;
+using namespace Sigmod;
+using namespace Sigmodr::Widgets;
+
+StatusUI::StatusUI(Status* status, QWidget* parent) :
         ObjectUI(parent)
 {
-    setObjects(status, new Sigmod::Status(*status));
+    setObjects(status, new Status(*status));
 }
 
-void Sigmodr::Widgets::StatusUI::initGui()
+void StatusUI::initGui()
 {
     QFile file(":/gui/status.ui");
     file.open(QFile::ReadOnly);
@@ -51,39 +55,39 @@ void Sigmodr::Widgets::StatusUI::initGui()
     connect(ui_worldScript, SIGNAL(valueChanged(Sigcore::Script)), this, SLOT(worldScriptChanged(Sigcore::Script)));
 }
 
-void Sigmodr::Widgets::StatusUI::setGui()
+void StatusUI::setGui()
 {
-    ui_name->setText(qobject_cast<Sigmod::Status*>(modified())->name());
-    ui_battleScript->setValue(qobject_cast<Sigmod::Status*>(modified())->battleScript());
-    ui_worldScript->setValue(qobject_cast<Sigmod::Status*>(modified())->worldScript());
+    ui_name->setText(qobject_cast<Status*>(modified())->name());
+    ui_battleScript->setValue(qobject_cast<Status*>(modified())->battleScript());
+    ui_worldScript->setValue(qobject_cast<Status*>(modified())->worldScript());
 }
 
-void Sigmodr::Widgets::StatusUI::apply()
+void StatusUI::apply()
 {
-    *qobject_cast<Sigmod::Status*>(original()) = *qobject_cast<Sigmod::Status*>(modified());
+    *qobject_cast<Status*>(original()) = *qobject_cast<Status*>(modified());
     emit(changed(false));
 }
 
-void Sigmodr::Widgets::StatusUI::discard()
+void StatusUI::discard()
 {
-    *qobject_cast<Sigmod::Status*>(modified()) = *qobject_cast<Sigmod::Status*>(original());
+    *qobject_cast<Status*>(modified()) = *qobject_cast<Status*>(original());
     setGui();
     emit(changed(false));
 }
 
-void Sigmodr::Widgets::StatusUI::nameChanged(const QString& name)
+void StatusUI::nameChanged(const QString& name)
 {
     const int cursor = ui_name->cursorPosition();
-    qobject_cast<Sigmod::Status*>(modified())->setName(name);
+    qobject_cast<Status*>(modified())->setName(name);
     ui_name->setCursorPosition(cursor);
 }
 
-void Sigmodr::Widgets::StatusUI::battleScriptChanged(const Sigcore::Script& battleScript)
+void StatusUI::battleScriptChanged(const Script& battleScript)
 {
-    qobject_cast<Sigmod::Status*>(modified())->setBattleScript(battleScript);
+    qobject_cast<Status*>(modified())->setBattleScript(battleScript);
 }
 
-void Sigmodr::Widgets::StatusUI::worldScriptChanged(const Sigcore::Script& worldScript)
+void StatusUI::worldScriptChanged(const Script& worldScript)
 {
-    qobject_cast<Sigmod::Status*>(modified())->setWorldScript(worldScript);
+    qobject_cast<Status*>(modified())->setWorldScript(worldScript);
 }