1 files changed, 20 insertions, 17 deletions
diff --git a/sigmodr/widgets/ObjectUI.cpp b/sigmodr/widgets/ObjectUI.cpp
index 21e1aa6f..59be2321 100644
--- a/sigmodr/widgets/ObjectUI.cpp
+++ b/sigmodr/widgets/ObjectUI.cpp
@@ -31,7 +31,10 @@
 #include <KMenu>
 #include <KMessageBox>
 
-Sigmodr::Widgets::ObjectUI::ObjectUI(QWidget* parent) :
+using namespace Sigmod;
+using namespace Sigmodr::Widgets;
+
+ObjectUI::ObjectUI(QWidget* parent) :
         QWidget(parent),
         m_changed(false),
         m_validator(NULL),
@@ -43,48 +46,48 @@ Sigmodr::Widgets::ObjectUI::ObjectUI(QWidget* parent) :
     connect(this, SIGNAL(customContextMenuRequested(QPoint)), SLOT(contextMenu(QPoint)));
 }
 
-Sigmodr::Widgets::ObjectUI::~ObjectUI()
+ObjectUI::~ObjectUI()
 {
     delete m_object_mod;
 }
 
-void Sigmodr::Widgets::ObjectUI::reload()
+void ObjectUI::reload()
 {
     refreshGui();
     setGui();
 }
 
-bool Sigmodr::Widgets::ObjectUI::isChanged() const
+bool ObjectUI::isChanged() const
 {
     return m_changed;
 }
 
-const Sigmod::Game* Sigmodr::Widgets::ObjectUI::game() const
+const Game* ObjectUI::game() const
 {
     return m_object->game();
 }
 
-const Sigmod::Object* Sigmodr::Widgets::ObjectUI::original() const
+const Object* ObjectUI::original() const
 {
     return m_object;
 }
 
-Sigmod::Object* Sigmodr::Widgets::ObjectUI::original()
+Object* ObjectUI::original()
 {
     return m_object;
 }
 
-const Sigmod::Object* Sigmodr::Widgets::ObjectUI::modified() const
+const Object* ObjectUI::modified() const
 {
     return m_object_mod;
 }
 
-Sigmod::Object* Sigmodr::Widgets::ObjectUI::modified()
+Object* ObjectUI::modified()
 {
     return m_object_mod;
 }
 
-void Sigmodr::Widgets::ObjectUI::setObjects(Sigmod::Object* original, Sigmod::Object* modified)
+void ObjectUI::setObjects(Object* original, Object* modified)
 {
     m_object = original;
     m_object_mod = modified;
@@ -99,33 +102,33 @@ void Sigmodr::Widgets::ObjectUI::setObjects(Sigmod::Object* original, Sigmod::Ob
     init();
 }
 
-void Sigmodr::Widgets::ObjectUI::init()
+void ObjectUI::init()
 {
     initGui();
     reload();
     emit(changed(false));
 }
 
-void Sigmodr::Widgets::ObjectUI::setChanged(const bool changed)
+void ObjectUI::setChanged(const bool changed)
 {
     m_changed = changed;
 }
 
-void Sigmodr::Widgets::ObjectUI::errorMessage(const QString& message)
+void ObjectUI::errorMessage(const QString& message)
 {
     KMessageBox::error(this, message, "Error");
 }
 
-void Sigmodr::Widgets::ObjectUI::warningMessage(const QString& message)
+void ObjectUI::warningMessage(const QString& message)
 {
     KMessageBox::warningContinueCancel(this, message, "Warning");
 }
 
-void Sigmodr::Widgets::ObjectUI::refreshGui()
+void ObjectUI::refreshGui()
 {
 }
 
-void Sigmodr::Widgets::ObjectUI::contextMenu(const QPoint& pos)
+void ObjectUI::contextMenu(const QPoint& pos)
 {
     KMenu* menu = new KMenu;
     menu->addAction("&Apply", this, SLOT(apply()));
@@ -138,7 +141,7 @@ void Sigmodr::Widgets::ObjectUI::contextMenu(const QPoint& pos)
     menu->popup(mapToGlobal(pos));
 }
 
-void Sigmodr::Widgets::ObjectUI::validate()
+void ObjectUI::validate()
 {
     if (m_changed)
         apply();