Delete loadertest and cleanup some of the new api.

[apitrace] / gui / apitrace.h

diff --git a/gui/apitrace.h b/gui/apitrace.h
index 3edffef700d573c87a5b2386b860b834bc04fd3a..bf90d17daf5577a656893726579f4b3049259fe0 100644 (file)
--- a/gui/apitrace.h
+++ b/gui/apitrace.h
@@ -21,9 +21,9 @@ public:
         FrameMarker_Clear
     };
     enum SearchResult {
-        SearchNotFound,
-        SearchFound,
-        SearchWrapped
+        SearchResult_NotFound,
+        SearchResult_Found,
+        SearchResult_Wrapped
     };
 
     static bool isCallAFrameMarker(const ApiTraceCall *call,
@@ -40,9 +40,7 @@ public:
 
     ApiTraceState defaultState() const;
 
-    QVector<ApiTraceCall*> calls() const;
     ApiTraceCall *callWithIndex(int idx) const;
-    int numCalls() const;
 
     QList<ApiTraceFrame*> frames() const;
     ApiTraceFrame *frameAt(int idx) const;
@@ -62,7 +60,6 @@ public:
 
 public slots:
     void setFileName(const QString &name);
-    void setFrameMarker(FrameMarker marker);
     void save();
     void loadFrame(ApiTraceFrame *frame);
     void findNext(ApiTraceFrame *frame,
@@ -73,6 +70,10 @@ public slots:
                   ApiTraceCall *call,
                   const QString &str,
                   Qt::CaseSensitivity sensitivity);
+    void findFrameStart(ApiTraceFrame *frame);
+    void findFrameEnd(ApiTraceFrame *frame);
+    void findCallIndex(int index);
+    void setCallError(const ApiTraceError &error);
 
 
 signals:
@@ -91,10 +92,11 @@ signals:
 
     void beginAddingFrames(int oldCount, int numAdded);
     void endAddingFrames();
-    void callsAdded(int oldCount, int numAdded);
     void beginLoadingFrame(ApiTraceFrame *frame, int numAdded);
     void endLoadingFrame(ApiTraceFrame *frame);
-
+    void foundFrameStart(ApiTraceFrame *frame);
+    void foundFrameEnd(ApiTraceFrame *frame);
+    void foundCallIndex(ApiTraceCall *call);
 
 signals:
     void loaderSearchNext(int startFrame,
@@ -103,6 +105,9 @@ signals:
     void loaderSearchPrev(int startFrame,
                           const QString &str,
                           Qt::CaseSensitivity sensitivity);
+    void loaderFindFrameStart(ApiTraceFrame *frame);
+    void loaderFindFrameEnd(ApiTraceFrame *frame);
+    void loaderFindCallIndex(int index);
 
 private slots:
     void addFrames(const QList<ApiTraceFrame*> &frames);
@@ -115,7 +120,7 @@ private slots:
                             ApiTraceCall *call);
 
 private:
-    void detectFrames();
+    int callInFrame(int callIdx) const;
 private:
     QString m_fileName;
     QString m_tempFileName;
@@ -134,6 +139,7 @@ private:
     bool m_needsSaving;
 
     QSet<ApiTraceCall*> m_errors;
+    QList< QPair<ApiTraceFrame*, ApiTraceError> > m_queuedErrors;
 };
 
 #endif