Changeset 206 in pacpusframework for trunk/include/Pacpus/kernel/PacpusEvent.h

Timestamp:

10/30/13 12:26:34 (11 years ago)

Author:

Marek Kurdej

Message:

Major: cleaned connection interfaces.

File:

• trunk/include/Pacpus/kernel/PacpusEvent.h (modified) (11 diffs)

trunk/include/Pacpus/kernel/PacpusEvent.h

@@ -38 +38 @@
 
     // TODO: should we make it virtual pure ???
-    virtual QDataStream& streamOut(QDataStream& out)
+    virtual QDataStream & streamOut(QDataStream & out)
     {
         return out;
@@ -77 +77 @@
 {
 public:
-    TypedData(const T& data)
-    : m_data(data)
+    TypedData(const T & data)
+        : m_data(data)
     {
     }
@@ -96 +96 @@
     }
 
-    size_t size() const
+    std::size_t size() const
     {
         return sizeof(T);
@@ -112 +112 @@
 public:
     // FIXME: why we need `data = T()` ???
-    PacpusTypedEvent(PacpusEventType type, const T & data = T(), road_time_t t = road_time(), road_timerange_t tr = 0 )
+    PacpusTypedEvent(PacpusEventType type, const T & data/* = T()*/, road_time_t t = road_time(), road_timerange_t tr = 0)
         : PacpusEvent(type, t, tr)
         , TypedData<T>(data)
-    {}
+    {
+    }
+    
+    /// Conversion constructor from another PacpusTypedEvent,
+    /// when T is convertible to S
+    template <typename S>
+    PacpusTypedEvent(const PacpusTypedEvent<S> & other)
+        : PacpusEvent(static_cast<PacpusEventType>(other.type()), other.time(), other.timerange())
+        , TypedData<T>(other.data())
+    {
+    }
 
     ~PacpusTypedEvent()
-    {}
-
-    QDataStream& streamOut(QDataStream& out)
+    {
+    }
+
+    QDataStream & streamOut(QDataStream & out)
     {
         // FIXME Stream Data errors
@@ -126 +137 @@
     }
 
-    QDataStream& streamIn(QDataStream& in)
+    QDataStream & streamIn(QDataStream & in)
     {
         return in >> (quint64&) time() >> timerange() /*>> m_data*/;
@@ -135 +146 @@
 {
 public:
-    GenericData(const char* data, size_t size)
+    GenericData(const char * data, size_t size)
         : m_data(NULL)
         , m_dataSize(size)
@@ -164 +175 @@
     }
 
-    size_t size() const
+    std::size_t size() const
     {
         return m_dataSize;
@@ -170 +181 @@
 
 private:
-    char* m_data;
-    size_t m_dataSize;
+    char * m_data;
+    std::size_t m_dataSize;
 };
 
@@ -179 +190 @@
 {
 public:
-    PacpusGenericEvent(PacpusEventType type, const char* data, size_t size)
+    PacpusGenericEvent(PacpusEventType type, const char * data, size_t size)
         : PacpusEvent(type)
         , GenericData(data, size)
@@ -192 +203 @@
 } // namespace pacpus
 
-PACPUSLIB_API inline QDataStream& operator<< (QDataStream& out, pacpus::PacpusEvent& ev)
+PACPUSLIB_API inline QDataStream & operator<<(QDataStream & out, pacpus::PacpusEvent & ev)
 {
     /*return ev.streamOut(out);*/
@@ -198 +209 @@
 }
 
-PACPUSLIB_API inline QDataStream& operator>> (QDataStream& in, pacpus::PacpusEvent& ev)
+PACPUSLIB_API inline QDataStream & operator>>(QDataStream & in, pacpus::PacpusEvent & ev)
 {
     /*return ev.streamIn(in);*/