Browse Source

Remove `namespace fs=fs`

Having these inside functions is silly and redundant now.
0.15
Wladimir J. van der Laan 8 years ago
parent
commit
f110272dc9
  1. 2
      src/qt/guiutil.cpp
  2. 2
      src/qt/intro.cpp
  3. 4
      src/util.cpp

2
src/qt/guiutil.cpp

@ -686,8 +686,6 @@ bool SetStartOnSystemStartup(bool fAutoStart) @@ -686,8 +686,6 @@ bool SetStartOnSystemStartup(bool fAutoStart)
fs::path static GetAutostartDir()
{
namespace fs = fs;
char* pszConfigHome = getenv("XDG_CONFIG_HOME");
if (pszConfigHome) return fs::path(pszConfigHome) / "autostart";
char* pszHome = getenv("HOME");

2
src/qt/intro.cpp

@ -69,7 +69,6 @@ FreespaceChecker::FreespaceChecker(Intro *_intro) @@ -69,7 +69,6 @@ FreespaceChecker::FreespaceChecker(Intro *_intro)
void FreespaceChecker::check()
{
namespace fs = fs;
QString dataDirStr = intro->getPathToCheck();
fs::path dataDir = GUIUtil::qstringToBoostPath(dataDirStr);
uint64_t freeBytesAvailable = 0;
@ -189,7 +188,6 @@ QString Intro::getDefaultDataDirectory() @@ -189,7 +188,6 @@ QString Intro::getDefaultDataDirectory()
bool Intro::pickDataDirectory()
{
namespace fs = fs;
QSettings settings;
/* If data directory provided on command line, no need to look at settings
or show a picking dialog */

4
src/util.cpp

@ -513,7 +513,6 @@ void PrintExceptionContinue(const std::exception* pex, const char* pszThread) @@ -513,7 +513,6 @@ void PrintExceptionContinue(const std::exception* pex, const char* pszThread)
fs::path GetDefaultDataDir()
{
namespace fs = fs;
// Windows < Vista: C:\Documents and Settings\Username\Application Data\Bitcoin
// Windows >= Vista: C:\Users\Username\AppData\Roaming\Bitcoin
// Mac: ~/Library/Application Support/Bitcoin
@ -544,7 +543,6 @@ static CCriticalSection csPathCached; @@ -544,7 +543,6 @@ static CCriticalSection csPathCached;
const fs::path &GetDataDir(bool fNetSpecific)
{
namespace fs = fs;
LOCK(csPathCached);
@ -789,8 +787,6 @@ void ShrinkDebugFile() @@ -789,8 +787,6 @@ void ShrinkDebugFile()
#ifdef WIN32
fs::path GetSpecialFolderPath(int nFolder, bool fCreate)
{
namespace fs = fs;
char pszPath[MAX_PATH] = "";
if(SHGetSpecialFolderPathA(NULL, pszPath, nFolder, fCreate))

Loading…
Cancel
Save