Merge branch 'master' into d2d

[apitrace] / gui / apitracecall.h

diff --git a/gui/apitracecall.h b/gui/apitracecall.h
index 784834b17a52764279acad5b64b9fed44241090f..3a9faafd495e851c281609d5c7c94e9431020c7d 100644 (file)
--- a/gui/apitracecall.h
+++ b/gui/apitracecall.h
@@ -54,23 +54,19 @@ struct ApiTraceError
 class ApiTraceEnumSignature
 {
 public:
-    ApiTraceEnumSignature(const QString &name = QString(),
-                          const QVariant &val=QVariant())\
-        : m_name(name),
-          m_value(val)
-    {}
+    ApiTraceEnumSignature(const trace::EnumSig *sig);
+
+    QString name(signed long long value) const;
 
-    QVariant value() const { return m_value; }
-    QString name() const { return m_name; }
 private:
-    QString m_name;
-    QVariant m_value;
+    typedef QList<QPair<QString, signed long long> > ValueList;
+    ValueList m_names;
 };
 
 class ApiEnum
 {
 public:
-    ApiEnum(ApiTraceEnumSignature *sig=0);
+    ApiEnum(ApiTraceEnumSignature *sig=0, signed long long value = 0);
 
     QString toString() const;
 
@@ -78,6 +74,7 @@ public:
     QString name() const;
 private:
     ApiTraceEnumSignature *m_sig;
+    signed long long m_value;
 };
 Q_DECLARE_METATYPE(ApiEnum);