X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fwidgets%2Fcolourpopup.cpp;h=285e9a050ae300adcce7228a8e69056c0769eb68;hp=816a4c50b95c773b89df1d86893cbf5bbe247d58;hb=8dbbc7f0b9ea59d0f0d62225772f8a56eee125f5;hpb=2a21747e9daac2a45cd9a5ceb9a351f9775c5704 diff --git a/pv/widgets/colourpopup.cpp b/pv/widgets/colourpopup.cpp index 816a4c5..285e9a0 100644 --- a/pv/widgets/colourpopup.cpp +++ b/pv/widgets/colourpopup.cpp @@ -25,21 +25,21 @@ namespace widgets { ColourPopup::ColourPopup(int rows, int cols, QWidget *parent) : Popup(parent), - _well_array(rows, cols, this), - _layout(this) + well_array_(rows, cols, this), + layout_(this) { - _layout.addWidget(&_well_array); - setLayout(&_layout); + layout_.addWidget(&well_array_); + setLayout(&layout_); - connect(&_well_array, SIGNAL(selected(int, int)), + connect(&well_array_, SIGNAL(selected(int, int)), this, SIGNAL(selected(int, int))); - connect(&_well_array, SIGNAL(selected(int, int)), + connect(&well_array_, SIGNAL(selected(int, int)), this, SLOT(colour_selected(int, int))); } QWellArray& ColourPopup::well_array() { - return _well_array; + return well_array_; } void ColourPopup::colour_selected(int, int)