projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Apply option changes immediately, not on decode stack rebuild
[pulseview.git]
/
pv
/
devices
/
device.hpp
diff --git
a/pv/devices/device.hpp
b/pv/devices/device.hpp
index acc772ecc5eaab8aed2ccc746f0e9911cc42590b..fd78960c153f50917eb08fca0745e54186c104f2 100644
(file)
--- a/
pv/devices/device.hpp
+++ b/
pv/devices/device.hpp
@@
-14,8
+14,7
@@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#ifndef PULSEVIEW_PV_DEVICES_DEVICE_HPP
*/
#ifndef PULSEVIEW_PV_DEVICES_DEVICE_HPP
@@
-24,6
+23,9
@@
#include <memory>
#include <string>
#include <memory>
#include <string>
+using std::shared_ptr;
+using std::string;
+
namespace sigrok {
class ConfigKey;
class Device;
namespace sigrok {
class ConfigKey;
class Device;
@@
-39,14
+41,14
@@
namespace devices {
class Device
{
protected:
class Device
{
protected:
- Device();
+ Device()
= default
;
public:
virtual ~Device();
public:
virtual ~Device();
- s
td::s
hared_ptr<sigrok::Session> session() const;
+ shared_ptr<sigrok::Session> session() const;
- s
td::s
hared_ptr<sigrok::Device> device() const;
+ shared_ptr<sigrok::Device> device() const;
template<typename T>
T read_config(const sigrok::ConfigKey *key, const T default_value = 0);
template<typename T>
T read_config(const sigrok::ConfigKey *key, const T default_value = 0);
@@
-54,14
+56,14
@@
public:
/**
* Builds the full name. It only contains all the fields.
*/
/**
* Builds the full name. It only contains all the fields.
*/
- virtual st
d::st
ring full_name() const = 0;
+ virtual string full_name() const = 0;
/**
* Builds the display name. It only contains fields as required.
* @param device_manager a reference to the device manager is needed
* so that other similarly titled devices can be detected.
*/
/**
* Builds the display name. It only contains fields as required.
* @param device_manager a reference to the device manager is needed
* so that other similarly titled devices can be detected.
*/
- virtual st
d::st
ring display_name(
+ virtual string display_name(
const DeviceManager &device_manager) const = 0;
virtual void open() = 0;
const DeviceManager &device_manager) const = 0;
virtual void open() = 0;
@@
-75,8
+77,8
@@
public:
virtual void stop();
protected:
virtual void stop();
protected:
- s
td::s
hared_ptr<sigrok::Session> session_;
- s
td::s
hared_ptr<sigrok::Device> device_;
+ shared_ptr<sigrok::Session> session_;
+ shared_ptr<sigrok::Device> device_;
};
} // namespace devices
};
} // namespace devices