refactor(format): Applies clang-format. (#493)

Author: OmniBlade

Core/GameEngine/Include/Common/ArchiveFile.h

@@ -38,13 +38,13 @@
 class File;
 
 /**
-  *	An archive file is itself a collection of sub files. Each file inside the archive file
-	* has a unique name by which it can be accessed. The ArchiveFile object class is the
-	* runtime interface to the mix file and the sub files. Each file inside the mix
-	* file can be accessed by the openFile().
-	*
-	* ArchiveFile interfaces can be created by the TheArchiveFileSystem object.
-	*/
+ *	An archive file is itself a collection of sub files. Each file inside the archive file
+ * has a unique name by which it can be accessed. The ArchiveFile object class is the
+ * runtime interface to the mix file and the sub files. Each file inside the mix
+ * file can be accessed by the openFile().
+ *
+ * ArchiveFile interfaces can be created by the TheArchiveFileSystem object.
+ */
 //===============================
 
 class ArchiveFile
@@ -53,24 +53,37 @@ class ArchiveFile
 	ArchiveFile();
 	virtual ~ArchiveFile();
 
-	virtual Bool					getFileInfo( const AsciiString& filename, FileInfo *fileInfo) const = 0;	///< fill in the fileInfo struct with info about the file requested.
-	virtual File*					openFile( const Char *filename, Int access = 0) = 0;	///< Open the specified file within the archive file
-	virtual void					closeAllFiles( void ) = 0;									///< Close all file opened in this archive file
-	virtual AsciiString		getName( void ) = 0;												///< Returns the name of the archive file
-	virtual AsciiString		getPath( void ) = 0;												///< Returns full path and name of archive file
-	virtual void					setSearchPriority( Int new_priority ) = 0;	///< Set this archive file's search priority
-	virtual void					close( void ) = 0;													///< Close this archive file
-	void									attachFile(File *file);
+	virtual Bool getFileInfo(const AsciiString &filename, FileInfo *fileInfo) const = 0; ///< fill in the fileInfo struct with
+																																											 ///< info about the file requested.
+	virtual File *openFile(const Char *filename, Int access = 0) = 0; ///< Open the specified file within the archive file
+	virtual void closeAllFiles(void) = 0; ///< Close all file opened in this archive file
+	virtual AsciiString getName(void) = 0; ///< Returns the name of the archive file
+	virtual AsciiString getPath(void) = 0; ///< Returns full path and name of archive file
+	virtual void setSearchPriority(Int new_priority) = 0; ///< Set this archive file's search priority
+	virtual void close(void) = 0; ///< Close this archive file
+	void attachFile(File *file);
 
-	void									getFileListInDirectory(const AsciiString& currentDirectory, const AsciiString& originalDirectory, const AsciiString& searchName, FilenameList &filenameList, Bool searchSubdirectories) const;
-	void									getFileListInDirectory(const DetailedArchivedDirectoryInfo *dirInfo, const AsciiString& currentDirectory, const AsciiString& searchName, FilenameList &filenameList, Bool searchSubdirectories) const;
+	void getFileListInDirectory(
+			const AsciiString &currentDirectory,
+			const AsciiString &originalDirectory,
+			const AsciiString &searchName,
+			FilenameList &filenameList,
+			Bool searchSubdirectories) const;
+	void getFileListInDirectory(
+			const DetailedArchivedDirectoryInfo *dirInfo,
+			const AsciiString &currentDirectory,
+			const AsciiString &searchName,
+			FilenameList &filenameList,
+			Bool searchSubdirectories) const;
 
-	void									addFile(const AsciiString& path, const ArchivedFileInfo *fileInfo); ///< add this file to our directory tree.
+	void addFile(const AsciiString &path, const ArchivedFileInfo *fileInfo); ///< add this file to our directory tree.
 
 protected:
-	const ArchivedFileInfo *		getArchivedFileInfo(const AsciiString& filename) const;	///< return the ArchivedFileInfo from the directory tree.
+	const ArchivedFileInfo *getArchivedFileInfo(const AsciiString &filename) const; ///< return the ArchivedFileInfo from the
+																																									///< directory tree.
 
-	File *m_file; ///< file pointer to the archive file on disk.  Kept open so we don't have to continuously open and close the file all the time.
+	File *m_file; ///< file pointer to the archive file on disk.  Kept open so we don't have to continuously open and close the
+								///< file all the time.
 	DetailedArchivedDirectoryInfo m_rootDirectory;
 };
 

