[FIX] All modules now use their own namespace

git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@201 6ecfd1a5-f3ed-3746-8530-beee90d26b22

1 files changed, 57 insertions, 57 deletions

diff --git a/pokemodr/PokemodUI.cpp b/pokemodr/PokemodUI.cpp
index 52be0137..55c856d0 100644
--- a/pokemodr/PokemodUI.cpp
+++ b/pokemodr/PokemodUI.cpp
@@ -18,7 +18,7 @@
 // Header include
 #include "PokemodUI.h"
 
-// PokeModr includes
+// Pokemodr includes
 #include "FileDialog.h"
 #include "TypechartModel.h"
 
@@ -28,185 +28,185 @@
 #include "../pokemod/Pokemod.h"
 #include "../pokemod/Type.h"
 
-PokemodUI::PokemodUI(Pokemod* pokemod, QWidget* parent) :
+Pokemodr::PokemodUI::PokemodUI(Pokemod::Pokemod* pokemod, QWidget* parent) :
         ObjectUI(parent),
         m_lastMap(-1)
 {
     setupUi(this);
-    setObjects(pokemod, new Pokemod(*pokemod));
+    setObjects(pokemod, new Pokemod::Pokemod(*pokemod));
 }
 
-PokemodUI::~PokemodUI()
+Pokemodr::PokemodUI::~PokemodUI()
 {
 }
 
-void PokemodUI::initGui()
+void Pokemodr::PokemodUI::initGui()
 {
     QStringList types;
-    for (int i = 0; i < static_cast<Pokemod*>(original())->typeCount(); ++i)
-        types << static_cast<Pokemod*>(original())->type(i)->name();
-    varTypechart->setModel(new TypechartModel(static_cast<Pokemod*>(modified())->typechart(), types));
+    for (int i = 0; i < static_cast<Pokemod::Pokemod*>(original())->typeCount(); ++i)
+        types << static_cast<Pokemod::Pokemod*>(original())->type(i)->name();
+    varTypechart->setModel(new TypechartModel(*static_cast<Pokemod::Pokemod*>(modified())->typechart(), types));
 }
 
-void PokemodUI::refreshGui()
+void Pokemodr::PokemodUI::refreshGui()
 {
     varMap->clear();
-    for (int i = 0; i < static_cast<Pokemod*>(original())->mapCount(); ++i)
+    for (int i = 0; i < static_cast<Pokemod::Pokemod*>(original())->mapCount(); ++i)
     {
-        const Map* map = static_cast<Pokemod*>(original())->map(i);
+        const Pokemod::Map* map = static_cast<Pokemod::Pokemod*>(original())->map(i);
         varMap->addItem(map->name(), map->id());
     }
     varEffectiveness->setEnabled(false);
 }
 
