Encapsulate on parser state in structure.

[apitrace] / gui / apitrace.h

diff --git a/gui/apitrace.h b/gui/apitrace.h
index ba8e11b0243681b3848561cb250ffa4ca73591cc..d01e7a0cfd81f3770d4157823eca0de538e7495c 100644 (file)
--- a/gui/apitrace.h
+++ b/gui/apitrace.h
@@ -6,8 +6,9 @@
 #include <QObject>
 #include <QSet>
 
-class LoaderThread;
+class TraceLoader;
 class SaverThread;
+class QThread;
 
 class ApiTrace : public QObject
 {
@@ -33,11 +34,7 @@ public:
 
     ApiTraceState defaultState() const;
 
-    ApiTraceCallSignature *signature(unsigned id);
-    void addSignature(unsigned id, ApiTraceCallSignature *signature);
-
-    QList<ApiTraceCall*> calls() const;
-    ApiTraceCall *callAt(int idx) const;
+    QVector<ApiTraceCall*> calls() const;
     ApiTraceCall *callWithIndex(int idx) const;
     int numCalls() const;
 
@@ -61,9 +58,13 @@ public slots:
     void setFileName(const QString &name);
     void setFrameMarker(FrameMarker marker);
     void save();
+    void loadFrame(ApiTraceFrame *frame);
 
 signals:
+    void loadTrace(const QString &name);
+    void requestFrame(ApiTraceFrame *frame);
     void startedLoadingTrace();
+    void loaded(int percent);
     void finishedLoadingTrace();
     void invalidated();
     void framesInvalidated();
@@ -74,10 +75,15 @@ 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);
 
 private slots:
     void addFrames(const QList<ApiTraceFrame*> &frames);
     void slotSaved();
+    void finishedParsing();
+    void frameLoadFinished(ApiTraceFrame *frame);
+
 private:
     void detectFrames();
 private:
@@ -85,11 +91,12 @@ private:
     QString m_tempFileName;
 
     QList<ApiTraceFrame*> m_frames;
-    QList<ApiTraceCall*> m_calls;
+    QVector<ApiTraceCall*> m_calls;
 
     FrameMarker m_frameMarker;
 
-    LoaderThread *m_loader;
+    TraceLoader *m_loader;
+    QThread     *m_loaderThread;
     SaverThread  *m_saver;
 
     QSet<ApiTraceCall*> m_editedCalls;
@@ -97,7 +104,6 @@ private:
     bool m_needsSaving;
 
     QSet<ApiTraceCall*> m_errors;
-    QVector<ApiTraceCallSignature*> m_signatures;
 };
 
 #endif