Fixed Sigmodr widgets to use namespaces in sources

1 files changed, 22 insertions, 19 deletions

diff --git a/sigmodr/widgets/StoreUI.cpp b/sigmodr/widgets/StoreUI.cpp
index e06efd19..2a0cf763 100644
--- a/sigmodr/widgets/StoreUI.cpp
+++ b/sigmodr/widgets/StoreUI.cpp
@@ -32,13 +32,16 @@
 #include <QtGui/QListWidgetItem>
 #include <QtUiTools/QUiLoader>
 
-Sigmodr::Widgets::StoreUI::StoreUI(Sigmod::Store* store, QWidget* parent) :
+using namespace Sigmod;
+using namespace Sigmodr::Widgets;
+
+StoreUI::StoreUI(Store* store, QWidget* parent) :
         ObjectUI(parent)
 {
-    setObjects(store, new Sigmod::Store(*store));
+    setObjects(store, new Store(*store));
 }
 
-void Sigmodr::Widgets::StoreUI::initGui()
+void StoreUI::initGui()
 {
     QFile file(":/gui/store.ui");
     file.open(QFile::ReadOnly);
@@ -51,14 +54,14 @@ void Sigmodr::Widgets::StoreUI::initGui()
     connect(ui_items, SIGNAL(removed(QListWidgetItem*)), this, SLOT(itemRemoved(QListWidgetItem*)));
 }
 
-void Sigmodr::Widgets::StoreUI::refreshGui()
+void StoreUI::refreshGui()
 {
     const bool blockedItems = ui_items->blockSignals(true);
     ui_items->availableListWidget()->clear();
     ui_items->selectedListWidget()->clear();
     for (int i = 0; i < game()->itemCount(); ++i)
     {
-        const Sigmod::Item* item = game()->item(i);
+        const Item* item = game()->item(i);
         QListWidgetItem* widgetItem = new QListWidgetItem(item->name(), ui_items->availableListWidget());
         widgetItem->setData(Qt::UserRole, item->id());
     }
@@ -66,53 +69,53 @@ void Sigmodr::Widgets::StoreUI::refreshGui()
     ui_items->setButtonsEnabled();
 }
 
-void Sigmodr::Widgets::StoreUI::setGui()
+void StoreUI::setGui()
 {
-    ui_name->setText(qobject_cast<Sigmod::Store*>(modified())->name());
+    ui_name->setText(qobject_cast<Store*>(modified())->name());
     for (int i = 0; i < ui_items->availableListWidget()->count(); ++i)
     {
         QListWidgetItem* widgetItem = ui_items->availableListWidget()->item(i);
-        if (qobject_cast<Sigmod::Store*>(modified())->item(widgetItem->data(Qt::UserRole).toInt()))
+        if (qobject_cast<Store*>(modified())->item(widgetItem->data(Qt::UserRole).toInt()))
             ui_items->selectedListWidget()->addItem(ui_items->availableListWidget()->takeItem(i--));
     }
     for (int i = 0; i < ui_items->selectedListWidget()->count(); ++i)
     {
         QListWidgetItem* widgetItem = ui_items->selectedListWidget()->item(i);
-        if (!qobject_cast<Sigmod::Store*>(modified())->item(widgetItem->data(Qt::UserRole).toInt()))
+        if (!qobject_cast<Store*>(modified())->item(widgetItem->data(Qt::UserRole).toInt()))
             ui_items->availableListWidget()->addItem(ui_items->selectedListWidget()->takeItem(i--));
     }
     ui_items->setButtonsEnabled();
 }
 
-void Sigmodr::Widgets::StoreUI::apply()
+void StoreUI::apply()
 {
-    *qobject_cast<Sigmod::Store*>(original()) = *qobject_cast<Sigmod::Store*>(modified());
+    *qobject_cast<Store*>(original()) = *qobject_cast<Store*>(modified());
     emit(changed(false));
 }
 
-void Sigmodr::Widgets::StoreUI::discard()
+void StoreUI::discard()
 {
-    *qobject_cast<Sigmod::Store*>(modified()) = *qobject_cast<Sigmod::Store*>(original());
+    *qobject_cast<Store*>(modified()) = *qobject_cast<Store*>(original());
     setGui();
     emit(changed(false));
 }
 
-void Sigmodr::Widgets::StoreUI::nameChanged(const QString& name)
+void StoreUI::nameChanged(const QString& name)
 {
     const int cursor = ui_name->cursorPosition();
-    qobject_cast<Sigmod::Store*>(modified())->setName(name);
+    qobject_cast<Store*>(modified())->setName(name);
     ui_name->setCursorPosition(cursor);
 }
 
-void Sigmodr::Widgets::StoreUI::itemAdded(QListWidgetItem* item)
+void StoreUI::itemAdded(QListWidgetItem* item)
 {
-    qobject_cast<Sigmod::Store*>(modified())->setItem(item->data(Qt::UserRole).toInt(), true);
+    qobject_cast<Store*>(modified())->setItem(item->data(Qt::UserRole).toInt(), true);
     setGui();
 }
 
-void Sigmodr::Widgets::StoreUI::itemRemoved(QListWidgetItem* item)
+void StoreUI::itemRemoved(QListWidgetItem* item)
 {
-    qobject_cast<Sigmod::Store*>(modified())->setItem(item->data(Qt::UserRole).toInt(), false);
+    qobject_cast<Store*>(modified())->setItem(item->data(Qt::UserRole).toInt(), false);
     setGui();
 }