Avoid underscore suffix in member function names.

diff --git a/include/libsigrokflow/libsigrokflow.hpp b/include/libsigrokflow/libsigrokflow.hpp
index baa41f2af54c971830234bd0fcfea671eb727141..c51f9632e0aa431176769800b5ae3d261284a88a 100644 (file)
--- a/include/libsigrokflow/libsigrokflow.hpp
+++ b/include/libsigrokflow/libsigrokflow.hpp
@@ -103,9 +103,9 @@ private:
        Glib::RefPtr<Gst::Task> task_;
        shared_ptr<sigrok::Session> session_;
 
-       void datafeed_callback_(shared_ptr<sigrok::Device> device,
+       void datafeed_callback(shared_ptr<sigrok::Device> device,
                        shared_ptr<sigrok::Packet> packet);
-       void run_();
+       void run();
 };
 
 class LegacyInput :
@@ -144,7 +144,7 @@ private:
        Glib::RefPtr<Gst::Pad> sink_pad_;
        Glib::RefPtr<Gst::Pad> src_pad_;
 
-       void datafeed_callback_(shared_ptr<sigrok::Device> device,
+       void datafeed_callback(shared_ptr<sigrok::Device> device,
                        shared_ptr<sigrok::Packet> packet);
 };
 

diff --git a/src/legacy_capture_device.cpp b/src/legacy_capture_device.cpp
index 1a2cfa81a9d81a43ee23b3b28f50b6f5a915a997..2930ad5b70673a00f3f8e18ba39a5e2318436889 100644 (file)
--- a/src/legacy_capture_device.cpp
+++ b/src/legacy_capture_device.cpp
@@ -80,7 +80,7 @@ Gst::StateChangeReturn LegacyCaptureDevice::change_state_vfunc(Gst::StateChange
        case Gst::STATE_CHANGE_READY_TO_PAUSED:
                return Gst::StateChangeReturn::STATE_CHANGE_NO_PREROLL;
        case Gst::STATE_CHANGE_PAUSED_TO_PLAYING:
-               task_ = Gst::Task::create(std::bind(&LegacyCaptureDevice::run_, this));
+               task_ = Gst::Task::create(std::bind(&LegacyCaptureDevice::run, this));
                task_->set_lock(mutex_);
                src_pad_->set_active(true);
                task_->start();
@@ -90,7 +90,7 @@ Gst::StateChangeReturn LegacyCaptureDevice::change_state_vfunc(Gst::StateChange
        }
 }
 
-void LegacyCaptureDevice::datafeed_callback_(
+void LegacyCaptureDevice::datafeed_callback(
        shared_ptr<sigrok::Device> device,
        shared_ptr<sigrok::Packet> packet)
 {
@@ -119,11 +119,11 @@ void LegacyCaptureDevice::datafeed_callback_(
        }
 }
 
-void LegacyCaptureDevice::run_()
+void LegacyCaptureDevice::run()
 {
        session_ = libsigrok_device_->driver()->parent()->create_session();
        session_->add_device(libsigrok_device_);
-       session_->add_datafeed_callback(bind(&LegacyCaptureDevice::datafeed_callback_, this, _1, _2));
+       session_->add_datafeed_callback(bind(&LegacyCaptureDevice::datafeed_callback, this, _1, _2));
        session_->start();
        session_->run();
        task_->stop();

diff --git a/src/legacy_input.cpp b/src/legacy_input.cpp
index c29f12754a481f1d39b6b4e122dda0cf4819a286..67d0c9b7dc6b262c592c048fac6b43928b839b4e 100644 (file)
--- a/src/legacy_input.cpp
+++ b/src/legacy_input.cpp
@@ -85,13 +85,13 @@ bool LegacyInput::start_vfunc()
        auto context = libsigrok_input_format_->parent();
        session_ = context->create_session();
        session_->add_device(libsigrok_input_->device());
-       session_->add_datafeed_callback(bind(&LegacyInput::datafeed_callback_, this, _1, _2));
+       session_->add_datafeed_callback(bind(&LegacyInput::datafeed_callback, this, _1, _2));
        session_->start();
 
        return true;
 }
 
-void LegacyInput::datafeed_callback_(
+void LegacyInput::datafeed_callback(
        shared_ptr<sigrok::Device> device,
        shared_ptr<sigrok::Packet> packet)
 {