From 78f4577a2dd9a2bdabd51d6791d92c744ece4e95 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Wed, 1 Aug 2012 16:08:24 +0200 Subject: 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 Reviewed-by: Dmytro Poplavskiy --- src/plugins/gstreamer/camerabin/camerabinsession.cpp | 4 ++-- src/plugins/gstreamer/mediacapture/qgstreamerrecordercontrol.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/plugins/gstreamer') diff --git a/src/plugins/gstreamer/camerabin/camerabinsession.cpp b/src/plugins/gstreamer/camerabin/camerabinsession.cpp index c5c4a50bd..cda01dd35 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 cfcdb1046..b7236facf 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"); -- cgit v1.2.3