strepsirrhini/libreoffice-online
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

No need to have Config as a static member in the class

Browse source 
Its value is already available as a macro from config.h even.
This commit is contained in:
Tor Lillqvist 2016-03-28 13:38:36 +03:00
parent 2604824d5f
commit af1973eea8
2 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
loolwsd/LOOLWSD.cpp
View file

@ -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);
}

1
loolwsd/LOOLWSD.hpp
View file

@ -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;