Use the 'default' keyword where applicable. This patch

 was initially created using clang-tidy:

  clang-tidy -checks="-*,moderize-use-default" -fix

However, the resulting patch only wanted to alter the
definitions in the .cpp file. I think it makes more
sense to remove the definitions completely and just
add "= default" to the declarations in the header file.

diff --git a/pv/data/signaldata.cpp b/pv/data/signaldata.cpp
index 6a4c6d926bf6e3d071d03b24515aaf63ed916c65..6baeac7c6f16e2c9a8a24c0e9cf6cc4dbf73ba4c 100644 (file)
--- a/pv/data/signaldata.cpp
+++ b/pv/data/signaldata.cpp
@@ -23,9 +23,5 @@
 namespace pv {
 namespace data {
 
-SignalData::SignalData()
-{
-}
-
 } // namespace data
 } // namespace pv

diff --git a/pv/data/signaldata.hpp b/pv/data/signaldata.hpp
index ff30cf1a0eee15a33e2c9ca269f89d5e729755c9..4b356100e3642a966526e200db7497166a280355 100644 (file)
--- a/pv/data/signaldata.hpp
+++ b/pv/data/signaldata.hpp
@@ -33,7 +33,7 @@ class Segment;
 class SignalData
 {
 public:
-       SignalData();
+       SignalData() = default;
        virtual ~SignalData() {}
 
 public:

diff --git a/pv/devicemanager.cpp b/pv/devicemanager.cpp
index b11e60c7705a3c89f137047d903b164de08521c1..41f2ae9c5f5bc6346aff24b895062d1e8d51ae53 100644 (file)
--- a/pv/devicemanager.cpp
+++ b/pv/devicemanager.cpp
@@ -65,10 +65,6 @@ DeviceManager::DeviceManager(shared_ptr<Context> context) :
                driver_scan(entry.second, map<const ConfigKey *, VariantBase>());
 }
 
