Merge branch 'master' into on-demand-loading

[apitrace] / gui / apitrace.h

diff --git a/gui/apitrace.h b/gui/apitrace.h
index a493fd2eb1e23beea9ef62b68c9b234747130887..d52c669928aeac70654bf3c9a48be89fbaa04698 100644 (file)
--- a/gui/apitrace.h
+++ b/gui/apitrace.h
@@ -52,6 +52,8 @@ public:
 
     bool isSaving() const;
 
+    bool hasErrors() const;
+
 public slots:
     void setFileName(const QString &name);
     void setFrameMarker(FrameMarker marker);
@@ -66,7 +68,8 @@ signals:
     void startedSaving();
     void saved();
 
-    void framesAdded(int oldCount, int numAdded);
+    void beginAddingFrames(int oldCount, int numAdded);
+    void endAddingFrames();
     void callsAdded(int oldCount, int numAdded);
 
 private slots:
@@ -89,6 +92,8 @@ private:
     QSet<ApiTraceCall*> m_editedCalls;
 
     bool m_needsSaving;
+
+    QSet<ApiTraceCall*> m_errors;
 };
 
 #endif