Mercurial > hg > svgui
diff widgets/NotifyingComboBox.h @ 1216:dc2af6616c83
Merge from branch 3.0-integration
author | Chris Cannam |
---|---|
date | Fri, 13 Jan 2017 10:29:50 +0000 |
parents | b1e3ee5f1be6 |
children | a18e78b9c78b |
line wrap: on
line diff
--- a/widgets/NotifyingComboBox.h Fri Mar 04 12:23:31 2016 +0000 +++ b/widgets/NotifyingComboBox.h Fri Jan 13 10:29:50 2017 +0000 @@ -13,8 +13,8 @@ COPYING included with this distribution for more information. */ -#ifndef _NOTIFYING_COMBO_BOX_H_ -#define _NOTIFYING_COMBO_BOX_H_ +#ifndef SV_NOTIFYING_COMBO_BOX_H +#define SV_NOTIFYING_COMBO_BOX_H #include <QComboBox> @@ -26,8 +26,8 @@ class NotifyingComboBox : public QComboBox { Q_OBJECT + public: - NotifyingComboBox(QWidget *parent = 0) : QComboBox(parent) { }