projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Trace: Removed coloured_bg state
[pulseview.git]
/
pv
/
devicemanager.cpp
diff --git
a/pv/devicemanager.cpp
b/pv/devicemanager.cpp
index 9e3944b5974e4ce5fa1dbd9c2d268c1ebb1e72bd..a51148b1d3ad2851a55888749312cb12b837e523 100644
(file)
--- a/
pv/devicemanager.cpp
+++ b/
pv/devicemanager.cpp
@@
-22,38
+22,29
@@
#include <cassert>
#include <functional>
#include <cassert>
#include <functional>
-#include <stdexcept>
#include <sstream>
#include <sstream>
+#include <stdexcept>
#include <string>
#include <string>
-#include <vector>
#include <libsigrokcxx/libsigrokcxx.hpp>
#include <libsigrokcxx/libsigrokcxx.hpp>
-#include <boost/algorithm/string/join.hpp>
#include <boost/filesystem.hpp>
#include <pv/devices/hardwaredevice.hpp>
#include <boost/filesystem.hpp>
#include <pv/devices/hardwaredevice.hpp>
-using boost::algorithm::join;
-
using std::bind;
using std::bind;
-using std::dynamic_pointer_cast;
using std::list;
using std::map;
using std::placeholders::_1;
using std::placeholders::_2;
using std::list;
using std::map;
using std::placeholders::_1;
using std::placeholders::_2;
-using std::remove_if;
-using std::runtime_error;
using std::shared_ptr;
using std::string;
using std::shared_ptr;
using std::string;
-using std::vector;
using Glib::VariantBase;
using sigrok::ConfigKey;
using sigrok::Context;
using sigrok::Driver;
using Glib::VariantBase;
using sigrok::ConfigKey;
using sigrok::Context;
using sigrok::Driver;
-using sigrok::SessionDevice;
namespace pv {
namespace pv {
@@
-64,7
+55,7
@@
DeviceManager::DeviceManager(shared_ptr<Context> context) :
driver_scan(entry.second, map<const ConfigKey *, VariantBase>());
}
driver_scan(entry.second, map<const ConfigKey *, VariantBase>());
}
-const s
td::s
hared_ptr<sigrok::Context>& DeviceManager::context() const
+const shared_ptr<sigrok::Context>& DeviceManager::context() const
{
return context_;
}
{
return context_;
}