comparison base/PlayParameters.h @ 1586:841b2a3e606d

Merge from branch fix-static-analysis

     published by the Free Software Foundation; either version 2 of the
     License, or (at your option) any later version.  See the file
     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>
 
 #include "XmlExportable.h"
 

 
     virtual QString getPlayClipId() const { return m_playClipId; }
 
     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);
     virtual void setPlayAudible(bool nonMuted);
     virtual void setPlayPan(float pan);