summaryrefslogtreecommitdiffstats
path: root/common/log.cpp
diff options
context:
space:
mode:
authorChristian Mollekopf <chrigi_1@fastmail.fm>2016-07-08 09:47:28 +0200
committerChristian Mollekopf <chrigi_1@fastmail.fm>2016-07-08 09:47:28 +0200
commit1b6439215fa0bb6ac1e191c2ffc992e815a53199 (patch)
tree71a23c3810b470f3058ee7ec8cafa99a226bc41f /common/log.cpp
parent3c05b5816aa0fb978686b0ed16a02336e0981a0e (diff)
downloadsink-1b6439215fa0bb6ac1e191c2ffc992e815a53199.tar.gz
sink-1b6439215fa0bb6ac1e191c2ffc992e815a53199.zip
Separate config from data and define centrally
Diffstat (limited to 'common/log.cpp')
-rw-r--r--common/log.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/common/log.cpp b/common/log.cpp
index a3df04c..099c043 100644
--- a/common/log.cpp
+++ b/common/log.cpp
@@ -4,19 +4,19 @@
4#include <QIODevice> 4#include <QIODevice>
5#include <QCoreApplication> 5#include <QCoreApplication>
6#include <QSettings> 6#include <QSettings>
7#include <QStandardPaths>
8#include <QSharedPointer> 7#include <QSharedPointer>
9#include <QMutex> 8#include <QMutex>
10#include <QMutexLocker> 9#include <QMutexLocker>
11#include <iostream> 10#include <iostream>
12#include <unistd.h> 11#include <unistd.h>
13#include <memory> 12#include <memory>
13#include <definitions.h>
14 14
15using namespace Sink::Log; 15using namespace Sink::Log;
16 16
17static QSharedPointer<QSettings> config() 17static QSharedPointer<QSettings> config()
18{ 18{
19 return QSharedPointer<QSettings>::create(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + "/sink/log.ini", QSettings::IniFormat); 19 return QSharedPointer<QSettings>::create(Sink::configLocation() + "/log.ini", QSettings::IniFormat);
20} 20}
21 21
22static QByteArray sPrimaryComponent; 22static QByteArray sPrimaryComponent;
@@ -223,7 +223,7 @@ static QByteArray getProgramName()
223 223
224static QSharedPointer<QSettings> debugAreasConfig() 224static QSharedPointer<QSettings> debugAreasConfig()
225{ 225{
226 return QSharedPointer<QSettings>::create(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + "/sink/debugAreas.ini", QSettings::IniFormat); 226 return QSharedPointer<QSettings>::create(Sink::dataLocation() + "/debugAreas.ini", QSettings::IniFormat);
227} 227}
228 228
229class DebugAreaCollector { 229class DebugAreaCollector {