X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdata%2Fsignalbase.hpp;h=8b60c36688dcf6f1665ae8c4c7745bb4b60bcc90;hp=6667dd76847cab8ce3235c99d6ec19deb73544fb;hb=6f925ba9d6faf1077b73c5a5808259576081716a;hpb=efdec55aec1a137460fa362a381ed1904182bfed diff --git a/pv/data/signalbase.hpp b/pv/data/signalbase.hpp index 6667dd7..8b60c36 100644 --- a/pv/data/signalbase.hpp +++ b/pv/data/signalbase.hpp @@ -28,6 +28,7 @@ #include +using std::shared_ptr; namespace sigrok { class Channel; @@ -50,14 +51,14 @@ private: static const int ColourBGAlpha; public: - SignalBase(std::shared_ptr channel); + SignalBase(shared_ptr channel); virtual ~SignalBase() {} public: /** * Returns the underlying SR channel. */ - std::shared_ptr channel() const; + shared_ptr channel() const; /** * Returns enabled status of this channel. @@ -113,25 +114,24 @@ public: /** * Sets the internal data object. */ - void set_data(std::shared_ptr data); + void set_data(shared_ptr data); /** * Get the internal data as analog data object in case of analog type. */ - std::shared_ptr analog_data() const; + shared_ptr analog_data() const; /** * Get the internal data as logic data object in case of logic type. */ - std::shared_ptr logic_data() const; + shared_ptr logic_data() const; #ifdef ENABLE_DECODE bool is_decode_signal() const; - std::shared_ptr decoder_stack() const; + shared_ptr decoder_stack() const; - void set_decoder_stack(std::shared_ptr - decoder_stack); + void set_decoder_stack(shared_ptr decoder_stack); #endif void save_settings(QSettings &settings) const; @@ -146,11 +146,11 @@ Q_SIGNALS: void colour_changed(const QColor &colour); private: - std::shared_ptr channel_; - std::shared_ptr data_; + shared_ptr channel_; + shared_ptr data_; #ifdef ENABLE_DECODE - std::shared_ptr decoder_stack_; + shared_ptr decoder_stack_; #endif QString internal_name_, name_;