Mercurial > hg > svcore
diff data/fileio/PlaylistFileReader.cpp @ 1450:a12fd0456f0c streaming-csv-writer
Merge from default branch
author | Chris Cannam |
---|---|
date | Tue, 17 Apr 2018 10:35:42 +0100 |
parents | 48e9f538e6e9 |
children | 70e172e6cc59 |
line wrap: on
line diff
--- a/data/fileio/PlaylistFileReader.cpp Tue Apr 17 10:03:51 2018 +0100 +++ b/data/fileio/PlaylistFileReader.cpp Tue Apr 17 10:35:42 2018 +0100 @@ -66,13 +66,13 @@ bool good = false; if (!m_file->exists()) { - m_error = QFile::tr("File \"%1\" does not exist") + m_error = QFile::tr("File \"%1\" does not exist") .arg(m_source.getLocation()); } else if (!m_file->open(QIODevice::ReadOnly | QIODevice::Text)) { - m_error = QFile::tr("Failed to open file \"%1\"") + m_error = QFile::tr("Failed to open file \"%1\"") .arg(m_source.getLocation()); } else { - good = true; + good = true; } if (good) { @@ -82,8 +82,8 @@ } if (!good) { - delete m_file; - m_file = 0; + delete m_file; + m_file = 0; } }