Emit Messages not strings. Refs #6202

mantidproject · Apr 15, 2013 · ed80b40 · ed80b40
1 parent a58a33f
commit ed80b40
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/Code/Mantid/MantidQt/API/inc/MantidQtAPI/QtSignalChannel.h b/Code/Mantid/MantidQt/API/inc/MantidQtAPI/QtSignalChannel.h
@@ -10,6 +10,11 @@ namespace MantidQt
 {
   namespace API
   {
+    //---------------------------------------------------------------------
+    //
+    //---------------------------------------------------------------------
+    class Message;
+
     /** 
     Provides a translation layer that takes a Poco::Message and converts it
     to a Qt signal.
@@ -53,7 +58,7 @@ namespace MantidQt
 
     signals:
       // Emitted when a Poco log message is received in this channel
-      void messageReceived(const QString & msg);
+      void messageReceived(const Message & msg);
 
     private:
       Q_DISABLE_COPY(QtSignalChannel);

diff --git a/Code/Mantid/MantidQt/API/src/MessageDisplay.cpp b/Code/Mantid/MantidQt/API/src/MessageDisplay.cpp
@@ -61,7 +61,7 @@ namespace MantidQt
         Poco::Logger::setChannel(rootLogger.name(), m_logChannel);
       }
 
-      connect(m_logChannel, SIGNAL(messageReceived(const QString&)),
+      connect(m_logChannel, SIGNAL(messageReceived(const API::Message&)),
           this, SLOT(append(const QString &)));
     }
 

diff --git a/Code/Mantid/MantidQt/API/src/QtSignalChannel.cpp b/Code/Mantid/MantidQt/API/src/QtSignalChannel.cpp
@@ -1,10 +1,9 @@
 #include "MantidQtAPI/QtSignalChannel.h"
+#include "MantidQtAPI/Message.h"
 #include "MantidKernel/Logger.h"
 
 #include <Poco/Message.h>
 
-#include <sstream>
-
 namespace MantidQt
 {
   namespace API
@@ -29,7 +28,7 @@ namespace MantidQt
      */
     void QtSignalChannel::log(const Poco::Message& msg)
     {
-      emit messageReceived(QString::fromStdString(msg.getText()));
+      emit messageReceived(API::Message(QString::fromStdString(msg.getText()), msg.getPriority()));
     }
 
     /*