QStandardPaths: add Config and GenericData, add methods

New methods: standardLocations, locate, locateAll.

Change-Id: I60bc90f8df53727a72c4b1839ea4d1d88a204e29
Reviewed-by: Thiago Macieira (Intel) <thiago.macieira@intel.com>

1 files changed, 43 insertions, 21 deletions

diff --git a/src/corelib/io/qstandardpaths_mac.cpp b/src/corelib/io/qstandardpaths_mac.cpp
index b90cc7c6f2..a13162cc7b 100644
--- a/src/corelib/io/qstandardpaths_mac.cpp
+++ b/src/corelib/io/qstandardpaths_mac.cpp
@@ -56,6 +56,8 @@ QT_BEGIN_NAMESPACE
 OSType translateLocation(QStandardPaths::StandardLocation type)
 {
     switch (type) {
+    case QStandardPaths::ConfigLocation:
+        return kPreferencesFolderType;
     case QStandardPaths::DesktopLocation:
         return kDesktopFolderType;
     case QStandardPaths::DocumentsLocation:
@@ -74,6 +76,7 @@ OSType translateLocation(QStandardPaths::StandardLocation type)
         return kPictureDocumentsFolderType;
     case QStandardPaths::TempLocation:
         return kTemporaryFolderType;
+    case QStandardPaths::GenericDataLocation:
     case QStandardPaths::DataLocation:
         return kApplicationSupportFolderType;
     case QStandardPaths::CacheLocation:
@@ -94,35 +97,54 @@ static QString getFullPath(const FSRef &ref)
     return QString();
 }
 
-QString QStandardPaths::storageLocation(StandardLocation type)
+static QString macLocation(QStandardPaths::StandardLocation type, short domain)
 {
-     if (type == HomeLocation)
-        return QDir::homePath();
-
-     if (type == TempLocation)
-         return QDir::tempPath();
+    // http://developer.apple.com/documentation/Carbon/Reference/Folder_Manager/Reference/reference.html
+    FSRef ref;
+    OSErr err = FSFindFolder(domain, translateLocation(type), false, &ref);
+    if (err)
+       return QString();
 
-    short domain = kOnAppropriateDisk;
+   QString path = getFullPath(ref);
 
-    if (type == DataLocation || type == CacheLocation)
-        domain = kUserDomain;
+   if (type == QStandardPaths::DataLocation || type == QStandardPaths::CacheLocation) {
+       if (!QCoreApplication::organizationName().isEmpty())
+           path += QLatin1Char('/') + QCoreApplication::organizationName();
+       if (!QCoreApplication::applicationName().isEmpty())
+           path += QLatin1Char('/') + QCoreApplication::applicationName();
+   }
+   return path;
+}
 
-     // http://developer.apple.com/documentation/Carbon/Reference/Folder_Manager/Reference/reference.html
-     FSRef ref;
-     OSErr err = FSFindFolder(domain, translateLocation(type), false, &ref);
-     if (err)
-        return QString();
+QString QStandardPaths::storageLocation(StandardLocation type)
+{
+    switch (type) {
+    case HomeLocation:
+        return QDir::homePath();
+    case TempLocation:
+        return QDir::tempPath();
+    case GenericDataLocation:
+    case DataLocation:
+    case CacheLocation:
+        return macLocation(type, kUserDomain);
+    default:
+        return macLocation(type, kOnAppropriateDisk);
+    }
+}
 
-    QString path = getFullPath(ref);
+QStringList QStandardPaths::standardLocations(StandardLocation type)
+{
+    QStringList dirs;
 
-    if (type == DataLocation || type == CacheLocation) {
-        if (QCoreApplication::organizationName().isEmpty() == false)
-            path += QLatin1Char('/') + QCoreApplication::organizationName();
-        if (QCoreApplication::applicationName().isEmpty() == false)
-            path += QLatin1Char('/') + QCoreApplication::applicationName();
+    if (type == GenericDataLocation || type == DataLocation || type == CacheLocation) {
+        const QString path = macLocation(type, kOnAppropriateDisk);
+        if (!path.isEmpty())
+            dirs.append(path);
     }
 
-    return path;
+    const QString localDir = storageLocation(type);
+    dirs.prepend(localDir);
+    return dirs;
 }
 
 QString QStandardPaths::displayName(StandardLocation type)