Core/GameEngine/Include/Common/ArchiveFileSystem.h

@@ -68,17 +68,16 @@ class ArchiveFile;
 //           Type Defines
 //----------------------------------------------------------------------------
 
-
 //===============================
 // ArchiveFileSystem
 //===============================
 /**
-  *	Creates and manages ArchiveFile interfaces. ArchiveFiles can be accessed
-	* by calling the openArchiveFile() member. ArchiveFiles can be accessed by
-	* name or by File interface.
-	*
-	* openFile() member searches all Archive files for the specified sub file.
-	*/
+ *	Creates and manages ArchiveFile interfaces. ArchiveFiles can be accessed
+ * by calling the openArchiveFile() member. ArchiveFiles can be accessed by
+ * name or by File interface.
+ *
+ * openFile() member searches all Archive files for the specified sub file.
+ */
 //===============================
 class ArchivedDirectoryInfo;
 class DetailedArchivedDirectoryInfo;
@@ -88,30 +87,30 @@ typedef std::map<AsciiString, DetailedArchivedDirectoryInfo> DetailedArchivedDir
 typedef std::map<AsciiString, ArchivedDirectoryInfo> ArchivedDirectoryInfoMap;
 typedef std::map<AsciiString, ArchivedFileInfo> ArchivedFileInfoMap;
 typedef std::map<AsciiString, ArchiveFile *> ArchiveFileMap;
