From d8fdb149417ee88c5d098dc3b006785f46fd71b6 Mon Sep 17 00:00:00 2001 From: "Martin T. H. Sandsmark" Date: Sun, 24 Jul 2016 22:40:20 +0200 Subject: [PATCH] Port away from deprecated Phonon API --- ui/snapshottaker.cpp | 2 +- ui/snapshottaker.h | 2 +- ui/videowidget.cpp | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ui/snapshottaker.cpp b/ui/snapshottaker.cpp index d34711720..81c051e3e 100644 --- a/ui/snapshottaker.cpp +++ b/ui/snapshottaker.cpp @@ -14,7 +14,7 @@ #include -SnapshotTaker::SnapshotTaker( const QString &url, QObject *parent ) +SnapshotTaker::SnapshotTaker(const QUrl &url, QObject *parent ) : QObject( parent ) , m_player( new Phonon::VideoPlayer( Phonon::NoCategory, 0 ) ) { diff --git a/ui/snapshottaker.h b/ui/snapshottaker.h index 237979ebe..6260191e7 100644 --- a/ui/snapshottaker.h +++ b/ui/snapshottaker.h @@ -21,7 +21,7 @@ class SnapshotTaker : public QObject Q_OBJECT public: - SnapshotTaker( const QString &url, QObject *parent = Q_NULLPTR ); + SnapshotTaker( const QUrl &url, QObject *parent = Q_NULLPTR ); ~SnapshotTaker(); Q_SIGNALS: diff --git a/ui/videowidget.cpp b/ui/videowidget.cpp index bdd4be3bc..50341c91f 100644 --- a/ui/videowidget.cpp +++ b/ui/videowidget.cpp @@ -119,7 +119,7 @@ void VideoWidget::Private::load() newurl = QUrl::fromLocalFile(url); } if ( newurl.isLocalFile() ) - player->load( newurl.toLocalFile() ); + player->load( newurl ); else player->load( newurl ); @@ -159,9 +159,9 @@ void VideoWidget::Private::takeSnapshot() SnapshotTaker *taker = 0; if ( newurl.isLocalFile() ) - taker = new SnapshotTaker( newurl.toLocalFile(), q ); + taker = new SnapshotTaker( newurl, q ); else - taker = new SnapshotTaker( newurl.url(), q ); + taker = new SnapshotTaker( newurl, q ); q->connect( taker, SIGNAL( finished( const QImage& ) ), q, SLOT( setPosterImage( const QImage& ) ) ); }