From af1973eea8a1f3e63c0cca0a81a846a9de64471a Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tml@collabora.com>
Date: Mon, 28 Mar 2016 13:38:36 +0300
Subject: [PATCH] No need to have Config as a static member in the class

Its value is already available as a macro from config.h even.
---
 loolwsd/LOOLWSD.cpp | 3 +--
 loolwsd/LOOLWSD.hpp | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index bec5a1dde..077b2e7bc 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -1011,7 +1011,6 @@ private:
 std::atomic<unsigned> LOOLWSD::NextSessionId;
 int LOOLWSD::BrokerWritePipe = -1;
 std::string LOOLWSD::Cache = LOOLWSD_CACHEDIR;
-std::string LOOLWSD::Config = LOOLWSD_CONFIGDIR;
 std::string LOOLWSD::SysTemplate;
 std::string LOOLWSD::LoTemplate;
 std::string LOOLWSD::ChildRoot;
@@ -1040,7 +1039,7 @@ void LOOLWSD::initialize(Application& self)
     // load default configuration files, if present
     if (loadConfiguration() == 0)
     {
-        std::string configPath = LOOLWSD::Config + "/loolwsd.xml";
+        std::string configPath = LOOLWSD_CONFIGDIR "/loolwsd.xml";
         loadConfiguration(configPath);
     }
 
diff --git a/loolwsd/LOOLWSD.hpp b/loolwsd/LOOLWSD.hpp
index 92a36829f..f2a498eca 100644
--- a/loolwsd/LOOLWSD.hpp
+++ b/loolwsd/LOOLWSD.hpp
@@ -40,7 +40,6 @@ public:
     static int BrokerWritePipe;
     static bool DoTest;
     static std::string Cache;
-    static std::string Config;
     static std::string SysTemplate;
     static std::string LoTemplate;
     static std::string ChildRoot;