Merge branch 'master' into d3dretrace

[apitrace] / gui / mainwindow.h

diff --git a/gui/mainwindow.h b/gui/mainwindow.h
index 644f14e7c085cdb54af8aee3866b013414fa4a54..66be2e20d88692802fe31c5952947077db237747 100644 (file)
--- a/gui/mainwindow.h
+++ b/gui/mainwindow.h
@@ -3,6 +3,7 @@
 
 #include "ui_mainwindow.h"
 
+#include "trace_api.hpp"
 #include "apitrace.h"
 
 #include <QMainWindow>
@@ -40,6 +41,7 @@ public slots:
 
 private slots:
     void callItemSelected(const QModelIndex &index);
+    void callItemActivated(const QModelIndex &index);
     void createTrace();
     void openTrace();
     void replayStart();
@@ -101,6 +103,8 @@ private:
     Ui_MainWindow m_ui;
     ShadersSourceWidget *m_sourcesWidget;
 
+    trace::API m_api;
+
     ApiTrace *m_trace;
     ApiTraceModel *m_model;
     ApiTraceFilter *m_proxyModel;