From e1866e635fa04704e47d09f5aaf20384cd7b83a7 Mon Sep 17 00:00:00 2001
From: Vasily <vautkin@teknik.io>
Date: Sun, 17 Mar 2019 16:44:16 +0100
Subject: [PATCH] Convert logfile to use new paths functions

---
 src/utils/paths.cpp | 13 +++++++++++++
 src/utils/paths.h   |  1 -
 src/utils/setup.cpp |  8 ++++----
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/utils/paths.cpp b/src/utils/paths.cpp
index 1090952..52b3216 100644
--- a/src/utils/paths.cpp
+++ b/src/utils/paths.cpp
@@ -51,4 +51,17 @@ optional<string> binaryDirectoryFindDirectory( const string directoryName )
     return path.toStdString();
 }
 
+optional<string> settingsDirectory()
+{
+    const auto path
+        = QStandardPaths::writableLocation( QStandardPaths::AppDataLocation );
+    if ( path == "" )
+    {
+        LOG( ERROR ) << "Could not find settings directory.";
+        return std::nullopt;
+    }
+
+    return path.toStdString();
+}
+
 } // namespace paths
diff --git a/src/utils/paths.h b/src/utils/paths.h
index 926c752..ae06208 100644
--- a/src/utils/paths.h
+++ b/src/utils/paths.h
@@ -12,6 +12,5 @@ optional<string> binaryDirectoryFindFile( string fileName );
 optional<string> binaryDirectoryFindDirectory( string directoryName );
 
 optional<string> settingsDirectory();
-optional<string> settingsDirectoryFindFile( string fileName );
 
 } // namespace paths
diff --git a/src/utils/setup.cpp b/src/utils/setup.cpp
index 4d5b4a2..e8b879f 100644
--- a/src/utils/setup.cpp
+++ b/src/utils/setup.cpp
@@ -275,10 +275,10 @@ void setUpLogging()
     const auto appDataLocation
         = std::string( "/" ) + application_strings::applicationOrganizationName
           + "/";
-    const auto logFilePath = QDir( QStandardPaths::writableLocation(
-                                       QStandardPaths::AppDataLocation )
-                                   + appDataLocation.c_str() )
-                                 .absoluteFilePath( logFileName );
+    const auto logFilePath
+        = QDir( QString::fromStdString( *paths::settingsDirectory() )
+                + appDataLocation.c_str() )
+              .absoluteFilePath( logFileName );
     conf.set( el::Level::Global,
               el::ConfigurationType::Filename,
               QDir::toNativeSeparators( logFilePath ).toStdString() );