Specify the Qt version which we require.

[apitrace] / trace_model.hpp

diff --git a/trace_model.hpp b/trace_model.hpp
index f978435f74f4907f9b97c4376660d8a27bd7bbb4..8436fc1afac77bb7dd6ab8a08b5351a71d458376 100644 (file)
--- a/trace_model.hpp
+++ b/trace_model.hpp
@@ -54,12 +54,12 @@ public:
     virtual ~Value() {}
     virtual void visit(Visitor &visitor) = 0;
 
-    operator bool (void) const;
-    operator signed long long (void) const;
-    operator unsigned long long (void) const;
-    operator double (void) const;
+    virtual operator bool (void) const = 0;
+    virtual operator signed long long (void) const;
+    virtual operator unsigned long long (void) const;
+    virtual operator double (void) const;
 
-    void *blob(void) const;
+    virtual void *blob(void) const;
     const char *string(void) const;
 
     inline operator signed char (void) const { 
@@ -105,17 +105,24 @@ public:
 class Null : public Value
 {
 public:
+    operator bool (void) const;
+    operator signed long long (void) const;
+    operator unsigned long long (void) const;
+    operator double (void) const;
+    void *blob(void) const;
     void visit(Visitor &visitor);
 };
 
 
-#undef Bool
-
 class Bool : public Value
 {
 public:
     Bool(bool _value) : value(_value) {}
 
+    operator bool (void) const;
+    operator signed long long (void) const;
+    operator unsigned long long (void) const;
+    operator double (void) const;
     void visit(Visitor &visitor);
 
     bool value;
@@ -127,6 +134,10 @@ class SInt : public Value
 public:
     SInt(signed long long _value) : value(_value) {}
 
+    operator bool (void) const;
+    operator signed long long (void) const;
+    operator unsigned long long (void) const;
+    operator double (void) const;
     void visit(Visitor &visitor);
 
     signed long long value;
@@ -138,6 +149,10 @@ class UInt : public Value
 public:
     UInt(unsigned long long _value) : value(_value) {}
 
+    operator bool (void) const;
+    operator signed long long (void) const;
+    operator unsigned long long (void) const;
+    operator double (void) const;
     void visit(Visitor &visitor);
 
     unsigned long long value;
@@ -149,6 +164,10 @@ class Float : public Value
 public:
     Float(double _value) : value(_value) {}
 
+    operator bool (void) const;
+    operator signed long long (void) const;
+    operator unsigned long long (void) const;
+    operator double (void) const;
     void visit(Visitor &visitor);
 
     double value;
@@ -160,6 +179,7 @@ class String : public Value
 public:
     String(std::string _value) : value(_value) {}
 
+    operator bool (void) const;
     void visit(Visitor &visitor);
 
     std::string value;
@@ -169,10 +189,26 @@ public:
 class Enum : public Value
 {
 public:
-    typedef std::pair<std::string, Value *> Signature;
+    struct Signature : public std::pair<std::string, Value *>
+    {
+        Signature()
+            : std::pair<std::string, Value *>()
+        {}
+        Signature(const std::string &n, Trace::Value *val)
+            : std::pair<std::string, Value *>(n, val)
+        {}
+        ~Signature()
+        {
+            delete second;
+        }
+    };
 
     Enum(const Signature *_sig) : sig(_sig) {}
 
+    operator bool (void) const;
+    operator signed long long (void) const;
+    operator unsigned long long (void) const;
+    operator double (void) const;
     void visit(Visitor &visitor);
 
     const Signature *sig;
@@ -204,6 +240,7 @@ public:
     Struct(Signature *_sig) : sig(_sig), members(_sig->member_names.size()) { }
     ~Struct();
 
+    operator bool (void) const;
     void visit(Visitor &visitor);
 
     const Signature *sig;
@@ -217,6 +254,7 @@ public:
     Array(size_t len) : values(len) {}
     ~Array();
 
+    operator bool (void) const;
     void visit(Visitor &visitor);
 
     std::vector<Value *> values;
@@ -233,6 +271,8 @@ public:
 
     ~Blob();
 
+    operator bool (void) const;
+    void *blob(void) const;
     void visit(Visitor &visitor);
 
     size_t size;
@@ -245,6 +285,8 @@ class Pointer : public UInt
 public:
     Pointer(unsigned long long value) : UInt(value) {}
 
+    operator bool (void) const;
+    void *blob(void) const;
     void visit(Visitor &visitor);
 };
 
@@ -252,18 +294,18 @@ public:
 class Visitor
 {
 public:
-    virtual void visit(Null *) {assert(0);}
-    virtual void visit(Bool *) {assert(0);}
-    virtual void visit(SInt *) {assert(0);}
-    virtual void visit(UInt *) {assert(0);}
-    virtual void visit(Float *) {assert(0);}
-    virtual void visit(String *) {assert(0);}
-    virtual void visit(Enum *) {assert(0);}
-    virtual void visit(Bitmask *bitmask) {visit(static_cast<UInt *>(bitmask));}
-    virtual void visit(Struct *) {assert(0);}
-    virtual void visit(Array *) {assert(0);}
-    virtual void visit(Blob *) {assert(0);}
-    virtual void visit(Pointer *) {assert(0);}
+    virtual void visit(Null *);
+    virtual void visit(Bool *);
+    virtual void visit(SInt *);
+    virtual void visit(UInt *);
+    virtual void visit(Float *);
+    virtual void visit(String *);
+    virtual void visit(Enum *);
+    virtual void visit(Bitmask *);
+    virtual void visit(Struct *);
+    virtual void visit(Array *);
+    virtual void visit(Blob *);
+    virtual void visit(Pointer *);
 
 protected:
     inline void _visit(Value *value) {