1 files changed, 21 insertions, 18 deletions

diff --git a/sigmodr/widgets/MapUI.cpp b/sigmodr/widgets/MapUI.cpp
index 21b51317..799c4da8 100644
--- a/sigmodr/widgets/MapUI.cpp
+++ b/sigmodr/widgets/MapUI.cpp
@@ -27,54 +27,57 @@
 
 // FIXME: Update map editing to new collage map
 
-Sigmodr::Widgets::MapUI::MapUI(Sigmod::Map* map, QWidget* parent) :
+using namespace Sigmod;
+using namespace Sigmodr::Widgets;
+
+MapUI::MapUI(Map* map, QWidget* parent) :
         ObjectUI(parent)
 {
     setupUi(this);
-    setObjects(map, new Sigmod::Map(*map));
+    setObjects(map, new Map(*map));
     varMap->setMap(map);
     connect(varMap, SIGNAL(changed()), this, SIGNAL(changed()));
 }
 
-Sigmodr::Widgets::MapUI::~MapUI()
+MapUI::~MapUI()
 {
 }
 
-void Sigmodr::Widgets::MapUI::initGui()
+void MapUI::initGui()
 {
-    varType->addItem(Sigmod::Map::TypeStr[Sigmod::Map::Outdoor], QVariant::fromValue(Sigmod::Map::Outdoor));
-    varType->addItem(Sigmod::Map::TypeStr[Sigmod::Map::Dungeon], QVariant::fromValue(Sigmod::Map::Dungeon));
-    varType->addItem(Sigmod::Map::TypeStr[Sigmod::Map::Building], QVariant::fromValue(Sigmod::Map::Building));
+    varType->addItem(Map::TypeStr[Map::Outdoor], QVariant::fromValue(Map::Outdoor));
+    varType->addItem(Map::TypeStr[Map::Dungeon], QVariant::fromValue(Map::Dungeon));
+    varType->addItem(Map::TypeStr[Map::Building], QVariant::fromValue(Map::Building));
 }
 
-void Sigmodr::Widgets::MapUI::setGui()
+void MapUI::setGui()
 {
-    varName->setText(qobject_cast<Sigmod::Map*>(modified())->name());
-    varType->setCurrentIndex(qobject_cast<Sigmod::Map*>(modified())->type());
+    varName->setText(qobject_cast<Map*>(modified())->name());
+    varType->setCurrentIndex(qobject_cast<Map*>(modified())->type());
     varMap->reset();
 }
 
-void Sigmodr::Widgets::MapUI::apply()
+void MapUI::apply()
 {
-    *qobject_cast<Sigmod::Map*>(original()) = *qobject_cast<Sigmod::Map*>(modified());
+    *qobject_cast<Map*>(original()) = *qobject_cast<Map*>(modified());
     emit(changed(false));
 }
 
-void Sigmodr::Widgets::MapUI::discard()
+void MapUI::discard()
 {
-    *qobject_cast<Sigmod::Map*>(modified()) = *qobject_cast<Sigmod::Map*>(original());
+    *qobject_cast<Map*>(modified()) = *qobject_cast<Map*>(original());
     setGui();
     emit(changed(false));
 }
 
-void Sigmodr::Widgets::MapUI::on_varName_textChanged(const QString& name)
+void MapUI::on_varName_textChanged(const QString& name)
 {
     const int cursor = varName->cursorPosition();
-    qobject_cast<Sigmod::Map*>(modified())->setName(name);
+    qobject_cast<Map*>(modified())->setName(name);
     varName->setCursorPosition(cursor);
 }
 
-void Sigmodr::Widgets::MapUI::on_varType_activated(const int type)
+void MapUI::on_varType_activated(const int type)
 {
-    qobject_cast<Sigmod::Map*>(modified())->setType(varType->itemData(type).value<Sigmod::Map::Type>());
+    qobject_cast<Map*>(modified())->setType(varType->itemData(type).value<Map::Type>());
 }