Mercurial > hg > svgui
diff widgets/ImageDialog.h @ 1414:fa986b91d77f
Merge from branch fix-static-analysis
author | Chris Cannam |
---|---|
date | Wed, 09 Jan 2019 15:24:51 +0000 |
parents | 05d614f6e46d |
children |
line wrap: on
line diff
--- a/widgets/ImageDialog.h Wed Jan 09 14:41:52 2019 +0000 +++ b/widgets/ImageDialog.h Wed Jan 09 15:24:51 2019 +0000 @@ -13,8 +13,8 @@ COPYING included with this distribution for more information. */ -#ifndef _IMAGE_DIALOG_H_ -#define _IMAGE_DIALOG_H_ +#ifndef SV_IMAGE_DIALOG_H +#define SV_IMAGE_DIALOG_H #include <QDialog> #include <QString> @@ -54,7 +54,7 @@ void imageEditEdited(); protected: - void resizeEvent(QResizeEvent *); + void resizeEvent(QResizeEvent *) override; QLineEdit *m_imageEdit; QLineEdit *m_labelEdit;