projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make member variable underscores a suffix instead of a prefix
[pulseview.git]
/
pv
/
storesession.h
diff --git
a/pv/storesession.h
b/pv/storesession.h
index 4c9eae0160d7588a3543062528610d775dea0d3c..8eaddaa60f50ebb3138870a6463d5937973d5e54 100644
(file)
--- a/
pv/storesession.h
+++ b/
pv/storesession.h
@@
-30,6
+30,10
@@
#include <QObject>
#include <QObject>
+namespace sigrok {
+class Output;
+}
+
namespace pv {
class SigSession;
namespace pv {
class SigSession;
@@
-51,7
+55,7
@@
public:
~StoreSession();
~StoreSession();
- std::pair<
uint64_t, uint64_
t> progress() const;
+ std::pair<
int, in
t> progress() const;
const QString& error() const;
const QString& error() const;
@@
-64,21
+68,23
@@
public:
private:
void store_proc(std::shared_ptr<pv::data::LogicSnapshot> snapshot);
private:
void store_proc(std::shared_ptr<pv::data::LogicSnapshot> snapshot);
-
signals
:
+
Q_SIGNALS
:
void progress_updated();
private:
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<
int> units_stored_, unit_count_
;
- mutable std::mutex _mutex;
- uint64_t _units_stored;
- uint64_t _unit_count;
- QString _error;
+ mutable std::mutex mutex_;
+ QString error_;
};
} // pv
};
} // pv