Move to Qt Signal/Slots

[frida/frida.git] / src / core / InformationManager.cxx

diff --git a/src/core/InformationManager.cxx b/src/core/InformationManager.cxx
index 485aacd9868a954b350d5c43a958de71a72c8b75..b7229d376854639dfc8cc16fbece136f2ef9bed2 100644 (file)
--- a/src/core/InformationManager.cxx
+++ b/src/core/InformationManager.cxx
@@ -7,7 +7,7 @@
 #include "core/events/NewFunctionEvent.hxx"
 #include "core/events/ChangeCommentEvent.hxx"
 
-#include "gui/qt.hxx"
+#include "qt.hxx"
 #include <quazip/quazip.h>
 #include <quazip/quazipfile.h>
 
@@ -50,7 +50,10 @@ void InformationManager::load(const std::string& filename) {
        QuaZipFile file(&zip);
        QuaZipFileInfo info;
 
-       zip.open(QuaZip::mdUnzip);
+       if (!zip.open(QuaZip::mdUnzip)) {
+               LOG4CXX_ERROR(logger, "Failed to open archive " << filename);
+               return;
+       }
        tmpfile.reset(new QTemporaryFile());
 
        {
@@ -267,7 +270,7 @@ void InformationManager::finishFunction(Function* fun) {
                blocks.insert(std::make_pair(bl->getStartAddress(), bl));
        }
        NewFunctionEvent event(fun->getStartAddress(), fun);
-       dispatch(&event);
+       Q_EMIT newFunctionEvent(&event);
 }
 
 void InformationManager::finishBasicBlock(BasicBlock*) {
@@ -276,7 +279,7 @@ void InformationManager::finishBasicBlock(BasicBlock*) {
 void InformationManager::finishComment(Comment* c) {
        LOG4CXX_DEBUG(logger, "Finishing comment " << c->getAddress());
        ChangeCommentEvent event(c->getAddress(), c->getLocation(), c);
-       dispatch(&event);
+       Q_EMIT changeCommentEvent(&event);
 }
 
 void InformationManager::deleteFunction(Function* f) {