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

Timestamp:

06/13/13 13:43:39 (11 years ago)

Author:

morasjul

Message:

Beta-2 : Fix CMakeList (link), remove useless code and add improvement

File:

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

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

@@ -9 +9 @@
 namespace pacpus {
 
+// registerEventType // TODO
+
 class GenericData {
 public:
     GenericData(char* data, size_t size) {
-        _data = (char*)malloc(size);
-        memcpy(_data,data,size);
+        data_ = (char*)malloc(size);
+        memcpy(data_,data,size);
         _size = size;}
 
-    ~GenericData() {free(_data);}
+    ~GenericData() {free(data_);}
 
-    char * data() { return _data;}
+    char * data() { return data_;}
     size_t size() {return _size;}
 
 private:
-char* _data;
+char* data_;
 size_t _size;
 };
@@ -52 +54 @@
 {
 public:
-    PacpusTypedEvent(PacpusEventType type, T data = T(), road_time_t t = road_time(), road_timerange_t tr = 0 ):PacpusEvent(type, t, tr),_data(data) {}
+    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*/;}
+    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;
+    T data_;
 };
-
-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
@@ -69 +68 @@
 public:
     PacpusGenericEvent(PacpusEventType type, char* data, size_t size):PacpusEvent(type) {
-        _data = (char*)malloc(size);
-        memcpy(_data,data,size);
+        data_ = (char*)malloc(size);
+        memcpy(data_,data,size);
         _size = size;
 
     }
-    virtual ~PacpusGenericEvent() {free(_data);}
-    char* _data;
+    virtual ~PacpusGenericEvent() {free(data_);}
+    char* data_;
     size_t _size;
 };
@@ -82 +81 @@
 } // namespace pacpus
 
+inline QDataStream& operator << (QDataStream& out, pacpus::PacpusEvent& ev) {/*return ev.streamOut(out);*/ return out;}
+inline QDataStream& operator >> (QDataStream& in, pacpus::PacpusEvent& ev) {/*return ev.streamIn(in);*/ return in;}
+
 #endif // PACPUS_EVENT_H