1 files changed, 36 insertions, 36 deletions

diff --git a/pokemodr/MapUI.cpp b/pokemodr/MapUI.cpp
index df05db97..1d09bce0 100644
--- a/pokemodr/MapUI.cpp
+++ b/pokemodr/MapUI.cpp
@@ -18,7 +18,7 @@
 // Header include
 #include "MapUI.h"
 
-// PokeModr includes
+// Pokemodr includes
 #include "TilemapModel.h"
 
 // Pokemod includes
@@ -30,133 +30,133 @@
 // Qt includes
 #include <QHeaderView>
 
-MapUI::MapUI(Map* map, QWidget* parent) :
+Pokemodr::MapUI::MapUI(Pokemod::Map* map, QWidget* parent) :
         ObjectUI(parent)
 {
     setupUi(this);
-    setObjects(map, new Map(*map));
+    setObjects(map, new Pokemod::Map(*map));
 }
 
-MapUI::~MapUI()
+Pokemodr::MapUI::~MapUI()
 {
 }
 
-void MapUI::initGui()
+void Pokemodr::MapUI::initGui()
 {
-    varType->addItems(Map::TypeStr);
+    varType->addItems(Pokemod::Map::TypeStr);
     varTilemap->horizontalHeader()->setResizeMode(QHeaderView::Fixed);
     varTilemap->verticalHeader()->setResizeMode(QHeaderView::Fixed);
     varTilemap->horizontalHeader()->setDefaultSectionSize(64);
     varTilemap->verticalHeader()->setDefaultSectionSize(64);
-    varTilemap->setModel(new TilemapModel(static_cast<Map*>(modified())->map(), pokemod()));
+    varTilemap->setModel(new TilemapModel(static_cast<Pokemod::Map*>(modified())->map(), pokemod()));
 }
 
-void MapUI::refreshGui()
+void Pokemodr::MapUI::refreshGui()
 {
     varFlyWarp->clear();
-    for (int i = 0; i < static_cast<Map*>(original())->warpCount(); ++i)
+    for (int i = 0; i < static_cast<Pokemod::Map*>(original())->warpCount(); ++i)
     {
-        const MapWarp* warp = static_cast<Map*>(original())->warp(i);
+        const Pokemod::MapWarp* warp = static_cast<Pokemod::Map*>(original())->warp(i);
         varFlyWarp->addItem(warp->name(), warp->id());
     }
     varTile->clear();
     for (int i = 0; i < pokemod()->tileCount(); ++i)
     {
-        const Tile* tile = pokemod()->tile(i);
+        const Pokemod::Tile* tile = pokemod()->tile(i);
         varTile->addItem(tile->sprite(), tile->name(), tile->id());
     }
     varTile->setEnabled(false);
 }
 
-void MapUI::setGui()
+void Pokemodr::MapUI::setGui()
 {
-    varName->setText(static_cast<Map*>(modified())->name());
-    boxFlyWarp->setChecked((static_cast<Map*>(modified())->flyWarp() == INT_MAX) ? Qt::Unchecked : Qt::Checked);
-//     varFlyWarp->setCurrentIndex(varFlyWarp->findData(static_cast<Map*>(modified())->flyWarp()));
-    varType->setCurrentIndex(static_cast<Map*>(modified())->type());
+    varName->setText(static_cast<Pokemod::Map*>(modified())->name());
+    boxFlyWarp->setChecked((static_cast<Pokemod::Map*>(modified())->flyWarp() == INT_MAX) ? Qt::Unchecked : Qt::Checked);
+//     varFlyWarp->setCurrentIndex(varFlyWarp->findData(static_cast<Pokemod::Map*>(modified())->flyWarp()));
+    varType->setCurrentIndex(static_cast<Pokemod::Map*>(modified())->type());
 //     buttonDeleteColumn->setEnabled(0 < m_model->columnCount());
 //     buttonDeleteRow->setEnabled(0 < m_model->rowCount());
 }
 
