diff data/fileio/DataFileReaderFactory.cpp @ 1599:ce185d4dd408 bqaudiostream

Merge from default branch

--- a/data/fileio/DataFileReaderFactory.cpp	Wed Jan 23 10:31:40 2019 +0000
+++ b/data/fileio/DataFileReaderFactory.cpp	Wed Jan 23 14:43:43 2019 +0000
@@ -37,7 +37,7 @@
 {
     QString err;
 
-    DataFileReader *reader = 0;
+    DataFileReader *reader = nullptr;
 
     if (!csv) {
         reader = new MIDIFileReader(path,
@@ -59,7 +59,7 @@
         delete reader;
     }
 
-    return 0;
+    return nullptr;
 }
 
 DataFileReader *
@@ -76,7 +76,7 @@
         (path, true, acquirer, CSVFormat(path), mainModelSampleRate, reporter);
     if (reader) return reader;
 
-    return 0;
+    return nullptr;
 }
 
 Model *
@@ -89,7 +89,7 @@
                                           acquirer,
                                           mainModelSampleRate,
                                           reporter);
-    if (!reader) return NULL;
+    if (!reader) return nullptr;
 
     try {
         Model *model = reader->load();
@@ -112,7 +112,7 @@
                                           CSVFormat(),
                                           mainModelSampleRate,
                                           reporter);
-    if (!reader) return NULL;
+    if (!reader) return nullptr;
 
     try {
         Model *model = reader->load();
@@ -129,10 +129,10 @@
                                sv_samplerate_t mainModelSampleRate,
                                ProgressReporter *reporter)
 {
-    DataFileReader *reader = createReader(path, true, 0, format,
+    DataFileReader *reader = createReader(path, true, nullptr, format,
                                           mainModelSampleRate,
                                           reporter);
-    if (!reader) return NULL;
+    if (!reader) return nullptr;
 
     try {
         Model *model = reader->load();