diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-10-28 14:10:28 +0100 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-10-29 13:41:44 +0100 |
commit | 9f77002fd3106ca4477159212781264d5b688ddb (patch) | |
tree | 767a8cbe4ab1e66ca4c7ca9d9e5f8f727c47e281 /src/multimedia | |
parent | c6e934601a3405f80c601aac207b09588e291b89 (diff) | |
download | qtmultimedia-9f77002fd3106ca4477159212781264d5b688ddb.tar.gz |
Update dependencies
Fix some warnings about deprecated API and usage
pf QMutexLocker.
Change-Id: I16a1e66a57d0c638f88478ec250e92178c6a433c
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/multimedia')
-rw-r--r-- | src/multimedia/playback/qmedianetworkplaylistprovider.cpp | 13 | ||||
-rw-r--r-- | src/multimedia/playback/qplaylistfileparser.cpp | 8 | ||||
-rw-r--r-- | src/multimedia/qmediaobject.cpp | 2 |
3 files changed, 13 insertions, 10 deletions
diff --git a/src/multimedia/playback/qmedianetworkplaylistprovider.cpp b/src/multimedia/playback/qmedianetworkplaylistprovider.cpp index 8282d636a..03bdb0e73 100644 --- a/src/multimedia/playback/qmedianetworkplaylistprovider.cpp +++ b/src/multimedia/playback/qmedianetworkplaylistprovider.cpp @@ -101,11 +101,14 @@ void QMediaNetworkPlaylistProviderPrivate::_q_handleNewItem(const QVariant& cont Q_Q(QMediaNetworkPlaylistProvider); QUrl url; - if (content.type() == QVariant::Url) { - url = content.toUrl(); - } else if (content.type() == QVariant::Map) { - url = content.toMap()[QLatin1String("url")].toUrl(); - } else { + switch (content.metaType().id() ) { + case QMetaType::QUrl: + url = content.toUrl(); + break; + case QMetaType::QVariantMap: + url = content.toMap().value(QLatin1String("url")).toUrl(); + break; + default: return; } diff --git a/src/multimedia/playback/qplaylistfileparser.cpp b/src/multimedia/playback/qplaylistfileparser.cpp index b60e9778c..c1a423308 100644 --- a/src/multimedia/playback/qplaylistfileparser.cpp +++ b/src/multimedia/playback/qplaylistfileparser.cpp @@ -135,7 +135,7 @@ public: */ bool parseLineImpl(int lineIndex, const QString& line, const QUrl& root) override { - if (line[0] == '#' ) { + if (line[0] == u'#' ) { if (m_extendedFormat) { if (line.startsWith(QLatin1String("#EXTINF:"))) { m_extraInfo.clear(); @@ -179,11 +179,11 @@ public: startPos = 0; const QChar* buf = line.data(); for (int i = startPos; i < line.length(); ++i) { - if (buf[i] == '-') { + if (buf[i] == u'-') { if (i == line.length() - 1) return i; ++i; - if (buf[i] != '-') + if (buf[i] != u'-') return i - 1; } } @@ -257,7 +257,7 @@ Version=2 } QString getValue(QStringView line) { - int start = line.indexOf('='); + int start = line.indexOf(u'='); if (start < 0) return QString(); return line.mid(start + 1).trimmed().toString(); diff --git a/src/multimedia/qmediaobject.cpp b/src/multimedia/qmediaobject.cpp index a26433c8e..26a8580f5 100644 --- a/src/multimedia/qmediaobject.cpp +++ b/src/multimedia/qmediaobject.cpp @@ -64,7 +64,7 @@ void QMediaObjectPrivate::_q_notify() for (int pi : qAsConst(properties)) { QMetaProperty p = m->property(pi); p.notifySignal().invoke( - q, QGenericArgument(QMetaType::typeName(p.userType()), p.read(q).data())); + q, QGenericArgument(p.metaType().name(), p.read(q).data())); } } |