Merge lp:~fboucault/qtubuntu-camera/save_videos_subfolder into lp:qtubuntu-camera

[Florian Boucault]

Save pictures and videos in a subfolder of the standard paths that depends on the application name.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:101
http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-ci/82/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-utopic-amd64-ci/25
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-utopic-armhf-ci/23
        deb: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-utopic-armhf-ci/23/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-utopic-i386-ci/23

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtubuntu-camera-ci/82/rebuild

review: Approve (continuous-integration)

[Jim Hodapp (jhodapp)]

Looks good, thanks!

review: Approve (code)

=== modified file 'src/storagemanager.cpp'
--- src/storagemanager.cpp	2013-05-24 11:25:15 +0000
+++ src/storagemanager.cpp	2014-07-29 18:11:44 +0000
@@ -21,6 +21,7 @@
 #include <QFile>
 #include <QFileInfo>
 #include <QStandardPaths>
+#include <QCoreApplication>
 
 const QLatin1String photoBase = QLatin1String("image");
 const QLatin1String videoBase = QLatin1String("video");
@@ -36,7 +37,7 @@
 {
     m_directory = directoy;
     if (m_directory.isEmpty())
-        m_directory = QStandardPaths::writableLocation(QStandardPaths::PicturesLocation);
+        m_directory = QStandardPaths::writableLocation(QStandardPaths::PicturesLocation) + "/" + QCoreApplication::applicationName();
 
     return nextMediaFileName(photoBase, photoExtension);
 }
@@ -45,7 +46,7 @@
 {
     m_directory = directoy;
     if (m_directory.isEmpty())
-        m_directory = QStandardPaths::writableLocation(QStandardPaths::MoviesLocation);
+        m_directory = QStandardPaths::writableLocation(QStandardPaths::MoviesLocation) + "/" + QCoreApplication::applicationName();
 
     return nextMediaFileName(videoBase, videoExtension);
 }