# HG changeset patch # User Chris Cannam # Date 1313663783 -3600 # Node ID b867c07478befa11e5ae3dc03c0baba0e4c7687a # Parent 5117d7cf59ec6e04203042998e084030f34c1196 Simplify temporary directory path &c diff -r 5117d7cf59ec -r b867c07478be base/ResourceFinder.cpp --- a/base/ResourceFinder.cpp Wed Aug 17 22:14:52 2011 +0100 +++ b/base/ResourceFinder.cpp Thu Aug 18 11:36:23 2011 +0100 @@ -75,8 +75,7 @@ } #else #ifdef Q_OS_MAC - list << QString("/Library/Application Support/%1/%2") - .arg(qApp->organizationName()) + list << QString("/Library/Application Support/%1") .arg(qApp->applicationName()); #else list << QString("/usr/local/share/%1") @@ -107,9 +106,8 @@ char *home = getenv("HOME"); if (!home || !home[0]) return ""; #ifdef Q_OS_MAC - return QString("%1/Library/Application Support/%2/%3") + return QString("%1/Library/Application Support/%2") .arg(home) - .arg(qApp->organizationName()) .arg(qApp->applicationName()); #else return QString("%1/.local/share/%2") diff -r 5117d7cf59ec -r b867c07478be base/TempDirectory.cpp --- a/base/TempDirectory.cpp Wed Aug 17 22:14:52 2011 +0100 +++ b/base/TempDirectory.cpp Thu Aug 18 11:36:23 2011 +0100 @@ -72,7 +72,7 @@ } if (!QFileInfo(svDir).exists()) { - if (!QDir(svDirParent).mkdir(svDir)) { + if (!QDir(svDirParent).mkpath(svDir)) { throw DirectoryCreationFailed(QString("%1 directory in %2") .arg(svDir).arg(svDirParent)); }