From e44e17abf046adb1da7c68f1ca87a7bcc045e982 Mon Sep 17 00:00:00 2001 From: Andreas Stefl Date: Thu, 3 Aug 2023 10:55:33 +0200 Subject: [PATCH] organize includes (#328) * organize includes * fix formatting * fix formatting script * fix compilation --- cli/src/back_translate.cpp | 6 ++++-- cli/src/meta.cpp | 4 +++- cli/src/translate.cpp | 3 ++- include/odr/open_document_reader.h | 1 + scripts/git_hooks/pre-commit/0_format | 2 +- src/document.cpp | 9 ++++++--- src/document_cursor.cpp | 6 ++++-- src/document_element.cpp | 4 +++- src/exceptions.cpp | 1 + src/file.cpp | 10 ++++++---- src/html.cpp | 14 ++++++++----- src/internal/abstract/document.h | 3 ++- src/internal/abstract/document_element.h | 3 ++- src/internal/abstract/file.h | 3 ++- src/internal/cfb/cfb_archive.cpp | 3 +-- src/internal/cfb/cfb_archive.h | 1 + src/internal/cfb/cfb_impl.cpp | 6 ++++-- src/internal/cfb/cfb_util.cpp | 7 +++---- src/internal/cfb/cfb_util.h | 4 +++- src/internal/common/archive.h | 5 +++-- src/internal/common/document_cursor.cpp | 6 +----- src/internal/common/document_cursor.h | 8 +++++--- src/internal/common/document_element.h | 1 + src/internal/common/document_path.cpp | 1 + src/internal/common/document_path.h | 3 ++- src/internal/common/file.cpp | 9 ++++----- src/internal/common/file.h | 1 + src/internal/common/filesystem.cpp | 14 ++++++------- src/internal/common/filesystem.h | 1 + src/internal/common/path.cpp | 1 + src/internal/common/random.cpp | 3 ++- src/internal/common/style.cpp | 2 -- src/internal/common/style.h | 1 + src/internal/common/table_cursor.cpp | 3 +-- src/internal/common/table_cursor.h | 3 ++- src/internal/common/table_position.cpp | 2 ++ src/internal/common/table_range.cpp | 2 +- src/internal/common/table_range.h | 3 ++- src/internal/common/temporary_file.cpp | 6 ++++-- src/internal/common/temporary_file.h | 3 ++- src/internal/crypto/crypto_util.cpp | 3 ++- src/internal/csv/csv_file.cpp | 2 ++ src/internal/csv/csv_file.h | 4 +++- src/internal/csv/csv_util.cpp | 4 +++- src/internal/html/common.cpp | 6 ++++-- src/internal/html/document.cpp | 19 ++++++++++-------- src/internal/html/document_element.cpp | 11 ++++++---- src/internal/html/document_style.cpp | 4 +++- src/internal/html/image_file.cpp | 13 +++++++----- src/internal/html/text_file.cpp | 9 ++++++--- src/internal/json/json_file.cpp | 2 ++ src/internal/json/json_file.h | 4 +++- src/internal/json/json_util.cpp | 1 + src/internal/magic.cpp | 4 +++- src/internal/odf/odf_crypto.cpp | 9 +++++---- src/internal/odf/odf_crypto.h | 3 ++- src/internal/odf/odf_cursor.cpp | 6 ++++-- src/internal/odf/odf_cursor.h | 1 + src/internal/odf/odf_document.cpp | 13 ++++++------ src/internal/odf/odf_document.h | 7 +++++-- src/internal/odf/odf_element.cpp | 19 +++++++++--------- src/internal/odf/odf_element.h | 1 + src/internal/odf/odf_file.cpp | 11 +++++----- src/internal/odf/odf_file.h | 4 +++- src/internal/odf/odf_manifest.cpp | 6 ++++-- src/internal/odf/odf_manifest.h | 3 ++- src/internal/odf/odf_meta.cpp | 13 +++++++----- src/internal/odf/odf_meta.h | 3 ++- src/internal/odf/odf_style.cpp | 8 +++++--- src/internal/odf/odf_style.h | 9 ++++++--- src/internal/oldms/oldms_file.cpp | 8 +++++--- src/internal/oldms/oldms_file.h | 4 +++- src/internal/ooxml/ooxml_crypto.cpp | 10 ++++++---- src/internal/ooxml/ooxml_file.cpp | 9 ++++++--- src/internal/ooxml/ooxml_file.h | 4 +++- src/internal/ooxml/ooxml_meta.cpp | 7 +++++-- src/internal/ooxml/ooxml_util.cpp | 13 +++++++----- src/internal/ooxml/ooxml_util.h | 6 ++++-- .../ooxml_presentation_cursor.cpp | 6 ++++-- .../spreadsheet/ooxml_spreadsheet_cursor.cpp | 6 ++++-- .../spreadsheet/ooxml_spreadsheet_cursor.h | 1 + .../ooxml_spreadsheet_document.cpp | 10 ++++++---- .../spreadsheet/ooxml_spreadsheet_document.h | 7 +++++-- .../spreadsheet/ooxml_spreadsheet_element.cpp | 12 +++++++---- .../spreadsheet/ooxml_spreadsheet_element.h | 3 +++ .../spreadsheet/ooxml_spreadsheet_style.cpp | 6 ++++-- .../spreadsheet/ooxml_spreadsheet_style.h | 4 +++- src/internal/ooxml/text/ooxml_text_cursor.cpp | 6 ++++-- src/internal/ooxml/text/ooxml_text_cursor.h | 1 + .../ooxml/text/ooxml_text_document.cpp | 13 ++++++------ src/internal/ooxml/text/ooxml_text_document.h | 7 +++++-- .../ooxml/text/ooxml_text_element.cpp | 18 +++++++++-------- src/internal/ooxml/text/ooxml_text_element.h | 3 +++ src/internal/ooxml/text/ooxml_text_style.cpp | 3 ++- src/internal/ooxml/text/ooxml_text_style.h | 5 ++++- src/internal/open_strategy.cpp | 11 +++++----- src/internal/resource.cpp | 3 ++- src/internal/resource.h | 1 + src/internal/svm/svm_file.cpp | 6 ++++-- src/internal/svm/svm_format.cpp | 7 +++++-- src/internal/svm/svm_to_svg.cpp | 9 +++++---- src/internal/text/text_file.cpp | 2 ++ src/internal/text/text_file.h | 4 +++- src/internal/text/text_util.cpp | 5 ++++- src/internal/util/file_util.cpp | 3 ++- src/internal/util/odr_meta_util.cpp | 3 ++- src/internal/util/stream_util.cpp | 1 - src/internal/util/xml_util.cpp | 2 -- src/internal/zip/zip_archive.cpp | 11 ++++++---- src/internal/zip/zip_archive.h | 6 ++++-- src/internal/zip/zip_util.cpp | 8 +++++--- src/internal/zip/zip_util.h | 12 ++++++----- src/open_document_reader.cpp | 17 ++++++++-------- src/quantity.cpp | 3 ++- test/src/document_test.cpp | 4 ++-- test/src/file_test.cpp | 3 ++- test/src/internal/cfb/cfb_archive_test.cpp | 8 +++++--- test/src/internal/common/archive_test.cpp | 5 +++-- .../internal/common/document_path_test.cpp | 2 ++ test/src/internal/common/path_test.cpp | 2 ++ .../src/internal/common/table_cursor_test.cpp | 2 ++ .../internal/common/table_position_test.cpp | 2 ++ test/src/internal/common/table_range_test.cpp | 2 ++ test/src/internal/csv/csv_file_test.cpp | 7 ++++--- test/src/internal/csv/csv_test.cpp | 3 ++- test/src/internal/magic_test.cpp | 6 ++++-- test/src/internal/ooxml/ooxml_crypto_test.cpp | 4 +++- test/src/internal/svm/svm_test.cpp | 8 +++++--- test/src/internal/text/text_file_test.cpp | 6 ++++-- test/src/internal/util/xml_util_test.cpp | 2 ++ test/src/internal/zip/miniz_test.cpp | 9 +++++---- test/src/internal/zip/zip_archive_test.cpp | 11 ++++++---- test/src/open_document_reader_test.cpp | 3 ++- test/src/output_reference_test.cpp | 20 +++++++++++-------- test/src/quantity_test.cpp | 2 +- test/src/test_util.cpp | 11 ++++++---- test/src/test_util.h | 1 + 137 files changed, 496 insertions(+), 283 deletions(-) diff --git a/cli/src/back_translate.cpp b/cli/src/back_translate.cpp index f6e91fdfa..30a776ea9 100644 --- a/cli/src/back_translate.cpp +++ b/cli/src/back_translate.cpp @@ -1,8 +1,10 @@ -#include -#include #include #include #include + +#include + +#include #include using namespace odr; diff --git a/cli/src/meta.cpp b/cli/src/meta.cpp index 785f7dfa7..42ae615cd 100644 --- a/cli/src/meta.cpp +++ b/cli/src/meta.cpp @@ -1,6 +1,8 @@ +#include + #include + #include -#include #include using namespace odr; diff --git a/cli/src/translate.cpp b/cli/src/translate.cpp index d91d98f97..ca16ef967 100644 --- a/cli/src/translate.cpp +++ b/cli/src/translate.cpp @@ -1,6 +1,7 @@ -#include #include #include + +#include #include using namespace odr; diff --git a/include/odr/open_document_reader.h b/include/odr/open_document_reader.h index 63a6996a5..e1cc36174 100644 --- a/include/odr/open_document_reader.h +++ b/include/odr/open_document_reader.h @@ -2,6 +2,7 @@ #define ODR_OPEN_DOCUMENT_READER_H #include +#include namespace odr { enum class FileType; diff --git a/scripts/git_hooks/pre-commit/0_format b/scripts/git_hooks/pre-commit/0_format index ab2079629..bea444b95 100755 --- a/scripts/git_hooks/pre-commit/0_format +++ b/scripts/git_hooks/pre-commit/0_format @@ -3,7 +3,7 @@ format_file() { local file="${1}" if [ -f $file ]; then - clang-format-12 -i -style=file ${1} + clang-format -i -style=file ${1} fi } diff --git a/src/document.cpp b/src/document.cpp index 76988bddc..44cf1c97b 100644 --- a/src/document.cpp +++ b/src/document.cpp @@ -1,9 +1,12 @@ -#include -#include -#include #include + #include #include + +#include +#include +#include + #include #include diff --git a/src/document_cursor.cpp b/src/document_cursor.cpp index 8c967dfc8..41f892caa 100644 --- a/src/document_cursor.cpp +++ b/src/document_cursor.cpp @@ -1,9 +1,11 @@ +#include + +#include + #include #include #include #include -#include -#include namespace odr { diff --git a/src/document_element.cpp b/src/document_element.cpp index eea967135..1262eb91c 100644 --- a/src/document_element.cpp +++ b/src/document_element.cpp @@ -1,8 +1,10 @@ -#include #include + #include #include +#include + namespace odr { Element::Element(const internal::abstract::Document *document, diff --git a/src/exceptions.cpp b/src/exceptions.cpp index 23acf513c..a4cccdab6 100644 --- a/src/exceptions.cpp +++ b/src/exceptions.cpp @@ -1,4 +1,5 @@ #include + #include namespace odr { diff --git a/src/file.cpp b/src/file.cpp index d769a88a2..b4b1c8035 100644 --- a/src/file.cpp +++ b/src/file.cpp @@ -1,10 +1,12 @@ -#include +#include + +#include +#include + #include #include #include -#include -#include -#include + #include #include diff --git a/src/html.cpp b/src/html.cpp index a67be43e6..30180085a 100644 --- a/src/html.cpp +++ b/src/html.cpp @@ -1,12 +1,16 @@ -#include +#include + +#include +#include +#include + #include #include #include + #include -#include -#include -#include -#include + +#include using namespace odr::internal; namespace fs = std::filesystem; diff --git a/src/internal/abstract/document.h b/src/internal/abstract/document.h index 442fa4c76..2f0995507 100644 --- a/src/internal/abstract/document.h +++ b/src/internal/abstract/document.h @@ -1,9 +1,10 @@ #ifndef ODR_INTERNAL_ABSTRACT_DOCUMENT_H #define ODR_INTERNAL_ABSTRACT_DOCUMENT_H -#include #include +#include + namespace odr { class File; enum class FileType; diff --git a/src/internal/abstract/document_element.h b/src/internal/abstract/document_element.h index 5f41380f3..3a56b3081 100644 --- a/src/internal/abstract/document_element.h +++ b/src/internal/abstract/document_element.h @@ -1,8 +1,9 @@ #ifndef ODR_INTERNAL_ABSTRACT_DOCUMENT_ELEMENT_H #define ODR_INTERNAL_ABSTRACT_DOCUMENT_ELEMENT_H -#include #include + +#include #include #include diff --git a/src/internal/abstract/file.h b/src/internal/abstract/file.h index c89ae41a2..a72896525 100644 --- a/src/internal/abstract/file.h +++ b/src/internal/abstract/file.h @@ -1,9 +1,10 @@ #ifndef ODR_INTERNAL_ABSTRACT_FILE_H #define ODR_INTERNAL_ABSTRACT_FILE_H +#include + #include #include -#include #include namespace odr::internal::common { diff --git a/src/internal/cfb/cfb_archive.cpp b/src/internal/cfb/cfb_archive.cpp index 04f48a41d..624625e19 100644 --- a/src/internal/cfb/cfb_archive.cpp +++ b/src/internal/cfb/cfb_archive.cpp @@ -1,7 +1,6 @@ #include -#include + #include -#include #include namespace odr::internal::abstract { diff --git a/src/internal/cfb/cfb_archive.h b/src/internal/cfb/cfb_archive.h index c4c3a63bf..b5d7d0816 100644 --- a/src/internal/cfb/cfb_archive.h +++ b/src/internal/cfb/cfb_archive.h @@ -4,6 +4,7 @@ #include #include #include + #include #include #include diff --git a/src/internal/cfb/cfb_impl.cpp b/src/internal/cfb/cfb_impl.cpp index 6d7ed9c59..a3876b7ba 100644 --- a/src/internal/cfb/cfb_impl.cpp +++ b/src/internal/cfb/cfb_impl.cpp @@ -1,7 +1,9 @@ -#include -#include #include + #include + +#include +#include #include namespace odr::internal::cfb::impl { diff --git a/src/internal/cfb/cfb_util.cpp b/src/internal/cfb/cfb_util.cpp index e939cfb88..a801a547c 100644 --- a/src/internal/cfb/cfb_util.cpp +++ b/src/internal/cfb/cfb_util.cpp @@ -1,9 +1,8 @@ -#include -#include -#include -#include #include + #include + +#include #include #include diff --git a/src/internal/cfb/cfb_util.h b/src/internal/cfb/cfb_util.h index e55e1e6e6..4bae481a3 100644 --- a/src/internal/cfb/cfb_util.h +++ b/src/internal/cfb/cfb_util.h @@ -1,11 +1,13 @@ #ifndef ODR_INTERNAL_CFB_UTIL_H #define ODR_INTERNAL_CFB_UTIL_H +#include + #include #include + #include #include -#include #include namespace odr::internal::common { diff --git a/src/internal/common/archive.h b/src/internal/common/archive.h index 92675833a..2ba74d74a 100644 --- a/src/internal/common/archive.h +++ b/src/internal/common/archive.h @@ -1,11 +1,12 @@ #ifndef ODR_INTERNAL_COMMON_ARCHIVE_H #define ODR_INTERNAL_COMMON_ARCHIVE_H +#include +#include + #include #include #include -#include -#include namespace odr::internal::common { diff --git a/src/internal/common/document_cursor.cpp b/src/internal/common/document_cursor.cpp index 3c29d6a92..446c9aaeb 100644 --- a/src/internal/common/document_cursor.cpp +++ b/src/internal/common/document_cursor.cpp @@ -1,9 +1,5 @@ -#include -#include -#include #include -#include -#include + #include #include diff --git a/src/internal/common/document_cursor.h b/src/internal/common/document_cursor.h index 92d9624ef..30e6dbc2d 100644 --- a/src/internal/common/document_cursor.h +++ b/src/internal/common/document_cursor.h @@ -1,14 +1,16 @@ #ifndef ODR_INTERNAL_COMMON_DOCUMENT_CURSOR_H #define ODR_INTERNAL_COMMON_DOCUMENT_CURSOR_H -#include -#include #include #include #include #include -#include + #include + +#include +#include +#include #include #include diff --git a/src/internal/common/document_element.h b/src/internal/common/document_element.h index 983e41dd4..79c7f9a19 100644 --- a/src/internal/common/document_element.h +++ b/src/internal/common/document_element.h @@ -2,6 +2,7 @@ #define ODR_INTERNAL_COMMON_DOCUMENT_ELEMENT_H #include + #include namespace odr::internal::abstract { diff --git a/src/internal/common/document_path.cpp b/src/internal/common/document_path.cpp index ba712bf9b..5ef61d138 100644 --- a/src/internal/common/document_path.cpp +++ b/src/internal/common/document_path.cpp @@ -1,4 +1,5 @@ #include + #include namespace odr::internal::common { diff --git a/src/internal/common/document_path.h b/src/internal/common/document_path.h index 87c8f917a..90c16ede4 100644 --- a/src/internal/common/document_path.h +++ b/src/internal/common/document_path.h @@ -1,8 +1,9 @@ #ifndef ODR_INTERNAL_COMMON_DOCUMENT_PATH_H #define ODR_INTERNAL_COMMON_DOCUMENT_PATH_H -#include #include + +#include #include #include #include diff --git a/src/internal/common/file.cpp b/src/internal/common/file.cpp index b298c5a2c..87cdce9e0 100644 --- a/src/internal/common/file.cpp +++ b/src/internal/common/file.cpp @@ -1,11 +1,10 @@ -#include -#include -#include -#include #include -#include + #include #include + +#include +#include #include #include diff --git a/src/internal/common/file.h b/src/internal/common/file.h index c809559b6..37310825c 100644 --- a/src/internal/common/file.h +++ b/src/internal/common/file.h @@ -3,6 +3,7 @@ #include #include + #include #include #include diff --git a/src/internal/common/filesystem.cpp b/src/internal/common/filesystem.cpp index f9f7c2a3f..456824e6d 100644 --- a/src/internal/common/filesystem.cpp +++ b/src/internal/common/filesystem.cpp @@ -1,14 +1,14 @@ -#include -#include -#include +#include + +#include + #include -#include #include -#include -#include #include + +#include +#include #include -#include #include #include diff --git a/src/internal/common/filesystem.h b/src/internal/common/filesystem.h index dc10f276e..6cf174ae1 100644 --- a/src/internal/common/filesystem.h +++ b/src/internal/common/filesystem.h @@ -3,6 +3,7 @@ #include #include + #include #include #include diff --git a/src/internal/common/path.cpp b/src/internal/common/path.cpp index 31ed53b89..a2d783787 100644 --- a/src/internal/common/path.cpp +++ b/src/internal/common/path.cpp @@ -1,4 +1,5 @@ #include + #include std::size_t std::hash<::odr::internal::common::Path>::operator()( diff --git a/src/internal/common/random.cpp b/src/internal/common/random.cpp index a5ae6433a..a5b305ed0 100644 --- a/src/internal/common/random.cpp +++ b/src/internal/common/random.cpp @@ -1,6 +1,7 @@ -#include #include +#include + namespace odr::internal { std::string common::random_string(std::size_t length) { diff --git a/src/internal/common/style.cpp b/src/internal/common/style.cpp index 948d2ca7b..6778f720f 100644 --- a/src/internal/common/style.cpp +++ b/src/internal/common/style.cpp @@ -1,6 +1,4 @@ #include -#include -#include namespace odr::internal::common { diff --git a/src/internal/common/style.h b/src/internal/common/style.h index 55712425e..ed712f3d6 100644 --- a/src/internal/common/style.h +++ b/src/internal/common/style.h @@ -2,6 +2,7 @@ #define ODR_INTERNAL_COMMON_STYLE_H #include + #include namespace odr::internal::common { diff --git a/src/internal/common/table_cursor.cpp b/src/internal/common/table_cursor.cpp index 52f361687..a81a6545e 100644 --- a/src/internal/common/table_cursor.cpp +++ b/src/internal/common/table_cursor.cpp @@ -1,6 +1,5 @@ #include -#include -#include + #include namespace odr::internal::common { diff --git a/src/internal/common/table_cursor.h b/src/internal/common/table_cursor.h index edb4952c8..406ef0e85 100644 --- a/src/internal/common/table_cursor.h +++ b/src/internal/common/table_cursor.h @@ -1,8 +1,9 @@ #ifndef ODR_INTERNAL_COMMON_TABLE_CURSOR_H #define ODR_INTERNAL_COMMON_TABLE_CURSOR_H -#include #include + +#include #include namespace odr::internal::common { diff --git a/src/internal/common/table_position.cpp b/src/internal/common/table_position.cpp index 2a67f4a25..2481afd5d 100644 --- a/src/internal/common/table_position.cpp +++ b/src/internal/common/table_position.cpp @@ -1,5 +1,7 @@ #include + #include + #include namespace odr::internal::common { diff --git a/src/internal/common/table_range.cpp b/src/internal/common/table_range.cpp index 4f7bc2dee..c8397b9b2 100644 --- a/src/internal/common/table_range.cpp +++ b/src/internal/common/table_range.cpp @@ -1,5 +1,5 @@ -#include #include + #include namespace odr::internal::common { diff --git a/src/internal/common/table_range.h b/src/internal/common/table_range.h index d3867c657..a1d1e7119 100644 --- a/src/internal/common/table_range.h +++ b/src/internal/common/table_range.h @@ -1,8 +1,9 @@ #ifndef ODR_INTERNAL_COMMON_TABLE_RANGE_H #define ODR_INTERNAL_COMMON_TABLE_RANGE_H -#include #include + +#include #include namespace odr::internal::common { diff --git a/src/internal/common/temporary_file.cpp b/src/internal/common/temporary_file.cpp index 8b1b117ea..d67680741 100644 --- a/src/internal/common/temporary_file.cpp +++ b/src/internal/common/temporary_file.cpp @@ -1,8 +1,10 @@ -#include -#include #include + +#include #include +#include + namespace odr::internal::common { TemporaryDiskFile::TemporaryDiskFile(const char *path) : DiskFile{path} {} diff --git a/src/internal/common/temporary_file.h b/src/internal/common/temporary_file.h index c52da4057..27a05fd08 100644 --- a/src/internal/common/temporary_file.h +++ b/src/internal/common/temporary_file.h @@ -1,9 +1,10 @@ #ifndef ODR_INTERNAL_COMMON_TEMPORARY_FILE_H #define ODR_INTERNAL_COMMON_TEMPORARY_FILE_H -#include #include +#include + namespace odr::internal::common { class TemporaryDiskFile final : public DiskFile { diff --git a/src/internal/crypto/crypto_util.cpp b/src/internal/crypto/crypto_util.cpp index 520024316..777c1cd10 100644 --- a/src/internal/crypto/crypto_util.cpp +++ b/src/internal/crypto/crypto_util.cpp @@ -1,3 +1,5 @@ +#include + #include #include #include @@ -7,7 +9,6 @@ #include #include #include -#include namespace odr::internal::crypto { diff --git a/src/internal/csv/csv_file.cpp b/src/internal/csv/csv_file.cpp index 4e277e1ad..20dc94149 100644 --- a/src/internal/csv/csv_file.cpp +++ b/src/internal/csv/csv_file.cpp @@ -1,5 +1,7 @@ #include + #include + #include namespace odr::internal::csv { diff --git a/src/internal/csv/csv_file.h b/src/internal/csv/csv_file.h index 32e979f5d..f70707962 100644 --- a/src/internal/csv/csv_file.h +++ b/src/internal/csv/csv_file.h @@ -1,9 +1,11 @@ #ifndef ODR_INTERNAL_CSV_FILE_H #define ODR_INTERNAL_CSV_FILE_H +#include + #include + #include -#include namespace odr::internal::csv { diff --git a/src/internal/csv/csv_util.cpp b/src/internal/csv/csv_util.cpp index 2d7bc83ce..d5ccb3e0d 100644 --- a/src/internal/csv/csv_util.cpp +++ b/src/internal/csv/csv_util.cpp @@ -1,7 +1,9 @@ -#include #include + #include +#include + namespace odr::internal { void csv::check_csv_file(std::istream &in) { diff --git a/src/internal/html/common.cpp b/src/internal/html/common.cpp index 037af7503..b7ff13b4a 100644 --- a/src/internal/html/common.cpp +++ b/src/internal/html/common.cpp @@ -1,9 +1,11 @@ #include -#include + #include -#include + #include #include + +#include #include namespace odr::internal { diff --git a/src/internal/html/document.cpp b/src/internal/html/document.cpp index a5c6c0cea..a2e659466 100644 --- a/src/internal/html/document.cpp +++ b/src/internal/html/document.cpp @@ -1,20 +1,23 @@ -#include +#include + +#include +#include +#include +#include +#include +#include + #include #include #include -#include #include #include #include #include #include + +#include #include -#include -#include -#include -#include -#include -#include namespace odr::internal { diff --git a/src/internal/html/document_element.cpp b/src/internal/html/document_element.cpp index d48dba880..7776b2526 100644 --- a/src/internal/html/document_element.cpp +++ b/src/internal/html/document_element.cpp @@ -1,12 +1,15 @@ +#include + +#include +#include +#include + #include #include -#include #include #include + #include -#include -#include -#include namespace odr::internal { diff --git a/src/internal/html/document_style.cpp b/src/internal/html/document_style.cpp index 38c04eb9a..5368b96c2 100644 --- a/src/internal/html/document_style.cpp +++ b/src/internal/html/document_style.cpp @@ -1,8 +1,10 @@ -#include #include + #include #include +#include + namespace odr::internal { const char *html::translate_text_align(const TextAlign text_align) { diff --git a/src/internal/html/image_file.cpp b/src/internal/html/image_file.cpp index a9f4aa9cd..3a10a4f46 100644 --- a/src/internal/html/image_file.cpp +++ b/src/internal/html/image_file.cpp @@ -1,14 +1,17 @@ -#include +#include + +#include +#include +#include + #include #include #include -#include #include #include #include -#include -#include -#include + +#include #include namespace odr::internal { diff --git a/src/internal/html/text_file.cpp b/src/internal/html/text_file.cpp index 38a0a63b5..f71c9be33 100644 --- a/src/internal/html/text_file.cpp +++ b/src/internal/html/text_file.cpp @@ -1,10 +1,13 @@ -#include -#include #include -#include + #include #include #include + +#include +#include + +#include #include namespace odr::internal { diff --git a/src/internal/json/json_file.cpp b/src/internal/json/json_file.cpp index a02e6a4e9..f1b990909 100644 --- a/src/internal/json/json_file.cpp +++ b/src/internal/json/json_file.cpp @@ -1,5 +1,7 @@ #include + #include + #include namespace odr::internal::json { diff --git a/src/internal/json/json_file.h b/src/internal/json/json_file.h index 33451513b..3bbe0d646 100644 --- a/src/internal/json/json_file.h +++ b/src/internal/json/json_file.h @@ -1,9 +1,11 @@ #ifndef ODR_INTERNAL_JSON_FILE_H #define ODR_INTERNAL_JSON_FILE_H +#include + #include + #include -#include namespace odr::internal::json { diff --git a/src/internal/json/json_util.cpp b/src/internal/json/json_util.cpp index b4650dbfa..f3383ade0 100644 --- a/src/internal/json/json_util.cpp +++ b/src/internal/json/json_util.cpp @@ -1,4 +1,5 @@ #include + #include namespace odr::internal { diff --git a/src/internal/magic.cpp b/src/internal/magic.cpp index 26653fb16..b0bb6a946 100644 --- a/src/internal/magic.cpp +++ b/src/internal/magic.cpp @@ -1,6 +1,8 @@ -#include #include + +#include #include + #include namespace odr::internal { diff --git a/src/internal/odf/odf_crypto.cpp b/src/internal/odf/odf_crypto.cpp index f8dcd1a96..16873631b 100644 --- a/src/internal/odf/odf_crypto.cpp +++ b/src/internal/odf/odf_crypto.cpp @@ -1,12 +1,13 @@ +#include + +#include + #include #include #include -#include #include -#include -#include #include -#include + #include #include diff --git a/src/internal/odf/odf_crypto.h b/src/internal/odf/odf_crypto.h index 40f396fff..23e446f84 100644 --- a/src/internal/odf/odf_crypto.h +++ b/src/internal/odf/odf_crypto.h @@ -1,9 +1,10 @@ #ifndef ODR_INTERNAL_ODF_CRYPTO_H #define ODR_INTERNAL_ODF_CRYPTO_H -#include #include #include + +#include #include #include diff --git a/src/internal/odf/odf_cursor.cpp b/src/internal/odf/odf_cursor.cpp index 3a83537bd..4fd81f0c0 100644 --- a/src/internal/odf/odf_cursor.cpp +++ b/src/internal/odf/odf_cursor.cpp @@ -1,9 +1,11 @@ -#include -#include #include + +#include #include #include + #include + #include namespace odr::internal::odf { diff --git a/src/internal/odf/odf_cursor.h b/src/internal/odf/odf_cursor.h index 7981da5b1..59bd5674a 100644 --- a/src/internal/odf/odf_cursor.h +++ b/src/internal/odf/odf_cursor.h @@ -4,6 +4,7 @@ #include #include #include + #include namespace pugi { diff --git a/src/internal/odf/odf_document.cpp b/src/internal/odf/odf_document.cpp index fb79118c5..10e18e737 100644 --- a/src/internal/odf/odf_document.cpp +++ b/src/internal/odf/odf_document.cpp @@ -1,14 +1,15 @@ -#include +#include + +#include +#include + #include #include -#include #include -#include -#include #include #include -#include -#include + +#include #include #include diff --git a/src/internal/odf/odf_document.h b/src/internal/odf/odf_document.h index 55d2e11e1..2ae9848bf 100644 --- a/src/internal/odf/odf_document.h +++ b/src/internal/odf/odf_document.h @@ -1,13 +1,16 @@ #ifndef ODR_INTERNAL_ODF_DOCUMENT_H #define ODR_INTERNAL_ODF_DOCUMENT_H +#include + #include #include #include -#include -#include + #include +#include + namespace odr::internal::abstract { class ReadableFilesystem; } // namespace odr::internal::abstract diff --git a/src/internal/odf/odf_element.cpp b/src/internal/odf/odf_element.cpp index be7885b44..c9da78e60 100644 --- a/src/internal/odf/odf_element.cpp +++ b/src/internal/odf/odf_element.cpp @@ -1,6 +1,8 @@ -#include -#include -#include +#include + +#include +#include + #include #include #include @@ -8,14 +10,13 @@ #include #include #include -#include -#include -#include #include -#include -#include -#include + #include + +#include +#include +#include #include #include diff --git a/src/internal/odf/odf_element.h b/src/internal/odf/odf_element.h index 3029493a5..3c32bc7f5 100644 --- a/src/internal/odf/odf_element.h +++ b/src/internal/odf/odf_element.h @@ -4,6 +4,7 @@ #include #include #include + #include namespace odr::internal::odf { diff --git a/src/internal/odf/odf_file.cpp b/src/internal/odf/odf_file.cpp index 143b0613d..64c608a93 100644 --- a/src/internal/odf/odf_file.cpp +++ b/src/internal/odf/odf_file.cpp @@ -1,12 +1,13 @@ +#include + +#include +#include + #include #include #include -#include -#include -#include #include -#include -#include + #include namespace odr::internal::abstract { diff --git a/src/internal/odf/odf_file.h b/src/internal/odf/odf_file.h index 2ba3daeec..b80314e25 100644 --- a/src/internal/odf/odf_file.h +++ b/src/internal/odf/odf_file.h @@ -1,10 +1,12 @@ #ifndef ODR_INTERNAL_ODF_FILE_H #define ODR_INTERNAL_ODF_FILE_H +#include + #include #include + #include -#include #include namespace odr::internal::abstract { diff --git a/src/internal/odf/odf_manifest.cpp b/src/internal/odf/odf_manifest.cpp index eb7883a34..4f2cf7fad 100644 --- a/src/internal/odf/odf_manifest.cpp +++ b/src/internal/odf/odf_manifest.cpp @@ -1,8 +1,10 @@ -#include -#include #include + +#include #include + #include + #include namespace odr::internal::odf { diff --git a/src/internal/odf/odf_manifest.h b/src/internal/odf/odf_manifest.h index 3fa3e9c53..28ced0e95 100644 --- a/src/internal/odf/odf_manifest.h +++ b/src/internal/odf/odf_manifest.h @@ -1,8 +1,9 @@ #ifndef ODR_INTERNAL_ODF_MANIFEST_H #define ODR_INTERNAL_ODF_MANIFEST_H -#include #include + +#include #include #include #include diff --git a/src/internal/odf/odf_meta.cpp b/src/internal/odf/odf_meta.cpp index 82e362469..ed701f7a8 100644 --- a/src/internal/odf/odf_meta.cpp +++ b/src/internal/odf/odf_meta.cpp @@ -1,15 +1,18 @@ -#include +#include + +#include +#include + #include #include #include -#include #include #include #include -#include -#include -#include + #include + +#include #include #include diff --git a/src/internal/odf/odf_meta.h b/src/internal/odf/odf_meta.h index 3dece56fc..7481737f3 100644 --- a/src/internal/odf/odf_meta.h +++ b/src/internal/odf/odf_meta.h @@ -1,9 +1,10 @@ #ifndef ODR_INTERNAL_ODF_META_H #define ODR_INTERNAL_ODF_META_H +#include + #include #include -#include #include #include diff --git a/src/internal/odf/odf_style.cpp b/src/internal/odf/odf_style.cpp index 91c696987..f0f3d315b 100644 --- a/src/internal/odf/odf_style.cpp +++ b/src/internal/odf/odf_style.cpp @@ -1,9 +1,11 @@ -#include -#include -#include #include + #include #include + +#include + +#include #include #include #include diff --git a/src/internal/odf/odf_style.h b/src/internal/odf/odf_style.h index f6fec8dbf..783ab29b4 100644 --- a/src/internal/odf/odf_style.h +++ b/src/internal/odf/odf_style.h @@ -1,12 +1,15 @@ #ifndef ODR_INTERNAL_ODF_STYLE_H #define ODR_INTERNAL_ODF_STYLE_H -#include +#include + #include + +#include + +#include #include -#include #include -#include #include #include #include diff --git a/src/internal/oldms/oldms_file.cpp b/src/internal/oldms/oldms_file.cpp index 028991852..976a6dbad 100644 --- a/src/internal/oldms/oldms_file.cpp +++ b/src/internal/oldms/oldms_file.cpp @@ -1,9 +1,11 @@ -#include -#include #include -#include + #include #include + +#include + +#include #include #include diff --git a/src/internal/oldms/oldms_file.h b/src/internal/oldms/oldms_file.h index 4c418a339..9503a241e 100644 --- a/src/internal/oldms/oldms_file.h +++ b/src/internal/oldms/oldms_file.h @@ -1,10 +1,12 @@ #ifndef ODR_INTERNAL_OLDMS_FILE_H #define ODR_INTERNAL_OLDMS_FILE_H +#include + #include #include + #include -#include #include namespace odr::internal::abstract { diff --git a/src/internal/ooxml/ooxml_crypto.cpp b/src/internal/ooxml/ooxml_crypto.cpp index dc1f959d5..b78f674dc 100644 --- a/src/internal/ooxml/ooxml_crypto.cpp +++ b/src/internal/ooxml/ooxml_crypto.cpp @@ -1,9 +1,11 @@ -#include -#include -#include #include -#include + #include + +#include +#include + +#include #include #include diff --git a/src/internal/ooxml/ooxml_file.cpp b/src/internal/ooxml/ooxml_file.cpp index 942c6b9b4..7f9b1962f 100644 --- a/src/internal/ooxml/ooxml_file.cpp +++ b/src/internal/ooxml/ooxml_file.cpp @@ -1,18 +1,21 @@ +#include + +#include +#include + #include #include #include #include #include #include -#include #include #include #include #include #include #include -#include -#include + #include namespace odr::internal::abstract { diff --git a/src/internal/ooxml/ooxml_file.h b/src/internal/ooxml/ooxml_file.h index 125fb38d1..da5676533 100644 --- a/src/internal/ooxml/ooxml_file.h +++ b/src/internal/ooxml/ooxml_file.h @@ -1,9 +1,11 @@ #ifndef ODR_INTERNAL_OOXML_FILE_H #define ODR_INTERNAL_OOXML_FILE_H +#include + #include + #include -#include #include namespace odr::internal::abstract { diff --git a/src/internal/ooxml/ooxml_meta.cpp b/src/internal/ooxml/ooxml_meta.cpp index 64e92a461..0972cfebb 100644 --- a/src/internal/ooxml/ooxml_meta.cpp +++ b/src/internal/ooxml/ooxml_meta.cpp @@ -1,8 +1,11 @@ -#include -#include #include + #include #include + +#include +#include + #include namespace odr::internal::ooxml { diff --git a/src/internal/ooxml/ooxml_util.cpp b/src/internal/ooxml/ooxml_util.cpp index cef868c90..217fdac44 100644 --- a/src/internal/ooxml/ooxml_util.cpp +++ b/src/internal/ooxml/ooxml_util.cpp @@ -1,14 +1,17 @@ -#include -#include +#include + +#include +#include + #include #include #include -#include #include -#include -#include + #include +#include + namespace odr::internal { std::optional diff --git a/src/internal/ooxml/ooxml_util.h b/src/internal/ooxml/ooxml_util.h index 530ce00d8..43278bfae 100644 --- a/src/internal/ooxml/ooxml_util.h +++ b/src/internal/ooxml/ooxml_util.h @@ -1,11 +1,13 @@ #ifndef ODR_INTERNAL_OOXML_UTIL_H #define ODR_INTERNAL_OOXML_UTIL_H +#include + +#include + #include #include -#include #include -#include #include #include diff --git a/src/internal/ooxml/presentation/ooxml_presentation_cursor.cpp b/src/internal/ooxml/presentation/ooxml_presentation_cursor.cpp index 4a0f1e1f5..679c9b29e 100644 --- a/src/internal/ooxml/presentation/ooxml_presentation_cursor.cpp +++ b/src/internal/ooxml/presentation/ooxml_presentation_cursor.cpp @@ -1,9 +1,11 @@ -#include -#include #include + +#include #include #include + #include + #include namespace odr::internal::ooxml::presentation { diff --git a/src/internal/ooxml/spreadsheet/ooxml_spreadsheet_cursor.cpp b/src/internal/ooxml/spreadsheet/ooxml_spreadsheet_cursor.cpp index 97763f5c3..bb3c67ac9 100644 --- a/src/internal/ooxml/spreadsheet/ooxml_spreadsheet_cursor.cpp +++ b/src/internal/ooxml/spreadsheet/ooxml_spreadsheet_cursor.cpp @@ -1,9 +1,11 @@ -#include -#include #include + +#include #include #include + #include + #include namespace odr::internal::ooxml::spreadsheet { diff --git a/src/internal/ooxml/spreadsheet/ooxml_spreadsheet_cursor.h b/src/internal/ooxml/spreadsheet/ooxml_spreadsheet_cursor.h index 830dae830..cb20bd7b3 100644 --- a/src/internal/ooxml/spreadsheet/ooxml_spreadsheet_cursor.h +++ b/src/internal/ooxml/spreadsheet/ooxml_spreadsheet_cursor.h @@ -2,6 +2,7 @@ #define ODR_INTERNAL_OOXML_SPREADSHEET_CURSOR_H #include + #include namespace pugi { diff --git a/src/internal/ooxml/spreadsheet/ooxml_spreadsheet_document.cpp b/src/internal/ooxml/spreadsheet/ooxml_spreadsheet_document.cpp index 242714e55..bed508a5d 100644 --- a/src/internal/ooxml/spreadsheet/ooxml_spreadsheet_document.cpp +++ b/src/internal/ooxml/spreadsheet/ooxml_spreadsheet_document.cpp @@ -1,11 +1,13 @@ +#include + +#include +#include + #include -#include #include #include -#include #include -#include -#include + #include namespace odr::internal::abstract { diff --git a/src/internal/ooxml/spreadsheet/ooxml_spreadsheet_document.h b/src/internal/ooxml/spreadsheet/ooxml_spreadsheet_document.h index 497f70385..e32c7a9ec 100644 --- a/src/internal/ooxml/spreadsheet/ooxml_spreadsheet_document.h +++ b/src/internal/ooxml/spreadsheet/ooxml_spreadsheet_document.h @@ -1,12 +1,15 @@ #ifndef ODR_INTERNAL_OOXML_SPREADSHEET_DOCUMENT_H #define ODR_INTERNAL_OOXML_SPREADSHEET_DOCUMENT_H +#include + #include #include #include -#include -#include + #include + +#include #include #include diff --git a/src/internal/ooxml/spreadsheet/ooxml_spreadsheet_element.cpp b/src/internal/ooxml/spreadsheet/ooxml_spreadsheet_element.cpp index b08b9baa7..b277d555e 100644 --- a/src/internal/ooxml/spreadsheet/ooxml_spreadsheet_element.cpp +++ b/src/internal/ooxml/spreadsheet/ooxml_spreadsheet_element.cpp @@ -1,4 +1,7 @@ -#include +#include + +#include + #include #include #include @@ -7,10 +10,11 @@ #include #include #include -#include -#include -#include + #include + +#include +#include #include #include diff --git a/src/internal/ooxml/spreadsheet/ooxml_spreadsheet_element.h b/src/internal/ooxml/spreadsheet/ooxml_spreadsheet_element.h index 87440c292..d1b7322ca 100644 --- a/src/internal/ooxml/spreadsheet/ooxml_spreadsheet_element.h +++ b/src/internal/ooxml/spreadsheet/ooxml_spreadsheet_element.h @@ -4,8 +4,11 @@ #include #include #include + #include + #include +#include namespace odr::internal::ooxml::spreadsheet { class Document; diff --git a/src/internal/ooxml/spreadsheet/ooxml_spreadsheet_style.cpp b/src/internal/ooxml/spreadsheet/ooxml_spreadsheet_style.cpp index 76dcd1fb9..39f3d951c 100644 --- a/src/internal/ooxml/spreadsheet/ooxml_spreadsheet_style.cpp +++ b/src/internal/ooxml/spreadsheet/ooxml_spreadsheet_style.cpp @@ -1,6 +1,8 @@ -#include -#include #include + +#include + +#include #include namespace odr::internal::ooxml::spreadsheet { diff --git a/src/internal/ooxml/spreadsheet/ooxml_spreadsheet_style.h b/src/internal/ooxml/spreadsheet/ooxml_spreadsheet_style.h index a06159b51..e16da403d 100644 --- a/src/internal/ooxml/spreadsheet/ooxml_spreadsheet_style.h +++ b/src/internal/ooxml/spreadsheet/ooxml_spreadsheet_style.h @@ -2,8 +2,10 @@ #define ODR_INTERNAL_OOXML_SPREADSHEET_STYLE_H #include -#include + #include + +#include #include #include diff --git a/src/internal/ooxml/text/ooxml_text_cursor.cpp b/src/internal/ooxml/text/ooxml_text_cursor.cpp index 090944a5c..14f3928e0 100644 --- a/src/internal/ooxml/text/ooxml_text_cursor.cpp +++ b/src/internal/ooxml/text/ooxml_text_cursor.cpp @@ -1,9 +1,11 @@ -#include -#include #include + +#include #include #include + #include + #include namespace odr::internal::ooxml::text { diff --git a/src/internal/ooxml/text/ooxml_text_cursor.h b/src/internal/ooxml/text/ooxml_text_cursor.h index 56e010329..d2e95a0e1 100644 --- a/src/internal/ooxml/text/ooxml_text_cursor.h +++ b/src/internal/ooxml/text/ooxml_text_cursor.h @@ -3,6 +3,7 @@ #include #include + #include namespace pugi { diff --git a/src/internal/ooxml/text/ooxml_text_document.cpp b/src/internal/ooxml/text/ooxml_text_document.cpp index 38bfa4735..666c5eb53 100644 --- a/src/internal/ooxml/text/ooxml_text_document.cpp +++ b/src/internal/ooxml/text/ooxml_text_document.cpp @@ -1,15 +1,16 @@ -#include +#include + +#include +#include + #include #include -#include #include #include -#include -#include #include #include -#include -#include + +#include #include #include diff --git a/src/internal/ooxml/text/ooxml_text_document.h b/src/internal/ooxml/text/ooxml_text_document.h index 90a28ab8c..f23a11615 100644 --- a/src/internal/ooxml/text/ooxml_text_document.h +++ b/src/internal/ooxml/text/ooxml_text_document.h @@ -1,12 +1,15 @@ #ifndef ODR_INTERNAL_OOXML_TEXT_DOCUMENT_H #define ODR_INTERNAL_OOXML_TEXT_DOCUMENT_H +#include + #include #include #include -#include -#include + #include + +#include #include #include diff --git a/src/internal/ooxml/text/ooxml_text_element.cpp b/src/internal/ooxml/text/ooxml_text_element.cpp index f9d32af03..e9953a81c 100644 --- a/src/internal/ooxml/text/ooxml_text_element.cpp +++ b/src/internal/ooxml/text/ooxml_text_element.cpp @@ -1,5 +1,9 @@ -#include -#include +#include + +#include +#include +#include + #include #include #include @@ -8,14 +12,12 @@ #include #include #include -#include -#include #include -#include -#include -#include -#include + #include + +#include +#include #include namespace odr::internal::ooxml::text { diff --git a/src/internal/ooxml/text/ooxml_text_element.h b/src/internal/ooxml/text/ooxml_text_element.h index 189d9de7b..1741151b4 100644 --- a/src/internal/ooxml/text/ooxml_text_element.h +++ b/src/internal/ooxml/text/ooxml_text_element.h @@ -4,8 +4,11 @@ #include #include #include + #include + #include +#include namespace odr::internal::ooxml::text { class Document; diff --git a/src/internal/ooxml/text/ooxml_text_style.cpp b/src/internal/ooxml/text/ooxml_text_style.cpp index d2531d3f6..e9d664900 100644 --- a/src/internal/ooxml/text/ooxml_text_style.cpp +++ b/src/internal/ooxml/text/ooxml_text_style.cpp @@ -1,6 +1,7 @@ +#include + #include #include -#include namespace odr::internal::ooxml::text { diff --git a/src/internal/ooxml/text/ooxml_text_style.h b/src/internal/ooxml/text/ooxml_text_style.h index 6492e0a5a..d03c013d5 100644 --- a/src/internal/ooxml/text/ooxml_text_style.h +++ b/src/internal/ooxml/text/ooxml_text_style.h @@ -1,9 +1,12 @@ #ifndef ODR_INTERNAL_OOXML_TEXT_STYLE_H #define ODR_INTERNAL_OOXML_TEXT_STYLE_H -#include #include + +#include + #include + #include namespace odr::internal::ooxml::text { diff --git a/src/internal/open_strategy.cpp b/src/internal/open_strategy.cpp index a24ade731..62ecd5908 100644 --- a/src/internal/open_strategy.cpp +++ b/src/internal/open_strategy.cpp @@ -1,7 +1,11 @@ +#include + +#include +#include + #include #include #include -#include #include #include #include @@ -9,12 +13,9 @@ #include #include #include -#include #include -#include #include -#include -#include + #include namespace odr::internal { diff --git a/src/internal/resource.cpp b/src/internal/resource.cpp index 023d63212..325061615 100644 --- a/src/internal/resource.cpp +++ b/src/internal/resource.cpp @@ -1,6 +1,7 @@ +#include + #include #include -#include #include namespace odr::internal { diff --git a/src/internal/resource.h b/src/internal/resource.h index 18242a9b1..a0d920062 100644 --- a/src/internal/resource.h +++ b/src/internal/resource.h @@ -2,6 +2,7 @@ #define ODR_INTERNAL_RESOURCE_H #include + #include #include diff --git a/src/internal/svm/svm_file.cpp b/src/internal/svm/svm_file.cpp index 3c4aa00ed..9e614ea90 100644 --- a/src/internal/svm/svm_file.cpp +++ b/src/internal/svm/svm_file.cpp @@ -1,7 +1,9 @@ -#include #include -#include + #include + +#include + #include namespace odr::internal::abstract { diff --git a/src/internal/svm/svm_format.cpp b/src/internal/svm/svm_format.cpp index db8f67bf7..dff0e0ef8 100644 --- a/src/internal/svm/svm_format.cpp +++ b/src/internal/svm/svm_format.cpp @@ -1,8 +1,11 @@ -#include #include -#include + #include +#include + +#include + namespace odr::internal { std::string svm::read_ascii_string(std::istream &in, diff --git a/src/internal/svm/svm_to_svg.cpp b/src/internal/svm/svm_to_svg.cpp index d08cd359b..39a47ebef 100644 --- a/src/internal/svm/svm_to_svg.cpp +++ b/src/internal/svm/svm_to_svg.cpp @@ -1,9 +1,10 @@ -#include -#include -#include #include -#include + #include + +#include +#include + #include namespace odr::internal::svm { diff --git a/src/internal/text/text_file.cpp b/src/internal/text/text_file.cpp index bc645052d..faf5b5078 100644 --- a/src/internal/text/text_file.cpp +++ b/src/internal/text/text_file.cpp @@ -1,5 +1,7 @@ #include + #include + #include namespace odr::internal::text { diff --git a/src/internal/text/text_file.h b/src/internal/text/text_file.h index a119be89b..6aedd6ab5 100644 --- a/src/internal/text/text_file.h +++ b/src/internal/text/text_file.h @@ -1,9 +1,11 @@ #ifndef ODR_INTERNAL_TEXT_FILE_H #define ODR_INTERNAL_TEXT_FILE_H +#include + #include + #include -#include namespace odr::internal::text { diff --git a/src/internal/text/text_util.cpp b/src/internal/text/text_util.cpp index 6d047e0e1..67f041d04 100644 --- a/src/internal/text/text_util.cpp +++ b/src/internal/text/text_util.cpp @@ -1,8 +1,11 @@ #include -#include + #include + #include +#include + namespace odr::internal { std::string text::guess_charset(std::istream &in) { diff --git a/src/internal/util/file_util.cpp b/src/internal/util/file_util.cpp index 314d54b5f..e537d53ee 100644 --- a/src/internal/util/file_util.cpp +++ b/src/internal/util/file_util.cpp @@ -1,8 +1,9 @@ #include +#include + #include #include -#include namespace odr::internal::util { diff --git a/src/internal/util/odr_meta_util.cpp b/src/internal/util/odr_meta_util.cpp index 01094ba56..c9f134c1c 100644 --- a/src/internal/util/odr_meta_util.cpp +++ b/src/internal/util/odr_meta_util.cpp @@ -1,9 +1,10 @@ #include -#include #include #include +#include + namespace odr::internal::util::meta { nlohmann::json meta_to_json(const FileMeta &meta) { diff --git a/src/internal/util/stream_util.cpp b/src/internal/util/stream_util.cpp index 64d7372d7..b414e7662 100644 --- a/src/internal/util/stream_util.cpp +++ b/src/internal/util/stream_util.cpp @@ -1,6 +1,5 @@ #include -#include #include #include diff --git a/src/internal/util/xml_util.cpp b/src/internal/util/xml_util.cpp index 636e3221b..cb469674e 100644 --- a/src/internal/util/xml_util.cpp +++ b/src/internal/util/xml_util.cpp @@ -8,8 +8,6 @@ #include -#include -#include #include namespace odr::internal::util { diff --git a/src/internal/zip/zip_archive.cpp b/src/internal/zip/zip_archive.cpp index 94e59b94c..5dc7cf04d 100644 --- a/src/internal/zip/zip_archive.cpp +++ b/src/internal/zip/zip_archive.cpp @@ -1,11 +1,14 @@ -#include -#include -#include #include + +#include + +#include #include + #include #include -#include + +#include #include #include #include diff --git a/src/internal/zip/zip_archive.h b/src/internal/zip/zip_archive.h index ea2d2f071..7c15080dc 100644 --- a/src/internal/zip/zip_archive.h +++ b/src/internal/zip/zip_archive.h @@ -1,12 +1,14 @@ #ifndef ODR_INTERNAL_ZIP_ARCHIVE_H #define ODR_INTERNAL_ZIP_ARCHIVE_H -#include #include + +#include + +#include #include #include #include -#include #include namespace odr::internal::abstract { diff --git a/src/internal/zip/zip_util.cpp b/src/internal/zip/zip_util.cpp index aba054ca9..2bc502efc 100644 --- a/src/internal/zip/zip_util.cpp +++ b/src/internal/zip/zip_util.cpp @@ -1,8 +1,10 @@ -#include -#include -#include #include + #include + +#include + +#include #include namespace odr::internal::zip::util { diff --git a/src/internal/zip/zip_util.h b/src/internal/zip/zip_util.h index 605651273..e74b2a7fa 100644 --- a/src/internal/zip/zip_util.h +++ b/src/internal/zip/zip_util.h @@ -1,16 +1,18 @@ #ifndef ODR_INTERNAL_ZIP_UTIL_H #define ODR_INTERNAL_ZIP_UTIL_H +#include + +#include + +#include +#include + #include #include -#include #include #include -#include -#include -#include #include -#include namespace odr::internal::common { class MemoryFile; diff --git a/src/open_document_reader.cpp b/src/open_document_reader.cpp index dae893d1f..b0d94cf05 100644 --- a/src/open_document_reader.cpp +++ b/src/open_document_reader.cpp @@ -1,16 +1,17 @@ -#include +#include + +#include +#include +#include +#include + #include #include -#include #include #include #include -#include -#include -#include -#include -#include -#include + +#include namespace odr { diff --git a/src/quantity.cpp b/src/quantity.cpp index d7608b4de..29342159e 100644 --- a/src/quantity.cpp +++ b/src/quantity.cpp @@ -1,5 +1,6 @@ -#include #include + +#include #include namespace odr { diff --git a/test/src/document_test.cpp b/test/src/document_test.cpp index 7f665de87..af7bddf32 100644 --- a/test/src/document_test.cpp +++ b/test/src/document_test.cpp @@ -1,12 +1,12 @@ -#include #include +#include + #include #include #include #include #include #include -#include using namespace odr; using namespace odr::test; diff --git a/test/src/file_test.cpp b/test/src/file_test.cpp index 649305036..43d521fa9 100644 --- a/test/src/file_test.cpp +++ b/test/src/file_test.cpp @@ -1,7 +1,8 @@ #include +#include + #include #include -#include using namespace odr; using namespace odr::test; diff --git a/test/src/internal/cfb/cfb_archive_test.cpp b/test/src/internal/cfb/cfb_archive_test.cpp index ff4675ec2..99dcb283f 100644 --- a/test/src/internal/cfb/cfb_archive_test.cpp +++ b/test/src/internal/cfb/cfb_archive_test.cpp @@ -1,9 +1,11 @@ #include +#include + +#include + #include -#include + #include -#include -#include using namespace odr::internal; using namespace odr::test; diff --git a/test/src/internal/common/archive_test.cpp b/test/src/internal/common/archive_test.cpp index e7fb0e853..50805855b 100644 --- a/test/src/internal/common/archive_test.cpp +++ b/test/src/internal/common/archive_test.cpp @@ -1,10 +1,11 @@ #include +#include + #include #include -#include #include + #include -#include using namespace odr::internal; using namespace odr::internal::common; diff --git a/test/src/internal/common/document_path_test.cpp b/test/src/internal/common/document_path_test.cpp index 50e8b01a5..fb2c5f740 100644 --- a/test/src/internal/common/document_path_test.cpp +++ b/test/src/internal/common/document_path_test.cpp @@ -1,5 +1,7 @@ #include + #include + #include using namespace odr::internal::common; diff --git a/test/src/internal/common/path_test.cpp b/test/src/internal/common/path_test.cpp index b63aadd91..381eea214 100644 --- a/test/src/internal/common/path_test.cpp +++ b/test/src/internal/common/path_test.cpp @@ -1,5 +1,7 @@ #include + #include + #include using namespace odr::internal::common; diff --git a/test/src/internal/common/table_cursor_test.cpp b/test/src/internal/common/table_cursor_test.cpp index f606628cd..5f7b25530 100644 --- a/test/src/internal/common/table_cursor_test.cpp +++ b/test/src/internal/common/table_cursor_test.cpp @@ -1,5 +1,7 @@ #include + #include + #include using namespace odr::internal::common; diff --git a/test/src/internal/common/table_position_test.cpp b/test/src/internal/common/table_position_test.cpp index c2f7848ba..4ea3a6f13 100644 --- a/test/src/internal/common/table_position_test.cpp +++ b/test/src/internal/common/table_position_test.cpp @@ -1,5 +1,7 @@ #include + #include + #include using namespace odr::internal::common; diff --git a/test/src/internal/common/table_range_test.cpp b/test/src/internal/common/table_range_test.cpp index 42986fe25..b3b3772ca 100644 --- a/test/src/internal/common/table_range_test.cpp +++ b/test/src/internal/common/table_range_test.cpp @@ -1,5 +1,7 @@ #include + #include + #include using namespace odr::internal::common; diff --git a/test/src/internal/csv/csv_file_test.cpp b/test/src/internal/csv/csv_file_test.cpp index 3b2468755..17a943019 100644 --- a/test/src/internal/csv/csv_file_test.cpp +++ b/test/src/internal/csv/csv_file_test.cpp @@ -1,9 +1,10 @@ #include -#include -#include +#include + #include #include -#include + +#include using namespace odr; using namespace odr::test; diff --git a/test/src/internal/csv/csv_test.cpp b/test/src/internal/csv/csv_test.cpp index ba3fa3dd5..92368d114 100644 --- a/test/src/internal/csv/csv_test.cpp +++ b/test/src/internal/csv/csv_test.cpp @@ -1,7 +1,8 @@ -#include #include #include +#include + using namespace odr; using namespace odr::test; diff --git a/test/src/internal/magic_test.cpp b/test/src/internal/magic_test.cpp index 44a0beec6..f4203d696 100644 --- a/test/src/internal/magic_test.cpp +++ b/test/src/internal/magic_test.cpp @@ -1,8 +1,10 @@ #include -#include -#include #include +#include + +#include + using namespace odr; using namespace odr::internal; using namespace odr::test; diff --git a/test/src/internal/ooxml/ooxml_crypto_test.cpp b/test/src/internal/ooxml/ooxml_crypto_test.cpp index 551be0e17..ff9439289 100644 --- a/test/src/internal/ooxml/ooxml_crypto_test.cpp +++ b/test/src/internal/ooxml/ooxml_crypto_test.cpp @@ -1,6 +1,8 @@ -#include #include + #include + +#include #include using namespace odr::internal::ooxml; diff --git a/test/src/internal/svm/svm_test.cpp b/test/src/internal/svm/svm_test.cpp index f833b93c9..c080b4fdc 100644 --- a/test/src/internal/svm/svm_test.cpp +++ b/test/src/internal/svm/svm_test.cpp @@ -1,11 +1,13 @@ -#include #include +#include + +#include + #include #include #include + #include -#include -#include using namespace odr::internal; using namespace odr::test; diff --git a/test/src/internal/text/text_file_test.cpp b/test/src/internal/text/text_file_test.cpp index 91fcfe605..0fb7bc697 100644 --- a/test/src/internal/text/text_file_test.cpp +++ b/test/src/internal/text/text_file_test.cpp @@ -1,8 +1,10 @@ #include -#include +#include + #include #include -#include + +#include using namespace odr; using namespace odr::test; diff --git a/test/src/internal/util/xml_util_test.cpp b/test/src/internal/util/xml_util_test.cpp index 50bb00888..01c2dd4e8 100644 --- a/test/src/internal/util/xml_util_test.cpp +++ b/test/src/internal/util/xml_util_test.cpp @@ -1,5 +1,7 @@ #include + #include + #include using namespace odr::internal::util::xml; diff --git a/test/src/internal/zip/miniz_test.cpp b/test/src/internal/zip/miniz_test.cpp index 27118567f..f8f4a4616 100644 --- a/test/src/internal/zip/miniz_test.cpp +++ b/test/src/internal/zip/miniz_test.cpp @@ -1,10 +1,11 @@ -#include -#include -#include #include +#include + #include + +#include +#include #include -#include using namespace odr::test; diff --git a/test/src/internal/zip/zip_archive_test.cpp b/test/src/internal/zip/zip_archive_test.cpp index f75a422b6..d76c5f671 100644 --- a/test/src/internal/zip/zip_archive_test.cpp +++ b/test/src/internal/zip/zip_archive_test.cpp @@ -1,11 +1,14 @@ -#include -#include #include +#include + +#include + #include #include + +#include +#include #include -#include -#include using namespace odr; using namespace odr::internal; diff --git a/test/src/open_document_reader_test.cpp b/test/src/open_document_reader_test.cpp index 5a5f17505..1bf6f9000 100644 --- a/test/src/open_document_reader_test.cpp +++ b/test/src/open_document_reader_test.cpp @@ -1,7 +1,8 @@ #include +#include + #include #include -#include using namespace odr; using namespace odr::internal; diff --git a/test/src/output_reference_test.cpp b/test/src/output_reference_test.cpp index b22769494..cfa04fa00 100644 --- a/test/src/output_reference_test.cpp +++ b/test/src/output_reference_test.cpp @@ -1,18 +1,22 @@ -#include -#include #include -#include -#include -#include -#include -#include +#include + #include #include #include #include + +#include +#include +#include + +#include + +#include +#include +#include #include #include -#include using namespace odr; using namespace odr::internal; diff --git a/test/src/quantity_test.cpp b/test/src/quantity_test.cpp index 0a2d5571a..21f04edfe 100644 --- a/test/src/quantity_test.cpp +++ b/test/src/quantity_test.cpp @@ -1,5 +1,5 @@ #include -#include + #include using namespace odr; diff --git a/test/src/test_util.cpp b/test/src/test_util.cpp index 553b244cf..26cfacd69 100644 --- a/test/src/test_util.cpp +++ b/test/src/test_util.cpp @@ -1,9 +1,12 @@ -#include -#include -#include -#include #include #include + +#include + +#include + +#include +#include #include #include #include diff --git a/test/src/test_util.h b/test/src/test_util.h index dceb5bdef..cf75227c7 100644 --- a/test/src/test_util.h +++ b/test/src/test_util.h @@ -2,6 +2,7 @@ #define ODR_TEST_META_H #include + #include #include #include