slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

QtMultimedia: Fix compiler warnings.

Browse Source 
Change-Id: Ic0edfa95c03103550d22bfdf88c33fdbd6f41e3c
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
This commit is contained in:
Friedemann Kleint
2012-04-24 10:59:20 +02:00
committed by Qt by Nokia
parent 5ae3adcfa9
commit c177d8d69e
2 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/multimedia/playback/qmediaplayer.cpp
View File

@@ -400,13 +400,11 @@ void QMediaPlayerPrivate::_q_handlePlaylistLoaded()
{ {
Q_Q(QMediaPlayer); Q_Q(QMediaPlayer);
QMediaPlaylist *oldPlaylist = 0;
if (pendingPlaylist.playlist()) { if (pendingPlaylist.playlist()) {
Q_ASSERT(!q->currentMedia().playlist()); Q_ASSERT(!q->currentMedia().playlist());
// if there is an active playlist // if there is an active playlist
if (playlist) { if (playlist) {
Q_ASSERT(playlist->currentIndex() >= 0); Q_ASSERT(playlist->currentIndex() >= 0);
oldPlaylist = playlist;
disconnectPlaylist(); disconnectPlaylist();
playlist->insertMedia(playlist->currentIndex() + 1, pendingPlaylist); playlist->insertMedia(playlist->currentIndex() + 1, pendingPlaylist);
playlist->removeMedia(playlist->currentIndex()); playlist->removeMedia(playlist->currentIndex());

2
src/multimedia/qmediaresourceset_p.cpp
View File

@@ -50,7 +50,7 @@ QMediaPlayerResourceSetInterface::QMediaPlayerResourceSetInterface(QObject *pare
QString QMediaPlayerResourceSetInterface::iid() QString QMediaPlayerResourceSetInterface::iid()
{ {
return QString(QMediaPlayerResourceSetInterface_iid); return QLatin1String(QMediaPlayerResourceSetInterface_iid);
} }
QT_END_NAMESPACE QT_END_NAMESPACE