Merge branch 'master' into noglut

[apitrace] / gui / apitracecall.h

diff --git a/gui/apitracecall.h b/gui/apitracecall.h
index 8f38bdaffa2c88490cda7e9ff767733ddf9c1e8e..c2fd98736331fbdecb0ab81c16fa05dee7f3f6c4 100644 (file)
--- a/gui/apitracecall.h
+++ b/gui/apitracecall.h
@@ -3,6 +3,7 @@
 
 #include <QStaticText>
 #include <QStringList>
+#include <QUrl>
 #include <QVariant>
 
 #include "trace_model.hpp"
@@ -117,8 +118,12 @@ public:
     virtual QStaticText staticText() const = 0;
     virtual int numChildren() const = 0;
 
+    QVariantMap state() const;
+    void setState(const QVariantMap &state);
+
 protected:
     Type m_type;
+    QVariantMap m_state;
 };
 Q_DECLARE_METATYPE(ApiTraceEvent*);
 
@@ -134,15 +139,20 @@ public:
     QVariantList argValues;
     QVariant returnValue;
     ApiTraceFrame *parentFrame;
+    QUrl helpUrl;
 
     QString toHtml() const;
     QString filterText() const;
     QStaticText staticText() const;
     int numChildren() const;
+    bool hasBinaryData() const;
+    int binaryDataIndex() const;
 private:
     mutable QString m_richText;
     mutable QString m_filterText;
     mutable QStaticText m_staticText;
+    mutable bool m_hasBinaryData;
+    mutable int m_binaryDataIndex;
 };
 Q_DECLARE_METATYPE(ApiTraceCall*);
 
@@ -153,7 +163,6 @@ public:
     int number;
     QList<ApiTraceCall*> calls;
 
-
     int numChildren() const;
     QStaticText staticText() const;
 private: