1 files changed, 35 insertions, 35 deletions

diff --git a/pokemodr/MapWarpUI.cpp b/pokemodr/MapWarpUI.cpp
index 4bc2654b..33c4e070 100644
--- a/pokemodr/MapWarpUI.cpp
+++ b/pokemodr/MapWarpUI.cpp
@@ -23,100 +23,100 @@
 #include "../pokemod/MapWarp.h"
 #include "../pokemod/Pokemod.h"
 
-MapWarpUI::MapWarpUI(MapWarp* warp, QWidget* parent) :
+Pokemodr::MapWarpUI::MapWarpUI(Pokemod::MapWarp* warp, QWidget* parent) :
         ObjectUI(parent),
         m_lastMap(-1)
 {
     setupUi(this);
-    setObjects(warp, new MapWarp(*warp));
+    setObjects(warp, new Pokemod::MapWarp(*warp));
 }
 
-MapWarpUI::~MapWarpUI()
+Pokemodr::MapWarpUI::~MapWarpUI()
 {
 }
 
-void MapWarpUI::initGui()
+void Pokemodr::MapWarpUI::initGui()
 {
-    varType->addItems(MapWarp::TypeStr);
+    varType->addItems(Pokemod::MapWarp::TypeStr);
 }
 
-void MapWarpUI::refreshGui()
+void Pokemodr::MapWarpUI::refreshGui()
 {
-    varCoordinate->setMaximum(static_cast<const Map*>(original()->parent())->size());
+    varCoordinate->setMaximum(static_cast<const Pokemod::Map*>(original()->parent())->size());
     varToMap->clear();
     for (int i = 0; i < pokemod()->mapCount(); ++i)
     {
-        const Map* map = pokemod()->map(i);
+        const Pokemod::Map* map = pokemod()->map(i);
         varToMap->addItem(map->name(), map->id());
     }
 }
 
-void MapWarpUI::setGui()
+void Pokemodr::MapWarpUI::setGui()
 {
-    const bool resetWarps = (static_cast<MapWarp*>(modified())->toMap() != m_lastMap);
-    varName->setText(static_cast<MapWarp*>(modified())->name());
-    varCoordinate->setValue(static_cast<MapWarp*>(modified())->coordinate());
-    varType->setCurrentIndex(static_cast<MapWarp*>(modified())->type());
-    varToMap->setCurrentIndex(varToMap->findData(static_cast<MapWarp*>(modified())->toMap()));
-    m_lastMap = static_cast<MapWarp*>(modified())->toMap();
+    const bool resetWarps = (static_cast<Pokemod::MapWarp*>(modified())->toMap() != m_lastMap);
+    varName->setText(static_cast<Pokemod::MapWarp*>(modified())->name());
+    varCoordinate->setValue(static_cast<Pokemod::MapWarp*>(modified())->coordinate());
+    varType->setCurrentIndex(static_cast<Pokemod::MapWarp*>(modified())->type());
+    varToMap->setCurrentIndex(varToMap->findData(static_cast<Pokemod::MapWarp*>(modified())->toMap()));
+    m_lastMap = static_cast<Pokemod::MapWarp*>(modified())->toMap();
     if (resetWarps)
     {
         varToWarp->clear();
-        const Map* map = pokemod()->mapById(static_cast<MapWarp*>(modified())->toMap());
+        const Pokemod::Map* map = pokemod()->mapById(static_cast<Pokemod::MapWarp*>(modified())->toMap());
         if (map)
         {
             for (int i = 0; i < map->warpCount(); ++i)
             {
-                const MapWarp* warp = map->warp(i);
+                const Pokemod::MapWarp* warp = map->warp(i);
                 varToWarp->addItem(warp->name(), warp->id());
             }
         }
     }
-    varToWarp->setCurrentIndex(varToMap->findData(static_cast<MapWarp*>(modified())->toWarp()));
-    varScript->setValue(static_cast<MapWarp*>(modified())->script());
+    varToWarp->setCurrentIndex(varToMap->findData(static_cast<Pokemod::MapWarp*>(modified())->toWarp()));
+    varScript->setValue(static_cast<Pokemod::MapWarp*>(modified())->script());
 }
 
-void MapWarpUI::apply()
+void Pokemodr::MapWarpUI::apply()
 {
-    *static_cast<MapWarp*>(original()) = *static_cast<MapWarp*>(modified());
+    *static_cast<Pokemod::MapWarp*>(original()) = *static_cast<Pokemod::MapWarp*>(modified());
     emit(changed(false));
 }
 
-void MapWarpUI::discard()
+void Pokemodr::MapWarpUI::discard()
 {
-    *static_cast<MapWarp*>(modified()) = *static_cast<MapWarp*>(original());
+    *static_cast<Pokemod::MapWarp*>(modified()) = *static_cast<Pokemod::MapWarp*>(original());
     setGui();
     emit(changed(false));
 }
 
-void MapWarpUI::on_varName_textChanged(const QString& name)
+void Pokemodr::MapWarpUI::on_varName_textChanged(const QString& name)
 {
     const int cursor = varName->cursorPosition();
-    static_cast<MapWarp*>(modified())->setName(name);
+    static_cast<Pokemod::MapWarp*>(modified())->setName(name);
     varName->setCursorPosition(cursor);
 }
 
-void MapWarpUI::on_varCoordinate_valueChanged(const Point& coordinate)
+void Pokemodr::MapWarpUI::on_varCoordinate_valueChanged(const Pokemod::Point& coordinate)
 {
-    static_cast<MapWarp*>(modified())->setCoordinate(coordinate);
+    static_cast<Pokemod::MapWarp*>(modified())->setCoordinate(coordinate);
 }
 
-void MapWarpUI::on_varType_activated(const int type)
+void Pokemodr::MapWarpUI::on_varType_activated(const int type)
 {
-    static_cast<MapWarp*>(modified())->setType(type);
+    static_cast<Pokemod::MapWarp*>(modified())->setType(type);
 }
 
-void MapWarpUI::on_varToMap_activated(const int toMap)
+void Pokemodr::MapWarpUI::on_varToMap_activated(const int toMap)
 {
-    static_cast<MapWarp*>(modified())->setToMap(toMap);
+    static_cast<Pokemod::MapWarp*>(modified())->setToMap(toMap);
 }
 
-void MapWarpUI::on_varToWarp_activated(const int toWarp)
+void Pokemodr::MapWarpUI::on_varToWarp_activated(const int toWarp)
 {
-    static_cast<MapWarp*>(modified())->setToWarp(toWarp);
+    static_cast<Pokemod::MapWarp*>(modified())->setToWarp(toWarp);
 }
 
-void MapWarpUI::on_varScript_valueChanged(const Script& script)
+void Pokemodr::MapWarpUI::on_varScript_valueChanged(const Pokemod::Script& script)
 {
-    static_cast<MapWarp*>(modified())->setScript(script);
+    static_cast<Pokemod::MapWarp*>(modified())->setScript(script);
 }