aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2017-03-02 09:42:12 +0100
committerWladimir J. van der Laan <laanwj@gmail.com>2017-04-03 12:33:14 +0200
commitf110272dc90cd870bfff48c9a61e091e67dbb2e9 (patch)
tree2c385efd61a2888c83cb0e0730a35913f6a707af /src
parent75594bd7f26b8c3842d399deec2321886b9e75ef (diff)
Remove `namespace fs=fs`
Having these inside functions is silly and redundant now.
Diffstat (limited to 'src')
-rw-r--r--src/qt/guiutil.cpp2
-rw-r--r--src/qt/intro.cpp2
-rw-r--r--src/util.cpp4
3 files changed, 0 insertions, 8 deletions
diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp
index 3a1f9b8e04..a2699d374a 100644
--- a/src/qt/guiutil.cpp
+++ b/src/qt/guiutil.cpp
@@ -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");
diff --git a/src/qt/intro.cpp b/src/qt/intro.cpp
index 2a7ea0ff65..2460a59109 100644
--- a/src/qt/intro.cpp
+++ b/src/qt/intro.cpp
@@ -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()
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 */
diff --git a/src/util.cpp b/src/util.cpp
index aa5d57c413..5473799289 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -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;
const fs::path &GetDataDir(bool fNetSpecific)
{
- namespace fs = fs;
LOCK(csPathCached);
@@ -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))