From 516dc948a8f180520352175e79f0139dde9b8d1f Mon Sep 17 00:00:00 2001 From: Tomasz Sterna Date: Sat, 3 Jan 2015 19:27:18 +0100 Subject: Fixed storage path creation --- daemon/appmanager.cpp | 6 ++---- daemon/daemon.cpp | 4 ---- daemon/jskitobjects.cpp | 2 +- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/daemon/appmanager.cpp b/daemon/appmanager.cpp index c10cf22..9896a70 100644 --- a/daemon/appmanager.cpp +++ b/daemon/appmanager.cpp @@ -24,10 +24,8 @@ AppManager::AppManager(QObject *parent) this, &AppManager::rescan); QDir dataDir(QStandardPaths::writableLocation(QStandardPaths::DataLocation)); - if (!dataDir.exists("apps")) { - if (!dataDir.mkdir("apps")) { - logger()->warn() << "could not create dir" << dataDir.absoluteFilePath("apps"); - } + if (!dataDir.mkpath("apps")) { + qCWarning(l) << "could not create apps dir" << dataDir.absoluteFilePath("apps"); } qCDebug(l) << "install apps in" << dataDir.absoluteFilePath("apps"); diff --git a/daemon/daemon.cpp b/daemon/daemon.cpp index 178f04d..b645eba 100644 --- a/daemon/daemon.cpp +++ b/daemon/daemon.cpp @@ -30,10 +30,6 @@ #include #include -#include -#include -#include -#include #include void signalhandler(int sig) diff --git a/daemon/jskitobjects.cpp b/daemon/jskitobjects.cpp index 2aca027..b0da7f9 100644 --- a/daemon/jskitobjects.cpp +++ b/daemon/jskitobjects.cpp @@ -229,7 +229,7 @@ void JSKitLocalStorage::checkLengthChanged() QString JSKitLocalStorage::getStorageFileFor(const QUuid &uuid) { QDir dataDir(QStandardPaths::writableLocation(QStandardPaths::DataLocation)); - dataDir.mkdir("js-storage"); + dataDir.mkpath("js-storage"); QString fileName = uuid.toString(); fileName.remove('{'); fileName.remove('}'); -- cgit v1.2.3