comparison framework/SVFileReader.h @ 644:6fd0ebfd2bbe

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 _SV_FILE_READER_H_
-#define _SV_FILE_READER_H_
+#ifndef SV_FILE_READER_H
+#define SV_FILE_READER_H
 
 #include "layer/LayerFactory.h"
 #include "transform/Transform.h"
 
 #include <QXmlDefaultHandler>

     QString getErrorString() const { return m_errorString; }
 
     // For loading a single layer onto an existing pane
     void setCurrentPane(Pane *pane) { m_currentPane = pane; }
     
-    virtual bool startElement(const QString &namespaceURI,
+    bool startElement(const QString &namespaceURI,
                               const QString &localName,
                               const QString &qName,
-                              const QXmlAttributes& atts);
-
-    virtual bool characters(const QString &);
-
-    virtual bool endElement(const QString &namespaceURI,
+                              const QXmlAttributes& atts) override;
+
+    bool characters(const QString &) override;
+
+    bool endElement(const QString &namespaceURI,
                             const QString &localName,
-                            const QString &qName);
-
-    bool error(const QXmlParseException &exception);
-    bool fatalError(const QXmlParseException &exception);
+                            const QString &qName) override;
+
+    bool error(const QXmlParseException &exception) override;
+    bool fatalError(const QXmlParseException &exception) override;
 
     enum FileType
     {
         SVSessionFile,
         SVLayerFile,