diff options
author | Lars Knoll <lars.knoll@qt.io> | 2020-12-23 10:35:52 +0100 |
---|---|---|
committer | Lars Knoll <lars.knoll@qt.io> | 2021-01-21 19:56:06 +0000 |
commit | ca1584428b438cb65d5b2aaaca624e9e17578ebd (patch) | |
tree | 8f28baf79c54bedf47dd5196dc9cce695edaea24 /src/multimedia/playback/qplaylistfileparser.cpp | |
parent | 1175c3b5405015a27bc28d836e96582f02d3ce00 (diff) |
Coding style cleanups
Do some coding style fixes proposed by clang-tidy.
Change-Id: I62584767fd7af2f98ac02653c1105d64188f5554
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Doris Verria <doris.verria@qt.io>
Diffstat (limited to 'src/multimedia/playback/qplaylistfileparser.cpp')
-rw-r--r-- | src/multimedia/playback/qplaylistfileparser.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/multimedia/playback/qplaylistfileparser.cpp b/src/multimedia/playback/qplaylistfileparser.cpp index 995243084..586a8a46d 100644 --- a/src/multimedia/playback/qplaylistfileparser.cpp +++ b/src/multimedia/playback/qplaylistfileparser.cpp @@ -90,19 +90,18 @@ protected: // Resolve it relative to root if (root.isLocalFile()) return QUrl::fromUserInput(line, root.adjusted(QUrl::RemoveFilename).toLocalFile(), QUrl::AssumeLocalFile); - else - return root.resolved(url); - } else if (url.scheme().length() == 1) { + return root.resolved(url); + } + if (url.scheme().length() == 1) // Assume it's a drive letter for a Windows path url = QUrl::fromLocalFile(line); - } return url; } void newItemFound(const QVariant& content) { Q_EMIT m_parent->newItem(content); } -protected: + QPlaylistFileParser *m_parent; bool m_aborted; }; |