From ffa440faa1348410df2f6b606199ebd97b839685 Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Sat, 31 Dec 2011 15:27:11 +0100 Subject: Remove dependency on QDesktopServices deprecated API. QDesktopServices::storageLocation() is deprecated in favor of QStandardPaths::writableLocation(). Change-Id: I5c427d8f2a8d7cbffcca7938c184b07b0ba47ab5 Reviewed-by: Robin Burchell Reviewed-by: Toby Tomkins --- examples/phonon/qmediaplayer/mediaplayer.cpp | 2 +- examples/phonon/qmusicplayer/mainwindow.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/phonon/qmediaplayer/mediaplayer.cpp b/examples/phonon/qmediaplayer/mediaplayer.cpp index 23bf0e7..9e249e0 100644 --- a/examples/phonon/qmediaplayer/mediaplayer.cpp +++ b/examples/phonon/qmediaplayer/mediaplayer.cpp @@ -714,7 +714,7 @@ void MediaPlayer::openFile() const bool hasPausedForDialog = playPauseForDialog(); QStringList fileNames = QFileDialog::getOpenFileNames(this, QString(), - QDesktopServices::storageLocation(QDesktopServices::MusicLocation)); + QStandardPaths::writableLocation(QStandardPaths::MusicLocation)); if (hasPausedForDialog) m_MediaObject.play(); diff --git a/examples/phonon/qmusicplayer/mainwindow.cpp b/examples/phonon/qmusicplayer/mainwindow.cpp index f6a41a3..18beafa 100644 --- a/examples/phonon/qmusicplayer/mainwindow.cpp +++ b/examples/phonon/qmusicplayer/mainwindow.cpp @@ -76,7 +76,7 @@ MainWindow::MainWindow() void MainWindow::addFiles() { QStringList files = QFileDialog::getOpenFileNames(this, tr("Select Music Files"), - QDesktopServices::storageLocation(QDesktopServices::MusicLocation)); + QStandardPaths::writableLocation(QStandardPaths::MusicLocation)); if (files.isEmpty()) return; -- cgit v1.2.3