X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fwidgets%2Fwellarray.cpp;h=3ae6eec6305b1eb696bb55affcf070a71d5790dc;hp=ad29b039657d8123de5f49c3ba4b2ec76d9559dc;hb=7e0c99bf95836c89574b53ae3fa7840e2ddca77d;hpb=f74015db20c1ac85df6397df7199a030e6db828f diff --git a/pv/widgets/wellarray.cpp b/pv/widgets/wellarray.cpp index ad29b039..3ae6eec6 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(); @@ -125,7 +125,7 @@ void WellArray::paintCell(QPainter* p, int row, int col, const QRect &rect) { int b = 3; //margin - const QPalette & g = palette(); + const QPalette& g = palette(); QStyleOptionFrame opt; int dfw = style()->pixelMetric(QStyle::PM_DefaultFrameWidth); opt.lineWidth = dfw; @@ -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,9 +263,9 @@ 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 setCurrent(curRow, curCol - 1); // set cr't to next left column @@ -286,7 +286,7 @@ void WellArray::keyPressEvent(QKeyEvent* e) 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; }