X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fstoresession.h;h=8eaddaa60f50ebb3138870a6463d5937973d5e54;hb=8dbbc7f0b9ea59d0f0d62225772f8a56eee125f5;hp=262eddc1eff3a9ad92afef0d673aa85bcb94d5f2;hpb=b101c41ea084b6dbf5db173759d79f6ca0cb2454;p=pulseview.git

diff --git a/pv/storesession.h b/pv/storesession.h
index 262eddc..8eaddaa 100644
--- a/pv/storesession.h
+++ b/pv/storesession.h
@@ -30,6 +30,10 @@
 
 #include <QObject>
 
+namespace sigrok {
+class Output;
+}
+
 namespace pv {
 
 class SigSession;
@@ -51,7 +55,7 @@ public:
 
 	~StoreSession();
 
-	std::pair<uint64_t, uint64_t> progress() const;
+	std::pair<int, int> progress() const;
 
 	const QString& error() const;
 
@@ -64,21 +68,23 @@ public:
 private:
 	void store_proc(std::shared_ptr<pv::data::LogicSnapshot> snapshot);
 
-signals:
+Q_SIGNALS:
 	void progress_updated();
 
 private:
-	const std::string _file_name;
-	const SigSession &_session;
+	const std::string file_name_;
+	const SigSession &session_;
+
+	std::shared_ptr<sigrok::Output> output_;
 
-	std::thread _thread;
+	std::thread thread_;
 
-	std::atomic<bool> _interrupt;
+	std::atomic<bool> interrupt_;
 
-	std::atomic<uint64_t> _units_stored, _unit_count;
+	std::atomic<int> units_stored_, unit_count_;
 
-	mutable std::mutex _mutex;
-	QString _error;
+	mutable std::mutex mutex_;
+	QString error_;
 };
 
 } // pv