projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove unused "using" declarations.
[pulseview.git]
/
pv
/
storesession.cpp
diff --git
a/pv/storesession.cpp
b/pv/storesession.cpp
index c2135ab3383564b007c70c3484d0d59155b4eaeb..8916cb8cd154e078837cef5174813e8e4bd38d1c 100644
(file)
--- a/
pv/storesession.cpp
+++ b/
pv/storesession.cpp
@@
-24,8
+24,6
@@
#define NOGDI
#define NORESOURCE
#endif
#define NOGDI
#define NORESOURCE
#endif
-#include <boost/thread/locks.hpp>
-#include <boost/thread/shared_mutex.hpp>
#include "storesession.hpp"
#include "storesession.hpp"
@@
-40,11
+38,7
@@
#include <libsigrokcxx/libsigrokcxx.hpp>
#include <libsigrokcxx/libsigrokcxx.hpp>
-using boost::shared_lock;
-using boost::shared_mutex;
-
using std::deque;
using std::deque;
-using std::dynamic_pointer_cast;
using std::ios_base;
using std::lock_guard;
using std::make_pair;
using std::ios_base;
using std::lock_guard;
using std::make_pair;
@@
-52,7
+46,6
@@
using std::map;
using std::min;
using std::mutex;
using std::pair;
using std::min;
using std::mutex;
using std::pair;
-using std::set;
using std::shared_ptr;
using std::string;
using std::unordered_set;
using std::shared_ptr;
using std::string;
using std::unordered_set;
@@
-60,7
+53,6
@@
using std::vector;
using Glib::VariantBase;
using Glib::VariantBase;
-using sigrok::ChannelType;
using sigrok::ConfigKey;
using sigrok::Error;
using sigrok::OutputFormat;
using sigrok::ConfigKey;
using sigrok::Error;
using sigrok::OutputFormat;
@@
-115,7
+107,7
@@
bool StoreSession::start()
if (!signal->enabled())
continue;
if (!signal->enabled())
continue;
- if (signal->type() ==
ChannelType::LOGIC
) {
+ if (signal->type() ==
data::SignalBase::LogicChannel
) {
// All logic channels share the same data segments
shared_ptr<data::Logic> ldata = signal->logic_data();
// All logic channels share the same data segments
shared_ptr<data::Logic> ldata = signal->logic_data();
@@
-131,7
+123,7
@@
bool StoreSession::start()
any_segment = lsegment;
}
any_segment = lsegment;
}
- if (signal->type() ==
ChannelType::ANALOG
) {
+ if (signal->type() ==
data::SignalBase::AnalogChannel
) {
// Each analog channel has its own segments
shared_ptr<data::Analog> adata = signal->analog_data();
// Each analog channel has its own segments
shared_ptr<data::Analog> adata = signal->analog_data();