Remove namespace fs=fs
Having these inside functions is silly and redundant now.
This commit is contained in:
parent
75594bd7f2
commit
f110272dc9
3 changed files with 0 additions and 8 deletions
|
@ -686,8 +686,6 @@ bool SetStartOnSystemStartup(bool fAutoStart)
|
||||||
|
|
||||||
fs::path static GetAutostartDir()
|
fs::path static GetAutostartDir()
|
||||||
{
|
{
|
||||||
namespace fs = fs;
|
|
||||||
|
|
||||||
char* pszConfigHome = getenv("XDG_CONFIG_HOME");
|
char* pszConfigHome = getenv("XDG_CONFIG_HOME");
|
||||||
if (pszConfigHome) return fs::path(pszConfigHome) / "autostart";
|
if (pszConfigHome) return fs::path(pszConfigHome) / "autostart";
|
||||||
char* pszHome = getenv("HOME");
|
char* pszHome = getenv("HOME");
|
||||||
|
|
|
@ -69,7 +69,6 @@ FreespaceChecker::FreespaceChecker(Intro *_intro)
|
||||||
|
|
||||||
void FreespaceChecker::check()
|
void FreespaceChecker::check()
|
||||||
{
|
{
|
||||||
namespace fs = fs;
|
|
||||||
QString dataDirStr = intro->getPathToCheck();
|
QString dataDirStr = intro->getPathToCheck();
|
||||||
fs::path dataDir = GUIUtil::qstringToBoostPath(dataDirStr);
|
fs::path dataDir = GUIUtil::qstringToBoostPath(dataDirStr);
|
||||||
uint64_t freeBytesAvailable = 0;
|
uint64_t freeBytesAvailable = 0;
|
||||||
|
@ -189,7 +188,6 @@ QString Intro::getDefaultDataDirectory()
|
||||||
|
|
||||||
bool Intro::pickDataDirectory()
|
bool Intro::pickDataDirectory()
|
||||||
{
|
{
|
||||||
namespace fs = fs;
|
|
||||||
QSettings settings;
|
QSettings settings;
|
||||||
/* If data directory provided on command line, no need to look at settings
|
/* If data directory provided on command line, no need to look at settings
|
||||||
or show a picking dialog */
|
or show a picking dialog */
|
||||||
|
|
|
@ -513,7 +513,6 @@ void PrintExceptionContinue(const std::exception* pex, const char* pszThread)
|
||||||
|
|
||||||
fs::path GetDefaultDataDir()
|
fs::path GetDefaultDataDir()
|
||||||
{
|
{
|
||||||
namespace fs = fs;
|
|
||||||
// Windows < Vista: C:\Documents and Settings\Username\Application Data\Bitcoin
|
// Windows < Vista: C:\Documents and Settings\Username\Application Data\Bitcoin
|
||||||
// Windows >= Vista: C:\Users\Username\AppData\Roaming\Bitcoin
|
// Windows >= Vista: C:\Users\Username\AppData\Roaming\Bitcoin
|
||||||
// Mac: ~/Library/Application Support/Bitcoin
|
// Mac: ~/Library/Application Support/Bitcoin
|
||||||
|
@ -544,7 +543,6 @@ static CCriticalSection csPathCached;
|
||||||
|
|
||||||
const fs::path &GetDataDir(bool fNetSpecific)
|
const fs::path &GetDataDir(bool fNetSpecific)
|
||||||
{
|
{
|
||||||
namespace fs = fs;
|
|
||||||
|
|
||||||
LOCK(csPathCached);
|
LOCK(csPathCached);
|
||||||
|
|
||||||
|
@ -789,8 +787,6 @@ void ShrinkDebugFile()
|
||||||
#ifdef WIN32
|
#ifdef WIN32
|
||||||
fs::path GetSpecialFolderPath(int nFolder, bool fCreate)
|
fs::path GetSpecialFolderPath(int nFolder, bool fCreate)
|
||||||
{
|
{
|
||||||
namespace fs = fs;
|
|
||||||
|
|
||||||
char pszPath[MAX_PATH] = "";
|
char pszPath[MAX_PATH] = "";
|
||||||
|
|
||||||
if(SHGetSpecialFolderPathA(NULL, pszPath, nFolder, fCreate))
|
if(SHGetSpecialFolderPathA(NULL, pszPath, nFolder, fCreate))
|
||||||
|
|
Loading…
Reference in a new issue