projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't use std:: in the code directly (where possible).
[pulseview.git]
/
pv
/
data
/
signalbase.hpp
diff --git
a/pv/data/signalbase.hpp
b/pv/data/signalbase.hpp
index 54d9ee0adc2d337a87e9b3195a5223099e46e4c6..8b60c36688dcf6f1665ae8c4c7745bb4b60bcc90 100644
(file)
--- a/
pv/data/signalbase.hpp
+++ b/
pv/data/signalbase.hpp
@@
-15,8
+15,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_DATA_SIGNALBASE_HPP
*/
#ifndef PULSEVIEW_PV_DATA_SIGNALBASE_HPP
@@
-29,6
+28,7
@@
#include <libsigrokcxx/libsigrokcxx.hpp>
#include <libsigrokcxx/libsigrokcxx.hpp>
+using std::shared_ptr;
namespace sigrok {
class Channel;
namespace sigrok {
class Channel;
@@
-51,14
+51,14
@@
private:
static const int ColourBGAlpha;
public:
static const int ColourBGAlpha;
public:
- SignalBase(s
td::s
hared_ptr<sigrok::Channel> channel);
+ SignalBase(shared_ptr<sigrok::Channel> channel);
virtual ~SignalBase() {}
public:
/**
* Returns the underlying SR channel.
*/
virtual ~SignalBase() {}
public:
/**
* Returns the underlying SR channel.
*/
- s
td::s
hared_ptr<sigrok::Channel> channel() const;
+ shared_ptr<sigrok::Channel> channel() const;
/**
* Returns enabled status of this channel.
/**
* Returns enabled status of this channel.
@@
-114,25
+114,24
@@
public:
/**
* Sets the internal data object.
*/
/**
* Sets the internal data object.
*/
- void set_data(s
td::s
hared_ptr<pv::data::SignalData> data);
+ void set_data(shared_ptr<pv::data::SignalData> data);
/**
* Get the internal data as analog data object in case of analog type.
*/
/**
* Get the internal data as analog data object in case of analog type.
*/
- s
td::s
hared_ptr<pv::data::Analog> analog_data() const;
+ shared_ptr<pv::data::Analog> analog_data() const;
/**
* Get the internal data as logic data object in case of logic type.
*/
/**
* Get the internal data as logic data object in case of logic type.
*/
- s
td::s
hared_ptr<pv::data::Logic> logic_data() const;
+ shared_ptr<pv::data::Logic> logic_data() const;
#ifdef ENABLE_DECODE
bool is_decode_signal() const;
#ifdef ENABLE_DECODE
bool is_decode_signal() const;
- s
td::s
hared_ptr<pv::data::DecoderStack> decoder_stack() const;
+ shared_ptr<pv::data::DecoderStack> decoder_stack() const;
- void set_decoder_stack(std::shared_ptr<pv::data::DecoderStack>
- decoder_stack);
+ void set_decoder_stack(shared_ptr<pv::data::DecoderStack> decoder_stack);
#endif
void save_settings(QSettings &settings) const;
#endif
void save_settings(QSettings &settings) const;
@@
-147,11
+146,11
@@
Q_SIGNALS:
void colour_changed(const QColor &colour);
private:
void colour_changed(const QColor &colour);
private:
- s
td::s
hared_ptr<sigrok::Channel> channel_;
- s
td::s
hared_ptr<pv::data::SignalData> data_;
+ shared_ptr<sigrok::Channel> channel_;
+ shared_ptr<pv::data::SignalData> data_;
#ifdef ENABLE_DECODE
#ifdef ENABLE_DECODE
- s
td::s
hared_ptr<pv::data::DecoderStack> decoder_stack_;
+ shared_ptr<pv::data::DecoderStack> decoder_stack_;
#endif
QString internal_name_, name_;
#endif
QString internal_name_, name_;