summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomasz Sterna <tomek@xiaoka.com>2015-01-03 19:27:18 +0100
committerTomasz Sterna <tomek@xiaoka.com>2015-01-03 19:27:18 +0100
commit516dc948a8f180520352175e79f0139dde9b8d1f (patch)
treed999d4a5cb4d02f9d92b960f0af7cdc83f4c17b6
parent4e7da1944f5fa75a0739c0757d40a8102f045365 (diff)
Fixed storage path creation
-rw-r--r--daemon/appmanager.cpp6
-rw-r--r--daemon/daemon.cpp4
-rw-r--r--daemon/jskitobjects.cpp2
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 <signal.h>
#include <QCoreApplication>
-#include <QStandardPaths>
-#include <QFile>
-#include <QDir>
-#include <QFileInfo>
#include <QLoggingCategory>
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('}');