X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fwidgets%2Fwellarray.cpp;h=1351467a122a7bc8c5bcd36e23ef7fd4192a6638;hp=a9418317b072fceae3cf45f25f3656113578cfbf;hb=d9ea96280ab1128427143660ae375c30b19aa0cb;hpb=ebad870b71f3eec4a08873040524bb9e57768364

diff --git a/pv/widgets/wellarray.cpp b/pv/widgets/wellarray.cpp
index a9418317..1351467a 100644
--- a/pv/widgets/wellarray.cpp
+++ b/pv/widgets/wellarray.cpp
@@ -49,9 +49,9 @@
 namespace pv {
 namespace widgets {
 
-void WellArray::paintEvent(QPaintEvent *e)
+void WellArray::paintEvent(QPaintEvent *event)
 {
-    QRect r = e->rect();
+    QRect r = event->rect();
     int cx = r.x();
     int cy = r.y();
     int ch = r.height();
@@ -104,7 +104,7 @@ WellArray::WellArray(int rows, int cols, QWidget *parent)
     : QWidget(parent)
         ,nrows(rows), ncols(cols)
 {
-    d = 0;
+    d = nullptr;
     setFocusPolicy(Qt::StrongFocus);
     cellw = 28;
     cellh = 24;
@@ -163,10 +163,10 @@ void WellArray::paintCellContents(QPainter *p, int row, int col, const QRect &r)
     }
 }
 
-void WellArray::mousePressEvent(QMouseEvent *e)
+void WellArray::mousePressEvent(QMouseEvent *event)
 {
     // The current cell marker is set to the cell the mouse is pressed in
-    QPoint pos = e->pos();
+    QPoint pos = event->pos();
     setCurrent(rowAt(pos.y()), columnAt(pos.x()));
 }
 
@@ -263,30 +263,30 @@ void WellArray::focusOutEvent(QFocusEvent*)
 
 /*\reimp
 */
-void WellArray::keyPressEvent(QKeyEvent* e)
+void WellArray::keyPressEvent(QKeyEvent* event)
 {
-    switch(e->key()) {                        // Look at the key code
+    switch(event->key()) {                        // Look at the key code
     case Qt::Key_Left:                                // If 'left arrow'-key,
-        if(curCol > 0)                        // and cr't not in leftmost col
+        if (curCol > 0)                        // and cr't not in leftmost col
             setCurrent(curRow, curCol - 1);        // set cr't to next left column
         break;
     case Qt::Key_Right:                                // Correspondingly...
-        if(curCol < numCols()-1)
+        if (curCol < numCols()-1)
             setCurrent(curRow, curCol + 1);
         break;
     case Qt::Key_Up:
-        if(curRow > 0)
+        if (curRow > 0)
             setCurrent(curRow - 1, curCol);
         break;
     case Qt::Key_Down:
-        if(curRow < numRows()-1)
+        if (curRow < numRows()-1)
             setCurrent(curRow + 1, curCol);
         break;
     case Qt::Key_Space:
         setSelected(curRow, curCol);
         break;
     default:                                // If not an interesting key,
-        e->ignore();                        // we don't accept the event
+        event->ignore();                        // we don't accept the event
         return;
     }