X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fwidgets%2Fcolourbutton.cpp;h=fc9084be632c899d946fac6ddc434863ca2406e3;hp=cf930f65a5f945cc4dcbd794e99565bf8df06d9a;hb=d9ea96280ab1128427143660ae375c30b19aa0cb;hpb=8dbbc7f0b9ea59d0f0d62225772f8a56eee125f5 diff --git a/pv/widgets/colourbutton.cpp b/pv/widgets/colourbutton.cpp index cf930f65..fc9084be 100644 --- a/pv/widgets/colourbutton.cpp +++ b/pv/widgets/colourbutton.cpp @@ -18,7 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "colourbutton.h" +#include "colourbutton.hpp" #include @@ -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++) - 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; @@ -92,9 +90,9 @@ void ColourButton::on_selected(int row, int col) selected(cur_colour_); } -void ColourButton::paintEvent(QPaintEvent *e) +void ColourButton::paintEvent(QPaintEvent *event) { - QPushButton::paintEvent(e); + QPushButton::paintEvent(event); QPainter p(this);