Skip to content

Commit f110272

Browse files
committed
Remove namespace fs=fs
Having these inside functions is silly and redundant now.
1 parent 75594bd commit f110272

File tree

3 files changed

+0
-8
lines changed

3 files changed

+0
-8
lines changed

src/qt/guiutil.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -686,8 +686,6 @@ bool SetStartOnSystemStartup(bool fAutoStart)
686686

687687
fs::path static GetAutostartDir()
688688
{
689-
namespace fs = fs;
690-
691689
char* pszConfigHome = getenv("XDG_CONFIG_HOME");
692690
if (pszConfigHome) return fs::path(pszConfigHome) / "autostart";
693691
char* pszHome = getenv("HOME");

src/qt/intro.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ FreespaceChecker::FreespaceChecker(Intro *_intro)
6969

7070
void FreespaceChecker::check()
7171
{
72-
namespace fs = fs;
7372
QString dataDirStr = intro->getPathToCheck();
7473
fs::path dataDir = GUIUtil::qstringToBoostPath(dataDirStr);
7574
uint64_t freeBytesAvailable = 0;
@@ -189,7 +188,6 @@ QString Intro::getDefaultDataDirectory()
189188

190189
bool Intro::pickDataDirectory()
191190
{
192-
namespace fs = fs;
193191
QSettings settings;
194192
/* If data directory provided on command line, no need to look at settings
195193
or show a picking dialog */

src/util.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -513,7 +513,6 @@ void PrintExceptionContinue(const std::exception* pex, const char* pszThread)
513513

514514
fs::path GetDefaultDataDir()
515515
{
516-
namespace fs = fs;
517516
// Windows < Vista: C:\Documents and Settings\Username\Application Data\Bitcoin
518517
// Windows >= Vista: C:\Users\Username\AppData\Roaming\Bitcoin
519518
// Mac: ~/Library/Application Support/Bitcoin
@@ -544,7 +543,6 @@ static CCriticalSection csPathCached;
544543

545544
const fs::path &GetDataDir(bool fNetSpecific)
546545
{
547-
namespace fs = fs;
548546

549547
LOCK(csPathCached);
550548

@@ -789,8 +787,6 @@ void ShrinkDebugFile()
789787
#ifdef WIN32
790788
fs::path GetSpecialFolderPath(int nFolder, bool fCreate)
791789
{
792-
namespace fs = fs;
793-
794790
char pszPath[MAX_PATH] = "";
795791

796792
if(SHGetSpecialFolderPathA(NULL, pszPath, nFolder, fCreate))

0 commit comments

Comments
 (0)