slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use QStandardPaths instead of QDesktopServices

Browse Source 
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>
This commit is contained in:
Thiago Macieira
2012-08-01 16:08:24 +02:00
committed by Qt by Nokia
parent e015f72189
commit 78f4577a2d
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/gstreamer/camerabin/camerabinsession.cpp
View File

@@ -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");

4
src/plugins/gstreamer/mediacapture/qgstreamerrecordercontrol.cpp
View File

@@ -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");