X-Git-Url: http://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fwidgets%2Fcolourpopup.cpp;h=8c8b1385fa64f562f866d6285ce75f5a6cb46ead;hp=816a4c50b95c773b89df1d86893cbf5bbe247d58;hb=ebad870b71f3eec4a08873040524bb9e57768364;hpb=b20265774e354ca052c4e5365161d93b2fe387e0

diff --git a/pv/widgets/colourpopup.cpp b/pv/widgets/colourpopup.cpp
index 816a4c50..8c8b1385 100644
--- a/pv/widgets/colourpopup.cpp
+++ b/pv/widgets/colourpopup.cpp
@@ -18,28 +18,28 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include "colourpopup.h"
+#include "colourpopup.hpp"
 
 namespace pv {
 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()
+WellArray& ColourPopup::well_array()
 {
-	return _well_array;
+	return well_array_;
 }
 
 void ColourPopup::colour_selected(int, int)