Mercurial > hg > svgui
diff widgets/NotifyingComboBox.h @ 1203:ff042979331b 3.0-integration
Merge from branch svg, and thus (in some subrepos) from levelpanwidget
author | Chris Cannam |
---|---|
date | Mon, 19 Dec 2016 16:34:38 +0000 |
parents | b1e3ee5f1be6 |
children | a18e78b9c78b |
line wrap: on
line diff
--- a/widgets/NotifyingComboBox.h Wed Dec 14 11:56:47 2016 +0000 +++ b/widgets/NotifyingComboBox.h Mon Dec 19 16:34:38 2016 +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) { }