comparison data/model/SparseOneDimensionalModel.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 _SPARSE_ONE_DIMENSIONAL_MODEL_H_
-#define _SPARSE_ONE_DIMENSIONAL_MODEL_H_
+#ifndef SV_SPARSE_ONE_DIMENSIONAL_MODEL_H
+#define SV_SPARSE_ONE_DIMENSIONAL_MODEL_H
 
 #include "SparseModel.h"
 #include "NoteData.h"
 #include "base/PlayParameterRepository.h"
 #include "base/RealTime.h"

     virtual ~SparseOneDimensionalModel()
     {
         PlayParameterRepository::getInstance()->removePlayable(this);
     }
 
-    virtual bool canPlay() const { return true; }
-
-    virtual QString getDefaultPlayClipId() const
+    bool canPlay() const override { return true; }
+
+    QString getDefaultPlayClipId() const override
     {
         return "tap";
     }
 
     int getIndexOf(const Point &point)

             if (!comparator(*j, point) && !comparator(point, *j)) return i;
         }
         return -1;
     }
 
-    QString getTypeName() const { return tr("Sparse 1-D"); }
+    QString getTypeName() const override { return tr("Sparse 1-D"); }
 
     /**
      * TabularModel methods.  
      */
     
-    virtual int getColumnCount() const
+    int getColumnCount() const override
     {
         return 3;
     }
 
-    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("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<OneDimensionalPoint>::getData
                 (row, column, role);
         }

         case 2: 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<OneDimensionalPoint>::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 == 2) return SortAlphabetical;
         return SortNumeric;
     }
 
     /**
      * NoteExportable methods.
      */
 
-    NoteList getNotes() const {
+    NoteList getNotes() const override {
         return getNotesWithin(getStartFrame(), getEndFrame());
     }
 
-    NoteList getNotesWithin(sv_frame_t startFrame, sv_frame_t endFrame) const {
+    NoteList getNotesWithin(sv_frame_t startFrame, sv_frame_t endFrame) const override {
         
         PointList points = getPoints(startFrame, endFrame);
         NoteList notes;
 
         for (PointList::iterator pli =