Mercurial > hg > svgui
diff widgets/AudioDial.h @ 1414:fa986b91d77f
Merge from branch fix-static-analysis
author | Chris Cannam |
---|---|
date | Wed, 09 Jan 2019 15:24:51 +0000 |
parents | 05d614f6e46d |
children | e5464dc2f6cf |
line wrap: on
line diff
--- a/widgets/AudioDial.h Wed Jan 09 14:41:52 2019 +0000 +++ b/widgets/AudioDial.h Wed Jan 09 15:24:51 2019 +0000 @@ -12,8 +12,8 @@ COPYING included with this distribution for more information. */ -#ifndef _AUDIO_DIAL_H_ -#define _AUDIO_DIAL_H_ +#ifndef SV_AUDIO_DIAL_H +#define SV_AUDIO_DIAL_H /** * A rotary dial widget. @@ -115,15 +115,15 @@ protected: void drawTick(QPainter &paint, double angle, int size, bool internal); - virtual void paintEvent(QPaintEvent *); + void paintEvent(QPaintEvent *) override; // Alternate mouse behavior event handlers. - virtual void mousePressEvent(QMouseEvent *pMouseEvent); - virtual void mouseMoveEvent(QMouseEvent *pMouseEvent); - virtual void mouseReleaseEvent(QMouseEvent *pMouseEvent); - virtual void mouseDoubleClickEvent(QMouseEvent *pMouseEvent); - virtual void enterEvent(QEvent *); - virtual void leaveEvent(QEvent *); + void mousePressEvent(QMouseEvent *pMouseEvent) override; + void mouseMoveEvent(QMouseEvent *pMouseEvent) override; + void mouseReleaseEvent(QMouseEvent *pMouseEvent) override; + void mouseDoubleClickEvent(QMouseEvent *pMouseEvent) override; + void enterEvent(QEvent *) override; + void leaveEvent(QEvent *) override; protected slots: void updateMappedValue(int value);