projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
MainWindow, View::View: Fix two memory errors reported by valgrind
[pulseview.git]
/
pv
/
widgets
/
colourbutton.cpp
diff --git
a/pv/widgets/colourbutton.cpp
b/pv/widgets/colourbutton.cpp
index 1f503462ea2f839f0f39891aeb481fa6c830b4ae..fc9084be632c899d946fac6ddc434863ca2406e3 100644
(file)
--- a/
pv/widgets/colourbutton.cpp
+++ b/
pv/widgets/colourbutton.cpp
@@
-58,9
+58,7
@@
void ColourButton::set_colour(QColor colour)
for (unsigned int r = 0; r < rows; r++)
for (unsigned int c = 0; c < cols; c++)
for (unsigned int r = 0; r < rows; r++)
for (unsigned int c = 0; c < cols; c++)
- if (popup_.well_array().cellBrush(r, c).color() ==
- colour)
- {
+ if (popup_.well_array().cellBrush(r, c).color() == colour) {
popup_.well_array().setSelected(r, c);
popup_.well_array().setCurrent(r, c);
return;
popup_.well_array().setSelected(r, c);
popup_.well_array().setCurrent(r, c);
return;
@@
-92,9
+90,9
@@
void ColourButton::on_selected(int row, int col)
selected(cur_colour_);
}
selected(cur_colour_);
}
-void ColourButton::paintEvent(QPaintEvent *e)
+void ColourButton::paintEvent(QPaintEvent *e
vent
)
{
{
- QPushButton::paintEvent(e);
+ QPushButton::paintEvent(e
vent
);
QPainter p(this);
QPainter p(this);