changeset 248:084ae1c213ee

* Add display of selection extents in status bar when dragging a selection * Some build fixes after that i18n update
author Chris Cannam
date Wed, 07 Mar 2007 18:00:49 +0000
parents 21b9b25bff48
children d3ac9f953ebf
files data/fileio/DataFileReader.h data/fileio/MIDIFileReader.h data/model/SparseModel.h
diffstat 3 files changed, 3 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/data/fileio/DataFileReader.h	Wed Mar 07 17:07:02 2007 +0000
+++ b/data/fileio/DataFileReader.h	Wed Mar 07 18:00:49 2007 +0000
@@ -17,10 +17,11 @@
 #define _DATA_FILE_READER_H_
 
 #include <QString>
+#include <QObject>
 
 class Model;
 
-class DataFileReader
+class DataFileReader : public QObject
 {
 public:
     /**
--- a/data/fileio/MIDIFileReader.h	Wed Mar 07 17:07:02 2007 +0000
+++ b/data/fileio/MIDIFileReader.h	Wed Mar 07 18:00:49 2007 +0000
@@ -33,7 +33,7 @@
 
 class MIDIEvent;
 
-class MIDIFileReader : public DataFileReader, public QObject
+class MIDIFileReader : public DataFileReader
 {
     Q_OBJECT
 
--- a/data/model/SparseModel.h	Wed Mar 07 17:07:02 2007 +0000
+++ b/data/model/SparseModel.h	Wed Mar 07 18:00:49 2007 +0000
@@ -35,8 +35,6 @@
 template <typename PointType>
 class SparseModel : public Model
 {
-    Q_OBJECT
-
 public:
     SparseModel(size_t sampleRate, size_t resolution,
 		bool notifyOnAdd = true);