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

Timestamp:

07/31/13 11:20:11 (11 years ago)

Author:

Marek Kurdej

Message:

Update: refactoring in XmlConfigFile.
Added: attributes 'prefix', 'postfix', 'extension' in <parameters>.
Example: <parameters prefix="" postfix="_d" extension="dll">

File:

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

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

@@ -42 +42 @@
 
 public:
-    PacpusEvent(PacpusEventType type, road_time_t t = road_time(), road_timerange_t tr = 0):QEvent(QEvent::Type(type)),t_(t),tr_(tr) {}
-    virtual ~PacpusEvent() {}
+    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) {return out;}; // NOTE virtual pure ??
-    virtual QDataStream& streamIn(QDataStream& in) {return in;};
+    // NOTE virtual pure ??
+    virtual QDataStream& streamOut(QDataStream& out)
+    {
+        return out;
+    } 
+    virtual QDataStream& streamIn(QDataStream& in)
+    {
+        return in;
+    }
 
-public: // TODO make protected
+protected: // TODO make protected
     road_time_t t_;
     road_timerange_t tr_;
@@ -63 +75 @@
     QDataStream& streamIn(QDataStream& in) {return in >> (quint64&)t_ >> tr_ /*>> data_*/;}
 
-public: // TODO make protected
+protected:
     T data_;
 };
@@ -70 +82 @@
 {
 public:
-    PacpusGenericEvent(PacpusEventType type, char* data, size_t size):PacpusEvent(type) {
-        data_ = (char*)malloc(size);
+    PacpusGenericEvent(PacpusEventType type, char* data, size_t size)
+        : PacpusEvent(type)
+    {
+        data_ = new char[size];
         memcpy(data_,data,size);
         _size = size;
 
     }
-    virtual ~PacpusGenericEvent() {free(data_);}
+    
+    virtual ~PacpusGenericEvent()
+    {
+        delete[] data_;
+    }
+
     char* data_;
     size_t _size;