Mercurial > hg > svcore
diff data/fileio/DataFileReaderFactory.cpp @ 1582:70e172e6cc59 fix-static-analysis
Use nullptr throughout
author | Chris Cannam |
---|---|
date | Mon, 26 Nov 2018 14:33:41 +0000 |
parents | 1dc64d3d323c |
children |
line wrap: on
line diff
--- a/data/fileio/DataFileReaderFactory.cpp Mon Nov 26 13:51:36 2018 +0000 +++ b/data/fileio/DataFileReaderFactory.cpp Mon Nov 26 14:33:41 2018 +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();