diff widgets/TipDialog.h @ 1414:fa986b91d77f

Merge from branch fix-static-analysis

--- a/widgets/TipDialog.h	Wed Jan 09 14:41:52 2019 +0000
+++ b/widgets/TipDialog.h	Wed Jan 09 15:24:51 2019 +0000
@@ -13,8 +13,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef _TIP_DIALOG_H_
-#define _TIP_DIALOG_H_
+#ifndef SV_TIP_DIALOG_H
+#define SV_TIP_DIALOG_H
 
 #include <QDialog>
 #include <QString>
@@ -59,19 +59,19 @@
         
         void parse(QXmlInputSource &source);
 
-        virtual bool startElement(const QString &namespaceURI,
+        bool startElement(const QString &namespaceURI,
                                   const QString &localName,
                                   const QString &qName,
-                                  const QXmlAttributes& atts);
+                                  const QXmlAttributes& atts) override;
         
-        virtual bool characters(const QString &);
+        bool characters(const QString &) override;
         
-        virtual bool endElement(const QString &namespaceURI,
+        bool endElement(const QString &namespaceURI,
                                 const QString &localName,
-                                const QString &qName);
+                                const QString &qName) override;
         
-        bool error(const QXmlParseException &exception);
-        bool fatalError(const QXmlParseException &exception);
+        bool error(const QXmlParseException &exception) override;
+        bool fatalError(const QXmlParseException &exception) override;
 
     protected:
         TipDialog *m_dialog;