-void MapUI::apply()
+void Pokemodr::MapUI::apply()
 {
-    *static_cast<Map*>(original()) = *static_cast<Map*>(modified());
+    *static_cast<Pokemod::Map*>(original()) = *static_cast<Pokemod::Map*>(modified());
     emit(changed(false));
 }
 
-void MapUI::discard()
+void Pokemodr::MapUI::discard()
 {
-    *static_cast<Map*>(modified()) = *static_cast<Map*>(original());
+    *static_cast<Pokemod::Map*>(modified()) = *static_cast<Pokemod::Map*>(original());
     setGui();
     emit(changed(false));
 }
 
-void MapUI::on_varName_textChanged(const QString& name)
+void Pokemodr::MapUI::on_varName_textChanged(const QString& name)
 {
     const int cursor = varName->cursorPosition();
-    static_cast<Map*>(modified())->setName(name);
+    static_cast<Pokemod::Map*>(modified())->setName(name);
     varName->setCursorPosition(cursor);
 }
 
-void MapUI::on_boxFlyWarp_toggled()
+void Pokemodr::MapUI::on_boxFlyWarp_toggled()
 {
-    static_cast<Map*>(modified())->setFlyWarp(-1);
+    static_cast<Pokemod::Map*>(modified())->setFlyWarp(-1);
 }
 
-void MapUI::on_varFlyWarp_activated(const int flyWarp)
+void Pokemodr::MapUI::on_varFlyWarp_activated(const int flyWarp)
 {
-    static_cast<Map*>(modified())->setFlyWarp(varFlyWarp->itemData(flyWarp).toInt());
+    static_cast<Pokemod::Map*>(modified())->setFlyWarp(varFlyWarp->itemData(flyWarp).toInt());
 }
 
-void MapUI::on_varType_activated(const int type)
+void Pokemodr::MapUI::on_varType_activated(const int type)
 {
-    static_cast<Map*>(modified())->setType(type);
+    static_cast<Pokemod::Map*>(modified())->setType(type);
 }
 
-void MapUI::on_varTilemap_clicked(const QModelIndex& index)
+void Pokemodr::MapUI::on_varTilemap_clicked(const QModelIndex& index)
 {
     m_index = index;
     varTile->setEnabled(true);
     varTile->setCurrentIndex(varTile->findData(varTilemap->model()->data(m_index, Qt::EditRole)));
 }
 
-void MapUI::on_buttonAddColumn_pressed()
+void Pokemodr::MapUI::on_buttonAddColumn_pressed()
 {
     varTilemap->model()->insertColumns(varTilemap->model()->columnCount(), 1);
     emit(changed(true));
 }
 
-void MapUI::on_buttonAddRow_pressed()
+void Pokemodr::MapUI::on_buttonAddRow_pressed()
 {
     varTilemap->model()->insertRows(varTilemap->model()->rowCount(), 1);
     emit(changed(true));
 }
 
-void MapUI::on_buttonDeleteColumn_pressed()
+void Pokemodr::MapUI::on_buttonDeleteColumn_pressed()
 {
     varTilemap->model()->removeColumns(m_index.column(), 1);
     emit(changed(true));
 }
 
-void MapUI::on_buttonDeleteRow_pressed()
+void Pokemodr::MapUI::on_buttonDeleteRow_pressed()
 {
     varTilemap->model()->removeRows(m_index.row(), 1);
     emit(changed(true));
 }
 
-void MapUI::on_buttonInsertColumn_pressed()
+void Pokemodr::MapUI::on_buttonInsertColumn_pressed()
 {
     varTilemap->model()->insertColumns(m_index.column(), 1);
     emit(changed(true));
 }
 
-void MapUI::on_buttonInsertRow_pressed()
+void Pokemodr::MapUI::on_buttonInsertRow_pressed()
 {
     varTilemap->model()->insertRows(m_index.row(), 1);
     emit(changed(true));
 }
 
-void MapUI::on_varTile_activated(const int tile)
+void Pokemodr::MapUI::on_varTile_activated(const int tile)
 {
     varTilemap->model()->setData(m_index, varTile->itemData(tile), Qt::EditRole);
     emit(changed(true));