1 files changed, 26 insertions, 22 deletions

diff --git a/sigmodr/widgets/MapEffectUI.cpp b/sigmodr/widgets/MapEffectUI.cpp
index 911b189c..e73110b4 100644
--- a/sigmodr/widgets/MapEffectUI.cpp
+++ b/sigmodr/widgets/MapEffectUI.cpp
@@ -24,65 +24,69 @@
 #include <sigmod/MapEffect.h>
 #include <sigmod/Skin.h>
 
-Sigmodr::Widgets::MapEffectUI::MapEffectUI(Sigmod::MapEffect* effect, QWidget* parent) :
+using namespace Sigcore;
+using namespace Sigmod;
+using namespace Sigmodr::Widgets;
+
+MapEffectUI::MapEffectUI(MapEffect* effect, QWidget* parent) :
         ObjectUI(parent)
 {
     setupUi(this);
-    setObjects(effect, new Sigmod::MapEffect(*effect));
+    setObjects(effect, new MapEffect(*effect));
 }
 
-Sigmodr::Widgets::MapEffectUI::~MapEffectUI()
+MapEffectUI::~MapEffectUI()
 {
 }
 
-void Sigmodr::Widgets::MapEffectUI::refreshGui()
+void MapEffectUI::refreshGui()
 {
     for (int i = 0; i < game()->skinCount(); ++i)
     {
-        const Sigmod::Skin* skin = game()->skin(i);
+        const Skin* skin = game()->skin(i);
         varSkin->addItem(skin->name(), skin->id());
     }
 }
 
-void Sigmodr::Widgets::MapEffectUI::setGui()
+void MapEffectUI::setGui()
 {
-    varName->setText(qobject_cast<Sigmod::MapEffect*>(modified())->name());
-    varSkin->setCurrentIndex(varSkin->findData(qobject_cast<Sigmod::MapEffect*>(modified())->skin()));
-    varScript->setValue(qobject_cast<Sigmod::MapEffect*>(modified())->script());
-    varIsGhost->setCheckState(qobject_cast<Sigmod::MapEffect*>(modified())->isGhost() ? Qt::Checked : Qt::Unchecked);
+    varName->setText(qobject_cast<MapEffect*>(modified())->name());
+    varSkin->setCurrentIndex(varSkin->findData(qobject_cast<MapEffect*>(modified())->skin()));
+    varScript->setValue(qobject_cast<MapEffect*>(modified())->script());
+    varIsGhost->setCheckState(qobject_cast<MapEffect*>(modified())->isGhost() ? Qt::Checked : Qt::Unchecked);
 }
 
-void Sigmodr::Widgets::MapEffectUI::apply()
+void MapEffectUI::apply()
 {
-    *qobject_cast<Sigmod::MapEffect*>(original()) = *qobject_cast<Sigmod::MapEffect*>(modified());
+    *qobject_cast<MapEffect*>(original()) = *qobject_cast<MapEffect*>(modified());
     emit(changed(false));
 }
 
-void Sigmodr::Widgets::MapEffectUI::discard()
+void MapEffectUI::discard()
 {
-    *qobject_cast<Sigmod::MapEffect*>(modified()) = *qobject_cast<Sigmod::MapEffect*>(original());
+    *qobject_cast<MapEffect*>(modified()) = *qobject_cast<MapEffect*>(original());
     setGui();
     emit(changed(false));
 }
 
-void Sigmodr::Widgets::MapEffectUI::on_varName_textChanged(const QString& name)
+void MapEffectUI::on_varName_textChanged(const QString& name)
 {
     const int cursor = varName->cursorPosition();
-    qobject_cast<Sigmod::MapEffect*>(modified())->setName(name);
+    qobject_cast<MapEffect*>(modified())->setName(name);
     varName->setCursorPosition(cursor);
 }
 
-void Sigmodr::Widgets::MapEffectUI::on_varSkin_currentIndexChanged(const int skin)
+void MapEffectUI::on_varSkin_currentIndexChanged(const int skin)
 {
-    qobject_cast<Sigmod::MapEffect*>(modified())->setSkin(varSkin->itemData(skin).toInt());
+    qobject_cast<MapEffect*>(modified())->setSkin(varSkin->itemData(skin).toInt());
 }
 
-void Sigmodr::Widgets::MapEffectUI::on_varScript_valueChanged(const Sigcore::Script& script)
+void MapEffectUI::on_varScript_valueChanged(const Script& script)
 {
-    qobject_cast<Sigmod::MapEffect*>(modified())->setScript(script);
+    qobject_cast<MapEffect*>(modified())->setScript(script);
 }
 
-void Sigmodr::Widgets::MapEffectUI::on_varIsGhost_toggled(const bool isGhost)
+void MapEffectUI::on_varIsGhost_toggled(const bool isGhost)
 {
-    qobject_cast<Sigmod::MapEffect*>(modified())->setIsGhost(isGhost);
+    qobject_cast<MapEffect*>(modified())->setIsGhost(isGhost);
 }