projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Generic auto-focusing for first line edit of popup
[pulseview.git]
/
pv
/
storesession.h
diff --git
a/pv/storesession.h
b/pv/storesession.h
index e543df13051eae592a8617a36e93e79f9b2763bc..83664274b553348ddc459e3a7101762f40a659a5 100644
(file)
--- a/
pv/storesession.h
+++ b/
pv/storesession.h
@@
-23,9
+23,10
@@
#include <stdint.h>
#include <stdint.h>
+#include <atomic>
+#include <mutex>
#include <string>
#include <string>
-
-#include <boost/thread.hpp>
+#include <thread>
#include <QObject>
#include <QObject>
@@
-50,7
+51,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;
@@
-63,18
+64,20
@@
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:
const std::string _file_name;
const SigSession &_session;
void progress_updated();
private:
const std::string _file_name;
const SigSession &_session;
- boost::thread _thread;
+ std::thread _thread;
+
+ std::atomic<bool> _interrupt;
+
+ std::atomic<int> _units_stored, _unit_count;
- mutable boost::mutex _mutex;
- uint64_t _units_stored;
- uint64_t _unit_count;
+ mutable std::mutex _mutex;
QString _error;
};
QString _error;
};