Fixed Sigmodr widgets to use namespaces in sources

1 files changed, 51 insertions, 47 deletions

diff --git a/sigmodr/widgets/NatureUI.cpp b/sigmodr/widgets/NatureUI.cpp
index 76af2e40..54e6e3de 100644
--- a/sigmodr/widgets/NatureUI.cpp
+++ b/sigmodr/widgets/NatureUI.cpp
@@ -26,125 +26,129 @@
 // Qt includes
 #include <QtGui/QHeaderView>
 
-Sigmodr::Widgets::NatureUI::NatureUI(Sigmod::Nature* nature, QWidget* parent) :
+using namespace Sigcore;
+using namespace Sigmod;
+using namespace Sigmodr::Widgets;
+
+NatureUI::NatureUI(Nature* nature, QWidget* parent) :
         ObjectUI(parent)
 {
     setupUi(this);
-    setObjects(nature, new Sigmod::Nature(*nature));
+    setObjects(nature, new Nature(*nature));
 }
 
-Sigmodr::Widgets::NatureUI::~NatureUI()
+NatureUI::~NatureUI()
 {
 }
 
-void Sigmodr::Widgets::NatureUI::initGui()
+void NatureUI::initGui()
 {
     varStat->horizontalHeader()->setResizeMode(QHeaderView::Stretch);
 }
 
-void Sigmodr::Widgets::NatureUI::refreshGui()
+void NatureUI::refreshGui()
 {
     const bool isSplit = game()->rules()->specialSplit();
     varStat->clear();
-    varStat->setRowCount((isSplit ? Sigmod::ST_SpecialDefense : Sigmod::ST_Special) - Sigmod::ST_Attack + 1);
-    varStat->setVerticalHeaderLabels((isSplit ? Sigmod::StatGSCStr : Sigmod::StatRBYStr).mid(Sigmod::ST_Attack, (isSplit ? Sigmod::ST_SpecialDefense : Sigmod::ST_Special) - Sigmod::ST_Attack + 1));
+    varStat->setRowCount((isSplit ? ST_SpecialDefense : ST_Special) - ST_Attack + 1);
+    varStat->setVerticalHeaderLabels((isSplit ? StatGSCStr : StatRBYStr).mid(ST_Attack, (isSplit ? ST_SpecialDefense : ST_Special) - ST_Attack + 1));
     varStat->setColumnCount(1);
     varStat->setHorizontalHeaderLabels(QStringList() << "Multiplier");
-    varStat->verticalHeaderItem(Sigmod::ST_Attack - Sigmod::ST_Attack)->setData(Qt::UserRole, QVariant::fromValue(Sigmod::ST_Attack));
-    varStat->verticalHeaderItem(Sigmod::ST_Defense - Sigmod::ST_Attack)->setData(Qt::UserRole, QVariant::fromValue(Sigmod::ST_Defense));
-    varStat->verticalHeaderItem(Sigmod::ST_Speed - Sigmod::ST_Attack)->setData(Qt::UserRole, QVariant::fromValue(Sigmod::ST_Speed));
+    varStat->verticalHeaderItem(ST_Attack - ST_Attack)->setData(Qt::UserRole, QVariant::fromValue(ST_Attack));
+    varStat->verticalHeaderItem(ST_Defense - ST_Attack)->setData(Qt::UserRole, QVariant::fromValue(ST_Defense));
+    varStat->verticalHeaderItem(ST_Speed - ST_Attack)->setData(Qt::UserRole, QVariant::fromValue(ST_Speed));
     if (isSplit)
     {
-        varStat->verticalHeaderItem(Sigmod::ST_SpecialAttack - Sigmod::ST_Attack)->setData(Qt::UserRole, QVariant::fromValue(Sigmod::ST_SpecialAttack));
-        varStat->verticalHeaderItem(Sigmod::ST_SpecialDefense - Sigmod::ST_Attack)->setData(Qt::UserRole, QVariant::fromValue(Sigmod::ST_SpecialDefense));
+        varStat->verticalHeaderItem(ST_SpecialAttack - ST_Attack)->setData(Qt::UserRole, QVariant::fromValue(ST_SpecialAttack));
+        varStat->verticalHeaderItem(ST_SpecialDefense - ST_Attack)->setData(Qt::UserRole, QVariant::fromValue(ST_SpecialDefense));
     }
     else
-        varStat->verticalHeaderItem(Sigmod::ST_Special - Sigmod::ST_Attack)->setData(Qt::UserRole, QVariant::fromValue(Sigmod::ST_Special));
-    varStat->setItem(Sigmod::ST_Attack - Sigmod::ST_Attack, 0, new QTableWidgetItem);
-    varStat->setItem(Sigmod::ST_Defense- Sigmod::ST_Attack, 0, new QTableWidgetItem);
-    varStat->setItem(Sigmod::ST_Speed - Sigmod::ST_Attack, 0, new QTableWidgetItem);
+        varStat->verticalHeaderItem(ST_Special - ST_Attack)->setData(Qt::UserRole, QVariant::fromValue(ST_Special));
+    varStat->setItem(ST_Attack - ST_Attack, 0, new QTableWidgetItem);
+    varStat->setItem(ST_Defense- ST_Attack, 0, new QTableWidgetItem);
+    varStat->setItem(ST_Speed - ST_Attack, 0, new QTableWidgetItem);
     if (isSplit)
     {
-        varStat->setItem(Sigmod::ST_SpecialAttack - Sigmod::ST_Attack, 0, new QTableWidgetItem);
-        varStat->setItem(Sigmod::ST_SpecialDefense - Sigmod::ST_Attack, 0, new QTableWidgetItem);
+        varStat->setItem(ST_SpecialAttack - ST_Attack, 0, new QTableWidgetItem);
+        varStat->setItem(ST_SpecialDefense - ST_Attack, 0, new QTableWidgetItem);
     }
     else
-        varStat->setItem(Sigmod::ST_Special - Sigmod::ST_Attack, 0, new QTableWidgetItem);
+        varStat->setItem(ST_Special - ST_Attack, 0, new QTableWidgetItem);
     QTableWidgetItem* item = new QTableWidgetItem;
     item->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
-    varStat->setItem(Sigmod::ST_Attack - Sigmod::ST_Attack, 0, item);
+    varStat->setItem(ST_Attack - ST_Attack, 0, item);
     varStat->setCurrentItem(item);
     item = new QTableWidgetItem;
     item->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
-    varStat->setItem(Sigmod::ST_Defense- Sigmod::ST_Attack, 0, item);
+    varStat->setItem(ST_Defense- ST_Attack, 0, item);
     item = new QTableWidgetItem;
     item->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
-    varStat->setItem(Sigmod::ST_Speed - Sigmod::ST_Attack, 0, item);
+    varStat->setItem(ST_Speed - ST_Attack, 0, item);
     if (isSplit)
     {
         item = new QTableWidgetItem;
         item->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
-        varStat->setItem(Sigmod::ST_SpecialAttack - Sigmod::ST_Attack, 0, item);
+        varStat->setItem(ST_SpecialAttack - ST_Attack, 0, item);
         item = new QTableWidgetItem;
         item->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
-        varStat->setItem(Sigmod::ST_SpecialDefense - Sigmod::ST_Attack, 0, item);
+        varStat->setItem(ST_SpecialDefense - ST_Attack, 0, item);
     }
     else
     {
         item = new QTableWidgetItem;
         item->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
-        varStat->setItem(Sigmod::ST_Special - Sigmod::ST_Attack, 0, item);
+        varStat->setItem(ST_Special - ST_Attack, 0, item);
     }
 }
 
