Mercurial > hg > svcore
diff data/fileio/PlaylistFileReader.cpp @ 1599:ce185d4dd408 bqaudiostream
Merge from default branch
author | Chris Cannam |
---|---|
date | Wed, 23 Jan 2019 14:43:43 +0000 |
parents | 70e172e6cc59 |
children | f36fef97ac81 |
line wrap: on
line diff
--- a/data/fileio/PlaylistFileReader.cpp Wed Jan 23 10:31:40 2019 +0000 +++ b/data/fileio/PlaylistFileReader.cpp Wed Jan 23 14:43:43 2019 +0000 @@ -25,7 +25,7 @@ PlaylistFileReader::PlaylistFileReader(QString path) : m_source(path), - m_file(0) + m_file(nullptr) { if (!m_source.isAvailable()) { m_error = QFile::tr("File or URL \"%1\" could not be retrieved") @@ -37,7 +37,7 @@ PlaylistFileReader::PlaylistFileReader(FileSource source) : m_source(source), - m_file(0) + m_file(nullptr) { if (!m_source.isAvailable()) { m_error = QFile::tr("File or URL \"%1\" could not be retrieved") @@ -83,14 +83,14 @@ if (!good) { delete m_file; - m_file = 0; + m_file = nullptr; } } bool PlaylistFileReader::isOK() const { - return (m_file != 0); + return (m_file != nullptr); } QString