From d755562ad376fc95184ff996ff8f1391c5f32b6b Mon Sep 17 00:00:00 2001 From: Joel Holdsworth Date: Sun, 27 Jan 2013 09:43:57 +0000 Subject: [PATCH] Renamed pv::dialogs::HwCap to DeviceOptions --- CMakeLists.txt | 2 +- pv/dialogs/{hwcap.cpp => deviceoptions.cpp} | 6 +++--- pv/dialogs/{hwcap.h => deviceoptions.h} | 10 +++++----- pv/samplingbar.cpp | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) rename pv/dialogs/{hwcap.cpp => deviceoptions.cpp} (91%) rename pv/dialogs/{hwcap.h => deviceoptions.h} (85%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8dd7c259..c1d0eed0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -100,7 +100,7 @@ set(pulseview_SOURCES pv/data/signaldata.cpp pv/data/snapshot.cpp pv/dialogs/about.cpp - pv/dialogs/hwcap.cpp + pv/dialogs/deviceoptions.cpp pv/prop/enum.cpp pv/prop/property.cpp pv/prop/binding/binding.cpp diff --git a/pv/dialogs/hwcap.cpp b/pv/dialogs/deviceoptions.cpp similarity index 91% rename from pv/dialogs/hwcap.cpp rename to pv/dialogs/deviceoptions.cpp index f3b9400a..b8f4cabf 100644 --- a/pv/dialogs/hwcap.cpp +++ b/pv/dialogs/deviceoptions.cpp @@ -18,12 +18,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "hwcap.h" +#include "deviceoptions.h" namespace pv { namespace dialogs { -HwCap::HwCap(QWidget *parent, struct sr_dev_inst *sdi) : +DeviceOptions::DeviceOptions(QWidget *parent, struct sr_dev_inst *sdi) : QDialog(parent), _layout(this), _button_box(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, @@ -43,7 +43,7 @@ HwCap::HwCap(QWidget *parent, struct sr_dev_inst *sdi) : _layout.addWidget(&_button_box); } -void HwCap::accept() +void DeviceOptions::accept() { QDialog::accept(); _device_options_binding.commit(); diff --git a/pv/dialogs/hwcap.h b/pv/dialogs/deviceoptions.h similarity index 85% rename from pv/dialogs/hwcap.h rename to pv/dialogs/deviceoptions.h index 692b743e..20f6b6b6 100644 --- a/pv/dialogs/hwcap.h +++ b/pv/dialogs/deviceoptions.h @@ -18,8 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef PULSEVIEW_PV_HWCAP_H -#define PULSEVIEW_PV_HWCAP_H +#ifndef PULSEVIEW_PV_DEVICEOPTIONS_H +#define PULSEVIEW_PV_DEVICEOPTIONS_H #include #include @@ -30,10 +30,10 @@ namespace pv { namespace dialogs { -class HwCap : public QDialog +class DeviceOptions : public QDialog { public: - HwCap(QWidget *parent, struct sr_dev_inst *sdi); + DeviceOptions(QWidget *parent, struct sr_dev_inst *sdi); protected: void accept(); @@ -48,4 +48,4 @@ private: } // namespace dialogs } // namespace pv -#endif // PULSEVIEW_PV_HWCAP_H +#endif // PULSEVIEW_PV_DEVICEOPTIONS_H diff --git a/pv/samplingbar.cpp b/pv/samplingbar.cpp index 7bc207ae..6195d899 100644 --- a/pv/samplingbar.cpp +++ b/pv/samplingbar.cpp @@ -30,7 +30,7 @@ extern "C" { #include "samplingbar.h" -#include +#include namespace pv { @@ -214,7 +214,7 @@ void SamplingBar::configure() sr_dev_inst *const sdi = get_selected_device(); assert(sdi); - pv::dialogs::HwCap dlg(this, sdi); + pv::dialogs::DeviceOptions dlg(this, sdi); dlg.exec(); } -- 2.30.2