-void Sigmodr::Widgets::NatureUI::setGui()
+void NatureUI::setGui()
 {
-    varName->setText(qobject_cast<Sigmod::Nature*>(modified())->name());
-    varStat->item(Sigmod::ST_Attack - Sigmod::ST_Attack, 0)->setData(Qt::DisplayRole, QString::number(qobject_cast<Sigmod::Nature*>(modified())->stat(Sigmod::ST_Attack), 'g', 7));
-    varStat->item(Sigmod::ST_Defense - Sigmod::ST_Attack, 0)->setData(Qt::DisplayRole, QString::number(qobject_cast<Sigmod::Nature*>(modified())->stat(Sigmod::ST_Defense), 'g', 7));
-    varStat->item(Sigmod::ST_Speed - Sigmod::ST_Attack, 0)->setData(Qt::DisplayRole, QString::number(qobject_cast<Sigmod::Nature*>(modified())->stat(Sigmod::ST_Speed), 'g', 7));
+    varName->setText(qobject_cast<Nature*>(modified())->name());
+    varStat->item(ST_Attack - ST_Attack, 0)->setData(Qt::DisplayRole, QString::number(qobject_cast<Nature*>(modified())->stat(ST_Attack), 'g', 7));
+    varStat->item(ST_Defense - ST_Attack, 0)->setData(Qt::DisplayRole, QString::number(qobject_cast<Nature*>(modified())->stat(ST_Defense), 'g', 7));
+    varStat->item(ST_Speed - ST_Attack, 0)->setData(Qt::DisplayRole, QString::number(qobject_cast<Nature*>(modified())->stat(ST_Speed), 'g', 7));
     if (game()->rules()->specialSplit())
     {
-        varStat->item(Sigmod::ST_SpecialAttack - Sigmod::ST_Attack, 0)->setData(Qt::DisplayRole, QString::number(qobject_cast<Sigmod::Nature*>(modified())->stat(Sigmod::ST_SpecialAttack), 'g', 7));
-        varStat->item(Sigmod::ST_SpecialDefense - Sigmod::ST_Attack, 0)->setData(Qt::DisplayRole, QString::number(qobject_cast<Sigmod::Nature*>(modified())->stat(Sigmod::ST_SpecialDefense), 'g', 7));
+        varStat->item(ST_SpecialAttack - ST_Attack, 0)->setData(Qt::DisplayRole, QString::number(qobject_cast<Nature*>(modified())->stat(ST_SpecialAttack), 'g', 7));
+        varStat->item(ST_SpecialDefense - ST_Attack, 0)->setData(Qt::DisplayRole, QString::number(qobject_cast<Nature*>(modified())->stat(ST_SpecialDefense), 'g', 7));
     }
     else
-        varStat->item(Sigmod::ST_Special - Sigmod::ST_Attack, 0)->setData(Qt::DisplayRole, QString::number(qobject_cast<Sigmod::Nature*>(modified())->stat(Sigmod::ST_Special), 'g', 7));
-    varStatMultiplier->setValue(qobject_cast<Sigmod::Nature*>(modified())->stat(varStat->verticalHeaderItem(varStat->currentRow())->data(Qt::UserRole).value<Sigmod::Stat>()));
-    varWeight->setValue(qobject_cast<Sigmod::Nature*>(modified())->weight());
+        varStat->item(ST_Special - ST_Attack, 0)->setData(Qt::DisplayRole, QString::number(qobject_cast<Nature*>(modified())->stat(ST_Special), 'g', 7));
+    varStatMultiplier->setValue(qobject_cast<Nature*>(modified())->stat(varStat->verticalHeaderItem(varStat->currentRow())->data(Qt::UserRole).value<Stat>()));
+    varWeight->setValue(qobject_cast<Nature*>(modified())->weight());
 }
 