-void PokemodUI::setGui()
+void Pokemodr::PokemodUI::setGui()
 {
-    const bool resetWarps = (static_cast<Pokemod*>(modified())->startMap() != m_lastMap);
-    varTitle->setText(static_cast<Pokemod*>(modified())->title());
-    varVersion->setText(static_cast<Pokemod*>(modified())->version());
-    varDescription->setText(static_cast<Pokemod*>(modified())->description());
-    varMap->setCurrentIndex(varMap->findData(static_cast<Pokemod*>(modified())->startMap()));
-    m_lastMap = static_cast<Pokemod*>(modified())->startMap();
+    const bool resetWarps = (static_cast<Pokemod::Pokemod*>(modified())->startMap() != m_lastMap);
+    varTitle->setText(static_cast<Pokemod::Pokemod*>(modified())->title());
+    varVersion->setText(static_cast<Pokemod::Pokemod*>(modified())->version());
+    varDescription->setText(static_cast<Pokemod::Pokemod*>(modified())->description());
+    varMap->setCurrentIndex(varMap->findData(static_cast<Pokemod::Pokemod*>(modified())->startMap()));
+    m_lastMap = static_cast<Pokemod::Pokemod*>(modified())->startMap();
     if (resetWarps)
     {
         varWarp->clear();
-        const int mapIndex = static_cast<Pokemod*>(original())->mapIndex(static_cast<Pokemod*>(modified())->startMap());
+        const int mapIndex = static_cast<Pokemod::Pokemod*>(original())->mapIndex(static_cast<Pokemod::Pokemod*>(modified())->startMap());
         if (mapIndex != INT_MAX)
         {
-            const Map* map = static_cast<Pokemod*>(original())->map(mapIndex);
+            const Pokemod::Map* map = static_cast<Pokemod::Pokemod*>(original())->map(mapIndex);
             for (int i = 0; i < map->warpCount(); ++i)
             {
-                const MapWarp* warp = map->warp(i);
+                const Pokemod::MapWarp* warp = map->warp(i);
                 varWarp->addItem(warp->name(), warp->id());
             }
         }
     }
-    varWarp->setCurrentIndex(varWarp->findData(static_cast<Pokemod*>(modified())->startWarp()));
-    varWalkSkin->setIcon(static_cast<Pokemod*>(original())->walkSkin());
-    varBikeSkin->setIcon(static_cast<Pokemod*>(original())->bikeSkin());
-    varFlySkin->setIcon(static_cast<Pokemod*>(original())->flySkin());
-    varSurfSkin->setIcon(static_cast<Pokemod*>(original())->surfSkin());
-    varFishSkin->setIcon(static_cast<Pokemod*>(original())->fishSkin());
-    varSurfFishSkin->setIcon(static_cast<Pokemod*>(original())->surfFishSkin());
+    varWarp->setCurrentIndex(varWarp->findData(static_cast<Pokemod::Pokemod*>(modified())->startWarp()));
+    varWalkSkin->setIcon(static_cast<Pokemod::Pokemod*>(original())->walkSkin());
+    varBikeSkin->setIcon(static_cast<Pokemod::Pokemod*>(original())->bikeSkin());
+    varFlySkin->setIcon(static_cast<Pokemod::Pokemod*>(original())->flySkin());
+    varSurfSkin->setIcon(static_cast<Pokemod::Pokemod*>(original())->surfSkin());
+    varFishSkin->setIcon(static_cast<Pokemod::Pokemod*>(original())->fishSkin());
+    varSurfFishSkin->setIcon(static_cast<Pokemod::Pokemod*>(original())->surfFishSkin());
 }
 
-void PokemodUI::apply()
+void Pokemodr::PokemodUI::apply()
 {
-    *static_cast<Pokemod*>(original()) = *static_cast<Pokemod*>(modified());
+    *static_cast<Pokemod::Pokemod*>(original()) = *static_cast<Pokemod::Pokemod*>(modified());
     emit(changed(false));
 }
 
-void PokemodUI::discard()
+void Pokemodr::PokemodUI::discard()
 {
-    *static_cast<Pokemod*>(modified()) = *static_cast<Pokemod*>(original());
+    *static_cast<Pokemod::Pokemod*>(modified()) = *static_cast<Pokemod::Pokemod*>(original());
     setGui();
     emit(changed(false));
 }
 
-void PokemodUI::on_varTitle_textChanged(const QString& title)
+void Pokemodr::PokemodUI::on_varTitle_textChanged(const QString& title)
 {
     const int cursor = varTitle->cursorPosition();
-    static_cast<Pokemod*>(modified())->setTitle(title);
+    static_cast<Pokemod::Pokemod*>(modified())->setTitle(title);
     varTitle->setCursorPosition(cursor);
 }
 
-void PokemodUI::on_varVersion_textChanged(const QString& version)
+void Pokemodr::PokemodUI::on_varVersion_textChanged(const QString& version)
 {
     const int cursor = varVersion->cursorPosition();
-    static_cast<Pokemod*>(modified())->setVersion(version);
+    static_cast<Pokemod::Pokemod*>(modified())->setVersion(version);
     varVersion->setCursorPosition(cursor);
 }
 
-void PokemodUI::on_varDescription_textChanged(const QString& description)
+void Pokemodr::PokemodUI::on_varDescription_textChanged(const QString& description)
 {
-    static_cast<Pokemod*>(modified())->setDescription(description);
+    static_cast<Pokemod::Pokemod*>(modified())->setDescription(description);
 }
 
-void PokemodUI::on_varMap_activated(const int map)
+void Pokemodr::PokemodUI::on_varMap_activated(const int map)
 {
-    static_cast<Pokemod*>(modified())->setStartMap(varMap->itemData(map).toInt());
+    static_cast<Pokemod::Pokemod*>(modified())->setStartMap(varMap->itemData(map).toInt());
 }
 
-void PokemodUI::on_varWarp_activated(const int warp)
+void Pokemodr::PokemodUI::on_varWarp_activated(const int warp)
 {
-    static_cast<Pokemod*>(modified())->setStartWarp(varWarp->itemData(warp).toInt());
+    static_cast<Pokemod::Pokemod*>(modified())->setStartWarp(varWarp->itemData(warp).toInt());
 }
 
