shave a few more megs by sizing trace call list correctly

[apitrace] / gui / apitracecall.h

diff --git a/gui/apitracecall.h b/gui/apitracecall.h
index 2b6e97c1d22c812aff94455cff62dab1552e817b..89f310205545f23e62f5713a958104e168efae0a 100644 (file)
--- a/gui/apitracecall.h
+++ b/gui/apitracecall.h
@@ -137,17 +137,44 @@ public:
     bool isEmpty() const;
     const QVariantMap & parameters() const;
     const QMap<QString, QString> & shaderSources() const;
+    const QVariantMap & uniforms() const;
     const QList<ApiTexture> & textures() const;
     const QList<ApiFramebuffer> & framebuffers() const;
 
 private:
     QVariantMap m_parameters;
     QMap<QString, QString> m_shaderSources;
+    QVariantMap m_uniforms;
     QList<ApiTexture> m_textures;
     QList<ApiFramebuffer> m_framebuffers;
 };
 Q_DECLARE_METATYPE(ApiTraceState);
 
+class ApiTraceCallSignature
+{
+public:
+    ApiTraceCallSignature(const QString &name,
+                          const QStringList &argNames);
+    ~ApiTraceCallSignature();
+
+    QString name() const
+    {
+        return m_name;
+    }
+    QStringList argNames() const
+    {
+        return m_argNames;
+    }
+
+    QUrl helpUrl() const;
+    void setHelpUrl(const QUrl &url);
+
+private:
+    QString m_name;
+    QStringList m_argNames;
+    QUrl m_helpUrl;
+};
+
 class ApiTraceEvent
 {
 public:
@@ -181,8 +208,7 @@ Q_DECLARE_METATYPE(ApiTraceEvent*);
 class ApiTraceCall : public ApiTraceEvent
 {
 public:
-    ApiTraceCall();
-    ApiTraceCall(const Trace::Call *tcall);
+    ApiTraceCall(ApiTraceFrame *parentFrame, const Trace::Call *tcall);
     ~ApiTraceCall();
 
     int index() const;
@@ -209,26 +235,24 @@ public:
     ApiTrace *parentTrace() const;
 
     QString toHtml() const;
-    QString filterText() const;
+    QString searchText() const;
     QStaticText staticText() const;
     int numChildren() const;
     bool hasBinaryData() const;
     int binaryDataIndex() const;
 private:
     int m_index;
-    QString m_name;
-    QStringList m_argNames;
+    ApiTraceCallSignature *m_signature;
     QVariantList m_argValues;
     QVariant m_returnValue;
     ApiTraceFrame *m_parentFrame;
-    QUrl m_helpUrl;
 
     QVariantList m_editedValues;
 
     QString m_error;
 
     mutable QString m_richText;
-    mutable QString m_filterText;
+    mutable QString m_searchText;
     mutable bool m_hasBinaryData;
     mutable int m_binaryDataIndex;
 };
@@ -237,13 +261,12 @@ Q_DECLARE_METATYPE(ApiTraceCall*);
 class ApiTraceFrame : public ApiTraceEvent
 {
 public:
-    ApiTraceFrame();
+    ApiTraceFrame(ApiTrace *parent);
     int number;
 
     bool isEmpty() const;
 
     ApiTrace *parentTrace() const;
-    void setParentTrace(ApiTrace *trace);
 
     int numChildren() const;
     QStaticText staticText() const;