1 files changed, 7 insertions, 16 deletions
diff --git a/pokemodr/StoreUI.cpp b/pokemodr/StoreUI.cpp
index 31db81a9..72128247 100644
--- a/pokemodr/StoreUI.cpp
+++ b/pokemodr/StoreUI.cpp
@@ -23,9 +23,6 @@
 #include "../pokemod/Pokemod.h"
 #include "../pokemod/Store.h"
 
-// General includes
-#include "../general/BugCatcher.h"
-
 StoreUI::StoreUI(Store* store, QWidget* parent) :
         ObjectUI(parent)
 {
@@ -33,6 +30,10 @@ StoreUI::StoreUI(Store* store, QWidget* parent) :
     QMetaObject::connectSlotsByName(this);
     setObjects(store, new Store(*store));
     connect(this, SIGNAL(changed(bool)), boxButtons, SLOT(setEnabled(bool)));
+    connect(modified(), SIGNAL(error()), this, SLOT(setGui()));
+    connect(modified(), SIGNAL(error(QString&)), this, SLOT(errorMessage(QString&)));
+    connect(modified(), SIGNAL(warning(QString&)), this, SLOT(warningMessage(QString&)));
+    connect(modified(), SIGNAL(changed()), this, SIGNAL(changed(true)));
     init();
 }
 
@@ -77,23 +78,13 @@ void StoreUI::on_buttonDiscard_clicked()
 void StoreUI::on_varName_textChanged(const QString& name)
 {
     static_cast<Store*>(modified())->setName(name);
-    emit(changed(true));
 }
 
 void StoreUI::on_varItems_itemSelectionChanged()
 {
-    try
-    {
-        for (int i = 0; i < varItems->count(); ++i)
-        {
-            const QListWidgetItem* widgetItem = varItems->item(i);
-            static_cast<Store*>(modified())->setItem(widgetItem->data(Qt::UserRole).toInt(), widgetItem->isSelected());
-        }
-        emit(changed(true));
-    }
-    catch (BoundsException& exception)
+    for (int i = 0; i < varItems->count(); ++i)
     {
-        BugCatcher::report(exception);
-        setGui();
+        const QListWidgetItem* widgetItem = varItems->item(i);
+        static_cast<Store*>(modified())->setItem(widgetItem->data(Qt::UserRole).toInt(), widgetItem->isSelected());
     }
 }