WellArray: Renamed to avoid namespace collissions, now that QWellArray is public

[pulseview.git] / pv / widgets / colourpopup.hpp

diff --git a/pv/widgets/colourpopup.hpp b/pv/widgets/colourpopup.hpp
index a1ee251c7add8d907036e7dad53e1ccb20f90915..9273b5da5e19228b8a115f57c0ae6deec9fbf6d8 100644 (file)
--- a/pv/widgets/colourpopup.hpp
+++ b/pv/widgets/colourpopup.hpp
@@ -36,7 +36,7 @@ class ColourPopup : public Popup
 public:
        ColourPopup(int rows, int cols, QWidget *partent);
 
-       QWellArray& well_array();
+       WellArray& well_array();
 
 Q_SIGNALS:
        void selected(int row, int col);
@@ -45,7 +45,7 @@ private Q_SLOTS:
        void colour_selected(int, int);
 
 private:
-       QWellArray well_array_;
+       WellArray well_array_;
        QVBoxLayout layout_;
 };