Fixed Sigmodr widgets to use namespaces in sources

1 files changed, 38 insertions, 34 deletions

diff --git a/sigmodr/widgets/MapWarpUI.cpp b/sigmodr/widgets/MapWarpUI.cpp
index fd4ebc5d..008484af 100644
--- a/sigmodr/widgets/MapWarpUI.cpp
+++ b/sigmodr/widgets/MapWarpUI.cpp
@@ -23,100 +23,104 @@
 #include <sigmod/Map.h>
 #include <sigmod/MapWarp.h>
 
-Sigmodr::Widgets::MapWarpUI::MapWarpUI(Sigmod::MapWarp* warp, QWidget* parent) :
+using namespace Sigcore;
+using namespace Sigmod;
+using namespace Sigmodr::Widgets;
+
+MapWarpUI::MapWarpUI(MapWarp* warp, QWidget* parent) :
         ObjectUI(parent),
         m_lastMap(-1)
 {
     setupUi(this);
-    setObjects(warp, new Sigmod::MapWarp(*warp));
+    setObjects(warp, new MapWarp(*warp));
 }
 
-Sigmodr::Widgets::MapWarpUI::~MapWarpUI()
+MapWarpUI::~MapWarpUI()
 {
 }
 
-void Sigmodr::Widgets::MapWarpUI::initGui()
+void MapWarpUI::initGui()
 {
-    varType->addItem(Sigmod::MapWarp::TypeStr[Sigmod::MapWarp::Door], QVariant::fromValue(Sigmod::MapWarp::Door));
-    varType->addItem(Sigmod::MapWarp::TypeStr[Sigmod::MapWarp::Warp], QVariant::fromValue(Sigmod::MapWarp::Warp));
-    varType->addItem(Sigmod::MapWarp::TypeStr[Sigmod::MapWarp::Hole], QVariant::fromValue(Sigmod::MapWarp::Hole));
-    varType->addItem(Sigmod::MapWarp::TypeStr[Sigmod::MapWarp::Boundary], QVariant::fromValue(Sigmod::MapWarp::Boundary));
+    varType->addItem(MapWarp::TypeStr[MapWarp::Door], QVariant::fromValue(MapWarp::Door));
+    varType->addItem(MapWarp::TypeStr[MapWarp::Warp], QVariant::fromValue(MapWarp::Warp));
+    varType->addItem(MapWarp::TypeStr[MapWarp::Hole], QVariant::fromValue(MapWarp::Hole));
+    varType->addItem(MapWarp::TypeStr[MapWarp::Boundary], QVariant::fromValue(MapWarp::Boundary));
 }
 
-void Sigmodr::Widgets::MapWarpUI::refreshGui()
+void MapWarpUI::refreshGui()
 {
     const bool blocked = varToMap->blockSignals(true);
     varToMap->clear();
     for (int i = 0; i < game()->mapCount(); ++i)
     {
-        const Sigmod::Map* map = game()->map(i);
+        const Map* map = game()->map(i);
         varToMap->addItem(map->name(), map->id());
     }
     varToMap->blockSignals(blocked);
 }
 
