Changed: Use of CFile::getApplicationDirectory
This commit is contained in:
parent
113e955568
commit
9fa9999627
4 changed files with 8 additions and 12 deletions
|
@ -957,11 +957,10 @@ int main(int /* argc */, char ** /* argv */)
|
||||||
NLMISC::CApplicationContext myApplicationContext;
|
NLMISC::CApplicationContext myApplicationContext;
|
||||||
|
|
||||||
#ifdef NL_OS_UNIX
|
#ifdef NL_OS_UNIX
|
||||||
std::string homeDir = getenv("HOME");
|
NLMISC::CPath::addSearchPath(NLMISC::CFile::getApplicationDirectory("NeL"));
|
||||||
NLMISC::CPath::addSearchPath( homeDir + "/.nel");
|
|
||||||
#endif // NL_OS_UNIX
|
#endif // NL_OS_UNIX
|
||||||
|
|
||||||
NLMISC::CPath::addSearchPath(NL_ZVIEWER_CFG);
|
NLMISC::CPath::addSearchPath(NL_ZVIEWER_CFG);
|
||||||
|
|
||||||
initViewerConfig("zviewer.cfg");
|
initViewerConfig("zviewer.cfg");
|
||||||
|
|
||||||
|
|
|
@ -424,11 +424,10 @@ int main( int argc, char ** argv )
|
||||||
NLMISC::CApplicationContext appContext;
|
NLMISC::CApplicationContext appContext;
|
||||||
|
|
||||||
#ifdef NL_OS_UNIX
|
#ifdef NL_OS_UNIX
|
||||||
std::string homeDir = getenv("HOME");
|
NLMISC::CPath::addSearchPath(NLMISC::CFile::getApplicationDirectory("NeL"));
|
||||||
NLMISC::CPath::addSearchPath( homeDir + "/.nel");
|
|
||||||
#endif // NL_OS_UNIX
|
#endif // NL_OS_UNIX
|
||||||
|
|
||||||
NLMISC::CPath::addSearchPath(NL_MK_SH_ID_CFG);
|
NLMISC::CPath::addSearchPath(NL_MK_SH_ID_CFG);
|
||||||
|
|
||||||
// read args
|
// read args
|
||||||
if( argc < 2 )
|
if( argc < 2 )
|
||||||
|
|
|
@ -86,11 +86,10 @@ void init()
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
#ifdef NL_OS_UNIX
|
#ifdef NL_OS_UNIX
|
||||||
std::string homeDir = getenv("HOME");
|
NLMISC::CPath::addSearchPath(NLMISC::CFile::getApplicationDirectory("NeL"));
|
||||||
NLMISC::CPath::addSearchPath( homeDir + "/.nel");
|
|
||||||
#endif // NL_OS_UNIX
|
#endif // NL_OS_UNIX
|
||||||
|
|
||||||
NLMISC::CPath::addSearchPath(NL_BIB_CFG);
|
NLMISC::CPath::addSearchPath(NL_BIB_CFG);
|
||||||
|
|
||||||
CConfigFile cf;
|
CConfigFile cf;
|
||||||
uint i;
|
uint i;
|
||||||
|
|
|
@ -122,11 +122,10 @@ void initConfig()
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
#ifdef NL_OS_UNIX
|
#ifdef NL_OS_UNIX
|
||||||
std::string homeDir = getenv("HOME");
|
NLMISC::CPath::addSearchPath(NLMISC::CFile::getApplicationDirectory("NeL"));
|
||||||
NLMISC::CPath::addSearchPath( homeDir + "/.nel");
|
|
||||||
#endif // NL_OS_UNIX
|
#endif // NL_OS_UNIX
|
||||||
|
|
||||||
NLMISC::CPath::addSearchPath(NL_BIRB_CFG);
|
NLMISC::CPath::addSearchPath(NL_BIRB_CFG);
|
||||||
|
|
||||||
CConfigFile cf;
|
CConfigFile cf;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue