comparison layer/Layer.h @ 1414:fa986b91d77f

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 _LAYER_H_
-#define _LAYER_H_
+#ifndef SV_LAYER_H
+#define SV_LAYER_H
 
 #include "base/PropertyContainer.h"
 #include "base/XmlExportable.h"
 #include "base/Selection.h"
 

     }
     virtual bool hasLightBackground() const {
         return true;
     }
 
-    virtual QString getPropertyContainerIconName() const;
-
-    virtual QString getPropertyContainerName() const {
+    QString getPropertyContainerIconName() const override;
+
+    QString getPropertyContainerName() const override {
         if (m_presentationName != "") return m_presentationName;
         else return objectName();
     }
 
     virtual void setPresentationName(QString name);

      * refers to) into XML for file output.  This class implements the
      * basic name/type/model-id output; subclasses will typically call
      * this superclass implementation with extra attributes describing
      * their particular properties.
      */
-    virtual void toXml(QTextStream &stream, QString indent = "",
-                       QString extraAttributes = "") const;
+    void toXml(QTextStream &stream, QString indent = "",
+                       QString extraAttributes = "") const override;
 
     /**
      * Set the particular properties of a layer (those specific to the
      * subclass) from a set of XML attributes.  This is the effective
      * inverse of the toXml method.

      * Return whether the layer is dormant (i.e. hidden) in the given
      * view.
      */
     virtual bool isLayerDormant(const LayerGeometryProvider *v) const;
 
-    virtual PlayParameters *getPlayParameters();
+    PlayParameters *getPlayParameters() override;
 
     /**
      * True if this layer will need to place text labels when it is
      * painted. The view will take into account how many layers are
      * requesting this, and will provide a distinct y-coord to each

     {
     public:
         AddMeasurementRectCommand(Layer *layer, MeasureRect rect) :
             m_layer(layer), m_rect(rect) { }
 
-        virtual QString getName() const;
-        virtual void execute();
-        virtual void unexecute();
+        QString getName() const override;
+        void execute() override;
+        void unexecute() override;
 
     private:
         Layer *m_layer;
         MeasureRect m_rect;
     };

     {
     public:
         DeleteMeasurementRectCommand(Layer *layer, MeasureRect rect) :
             m_layer(layer), m_rect(rect) { }
 
-        virtual QString getName() const;
-        virtual void execute();
-        virtual void unexecute();
+        QString getName() const override;
+        void execute() override;
+        void unexecute() override;
 
     private:
         Layer *m_layer;
         MeasureRect m_rect;
     };