projects
/
pulseview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
80d5014
)
Added missing virtual destructors
author
Joel Holdsworth
<joel@airwebreathe.org.uk>
Thu, 25 Apr 2013 11:45:29 +0000
(12:45 +0100)
committer
Joel Holdsworth
<joel@airwebreathe.org.uk>
Sat, 27 Apr 2013 18:28:56 +0000
(19:28 +0100)
This fixes bug #106.
pv/prop/bool.cpp
patch
|
blob
|
history
pv/prop/bool.h
patch
|
blob
|
history
pv/prop/double.cpp
patch
|
blob
|
history
pv/prop/double.h
patch
|
blob
|
history
pv/prop/int.cpp
patch
|
blob
|
history
pv/prop/int.h
patch
|
blob
|
history
pv/view/analogsignal.cpp
patch
|
blob
|
history
pv/view/analogsignal.h
patch
|
blob
|
history
pv/view/logicsignal.cpp
patch
|
blob
|
history
pv/view/logicsignal.h
patch
|
blob
|
history
diff --git
a/pv/prop/bool.cpp
b/pv/prop/bool.cpp
index 95cbb96e0caceea6c82e37367f933b1481ba3762..ad9a13e7c0e05bc710fc7d385b6ad7e6b22a04be 100644
(file)
--- a/
pv/prop/bool.cpp
+++ b/
pv/prop/bool.cpp
@@
-36,6
+36,10
@@
Bool::Bool(QString name, Getter getter, Setter setter) :
{
}
{
}
+Bool::~Bool()
+{
+}
+
QWidget* Bool::get_widget(QWidget *parent)
{
if (_check_box)
QWidget* Bool::get_widget(QWidget *parent)
{
if (_check_box)
diff --git
a/pv/prop/bool.h
b/pv/prop/bool.h
index 62e5ca36b6425ee1f91f9ff34afe6d1504b9fe2b..22fc95cc8c2827305491bacd6f21e6602f0a6b27 100644
(file)
--- a/
pv/prop/bool.h
+++ b/
pv/prop/bool.h
@@
-33,6
+33,8
@@
class Bool : public Property
public:
Bool(QString name, Getter getter, Setter setter);
public:
Bool(QString name, Getter getter, Setter setter);
+ virtual ~Bool();
+
QWidget* get_widget(QWidget *parent);
bool labeled_widget() const;
QWidget* get_widget(QWidget *parent);
bool labeled_widget() const;
diff --git
a/pv/prop/double.cpp
b/pv/prop/double.cpp
index 6f6fe0c1ea7e228ca7ed1487efa13e7202a3f5c2..39e205ee691f2910dd7899ac958ae5d9c69bde3f 100644
(file)
--- a/
pv/prop/double.cpp
+++ b/
pv/prop/double.cpp
@@
-46,6
+46,10
@@
Double::Double(QString name,
{
}
{
}
+Double::~Double()
+{
+}
+
QWidget* Double::get_widget(QWidget *parent)
{
if (_spin_box)
QWidget* Double::get_widget(QWidget *parent)
{
if (_spin_box)
diff --git
a/pv/prop/double.h
b/pv/prop/double.h
index b00adb1439125118720def25a194bfb021cad153..5edb392419cf302a940b49d0e643ca3c15bd60ad 100644
(file)
--- a/
pv/prop/double.h
+++ b/
pv/prop/double.h
@@
-41,6
+41,8
@@
public:
Getter getter,
Setter setter);
Getter getter,
Setter setter);
+ virtual ~Double();
+
QWidget* get_widget(QWidget *parent);
void commit();
QWidget* get_widget(QWidget *parent);
void commit();
diff --git
a/pv/prop/int.cpp
b/pv/prop/int.cpp
index 502665daf4035a8e473b356bb17ebead87c2ef56..761bd10a90f3c57b908678fce8029cfc6a39d921 100644
(file)
--- a/
pv/prop/int.cpp
+++ b/
pv/prop/int.cpp
@@
-42,6
+42,10
@@
Int::Int(QString name,
{
}
{
}
+Int::~Int()
+{
+}
+
QWidget* Int::get_widget(QWidget *parent)
{
if (_spin_box)
QWidget* Int::get_widget(QWidget *parent)
{
if (_spin_box)
diff --git
a/pv/prop/int.h
b/pv/prop/int.h
index ef6fb1df699d006440fb7237c010ce1095fd54db..279bedc1c5bb758f2703cdfabc9aae2fe3e34cc4 100644
(file)
--- a/
pv/prop/int.h
+++ b/
pv/prop/int.h
@@
-39,6
+39,8
@@
public:
boost::optional< std::pair<int64_t, int64_t> > range,
Getter getter, Setter setter);
boost::optional< std::pair<int64_t, int64_t> > range,
Getter getter, Setter setter);
+ virtual ~Int();
+
QWidget* get_widget(QWidget *parent);
void commit();
QWidget* get_widget(QWidget *parent);
void commit();
diff --git
a/pv/view/analogsignal.cpp
b/pv/view/analogsignal.cpp
index 251a0ffb5681870b165be0aac83de77d0d8f97f1..367b5890d7d6ef46f078c732cd579a2b4a5daa09 100644
(file)
--- a/
pv/view/analogsignal.cpp
+++ b/
pv/view/analogsignal.cpp
@@
-50,6
+50,10
@@
AnalogSignal::AnalogSignal(QString name, shared_ptr<data::Analog> data,
_colour = SignalColours[probe_index % countof(SignalColours)];
}
_colour = SignalColours[probe_index % countof(SignalColours)];
}
+AnalogSignal::~AnalogSignal()
+{
+}
+
void AnalogSignal::set_scale(float scale)
{
_scale = scale;
void AnalogSignal::set_scale(float scale)
{
_scale = scale;
diff --git
a/pv/view/analogsignal.h
b/pv/view/analogsignal.h
index ce1dff105041a77934355f302e5a80168f1cdbff..5ebf501619e4c6a48473b0f89959b5374ae27520 100644
(file)
--- a/
pv/view/analogsignal.h
+++ b/
pv/view/analogsignal.h
@@
-45,6
+45,8
@@
public:
AnalogSignal(QString name,
boost::shared_ptr<pv::data::Analog> data, int probe_index);
AnalogSignal(QString name,
boost::shared_ptr<pv::data::Analog> data, int probe_index);
+ virtual ~AnalogSignal();
+
void set_scale(float scale);
/**
void set_scale(float scale);
/**
diff --git
a/pv/view/logicsignal.cpp
b/pv/view/logicsignal.cpp
index 87fe5b0469e08c417804ac5b0a2519b3331dc95e..21c9abbc8f8af78580ebe111c8654db865bb0273 100644
(file)
--- a/
pv/view/logicsignal.cpp
+++ b/
pv/view/logicsignal.cpp
@@
-62,6
+62,10
@@
LogicSignal::LogicSignal(QString name, shared_ptr<data::Logic> data,
_colour = SignalColours[_probe_index % countof(SignalColours)];
}
_colour = SignalColours[_probe_index % countof(SignalColours)];
}
+LogicSignal::~LogicSignal()
+{
+}
+
void LogicSignal::paint(QPainter &p, int y, int left, int right,
double scale, double offset)
{
void LogicSignal::paint(QPainter &p, int y, int left, int right,
double scale, double offset)
{
diff --git
a/pv/view/logicsignal.h
b/pv/view/logicsignal.h
index a9c24b44da7bd13b27896ffc5cdc2e2173f54fad..c4ae755152ca6b997843b07cb6e7f1fadb32cbcb 100644
(file)
--- a/
pv/view/logicsignal.h
+++ b/
pv/view/logicsignal.h
@@
-49,6
+49,8
@@
public:
boost::shared_ptr<pv::data::Logic> data,
int probe_index);
boost::shared_ptr<pv::data::Logic> data,
int probe_index);
+ virtual ~LogicSignal();
+
/**
* Paints the signal with a QPainter
* @param p the QPainter to paint into.
/**
* Paints the signal with a QPainter
* @param p the QPainter to paint into.