mirror of
https://gitlab.com/OpenMW/openmw.git
synced 2025-09-08 03:41:11 -04:00
Standardize components/bsa file include guards and order
This commit is contained in:
parent
8b911ce3eb
commit
5d5595cc5b
@ -24,13 +24,15 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <boost/iostreams/device/array.hpp>
|
#include <boost/iostreams/device/array.hpp>
|
||||||
#include <components/bsa/ba2file.hpp>
|
|
||||||
#include <components/bsa/memorystream.hpp>
|
|
||||||
#include <components/esm/fourcc.hpp>
|
#include <components/esm/fourcc.hpp>
|
||||||
#include <components/files/constrainedfilestream.hpp>
|
#include <components/files/constrainedfilestream.hpp>
|
||||||
#include <components/files/conversion.hpp>
|
#include <components/files/conversion.hpp>
|
||||||
#include <components/misc/strings/lower.hpp>
|
#include <components/misc/strings/lower.hpp>
|
||||||
|
|
||||||
|
#include "ba2file.hpp"
|
||||||
|
#include "memorystream.hpp"
|
||||||
|
|
||||||
namespace Bsa
|
namespace Bsa
|
||||||
{
|
{
|
||||||
BA2DX10File::BA2DX10File() {}
|
BA2DX10File::BA2DX10File() {}
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
#ifndef BSA_BA2_DX10_FILE_H
|
#ifndef OPENMW_COMPONENTS_BSA_BA2DX10FILE_HPP
|
||||||
#define BSA_BA2_DX10_FILE_H
|
#define OPENMW_COMPONENTS_BSA_BA2DX10FILE_HPP
|
||||||
|
|
||||||
#include <list>
|
#include <list>
|
||||||
#include <map>
|
#include <map>
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
#ifndef BSA_BA2_FILE_H
|
#ifndef OPENMW_COMPONENTS_BSA_BA2FILE_HPP
|
||||||
#define BSA_BA2_FILE_H
|
#define OPENMW_COMPONENTS_BSA_BA2FILE_HPP
|
||||||
|
|
||||||
#include <cstdint>
|
#include <cstdint>
|
||||||
#include <string>
|
#include <string>
|
||||||
|
@ -22,13 +22,15 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <boost/iostreams/device/array.hpp>
|
#include <boost/iostreams/device/array.hpp>
|
||||||
#include <components/bsa/ba2file.hpp>
|
|
||||||
#include <components/bsa/memorystream.hpp>
|
|
||||||
#include <components/esm/fourcc.hpp>
|
#include <components/esm/fourcc.hpp>
|
||||||
#include <components/files/constrainedfilestream.hpp>
|
#include <components/files/constrainedfilestream.hpp>
|
||||||
#include <components/files/conversion.hpp>
|
#include <components/files/conversion.hpp>
|
||||||
#include <components/misc/strings/lower.hpp>
|
#include <components/misc/strings/lower.hpp>
|
||||||
|
|
||||||
|
#include "ba2file.hpp"
|
||||||
|
#include "memorystream.hpp"
|
||||||
|
|
||||||
namespace Bsa
|
namespace Bsa
|
||||||
{
|
{
|
||||||
// special marker for invalid records,
|
// special marker for invalid records,
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
#ifndef BSA_BA2_GNRL_FILE_H
|
#ifndef OPENMW_COMPONENTS_BSA_BA2GNRLFILE_HPP
|
||||||
#define BSA_BA2_GNRL_FILE_H
|
#define OPENMW_COMPONENTS_BSA_BA2GNRLFILE_HPP
|
||||||
|
|
||||||
#include <list>
|
#include <list>
|
||||||
#include <map>
|
#include <map>
|
||||||
|
@ -23,15 +23,15 @@
|
|||||||
|
|
||||||
#include "bsafile.hpp"
|
#include "bsafile.hpp"
|
||||||
|
|
||||||
#include <components/esm/fourcc.hpp>
|
|
||||||
#include <components/files/constrainedfilestream.hpp>
|
|
||||||
|
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
#include <cassert>
|
#include <cassert>
|
||||||
#include <cstring>
|
#include <cstring>
|
||||||
#include <filesystem>
|
#include <filesystem>
|
||||||
#include <fstream>
|
#include <fstream>
|
||||||
|
|
||||||
|
#include <components/esm/fourcc.hpp>
|
||||||
|
#include <components/files/constrainedfilestream.hpp>
|
||||||
|
|
||||||
using namespace Bsa;
|
using namespace Bsa;
|
||||||
|
|
||||||
/// Error handling
|
/// Error handling
|
||||||
|
@ -21,8 +21,8 @@
|
|||||||
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef BSA_BSA_FILE_H
|
#ifndef OPENMW_COMPONENTS_BSA_BSAFILE_HPP
|
||||||
#define BSA_BSA_FILE_H
|
#define OPENMW_COMPONENTS_BSA_BSAFILE_HPP
|
||||||
|
|
||||||
#include <cstdint>
|
#include <cstdint>
|
||||||
#include <filesystem>
|
#include <filesystem>
|
||||||
|
@ -45,11 +45,13 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <boost/iostreams/device/array.hpp>
|
#include <boost/iostreams/device/array.hpp>
|
||||||
#include <components/bsa/memorystream.hpp>
|
|
||||||
#include <components/files/constrainedfilestream.hpp>
|
#include <components/files/constrainedfilestream.hpp>
|
||||||
#include <components/files/conversion.hpp>
|
#include <components/files/conversion.hpp>
|
||||||
#include <components/misc/strings/lower.hpp>
|
#include <components/misc/strings/lower.hpp>
|
||||||
|
|
||||||
|
#include "memorystream.hpp"
|
||||||
|
|
||||||
namespace Bsa
|
namespace Bsa
|
||||||
{
|
{
|
||||||
/// Read header information from the input source
|
/// Read header information from the input source
|
||||||
|
@ -23,8 +23,8 @@
|
|||||||
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef BSA_COMPRESSED_BSA_FILE_H
|
#ifndef OPENMW_COMPONENTS_BSA_COMPRESSEDBSAFILE_HPP
|
||||||
#define BSA_COMPRESSED_BSA_FILE_H
|
#define OPENMW_COMPONENTS_BSA_COMPRESSEDBSAFILE_HPP
|
||||||
|
|
||||||
#include <filesystem>
|
#include <filesystem>
|
||||||
#include <limits>
|
#include <limits>
|
||||||
|
@ -23,13 +23,14 @@
|
|||||||
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef BSA_MEMORY_STREAM_H
|
#ifndef OPENMW_COMPONENTS_BSA_MEMORYSTREAM_HPP
|
||||||
#define BSA_MEMORY_STREAM_H
|
#define OPENMW_COMPONENTS_BSA_MEMORYSTREAM_HPP
|
||||||
|
|
||||||
#include <components/files/memorystream.hpp>
|
|
||||||
#include <istream>
|
#include <istream>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
|
#include <components/files/memorystream.hpp>
|
||||||
|
|
||||||
namespace Bsa
|
namespace Bsa
|
||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
|
Loading…
x
Reference in New Issue
Block a user