Renamed SamplingBar::configure to on_configure

diff --git a/pv/toolbars/samplingbar.cpp b/pv/toolbars/samplingbar.cpp
index aa43f9c9526cf2dfa2d859cc22f95e307a5cb8f7..c35faadad49f5773a179810165bc8b5e8dda4013 100644 (file)
--- a/pv/toolbars/samplingbar.cpp
+++ b/pv/toolbars/samplingbar.cpp
@@ -76,7 +76,7 @@ SamplingBar::SamplingBar(QWidget *parent) :
        connect(&_device_selector, SIGNAL(currentIndexChanged (int)),
                this, SLOT(on_device_selected()));
        connect(&_configure_button, SIGNAL(clicked()),
        connect(&_device_selector, SIGNAL(currentIndexChanged (int)),
                this, SLOT(on_device_selected()));
        connect(&_configure_button, SIGNAL(clicked()),

-               this, SLOT(configure()));
+               this, SLOT(on_configure()));

 
        _sample_rate_value.setDecimals(0);
        _sample_rate_value.setSuffix("Hz");
 
        _sample_rate_value.setDecimals(0);
        _sample_rate_value.setSuffix("Hz");


@@ -290,7 +290,7 @@ void SamplingBar::on_sample_rate_changed()
        commit_sample_rate();
 }
 
        commit_sample_rate();
 }
 

-void SamplingBar::configure()
+void SamplingBar::on_configure()

 {
        commit_sample_rate();
 
 {
        commit_sample_rate();
 

diff --git a/pv/toolbars/samplingbar.h b/pv/toolbars/samplingbar.h
index 3502e25b8fa6655d3a1f8dff83a12a29f7422ac8..d7ad4f2f604107c50b783ab22cb6e545826f11cc 100644 (file)
--- a/pv/toolbars/samplingbar.h
+++ b/pv/toolbars/samplingbar.h
@@ -67,7 +67,7 @@ private:
 private slots:
        void on_device_selected();
        void on_sample_rate_changed();
 private slots:
        void on_device_selected();
        void on_sample_rate_changed();

-       void configure();
+       void on_configure();

 
 private:
        QComboBox _device_selector;
 
 private:
        QComboBox _device_selector;