Changeset 96 in pacpusframework for branches/2.0-beta1/include/Pacpus/kernel/PacpusEvent.h

Timestamp:

05/23/13 12:16:31 (11 years ago)

Author:

morasjul

Message:

2.0 minor fixs

File:

• branches/2.0-beta1/include/Pacpus/kernel/PacpusEvent.h (modified) (3 diffs)

branches/2.0-beta1/include/Pacpus/kernel/PacpusEvent.h

@@ -5 +5 @@
 #include "Pacpus/kernel/road_time.h"
 #include <Pacpus/kernel/pacpus.h>
+#include <QDataStream>
 
 namespace pacpus {
@@ -36 +37 @@
 {
 public:
-    PacpusEvent(QEvent::Type type):QEvent(type) {}
+    PacpusEvent(PacpusEventType type, road_time_t t = road_time(), road_timerange_t tr = 0):QEvent(QEvent::Type(type)),t_(t),tr_(tr) {}
+    virtual ~PacpusEvent() {}
+
+    virtual QDataStream& streamOut(QDataStream& out) {}; // NOTE virtual pure ??
+    virtual QDataStream& streamIn(QDataStream& in) {};
+
+public: // TODO make protected
+    road_time_t t_;
+    road_timerange_t tr_;
 };
 
@@ -43 +52 @@
 {
 public:
-    PacpusTypedEvent(QEvent::Type type, T data, road_time_t t = road_time(), road_timerange_t tr = 0 ):PacpusEvent(type)
-    {_data = data; t_ = t; tr_ = tr;}
+    PacpusTypedEvent(PacpusEventType type, T data = T(), road_time_t t = road_time(), road_timerange_t tr = 0 ):PacpusEvent(type, t, tr),_data(data) {}
     ~PacpusTypedEvent() {}
+
+    QDataStream& streamOut(QDataStream& out) {return out << (quint64)t_ << tr_ /*<<_data*/;} // FIXME Stream Data errors
+    QDataStream& streamIn(QDataStream& in) {return in >> (quint64&)t_ >> tr_ /*>> _data*/;}
+
+public: // TODO make protected
     T _data;
-    road_time_t t_;
-    road_timerange_t tr_;
 };
+
+inline QDataStream& operator << (QDataStream& out, PacpusEvent& ev) {return ev.streamOut(out);}
+inline QDataStream& operator >> (QDataStream& in, PacpusEvent& ev) {return ev.streamIn(in);}
 
 class PACPUSLIB_API PacpusGenericEvent : public PacpusEvent
 {
 public:
-    PacpusGenericEvent(QEvent::Type type, char* data, size_t size):PacpusEvent(type) {
+    PacpusGenericEvent(PacpusEventType type, char* data, size_t size):PacpusEvent(type) {
         _data = (char*)malloc(size);
         memcpy(_data,data,size);