-DeviceManager::~DeviceManager()
-{
-}
-
 const std::shared_ptr<sigrok::Context>& DeviceManager::context() const
 {
        return context_;

diff --git a/pv/devicemanager.hpp b/pv/devicemanager.hpp
index 33e784de5f564f9c35968806e274e12da528b423..d0d11cbd4d7095bcf7f1b3fede305bd83a8a711e 100644 (file)
--- a/pv/devicemanager.hpp
+++ b/pv/devicemanager.hpp
@@ -50,7 +50,7 @@ class DeviceManager
 public:
        DeviceManager(std::shared_ptr<sigrok::Context> context);
 
-       ~DeviceManager();
+       ~DeviceManager() = default;
 
        const std::shared_ptr<sigrok::Context>& context() const;
 

diff --git a/pv/prop/bool.cpp b/pv/prop/bool.cpp
index 3e201cc4c6a1ffc8bdec2b940a8686fef9dc5e94..3281de78cbf90841e7480c238fa8781ebeef9c36 100644 (file)
--- a/pv/prop/bool.cpp
+++ b/pv/prop/bool.cpp
@@ -33,10 +33,6 @@ Bool::Bool(QString name, Getter getter, Setter setter) :
 {
 }
 
-Bool::~Bool()
-{
-}
-
 QWidget* Bool::get_widget(QWidget *parent, bool auto_commit)
 {
        if (check_box_)

diff --git a/pv/prop/bool.hpp b/pv/prop/bool.hpp
index 6d32da7ef1f05286f534123c498a81f975ae2d8f..dada54dbf4816ceb71c81af36393257ab7180f6f 100644 (file)
--- a/pv/prop/bool.hpp
+++ b/pv/prop/bool.hpp
@@ -35,7 +35,7 @@ class Bool : public Property
 public:
        Bool(QString name, Getter getter, Setter setter);
 
-       virtual ~Bool();
+       virtual ~Bool() = default;
 
        QWidget* get_widget(QWidget *parent, bool auto_commit);
        bool labeled_widget() const;

diff --git a/pv/prop/double.cpp b/pv/prop/double.cpp
index c5ab1db4e28b5a83b98f33f030fc0124b4bef727..f4e6e443a5bb6f2e7dcf27fe29053f6daed50090 100644 (file)
--- a/pv/prop/double.cpp
+++ b/pv/prop/double.cpp
@@ -46,10 +46,6 @@ Double::Double(QString name,
 {
 }
 
-Double::~Double()
-{
-}
-
 QWidget* Double::get_widget(QWidget *parent, bool auto_commit)
 {
        if (spin_box_)

diff --git a/pv/prop/double.hpp b/pv/prop/double.hpp
index b62d1fa62f13e62b389d8d46fcacd0c00cad9c18..dc119bdb36e40c421421869e3e9610cc700157cb 100644 (file)
--- a/pv/prop/double.hpp
+++ b/pv/prop/double.hpp
@@ -43,7 +43,7 @@ public:
                Getter getter,
                Setter setter);
 
-       virtual ~Double();
+       virtual ~Double() = default;
 
        QWidget* get_widget(QWidget *parent, bool auto_commit);
 

diff --git a/pv/prop/enum.cpp b/pv/prop/enum.cpp
index 06e4d76f1098e5f6967b57eeee81ba591d72de45..71ed19e6e2c12de2ff5cc4900417e8a46cd0357d 100644 (file)
--- a/pv/prop/enum.cpp
+++ b/pv/prop/enum.cpp
@@ -39,10 +39,6 @@ Enum::Enum(QString name,
 {
 }
 
-Enum::~Enum()
-{
-}
-
 QWidget* Enum::get_widget(QWidget *parent, bool auto_commit)
 {
        if (selector_)

diff --git a/pv/prop/enum.hpp b/pv/prop/enum.hpp
index 63f78af0d272c89215c1b770fa40a5a1b0c59bab..0ae8a9c65950dace7499d825f4b1d8e98e62a5dc 100644 (file)
--- a/pv/prop/enum.hpp
+++ b/pv/prop/enum.hpp
@@ -43,7 +43,7 @@ public:
        Enum(QString name, std::vector<std::pair<Glib::VariantBase, QString> > values,
                Getter getter, Setter setter);
 
-       virtual ~Enum();
+       virtual ~Enum() = default;
 
        QWidget* get_widget(QWidget *parent, bool auto_commit);
 

diff --git a/pv/prop/int.cpp b/pv/prop/int.cpp
index e750e9fa9d8ec15757801c2809de31bbba196ef6..fd3bfe4708e6a0cb95832e81643421945de5a5eb 100644 (file)
--- a/pv/prop/int.cpp
+++ b/pv/prop/int.cpp
@@ -45,10 +45,6 @@ Int::Int(QString name,
 {
 }
 
-Int::~Int()
-{
-}
-
 QWidget* Int::get_widget(QWidget *parent, bool auto_commit)
 {
        int64_t int_val = 0, range_min = 0;

diff --git a/pv/prop/int.hpp b/pv/prop/int.hpp
index 60c9d51305a55997659efde3cc59c3ad290ac185..baf7dd7e1a8007fc7f7aafca7f5eaf4e2ab8df89 100644 (file)
--- a/pv/prop/int.hpp
+++ b/pv/prop/int.hpp
@@ -41,7 +41,7 @@ public:
                boost::optional< std::pair<int64_t, int64_t> > range,
                Getter getter, Setter setter);
 
-       virtual ~Int();
+       virtual ~Int() = default;
 
        QWidget* get_widget(QWidget *parent, bool auto_commit);
 

diff --git a/pv/view/analogsignal.cpp b/pv/view/analogsignal.cpp
index 2597a8f38445959051cadbdeae26ed7eb9f3ef8f..30cf5abf33a6dc5ac888c1fe89aa2ddd470fd6e4 100644 (file)
--- a/pv/view/analogsignal.cpp
+++ b/pv/view/analogsignal.cpp
@@ -66,10 +66,6 @@ AnalogSignal::AnalogSignal(
        set_colour(SignalColours[channel_->index() % countof(SignalColours)]);
 }
 
-AnalogSignal::~AnalogSignal()
-{
-}
-
 shared_ptr<pv::data::SignalData> AnalogSignal::data() const
 {
        return data_;

diff --git a/pv/view/analogsignal.hpp b/pv/view/analogsignal.hpp
index 938d92d5b5c8d7e086fcef406ab66403fbc37b63..06867a557db644f82fe5d01a7a16634a3420c10d 100644 (file)
--- a/pv/view/analogsignal.hpp
+++ b/pv/view/analogsignal.hpp
@@ -47,7 +47,7 @@ public:
                std::shared_ptr<sigrok::Channel> channel,
                std::shared_ptr<pv::data::Analog> data);
 
-       virtual ~AnalogSignal();
+       virtual ~AnalogSignal() = default;
 
        std::shared_ptr<pv::data::SignalData> data() const;
 

diff --git a/pv/view/logicsignal.cpp b/pv/view/logicsignal.cpp
index 78bfdec517667646c35f87c212d5cc4ab5ca2f7d..5584a1fcb70a0fb334e85b2d2165a6b965efabfe 100644 (file)
--- a/pv/view/logicsignal.cpp
+++ b/pv/view/logicsignal.cpp
@@ -126,10 +126,6 @@ LogicSignal::LogicSignal(
                                        trigger_match_ = match->type();
 }
 
-LogicSignal::~LogicSignal()
-{
-}
-
 shared_ptr<pv::data::SignalData> LogicSignal::data() const
 {
        return data_;

diff --git a/pv/view/logicsignal.hpp b/pv/view/logicsignal.hpp
index d34b65e755a399540ff96ee965b1f73d93a930c5..fc0dcabb26c15233eb4cce4f7b88fd2995f4045a 100644 (file)
--- a/pv/view/logicsignal.hpp
+++ b/pv/view/logicsignal.hpp
@@ -69,7 +69,7 @@ public:
                std::shared_ptr<sigrok::Channel> channel,
                std::shared_ptr<pv::data::Logic> data);
 
-       virtual ~LogicSignal();
+       virtual ~LogicSignal() = default;
 
        std::shared_ptr<pv::data::SignalData> data() const;