From f79c92c742adf7f2bcd1d5f9f83c0a654bea031d Mon Sep 17 00:00:00 2001 From: modeco80 Date: Wed, 21 Sep 2022 02:59:16 -0500 Subject: [PATCH] chore(*): .h -> .hpp Preferences change a bit. --- include/europa/io/{PakFile.h => PakFile.hpp} | 3 +-- include/europa/io/{PakReader.h => PakReader.hpp} | 5 ++--- include/europa/io/{PakWriter.h => PakWriter.hpp} | 3 +-- include/europa/io/{YatfReader.h => YatfReader.hpp} | 2 +- .../europa/structs/{ImHexAdapter.h => ImHexAdapter.hpp} | 0 include/europa/structs/{Pak.h => Pak.hpp} | 3 +-- include/europa/structs/{Yatf.h => Yatf.hpp} | 5 ++--- include/europa/util/{FixedString.h => FixedString.hpp} | 0 include/europa/util/{FourCC.h => FourCC.hpp} | 3 +-- include/europa/util/{TupleElement.h => TupleElement.hpp} | 0 src/libeuropa/io/PakFile.cpp | 2 +- src/libeuropa/io/PakReader.cpp | 5 ++--- src/libeuropa/io/PakWriter.cpp | 8 +++----- src/libeuropa/io/YatfReader.cpp | 3 +-- src/tools/europa_pack_extractor.cpp | 3 +-- src/tools/pakcreate.cpp | 7 +++---- src/tools/paktest.cpp | 5 ++--- src/tools/texdump.cpp | 2 +- 18 files changed, 23 insertions(+), 36 deletions(-) rename include/europa/io/{PakFile.h => PakFile.hpp} (96%) rename include/europa/io/{PakReader.h => PakReader.hpp} (92%) rename include/europa/io/{PakWriter.h => PakWriter.hpp} (95%) rename include/europa/io/{YatfReader.h => YatfReader.hpp} (95%) rename include/europa/structs/{ImHexAdapter.h => ImHexAdapter.hpp} (100%) rename include/europa/structs/{Pak.h => Pak.hpp} (98%) rename include/europa/structs/{Yatf.h => Yatf.hpp} (91%) rename include/europa/util/{FixedString.h => FixedString.hpp} (100%) rename include/europa/util/{FourCC.h => FourCC.hpp} (96%) rename include/europa/util/{TupleElement.h => TupleElement.hpp} (100%) diff --git a/include/europa/io/PakFile.h b/include/europa/io/PakFile.hpp similarity index 96% rename from include/europa/io/PakFile.h rename to include/europa/io/PakFile.hpp index 0a3bbf0..83b9d40 100644 --- a/include/europa/io/PakFile.h +++ b/include/europa/io/PakFile.hpp @@ -9,9 +9,8 @@ #ifndef EUROPA_IO_PAKFILE_H #define EUROPA_IO_PAKFILE_H -#include - #include +#include #include namespace europa::io { diff --git a/include/europa/io/PakReader.h b/include/europa/io/PakReader.hpp similarity index 92% rename from include/europa/io/PakReader.h rename to include/europa/io/PakReader.hpp index 534bdb9..3b8cfe8 100644 --- a/include/europa/io/PakReader.h +++ b/include/europa/io/PakReader.hpp @@ -9,9 +9,8 @@ #ifndef EUROPA_IO_PAKREADER_H #define EUROPA_IO_PAKREADER_H -#include -#include - +#include +#include #include #include #include diff --git a/include/europa/io/PakWriter.h b/include/europa/io/PakWriter.hpp similarity index 95% rename from include/europa/io/PakWriter.h rename to include/europa/io/PakWriter.hpp index 9822c7b..e3cc6d1 100644 --- a/include/europa/io/PakWriter.h +++ b/include/europa/io/PakWriter.hpp @@ -9,8 +9,7 @@ #ifndef EUROPA_IO_PAKWRITER_H #define EUROPA_IO_PAKWRITER_H -#include - +#include #include #include #include diff --git a/include/europa/io/YatfReader.h b/include/europa/io/YatfReader.hpp similarity index 95% rename from include/europa/io/YatfReader.h rename to include/europa/io/YatfReader.hpp index 867e875..40fb2ae 100644 --- a/include/europa/io/YatfReader.h +++ b/include/europa/io/YatfReader.hpp @@ -9,9 +9,9 @@ #ifndef EUROPA_IO_YATFREADER_H #define EUROPA_IO_YATFREADER_H -#include #include +#include #include namespace europa::io { diff --git a/include/europa/structs/ImHexAdapter.h b/include/europa/structs/ImHexAdapter.hpp similarity index 100% rename from include/europa/structs/ImHexAdapter.h rename to include/europa/structs/ImHexAdapter.hpp diff --git a/include/europa/structs/Pak.h b/include/europa/structs/Pak.hpp similarity index 98% rename from include/europa/structs/Pak.h rename to include/europa/structs/Pak.hpp index 5ed0b21..475fe1d 100644 --- a/include/europa/structs/Pak.h +++ b/include/europa/structs/Pak.hpp @@ -9,10 +9,9 @@ #ifndef EUROPA_STRUCTS_PAK_H #define EUROPA_STRUCTS_PAK_H -#include - #include #include +#include namespace europa::structs { diff --git a/include/europa/structs/Yatf.h b/include/europa/structs/Yatf.hpp similarity index 91% rename from include/europa/structs/Yatf.h rename to include/europa/structs/Yatf.hpp index 2966eaf..1a51c9f 100644 --- a/include/europa/structs/Yatf.h +++ b/include/europa/structs/Yatf.hpp @@ -9,9 +9,8 @@ #ifndef EUROPA_STRUCTS_YATF_H #define EUROPA_STRUCTS_YATF_H -#include -#include - +#include +#include #include namespace europa::structs { diff --git a/include/europa/util/FixedString.h b/include/europa/util/FixedString.hpp similarity index 100% rename from include/europa/util/FixedString.h rename to include/europa/util/FixedString.hpp diff --git a/include/europa/util/FourCC.h b/include/europa/util/FourCC.hpp similarity index 96% rename from include/europa/util/FourCC.h rename to include/europa/util/FourCC.hpp index 6847ce6..1d834dc 100644 --- a/include/europa/util/FourCC.h +++ b/include/europa/util/FourCC.hpp @@ -9,9 +9,8 @@ #ifndef EUROPA_FOURCC_H #define EUROPA_FOURCC_H -#include - #include +#include namespace europa::util { diff --git a/include/europa/util/TupleElement.h b/include/europa/util/TupleElement.hpp similarity index 100% rename from include/europa/util/TupleElement.h rename to include/europa/util/TupleElement.hpp diff --git a/src/libeuropa/io/PakFile.cpp b/src/libeuropa/io/PakFile.cpp index 5adda43..28839d7 100644 --- a/src/libeuropa/io/PakFile.cpp +++ b/src/libeuropa/io/PakFile.cpp @@ -6,7 +6,7 @@ // SPDX-License-Identifier: LGPL-3.0-or-later // -#include +#include namespace europa::io { diff --git a/src/libeuropa/io/PakReader.cpp b/src/libeuropa/io/PakReader.cpp index ba0a531..13e9fa2 100644 --- a/src/libeuropa/io/PakReader.cpp +++ b/src/libeuropa/io/PakReader.cpp @@ -6,10 +6,9 @@ // SPDX-License-Identifier: LGPL-3.0-or-later // -#include -#include - #include +#include +#include #include "StreamUtils.h" diff --git a/src/libeuropa/io/PakWriter.cpp b/src/libeuropa/io/PakWriter.cpp index f62f7fa..d15a396 100644 --- a/src/libeuropa/io/PakWriter.cpp +++ b/src/libeuropa/io/PakWriter.cpp @@ -6,15 +6,13 @@ // SPDX-License-Identifier: LGPL-3.0-or-later // -#include - +#include +#include +#include #include #include "StreamUtils.h" -#include -#include - namespace europa::io { void PakWriter::Init(structs::PakHeader::Version version) { diff --git a/src/libeuropa/io/YatfReader.cpp b/src/libeuropa/io/YatfReader.cpp index 29be3bf..4943a35 100644 --- a/src/libeuropa/io/YatfReader.cpp +++ b/src/libeuropa/io/YatfReader.cpp @@ -6,8 +6,7 @@ // SPDX-License-Identifier: LGPL-3.0-or-later // -#include - +#include #include #include "StreamUtils.h" diff --git a/src/tools/europa_pack_extractor.cpp b/src/tools/europa_pack_extractor.cpp index bbb0cb5..34c33ec 100644 --- a/src/tools/europa_pack_extractor.cpp +++ b/src/tools/europa_pack_extractor.cpp @@ -6,8 +6,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#include - +#include #include #include #include diff --git a/src/tools/pakcreate.cpp b/src/tools/pakcreate.cpp index 1b71bc3..508fd83 100644 --- a/src/tools/pakcreate.cpp +++ b/src/tools/pakcreate.cpp @@ -8,12 +8,11 @@ // A test utility to regurgitate a pak. -#include -#include - +#include +#include +#include #include #include -#include namespace fs = std::filesystem; diff --git a/src/tools/paktest.cpp b/src/tools/paktest.cpp index ba71f62..1796c54 100644 --- a/src/tools/paktest.cpp +++ b/src/tools/paktest.cpp @@ -8,9 +8,8 @@ // A test utility to regurgitate a pak. -#include -#include - +#include +#include #include #include diff --git a/src/tools/texdump.cpp b/src/tools/texdump.cpp index 0d2048d..34fdb31 100644 --- a/src/tools/texdump.cpp +++ b/src/tools/texdump.cpp @@ -6,9 +6,9 @@ // SPDX-License-Identifier: GPL-3.0-or-later // -#include #include +#include #include #include #include