-void Sigmodr::Widgets::NatureUI::apply()
+void NatureUI::apply()
 {
-    *qobject_cast<Sigmod::Nature*>(original()) = *qobject_cast<Sigmod::Nature*>(modified());
+    *qobject_cast<Nature*>(original()) = *qobject_cast<Nature*>(modified());
     emit(changed(false));
 }
 
-void Sigmodr::Widgets::NatureUI::discard()
+void NatureUI::discard()
 {
-    *qobject_cast<Sigmod::Nature*>(modified()) = *qobject_cast<Sigmod::Nature*>(original());
+    *qobject_cast<Nature*>(modified()) = *qobject_cast<Nature*>(original());
     setGui();
     emit(changed(false));
 }
 
-void Sigmodr::Widgets::NatureUI::on_varName_textChanged(const QString& name)
+void NatureUI::on_varName_textChanged(const QString& name)
 {
     const int cursor = varName->cursorPosition();
-    qobject_cast<Sigmod::Nature*>(modified())->setName(name);
+    qobject_cast<Nature*>(modified())->setName(name);
     varName->setCursorPosition(cursor);
 }
 
-void Sigmodr::Widgets::NatureUI::on_varStat_currentCellChanged(const int row)
+void NatureUI::on_varStat_currentCellChanged(const int row)
 {
-    varStatMultiplier->setValue(qobject_cast<Sigmod::Nature*>(modified())->stat(varStat->verticalHeaderItem(row)->data(Qt::UserRole).value<Sigmod::Stat>()));
+    varStatMultiplier->setValue(qobject_cast<Nature*>(modified())->stat(varStat->verticalHeaderItem(row)->data(Qt::UserRole).value<Stat>()));
 }
 
-void Sigmodr::Widgets::NatureUI::on_varStatMultiplier_valueChanged(const Sigcore::Fraction& multiplier)
+void NatureUI::on_varStatMultiplier_valueChanged(const Fraction& multiplier)
 {
-    qobject_cast<Sigmod::Nature*>(modified())->setStat(varStat->verticalHeaderItem(varStat->currentRow())->data(Qt::UserRole).value<Sigmod::Stat>(), multiplier);
+    qobject_cast<Nature*>(modified())->setStat(varStat->verticalHeaderItem(varStat->currentRow())->data(Qt::UserRole).value<Stat>(), multiplier);
 }
 
-void Sigmodr::Widgets::NatureUI::on_varWeight_valueChanged(const int weight)
+void NatureUI::on_varWeight_valueChanged(const int weight)
 {
-    qobject_cast<Sigmod::Nature*>(modified())->setWeight(weight);
+    qobject_cast<Nature*>(modified())->setWeight(weight);
 }