comparison data/model/TextModel.h @ 1599:ce185d4dd408 bqaudiostream

Merge from default branch

     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 _TEXT_MODEL_H_
-#define _TEXT_MODEL_H_
+#ifndef SV_TEXT_MODEL_H
+#define SV_TEXT_MODEL_H
 
 #include "SparseModel.h"
 #include "base/XmlExportable.h"
 #include "base/RealTime.h"
 

     QString label;
 
     QString getLabel() const { return label; }
     
     void toXml(QTextStream &stream, QString indent = "",
-               QString extraAttributes = "") const
+               QString extraAttributes = "") const override
     {
         stream << QString("%1<point frame=\"%2\" height=\"%3\" label=\"%4\" %5/>\n")
             .arg(indent).arg(frame).arg(height)
             .arg(encodeEntities(label)).arg(extraAttributes);
     }

 public:
     TextModel(sv_samplerate_t sampleRate, int resolution, bool notifyOnAdd = true) :
         SparseModel<TextPoint>(sampleRate, resolution, notifyOnAdd)
     { }
 
-    virtual void toXml(QTextStream &out,
+    void toXml(QTextStream &out,
                        QString indent = "",
-                       QString extraAttributes = "") const
+                       QString extraAttributes = "") const override
     {
         SparseModel<TextPoint>::toXml
             (out, 
              indent,
              QString("%1 subtype=\"text\"")
              .arg(extraAttributes));
     }
 
-    QString getTypeName() const { return tr("Text"); }
+    QString getTypeName() const override { return tr("Text"); }
 
     /**
      * TabularModel methods.  
      */
     
-    virtual int getColumnCount() const
+    int getColumnCount() const override
     {
         return 4;
     }
 
-    virtual QString getHeading(int column) const
+    QString getHeading(int column) const override
     {
         switch (column) {
         case 0: return tr("Time");
         case 1: return tr("Frame");
         case 2: return tr("Height");
         case 3: return tr("Label");
         default: return tr("Unknown");
         }
     }
 
-    virtual QVariant getData(int row, int column, int role) const
+    QVariant getData(int row, int column, int role) const override
     {
         if (column < 2) {
             return SparseModel<TextPoint>::getData
                 (row, column, role);
         }

         case 3: return i->label;
         default: return QVariant();
         }
     }
 
-    virtual Command *getSetDataCommand(int row, int column, const QVariant &value, int role)
+    Command *getSetDataCommand(int row, int column, const QVariant &value, int role) override
     {
         if (column < 2) {
             return SparseModel<TextPoint>::getSetDataCommand
                 (row, column, value, role);
         }

 
         command->addPoint(point);
         return command->finish();
     }
 
-    virtual bool isColumnTimeValue(int column) const
+    bool isColumnTimeValue(int column) const override
     {
         return (column < 2); 
     }
 
-    virtual SortType getSortType(int column) const
+    SortType getSortType(int column) const override
     {
         if (column == 3) return SortAlphabetical;
         return SortNumeric;
     }