X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fwidgets%2Fwellarray.hpp;h=6bed8ee133cd3ad2b6fa8305846bf72b477130a5;hp=ebe3c00019023c7370c060ef3a59d6ba6319269c;hb=f54fc97e8c4c20b7a37f10b8fd125407eba17226;hpb=2acdb232d6bb452cfdfaea3ef5218fb4da592329 diff --git a/pv/widgets/wellarray.hpp b/pv/widgets/wellarray.hpp index ebe3c000..6bed8ee1 100644 --- a/pv/widgets/wellarray.hpp +++ b/pv/widgets/wellarray.hpp @@ -41,16 +41,19 @@ #include -struct QWellArrayData; +namespace pv { +namespace widgets { -class QWellArray : public QWidget +struct WellArrayData; + +class WellArray : public QWidget { Q_OBJECT Q_PROPERTY(int selectedColumn READ selectedColumn) Q_PROPERTY(int selectedRow READ selectedRow) public: - QWellArray(int rows, int cols, QWidget* parent=0); + WellArray(int rows, int cols, QWidget* parent = nullptr); QString cellContent(int row, int col) const; int selectedColumn() const { return selCol; } @@ -116,10 +119,10 @@ protected: void keyPressEvent(QKeyEvent*); void focusInEvent(QFocusEvent*); void focusOutEvent(QFocusEvent*); - void paintEvent(QPaintEvent *); + void paintEvent(QPaintEvent*); private: - Q_DISABLE_COPY(QWellArray) + Q_DISABLE_COPY(WellArray) int nrows; int ncols; @@ -129,5 +132,8 @@ private: int curCol; int selRow; int selCol; - QWellArrayData *d; + WellArrayData *d; }; + +} // namespace wellarray +} // namespace pv