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 ffe1facd742c9b5a194ed4bb75fc2e69f4e4b40e..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;
@@
-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
;
+ std::atomic<int>
units_stored_, unit_count_
;
- mutable std::mutex
_mutex
;
- QString
_error
;
+ mutable std::mutex
mutex_
;
+ QString
error_
;
};
} // pv
};
} // pv