Remove global "using namespace std;" declarations, use "std::" prefixes on all std elements
Fix whitespace changes
This commit is contained in:
committed by
Martin Natano
parent
f0680a29fc
commit
0cba3579de
+10
-10
@@ -63,7 +63,7 @@ inline bool operator!=(File const &lhs, File const &rhs)
|
||||
/** @brief This represents a directory. */
|
||||
struct FileSet
|
||||
{
|
||||
set<File> files;
|
||||
std::set<File> files;
|
||||
RageTimer age;
|
||||
|
||||
/*
|
||||
@@ -77,8 +77,8 @@ struct FileSet
|
||||
|
||||
void GetFilesMatching(
|
||||
const RString &sBeginning, const RString &sContaining, const RString &sEnding,
|
||||
vector<RString> &asOut, bool bOnlyDirs ) const;
|
||||
void GetFilesEqualTo( const RString &pat, vector<RString> &out, bool bOnlyDirs ) const;
|
||||
std::vector<RString> &asOut, bool bOnlyDirs ) const;
|
||||
void GetFilesEqualTo( const RString &pat, std::vector<RString> &out, bool bOnlyDirs ) const;
|
||||
|
||||
RageFileManager::FileType GetFileType( const RString &sPath ) const;
|
||||
int GetFileSize( const RString &sPath ) const;
|
||||
@@ -98,7 +98,7 @@ public:
|
||||
|
||||
/* This handles at most two * wildcards. If we need anything more complicated,
|
||||
* we'll need to use fnmatch or regex. */
|
||||
void GetFilesSimpleMatch( const RString &sDir, const RString &sFile, vector<RString> &asOut, bool bOnlyDirs );
|
||||
void GetFilesSimpleMatch( const RString &sDir, const RString &sFile, std::vector<RString> &asOut, bool bOnlyDirs );
|
||||
|
||||
/* Search for "path" case-insensitively and replace it with the correct
|
||||
* case. If only a portion of the path exists, resolve as much as possible.
|
||||
@@ -108,7 +108,7 @@ public:
|
||||
RageFileManager::FileType GetFileType( const RString &sPath );
|
||||
int GetFileSize( const RString &sPath );
|
||||
int GetFileHash( const RString &sFilePath );
|
||||
void GetDirListing( const RString &sPath, vector<RString> &asAddTo, bool bOnlyDirs, bool bReturnPathToo );
|
||||
void GetDirListing( const RString &sPath, std::vector<RString> &asAddTo, bool bOnlyDirs, bool bReturnPathToo );
|
||||
|
||||
void FlushDirCache( const RString &sDir = RString() );
|
||||
|
||||
@@ -123,15 +123,15 @@ protected:
|
||||
FileSet *GetFileSet( const RString &sDir, bool create=true );
|
||||
|
||||
/* Directories we have cached: */
|
||||
map<RString, FileSet *> dirs;
|
||||
std::map<RString, FileSet *> dirs;
|
||||
|
||||
int ExpireSeconds;
|
||||
|
||||
void GetFilesEqualTo( const RString &sDir, const RString &sName, vector<RString> &asOut, bool bOnlyDirs );
|
||||
void GetFilesEqualTo( const RString &sDir, const RString &sName, std::vector<RString> &asOut, bool bOnlyDirs );
|
||||
void GetFilesMatching( const RString &sDir,
|
||||
const RString &sBeginning, const RString &sContaining, const RString &sEnding,
|
||||
vector<RString> &asOut, bool bOnlyDirs );
|
||||
void DelFileSet( map<RString, FileSet *>::iterator dir );
|
||||
const RString &sBeginning, const RString &sContaining, const RString &sEnding,
|
||||
std::vector<RString> &asOut, bool bOnlyDirs );
|
||||
void DelFileSet( std::map<RString, FileSet *>::iterator dir );
|
||||
|
||||
/* The given path wasn't cached. Cache it. */
|
||||
virtual void PopulateFileSet( FileSet & /* fs */, const RString & /* sPath */ ) { }
|
||||
|
||||
Reference in New Issue
Block a user