-typedef std::map<AsciiString, AsciiString> ArchivedFileLocationMap; // first string is the file name, second one is the archive filename.
+typedef std::map<AsciiString, AsciiString> ArchivedFileLocationMap; // first string is the file name, second one is the
+																																		// archive filename.
 
 class ArchivedDirectoryInfo
 {
 public:
-	AsciiString								m_directoryName;
-	ArchivedDirectoryInfoMap	m_directories;
-	ArchivedFileLocationMap		m_files;
+	AsciiString m_directoryName;
+	ArchivedDirectoryInfoMap m_directories;
+	ArchivedFileLocationMap m_files;
 
 	void clear()
 	{
 		m_directoryName.clear();
 		m_directories.clear();
 		m_files.clear();
 	}
-
 };
 
 class DetailedArchivedDirectoryInfo
 {
 public:
-	AsciiString												m_directoryName;
-	DetailedArchivedDirectoryInfoMap	m_directories;
-	ArchivedFileInfoMap								m_files;
+	AsciiString m_directoryName;
+	DetailedArchivedDirectoryInfoMap m_directories;
+	ArchivedFileInfoMap m_files;
 
 	void clear()
 	{
@@ -129,10 +128,7 @@ class ArchivedFileInfo
 	UnsignedInt m_offset;
 	UnsignedInt m_size;
 
-	ArchivedFileInfo()
-	{
-		clear();
-	}
+	ArchivedFileInfo() { clear(); }
 
 	void clear()
 	{
@@ -143,45 +139,55 @@ class ArchivedFileInfo
 	}
 };
 
-
 class ArchiveFileSystem : public SubsystemInterface
 {
-	public:
+public:
 	ArchiveFileSystem();
 	virtual ~ArchiveFileSystem();
 
-	virtual void init( void ) = 0;
-	virtual void update( void ) = 0;
-	virtual void reset( void ) = 0;
-	virtual void postProcessLoad( void ) = 0;
+	virtual void init(void) = 0;
+	virtual void update(void) = 0;
+	virtual void reset(void) = 0;
+	virtual void postProcessLoad(void) = 0;
 
 	// ArchiveFile operations
-	virtual ArchiveFile*	openArchiveFile( const Char *filename ) = 0;		///< Create new or return existing Archive file from file name
-	virtual void					closeArchiveFile( const Char *filename ) = 0;		///< Close the one specified big file.
-	virtual void					closeAllArchiveFiles( void ) = 0;								///< Close all Archivefiles currently open
+	virtual ArchiveFile *openArchiveFile(const Char *filename) = 0; ///< Create new or return existing Archive file from file
+																																	///< name
+	virtual void closeArchiveFile(const Char *filename) = 0; ///< Close the one specified big file.
+	virtual void closeAllArchiveFiles(void) = 0; ///< Close all Archivefiles currently open
 
 	// File operations
-	virtual File*					openFile( const Char *filename, Int access = 0);	///< Search Archive files for specified file name and open it if found
-	virtual void					closeAllFiles( void ) = 0;									///< Close all files associated with ArchiveFiles
-	virtual Bool					doesFileExist(const Char *filename) const;		///< return true if that file exists in an archive file somewhere.
-
-	void					getFileListInDirectory(const AsciiString& currentDirectory, const AsciiString& originalDirectory, const AsciiString& searchName, FilenameList &filenameList, Bool searchSubdirectories) const; ///< search the given directory for files matching the searchName (egs. *.ini, *.rep).  Possibly search subdirectories.  Scans each Archive file.
-	Bool					getFileInfo(const AsciiString& filename, FileInfo *fileInfo) const; ///< see FileSystem.h
-
-	virtual Bool	loadBigFilesFromDirectory(AsciiString dir, AsciiString fileMask, Bool overwrite = FALSE) = 0;
+	virtual File *openFile(const Char *filename, Int access = 0); ///< Search Archive files for specified file name and open it
+																																///< if found
+	virtual void closeAllFiles(void) = 0; ///< Close all files associated with ArchiveFiles
+	virtual Bool doesFileExist(const Char *filename) const; ///< return true if that file exists in an archive file somewhere.
+
+	void getFileListInDirectory(
+			const AsciiString &currentDirectory,
+			const AsciiString &originalDirectory,
+			const AsciiString &searchName,
+			FilenameList &filenameList,
+			Bool searchSubdirectories) const; ///< search the given directory for files matching the searchName (egs. *.ini,
+																				///< *.rep).  Possibly search subdirectories.  Scans each Archive file.
+	Bool getFileInfo(const AsciiString &filename, FileInfo *fileInfo) const; ///< see FileSystem.h
+
+	virtual Bool loadBigFilesFromDirectory(AsciiString dir, AsciiString fileMask, Bool overwrite = FALSE) = 0;
 
 	// Unprotected this for copy-protection routines
-	AsciiString						getArchiveFilenameForFile(const AsciiString& filename) const;
-	void loadMods( void );
+	AsciiString getArchiveFilenameForFile(const AsciiString &filename) const;
+	void loadMods(void);
 
 protected:
-	virtual void					loadIntoDirectoryTree(const ArchiveFile *archiveFile, const AsciiString& archiveFilename, Bool overwrite = FALSE );	///< load the archive file's header information and apply it to the global archive directory tree.
+	virtual void loadIntoDirectoryTree(
+			const ArchiveFile *archiveFile,
+			const AsciiString &archiveFilename,
+			Bool overwrite = FALSE); ///< load the archive file's header information and apply it to the global archive directory
+															 ///< tree.
 
 	ArchiveFileMap m_archiveFileMap;
 	ArchivedDirectoryInfo m_rootDirectory;
 };
 
-
 extern ArchiveFileSystem *TheArchiveFileSystem;
 
 //----------------------------------------------------------------------------