Trace: Renamed get_name() to name()

diff --git a/pv/popups/channels.cpp b/pv/popups/channels.cpp
index f93734a1f10ed71d372bbc741503502a22191126..f6b5aa14e99317cb6d08e35f70d265e4ea5a6927 100644 (file)
--- a/pv/popups/channels.cpp
+++ b/pv/popups/channels.cpp
@@ -183,7 +183,7 @@ QGridLayout* Channels::create_channel_group_grid(
        {
                assert(sig);
 
-               QCheckBox *const checkbox = new QCheckBox(sig->get_name());
+               QCheckBox *const checkbox = new QCheckBox(sig->name());
                _check_box_mapper.setMapping(checkbox, checkbox);
                connect(checkbox, SIGNAL(toggled(bool)),
                        &_check_box_mapper, SLOT(map()));

diff --git a/pv/sigsession.cpp b/pv/sigsession.cpp
index 4f26842f5b8c89c1a8e16bc47d7f12e1753271be..d1f3a6062cde8b02f881bd9ffa33972edd39b5ef 100644 (file)
--- a/pv/sigsession.cpp
+++ b/pv/sigsession.cpp
@@ -274,7 +274,7 @@ bool SigSession::add_decoder(srd_decoder *const dec)
                                        dynamic_pointer_cast<view::LogicSignal>(s);
                                if (l && QString::fromUtf8(pdch->name).
                                        toLower().contains(
-                                       l->get_name().toLower()))
+                                       l->name().toLower()))
                                        channels[pdch] = l;
                        }
 

diff --git a/pv/view/decodetrace.cpp b/pv/view/decodetrace.cpp
index 2773297197fa304e9561e6bb0ab009b9421a378f..ae2ec16287b561e775b595e35a622ab17e105fbd 100644 (file)
--- a/pv/view/decodetrace.cpp
+++ b/pv/view/decodetrace.cpp
@@ -702,7 +702,7 @@ QComboBox* DecodeTrace::create_channel_selector(
 
                if (dynamic_pointer_cast<LogicSignal>(s) && s->enabled())
                {
-                       selector->addItem(s->get_name(),
+                       selector->addItem(s->name(),
                                qVariantFromValue((void*)s.get()));
                        if ((*channel_iter).second == s)
                                selector->setCurrentIndex(i + 1);

diff --git a/pv/view/trace.cpp b/pv/view/trace.cpp
index aba51510db59ad964d9f4213b994c05caf5275d8..367891a22c67e72b21a68057ba553c9d0ba50e7a 100644 (file)
--- a/pv/view/trace.cpp
+++ b/pv/view/trace.cpp
@@ -48,7 +48,7 @@ Trace::Trace(QString name) :
 {
 }
 
-QString Trace::get_name() const
+QString Trace::name() const
 {
        return _name;
 }

diff --git a/pv/view/trace.h b/pv/view/trace.h
index ef327edb29a0207fb660c7b915f46b23487573f9..7cfa3c2e0681c76663319939f246f983f8a2c31f 100644 (file)
--- a/pv/view/trace.h
+++ b/pv/view/trace.h
@@ -56,7 +56,7 @@ public:
        /**
         * Gets the name of this signal.
         */
-       QString get_name() const;
+       QString name() const;
 
        /**
         * Sets the name of the signal.