Now IPC messages are ok.

parent ee97073f
...@@ -45,7 +45,7 @@ void SkyliveAuth::startPlugin() ...@@ -45,7 +45,7 @@ void SkyliveAuth::startPlugin()
void SkyliveAuth::receiveMessage(SKMessage::SKMessage msg) void SkyliveAuth::receiveMessage(SKMessage::SKMessage msg)
{ {
std::cout << "SkyliveAuth receive" << msg.handle << std::endl; std::cout << "SkyliveAuth msg received: " << msg.handle.toStdString() << std::endl;
} }
void SkyliveAuth::sendMessage(SKMessage::SKMessage msg) void SkyliveAuth::sendMessage(SKMessage::SKMessage msg)
......
...@@ -40,13 +40,13 @@ ...@@ -40,13 +40,13 @@
void SkyliveProtocol::startPlugin() void SkyliveProtocol::startPlugin()
{ {
std::cout << "SkyliveProtocol initialized in thread " << thread() << std::endl; std::cout << "SkyliveProtocol initialized in thread " << thread() << std::endl;
std::string prova("ANTANI STA PROVA!!"); SKMessage::SKMessage prova("ANTANI STA PROVA!!");
sendMessage(prova); sendMessage(prova);
} }
void SkyliveProtocol::receiveMessage(SKMessage::SKMessage msg) void SkyliveProtocol::receiveMessage(SKMessage::SKMessage msg)
{ {
std::cout << "SkyliveProtocol receive" << msg.handle << std::endl; std::cout << "SkyliveProtocol msg received: " << msg.handle.toStdString() << std::endl;
} }
void SkyliveProtocol::sendMessage(SKMessage::SKMessage msg) void SkyliveProtocol::sendMessage(SKMessage::SKMessage msg)
......
...@@ -35,38 +35,39 @@ ...@@ -35,38 +35,39 @@
#include <QTime> #include <QTime>
#include <QHash> #include <QHash>
#include <QString>
#include <iostream> #include <iostream>
#include "ipcmsg.h" #include "ipcmsg.h"
SKMessage::SKMessage(std::string s, std::string h, QHash<std::string, std::string > p) SKMessage::SKMessage(QString s, QString h, QHash<QString, QString > p)
{ {
handle=h; handle=h;
sender=s; sender=s;
parameters=p; parameters=p;
time = QTime::currentTime(); time = QTime::currentTime();
std::cout << "SKMessage initialized " << handle << std::endl; std::cout << "SKMessage initialized " << handle.toStdString() << std::endl;
} }
SKMessage::SKMessage(std::string h, QHash<std::string, std::string > p) SKMessage::SKMessage(QString h, QHash<QString, QString > p)
{ {
sender= std::string("unknown"); sender= QString("unknown");
time = QTime::currentTime(); time = QTime::currentTime();
parameters = p; parameters = p;
handle = h; handle = h;
} }
SKMessage::SKMessage(std::string h) SKMessage::SKMessage(QString h)
{ {
sender= std::string("unknown"); sender= QString("unknown");
handle = h; handle = h;
time = QTime::currentTime(); time = QTime::currentTime();
} }
SKMessage::SKMessage() SKMessage::SKMessage()
{ {
sender= std::string("unknown"); sender= QString("unknown");
handle = std::string("none"); handle = QString("none");
time = QTime::currentTime(); time = QTime::currentTime();
} }
......
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
#include <QTime> #include <QTime>
#include <QHash> #include <QHash>
#include <iostream> #include <QString>
/* /*
* SKMessage * SKMessage
...@@ -54,13 +54,13 @@ class SKMessage ...@@ -54,13 +54,13 @@ class SKMessage
~SKMessage(); ~SKMessage();
QTime time; QTime time;
std::string sender; QString sender;
std::string handle; QString handle;
QHash<std::string, std::string > parameters; QHash<QString, QString > parameters;
SKMessage(std::string s, std::string h, QHash<std::string, std::string > p); SKMessage(QString s, QString h, QHash<QString, QString > p);
SKMessage(std::string h, QHash<std::string, std::string > p); SKMessage(QString h, QHash<QString, QString > p);
SKMessage(std::string h); SKMessage(QString h);
}; };
......
...@@ -68,5 +68,5 @@ MainWin::~MainWin() ...@@ -68,5 +68,5 @@ MainWin::~MainWin()
void MainWin::msgFromCore(SKMessage::SKMessage &msg) void MainWin::msgFromCore(SKMessage::SKMessage &msg)
{ {
std::cout << "Message from core: " << msg.handle << std::endl; std::cout << "MainWindow msg reveived: " << msg.handle.toStdString() << std::endl;
} }
...@@ -55,11 +55,10 @@ void SkyliveX::initialize() ...@@ -55,11 +55,10 @@ void SkyliveX::initialize()
} }
// read messages from plugins and dispatch to others
void SkyliveX::process() void SkyliveX::process()
{ {
SKMessage::SKMessage sarca("ANTANI!"); //SKMessage::SKMessage sarca("ANTANI!");
sendMessage(sarca); //sendMessage(sarca);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment