From: Thiago Macieira <thiago.macieira@intel.com>
Date: Wed, 1 Aug 2012 14:08:24 +0000 (+0200)
Subject: Use QStandardPaths instead of QDesktopServices
X-Git-Tag: upstream/5.2.95+rc1~222
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=78f4577a2dd9a2bdabd51d6791d92c744ece4e95;p=platform%2Fupstream%2Fqtmultimedia.git

Use QStandardPaths instead of QDesktopServices

The use of QDesktopServices for getting paths is deprecated in favour
of QStandardPaths.

Change-Id: I93c4a15dd65962d668c90e78f3f33f357e2450bb
Reviewed-by: David Faure <faure@kde.org>
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
---

diff --git a/src/plugins/gstreamer/camerabin/camerabinsession.cpp b/src/plugins/gstreamer/camerabin/camerabinsession.cpp
index c5c4a50..cda01dd 100644
--- a/src/plugins/gstreamer/camerabin/camerabinsession.cpp
+++ b/src/plugins/gstreamer/camerabin/camerabinsession.cpp
@@ -462,11 +462,11 @@ QDir CameraBinSession::defaultDir(QCamera::CaptureModes mode) const
 #endif
 
     if (mode == QCamera::CaptureVideo) {
-        dirCandidates << QDesktopServices::storageLocation(QDesktopServices::MoviesLocation);
+        dirCandidates << QStandardPaths::writableLocation(QStandardPaths::MoviesLocation);
         dirCandidates << QDir::home().filePath("Documents/Video");
         dirCandidates << QDir::home().filePath("Documents/Videos");
     } else {
-        dirCandidates << QDesktopServices::storageLocation(QDesktopServices::PicturesLocation);
+        dirCandidates << QStandardPaths::writableLocation(QStandardPaths::PicturesLocation);
         dirCandidates << QDir::home().filePath("Documents/Photo");
         dirCandidates << QDir::home().filePath("Documents/Photos");
         dirCandidates << QDir::home().filePath("Documents/photo");
diff --git a/src/plugins/gstreamer/mediacapture/qgstreamerrecordercontrol.cpp b/src/plugins/gstreamer/mediacapture/qgstreamerrecordercontrol.cpp
index cfcdb10..b7236fa 100644
--- a/src/plugins/gstreamer/mediacapture/qgstreamerrecordercontrol.cpp
+++ b/src/plugins/gstreamer/mediacapture/qgstreamerrecordercontrol.cpp
@@ -334,9 +334,9 @@ QDir QGstreamerRecorderControl::defaultDir() const
 #endif
 
     if (m_session->captureMode() & QGstreamerCaptureSession::Video)
-        dirCandidates << QDesktopServices::storageLocation(QDesktopServices::MoviesLocation);
+        dirCandidates << QStandardPaths::writableLocation(QStandardPaths::MoviesLocation);
     else
-        dirCandidates << QDesktopServices::storageLocation(QDesktopServices::MusicLocation);
+        dirCandidates << QStandardPaths::writableLocation(QStandardPaths::MusicLocation);
 
     dirCandidates << QDir::home().filePath("Documents");
     dirCandidates << QDir::home().filePath("My Documents");