-void Sigmodr::Widgets::MapWarpUI::setGui()
+void MapWarpUI::setGui()
 {
-    const bool resetWarps = (qobject_cast<Sigmod::MapWarp*>(modified())->toMap() != m_lastMap);
-    varName->setText(qobject_cast<Sigmod::MapWarp*>(modified())->name());
-    varType->setCurrentIndex(qobject_cast<Sigmod::MapWarp*>(modified())->type());
-    varToMap->setCurrentIndex(varToMap->findData(qobject_cast<Sigmod::MapWarp*>(modified())->toMap()));
-    m_lastMap = qobject_cast<Sigmod::MapWarp*>(modified())->toMap();
+    const bool resetWarps = (qobject_cast<MapWarp*>(modified())->toMap() != m_lastMap);
+    varName->setText(qobject_cast<MapWarp*>(modified())->name());
+    varType->setCurrentIndex(qobject_cast<MapWarp*>(modified())->type());
+    varToMap->setCurrentIndex(varToMap->findData(qobject_cast<MapWarp*>(modified())->toMap()));
+    m_lastMap = qobject_cast<MapWarp*>(modified())->toMap();
     if (resetWarps)
     {
         const bool blocked = varToWarp->blockSignals(true);
         varToWarp->clear();
-        const Sigmod::Map* map = game()->mapById(qobject_cast<Sigmod::MapWarp*>(modified())->toMap());
+        const Map* map = game()->mapById(qobject_cast<MapWarp*>(modified())->toMap());
         if (map)
         {
             for (int i = 0; i < map->warpCount(); ++i)
             {
-                const Sigmod::MapWarp* warp = map->warp(i);
+                const MapWarp* warp = map->warp(i);
                 varToWarp->addItem(warp->name(), warp->id());
             }
         }
         varToWarp->blockSignals(blocked);
     }
-    varToWarp->setCurrentIndex(varToMap->findData(qobject_cast<Sigmod::MapWarp*>(modified())->toWarp()));
-    varScript->setValue(qobject_cast<Sigmod::MapWarp*>(modified())->script());
+    varToWarp->setCurrentIndex(varToMap->findData(qobject_cast<MapWarp*>(modified())->toWarp()));
+    varScript->setValue(qobject_cast<MapWarp*>(modified())->script());
 }
 
-void Sigmodr::Widgets::MapWarpUI::apply()
+void MapWarpUI::apply()
 {
-    *qobject_cast<Sigmod::MapWarp*>(original()) = *qobject_cast<Sigmod::MapWarp*>(modified());
+    *qobject_cast<MapWarp*>(original()) = *qobject_cast<MapWarp*>(modified());
     emit(changed(false));
 }
 
-void Sigmodr::Widgets::MapWarpUI::discard()
+void MapWarpUI::discard()
 {
-    *qobject_cast<Sigmod::MapWarp*>(modified()) = *qobject_cast<Sigmod::MapWarp*>(original());
+    *qobject_cast<MapWarp*>(modified()) = *qobject_cast<MapWarp*>(original());
     setGui();
     emit(changed(false));
 }
 
-void Sigmodr::Widgets::MapWarpUI::on_varName_textChanged(const QString& name)
+void MapWarpUI::on_varName_textChanged(const QString& name)
 {
     const int cursor = varName->cursorPosition();
-    qobject_cast<Sigmod::MapWarp*>(modified())->setName(name);
+    qobject_cast<MapWarp*>(modified())->setName(name);
     varName->setCursorPosition(cursor);
 }
 
-void Sigmodr::Widgets::MapWarpUI::on_varType_activated(const int type)
+void MapWarpUI::on_varType_activated(const int type)
 {
-    qobject_cast<Sigmod::MapWarp*>(modified())->setType(varType->itemData(type).value<Sigmod::MapWarp::Type>());
+    qobject_cast<MapWarp*>(modified())->setType(varType->itemData(type).value<MapWarp::Type>());
 }
 
-void Sigmodr::Widgets::MapWarpUI::on_varToMap_activated(const int toMap)
+void MapWarpUI::on_varToMap_activated(const int toMap)
 {
-    qobject_cast<Sigmod::MapWarp*>(modified())->setToMap(toMap);
+    qobject_cast<MapWarp*>(modified())->setToMap(toMap);
 }
 
-void Sigmodr::Widgets::MapWarpUI::on_varToWarp_activated(const int toWarp)
+void MapWarpUI::on_varToWarp_activated(const int toWarp)
 {
-    qobject_cast<Sigmod::MapWarp*>(modified())->setToWarp(toWarp);
+    qobject_cast<MapWarp*>(modified())->setToWarp(toWarp);
 }
 
-void Sigmodr::Widgets::MapWarpUI::on_varScript_valueChanged(const Sigcore::Script& script)
+void MapWarpUI::on_varScript_valueChanged(const Script& script)
 {
-    qobject_cast<Sigmod::MapWarp*>(modified())->setScript(script);
+    qobject_cast<MapWarp*>(modified())->setScript(script);
 }