-void PokemodUI::on_varWalkSkin_pressed()
+void Pokemodr::PokemodUI::on_varWalkSkin_pressed()
 {
     FileDialog* dialog = new FileDialog(QSize(192, 168));
     if (dialog->exec() == QDialog::Accepted)
     {
-        static_cast<Pokemod*>(original())->setWalkSkin(QPixmap(dialog->selectedFile()));
+        static_cast<Pokemod::Pokemod*>(original())->setWalkSkin(QPixmap(dialog->selectedFile()));
         setGui();
     }
     delete dialog;
 }
 
-void PokemodUI::on_varBikeSkin_pressed()
+void Pokemodr::PokemodUI::on_varBikeSkin_pressed()
 {
     FileDialog* dialog = new FileDialog(QSize(192, 168));
     if (dialog->exec() == QDialog::Accepted)
     {
-        static_cast<Pokemod*>(original())->setBikeSkin(QPixmap(dialog->selectedFile()));
+        static_cast<Pokemod::Pokemod*>(original())->setBikeSkin(QPixmap(dialog->selectedFile()));
         setGui();
     }
     delete dialog;
 }
 
-void PokemodUI::on_varFlySkin_pressed()
+void Pokemodr::PokemodUI::on_varFlySkin_pressed()
 {
     FileDialog* dialog = new FileDialog(QSize(192, 168));
     if (dialog->exec() == QDialog::Accepted)
     {
-        static_cast<Pokemod*>(original())->setFlySkin(QPixmap(dialog->selectedFile()));
+        static_cast<Pokemod::Pokemod*>(original())->setFlySkin(QPixmap(dialog->selectedFile()));
         setGui();
     }
     delete dialog;
 }
 
-void PokemodUI::on_varSurfSkin_pressed()
+void Pokemodr::PokemodUI::on_varSurfSkin_pressed()
 {
     FileDialog* dialog = new FileDialog(QSize(192, 168));
     if (dialog->exec() == QDialog::Accepted)
     {
-        static_cast<Pokemod*>(original())->setSurfSkin(QPixmap(dialog->selectedFile()));
+        static_cast<Pokemod::Pokemod*>(original())->setSurfSkin(QPixmap(dialog->selectedFile()));
         setGui();
     }
     delete dialog;
 }
 
-void PokemodUI::on_varFishSkin_pressed()
+void Pokemodr::PokemodUI::on_varFishSkin_pressed()
 {
     FileDialog* dialog = new FileDialog(QSize(192, 168));
     if (dialog->exec() == QDialog::Accepted)
     {
-        static_cast<Pokemod*>(original())->setFishSkin(QPixmap(dialog->selectedFile()));
+        static_cast<Pokemod::Pokemod*>(original())->setFishSkin(QPixmap(dialog->selectedFile()));
         setGui();
     }
     delete dialog;
 }
 
-void PokemodUI::on_varSurfFishSkin_pressed()
+void Pokemodr::PokemodUI::on_varSurfFishSkin_pressed()
 {
     FileDialog* dialog = new FileDialog(QSize(192, 168));
     if (dialog->exec() == QDialog::Accepted)
     {
-        static_cast<Pokemod*>(original())->setSurfFishSkin(QPixmap(dialog->selectedFile()));
+        static_cast<Pokemod::Pokemod*>(original())->setSurfFishSkin(QPixmap(dialog->selectedFile()));
         setGui();
     }
     delete dialog;
 }
 
-void PokemodUI::on_varTypechart_clicked(const QModelIndex& index)
+void Pokemodr::PokemodUI::on_varTypechart_clicked(const QModelIndex& index)
 {
     m_index = index;
     varEffectiveness->setEnabled(true);
     boxEffectiveness->setTitle(QString("%1 vs. %2").arg(varTypechart->model()->headerData(index.row(), Qt::Vertical, Qt::DisplayRole).toString()).arg(varTypechart->model()->headerData(index.column(), Qt::Horizontal, Qt::DisplayRole).toString()));
-    varEffectiveness->setValue(varTypechart->model()->data(m_index, Qt::EditRole).value<Fraction>());
+    varEffectiveness->setValue(varTypechart->model()->data(m_index, Qt::EditRole).value<Pokemod::Fraction>());
 }
 
-void PokemodUI::on_varEffectiveness_valueChanged(const Fraction& multiplier)
+void Pokemodr::PokemodUI::on_varEffectiveness_valueChanged(const Pokemod::Fraction& multiplier)
 {
     varTypechart->model()->setData(m_index, QVariant::fromValue(multiplier), Qt::EditRole);
     emit(changed());