summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin T. H. Sandsmark <martin.sandsmark@kde.org>2016-07-24 20:40:20 (GMT)
committerMartin T. H. Sandsmark <martin.sandsmark@kde.org>2016-07-24 20:40:20 (GMT)
commitd8fdb149417ee88c5d098dc3b006785f46fd71b6 (patch)
tree78c09a980b0211d7c67fa6367b6049300b1ff569
parentfc09e52fc30d3ddb6799310e4036ece314073da7 (diff)
Port away from deprecated Phonon API
-rw-r--r--ui/snapshottaker.cpp2
-rw-r--r--ui/snapshottaker.h2
-rw-r--r--ui/videowidget.cpp6
3 files changed, 5 insertions, 5 deletions
diff --git a/ui/snapshottaker.cpp b/ui/snapshottaker.cpp
index d347117..81c051e 100644
--- a/ui/snapshottaker.cpp
+++ b/ui/snapshottaker.cpp
@@ -14,7 +14,7 @@
#include <QtGui/QImage>
-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 237979e..6260191 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 bdd4be3..50341c9 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& ) ) );
}