projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move trace view files
[pulseview.git]
/
pv
/
widgets
/
devicetoolbutton.hpp
diff --git
a/pv/widgets/devicetoolbutton.hpp
b/pv/widgets/devicetoolbutton.hpp
index cedf49e78386d58482e42b6ac98c439ab89c5b98..ee7b12ae81aaeed1decbb3f90c502ad7c675e28b 100644
(file)
--- a/
pv/widgets/devicetoolbutton.hpp
+++ b/
pv/widgets/devicetoolbutton.hpp
@@
-29,6
+29,11
@@
#include <QSignalMapper>
#include <QToolButton>
#include <QSignalMapper>
#include <QToolButton>
+using std::list;
+using std::shared_ptr;
+using std::vector;
+using std::weak_ptr;
+
struct srd_decoder;
namespace pv {
struct srd_decoder;
namespace pv {
@@
-58,7
+63,7
@@
public:
/**
* Returns a reference to the selected device.
*/
/**
* Returns a reference to the selected device.
*/
- s
td::s
hared_ptr<devices::Device> selected_device();
+ shared_ptr<devices::Device> selected_device();
/**
* Sets the current list of devices.
/**
* Sets the current list of devices.
@@
-66,8
+71,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<devices::Device> > &devices,
- s
td::s
hared_ptr<devices::Device> selected);
+ const
list<
shared_ptr<devices::Device> > &devices,
+ shared_ptr<devices::Device> selected);
/**
* Sets the current device to "no device". Useful for when a selected
/**
* Sets the current device to "no device". Useful for when a selected
@@
-98,13
+103,13
@@
private:
QMenu menu_;
QSignalMapper mapper_;
QMenu menu_;
QSignalMapper mapper_;
- s
td::s
hared_ptr<devices::Device> selected_device_;
-
std::vector< std::
weak_ptr<devices::Device> > devices_;
+ shared_ptr<devices::Device> selected_device_;
+
vector<
weak_ptr<devices::Device> > devices_;
QString device_tooltip_;
};
QString device_tooltip_;
};
-}
//
widgets
-}
//
pv
+}
// namespace
widgets
+}
// namespace
pv
#endif // PULSEVIEW_PV_WIDGETS_DEVICETOOLBUTTON_HPP
#endif // PULSEVIEW_PV_WIDGETS_DEVICETOOLBUTTON_HPP