Mercurial > hg > svcore
diff base/PlayParameters.h @ 1586:841b2a3e606d
Merge from branch fix-static-analysis
author | Chris Cannam |
---|---|
date | Wed, 09 Jan 2019 15:24:38 +0000 |
parents | c01cbe41aeb5 |
children | 52705a328b34 |
line wrap: on
line diff
--- a/base/PlayParameters.h Wed Jan 09 14:39:50 2019 +0000 +++ b/base/PlayParameters.h Wed Jan 09 15:24:38 2019 +0000 @@ -13,8 +13,8 @@ COPYING included with this distribution for more information. */ -#ifndef _PLAY_PARAMETERS_H_ -#define _PLAY_PARAMETERS_H_ +#ifndef SV_PLAY_PARAMETERS_H +#define SV_PLAY_PARAMETERS_H #include <QObject> @@ -36,9 +36,9 @@ virtual void copyFrom(const PlayParameters *); - virtual void toXml(QTextStream &stream, + void toXml(QTextStream &stream, QString indent = "", - QString extraAttributes = "") const; + QString extraAttributes = "") const override; public slots: virtual void setPlayMuted(bool muted);