projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use device::Devices to represent sigrok Devices
[pulseview.git]
/
pv
/
widgets
/
devicetoolbutton.hpp
diff --git
a/pv/widgets/devicetoolbutton.hpp
b/pv/widgets/devicetoolbutton.hpp
index af9e6e686da2a0dfe5662adf3a48d6d4b52b976e..ed69a4b64a4ef1b0209daf004f2192117a9af8c6 100644
(file)
--- a/
pv/widgets/devicetoolbutton.hpp
+++ b/
pv/widgets/devicetoolbutton.hpp
@@
-32,14
+32,14
@@
struct srd_decoder;
struct srd_decoder;
-namespace sigrok {
-class Device;
-}
-
namespace pv {
class DeviceManager;
namespace pv {
class DeviceManager;
+namespace devices {
+class Device;
+}
+
namespace widgets {
class DeviceToolButton : public QToolButton
namespace widgets {
class DeviceToolButton : public QToolButton
@@
-59,7
+59,7
@@
public:
/**
* Returns a reference to the selected device.
*/
/**
* Returns a reference to the selected device.
*/
- std::shared_ptr<
sigrok
::Device> selected_device();
+ std::shared_ptr<
devices
::Device> selected_device();
/**
* Sets the current list of devices.
/**
* Sets the current list of devices.
@@
-67,8
+67,8
@@
public:
* @param selected_device the currently active device.
*/
void set_device_list(
* @param selected_device the currently active device.
*/
void set_device_list(
- const std::list< std::shared_ptr<
sigrok
::Device> > &devices,
- std::shared_ptr<
sigrok
::Device> selected);
+ const std::list< std::shared_ptr<
devices
::Device> > &devices,
+ std::shared_ptr<
devices
::Device> selected);
private:
/**
private:
/**
@@
-93,8
+93,8
@@
private:
QMenu menu_;
QSignalMapper mapper_;
QMenu menu_;
QSignalMapper mapper_;
- std::shared_ptr<
sigrok
::Device> selected_device_;
- std::vector< std::weak_ptr<
sigrok
::Device> > devices_;
+ std::shared_ptr<
devices
::Device> selected_device_;
+ std::vector< std::weak_ptr<
devices
::Device> > devices_;
QString device_tooltip_;
};
QString device_tooltip_;
};