Mercurial > hg > svcore
comparison transform/FileFeatureWriter.cpp @ 1582:70e172e6cc59 fix-static-analysis
Use nullptr throughout
author | Chris Cannam |
---|---|
date | Mon, 26 Nov 2018 14:33:41 +0000 |
parents | 87ae75da6527 |
children |
comparison
equal
deleted
inserted
replaced
1581:ad5f892c0c4d | 1582:70e172e6cc59 |
---|---|
30 using namespace std; | 30 using namespace std; |
31 using namespace Vamp; | 31 using namespace Vamp; |
32 | 32 |
33 FileFeatureWriter::FileFeatureWriter(int support, | 33 FileFeatureWriter::FileFeatureWriter(int support, |
34 QString extension) : | 34 QString extension) : |
35 m_prevstream(0), | 35 m_prevstream(nullptr), |
36 m_support(support), | 36 m_support(support), |
37 m_extension(extension), | 37 m_extension(extension), |
38 m_manyFiles(false), | 38 m_manyFiles(false), |
39 m_stdout(false), | 39 m_stdout(false), |
40 m_append(false), | 40 m_append(false), |
282 if (m_files.find(key) == m_files.end()) { | 282 if (m_files.find(key) == m_files.end()) { |
283 | 283 |
284 QString filename = createOutputFilename(trackId, transformId); | 284 QString filename = createOutputFilename(trackId, transformId); |
285 | 285 |
286 if (filename == "") { // stdout or failure | 286 if (filename == "") { // stdout or failure |
287 return 0; | 287 return nullptr; |
288 } | 288 } |
289 | 289 |
290 SVDEBUG << "FileFeatureWriter: NOTE: Using output filename \"" | 290 SVDEBUG << "FileFeatureWriter: NOTE: Using output filename \"" |
291 << filename << "\"" << endl; | 291 << filename << "\"" << endl; |
292 | 292 |
301 | 301 |
302 if (!file->open(mode)) { | 302 if (!file->open(mode)) { |
303 SVCERR << "FileFeatureWriter: ERROR: Failed to open output file \"" << filename | 303 SVCERR << "FileFeatureWriter: ERROR: Failed to open output file \"" << filename |
304 << "\" for writing" << endl; | 304 << "\" for writing" << endl; |
305 delete file; | 305 delete file; |
306 m_files[key] = 0; | 306 m_files[key] = nullptr; |
307 throw FailedToOpenFile(filename); | 307 throw FailedToOpenFile(filename); |
308 } | 308 } |
309 | 309 |
310 m_files[key] = file; | 310 m_files[key] = file; |
311 } | 311 } |
318 TransformId transformId, | 318 TransformId transformId, |
319 QTextCodec *codec) | 319 QTextCodec *codec) |
320 { | 320 { |
321 QFile *file = getOutputFile(trackId, transformId); | 321 QFile *file = getOutputFile(trackId, transformId); |
322 if (!file && !m_stdout) { | 322 if (!file && !m_stdout) { |
323 return 0; | 323 return nullptr; |
324 } | 324 } |
325 | 325 |
326 if (m_streams.find(file) == m_streams.end()) { | 326 if (m_streams.find(file) == m_streams.end()) { |
327 if (m_stdout) { | 327 if (m_stdout) { |
328 m_streams[file] = new QTextStream(stdout); | 328 m_streams[file] = new QTextStream(stdout); |
370 << m_files.begin()->second->fileName() << "\"" << endl; | 370 << m_files.begin()->second->fileName() << "\"" << endl; |
371 delete m_files.begin()->second; | 371 delete m_files.begin()->second; |
372 } | 372 } |
373 m_files.erase(m_files.begin()); | 373 m_files.erase(m_files.begin()); |
374 } | 374 } |
375 m_prevstream = 0; | 375 m_prevstream = nullptr; |
376 } | 376 } |
377 | 377 |