Standardize on 'event' as name for all Qt events.

[pulseview.git] / pv / widgets / popup.cpp

diff --git a/pv/widgets/popup.cpp b/pv/widgets/popup.cpp
index 7143c24a9aba9ce568bc933d3283ee67c648660c..73ddf99f30caaeafcf14c257f74736377c69ecdc 100644 (file)
--- a/pv/widgets/popup.cpp
+++ b/pv/widgets/popup.cpp
@@ -65,17 +65,16 @@ void Popup::set_position(const QPoint point, Position pos)
                MarginWidth + ((pos == Bottom) ? ArrowLength : 0),
                MarginWidth + ((pos == Left) ? ArrowLength : 0),
                MarginWidth + ((pos == Top) ? ArrowLength : 0));
-
 }
 
-bool Popup::eventFilter(QObject *obj, QEvent *evt)
+bool Popup::eventFilter(QObject *obj, QEvent *event)
 {
        QKeyEvent *keyEvent;
 
        (void)obj;
 
-       if (evt->type() == QEvent::KeyPress) {
-               keyEvent = static_cast<QKeyEvent*>(evt);
+       if (event->type() == QEvent::KeyPress) {
+               keyEvent = static_cast<QKeyEvent*>(event);
                if (keyEvent->key() == Qt::Key_Enter ||
                    keyEvent->key() == Qt::Key_Return) {
                        close();
@@ -145,8 +144,7 @@ QPolygon Popup::arrow_polygon() const
        const QPoint p = mapFromGlobal(point_);
        const int l = ArrowLength + ArrowOverlap; 
 
-       switch (pos_)
-        {
+       switch (pos_) {
        case Right:
                poly << QPoint(p.x() + l, p.y() - l);
                break;
@@ -155,7 +153,7 @@ QPolygon Popup::arrow_polygon() const
                poly << QPoint(p.x() - l, p.y() + l);
                break;
 
-        case Left:
+       case Left:
        case Top:
                poly << QPoint(p.x() - l, p.y() - l);
                break;
@@ -163,14 +161,13 @@ QPolygon Popup::arrow_polygon() const
 
        poly << p;
 
-       switch (pos_)
-        {
+       switch (pos_) {
        case Right:
        case Bottom:
                poly << QPoint(p.x() + l, p.y() + l);
                break;
 
-        case Left:
+       case Left:
                poly << QPoint(p.x() - l, p.y() + l);
                break;
                
@@ -238,7 +235,7 @@ void Popup::reposition_widget()
 
        if (pos_ == Left)
                o.rx() = -width();
-       else if(pos_ == Top)
+       else if (pos_ == Top)
                o.ry() = -height();
 
        o += point_;
@@ -294,13 +291,13 @@ void Popup::resizeEvent(QResizeEvent*)
        setMask(popup_region());
 }
 
-void Popup::mouseReleaseEvent(QMouseEvent *e)
+void Popup::mouseReleaseEvent(QMouseEvent *event)
 {
-       assert(e);
+       assert(event);
 
        // We need our own out-of-bounds click handler because QWidget counts
        // the drop-shadow region as inside the widget
-       if(!bubble_rect().contains(e->pos()))
+       if (!bubble_rect().contains(event->pos()))
                close();
 }
 
@@ -311,4 +308,3 @@ void Popup::showEvent(QShowEvent*)
 
 } // namespace widgets
 } // namespace pv
-