Standardize components/bsa file include guards and order

This commit is contained in:
Alexei Kotov 2025-02-22 21:12:28 +03:00
parent 8b911ce3eb
commit 5d5595cc5b
10 changed files with 28 additions and 21 deletions

View File

@ -24,13 +24,15 @@
#endif
#include <boost/iostreams/device/array.hpp>
#include <components/bsa/ba2file.hpp>
#include <components/bsa/memorystream.hpp>
#include <components/esm/fourcc.hpp>
#include <components/files/constrainedfilestream.hpp>
#include <components/files/conversion.hpp>
#include <components/misc/strings/lower.hpp>
#include "ba2file.hpp"
#include "memorystream.hpp"
namespace Bsa
{
BA2DX10File::BA2DX10File() {}

View File

@ -1,5 +1,5 @@
#ifndef BSA_BA2_DX10_FILE_H
#define BSA_BA2_DX10_FILE_H
#ifndef OPENMW_COMPONENTS_BSA_BA2DX10FILE_HPP
#define OPENMW_COMPONENTS_BSA_BA2DX10FILE_HPP
#include <list>
#include <map>

View File

@ -1,5 +1,5 @@
#ifndef BSA_BA2_FILE_H
#define BSA_BA2_FILE_H
#ifndef OPENMW_COMPONENTS_BSA_BA2FILE_HPP
#define OPENMW_COMPONENTS_BSA_BA2FILE_HPP
#include <cstdint>
#include <string>

View File

@ -22,13 +22,15 @@
#endif
#include <boost/iostreams/device/array.hpp>
#include <components/bsa/ba2file.hpp>
#include <components/bsa/memorystream.hpp>
#include <components/esm/fourcc.hpp>
#include <components/files/constrainedfilestream.hpp>
#include <components/files/conversion.hpp>
#include <components/misc/strings/lower.hpp>
#include "ba2file.hpp"
#include "memorystream.hpp"
namespace Bsa
{
// special marker for invalid records,

View File

@ -1,5 +1,5 @@
#ifndef BSA_BA2_GNRL_FILE_H
#define BSA_BA2_GNRL_FILE_H
#ifndef OPENMW_COMPONENTS_BSA_BA2GNRLFILE_HPP
#define OPENMW_COMPONENTS_BSA_BA2GNRLFILE_HPP
#include <list>
#include <map>

View File

@ -23,15 +23,15 @@
#include "bsafile.hpp"
#include <components/esm/fourcc.hpp>
#include <components/files/constrainedfilestream.hpp>
#include <algorithm>
#include <cassert>
#include <cstring>
#include <filesystem>
#include <fstream>
#include <components/esm/fourcc.hpp>
#include <components/files/constrainedfilestream.hpp>
using namespace Bsa;
/// Error handling

View File

@ -21,8 +21,8 @@
*/
#ifndef BSA_BSA_FILE_H
#define BSA_BSA_FILE_H
#ifndef OPENMW_COMPONENTS_BSA_BSAFILE_HPP
#define OPENMW_COMPONENTS_BSA_BSAFILE_HPP
#include <cstdint>
#include <filesystem>

View File

@ -45,11 +45,13 @@
#endif
#include <boost/iostreams/device/array.hpp>
#include <components/bsa/memorystream.hpp>
#include <components/files/constrainedfilestream.hpp>
#include <components/files/conversion.hpp>
#include <components/misc/strings/lower.hpp>
#include "memorystream.hpp"
namespace Bsa
{
/// Read header information from the input source

View File

@ -23,8 +23,8 @@
*/
#ifndef BSA_COMPRESSED_BSA_FILE_H
#define BSA_COMPRESSED_BSA_FILE_H
#ifndef OPENMW_COMPONENTS_BSA_COMPRESSEDBSAFILE_HPP
#define OPENMW_COMPONENTS_BSA_COMPRESSEDBSAFILE_HPP
#include <filesystem>
#include <limits>

View File

@ -23,13 +23,14 @@
*/
#ifndef BSA_MEMORY_STREAM_H
#define BSA_MEMORY_STREAM_H
#ifndef OPENMW_COMPONENTS_BSA_MEMORYSTREAM_HPP
#define OPENMW_COMPONENTS_BSA_MEMORYSTREAM_HPP
#include <components/files/memorystream.hpp>
#include <istream>
#include <vector>
#include <components/files/memorystream.hpp>
namespace Bsa
{
/**