organize includes (#328)

* organize includes * fix formatting * fix formatting script * fix compilation
opendocument-app · Aug 3, 2023 · e44e17a · e44e17a
1 parent 4896bc1
commit e44e17a
Show file tree

Hide file tree

Showing 137 changed files with 496 additions and 283 deletions.
diff --git a/cli/src/back_translate.cpp b/cli/src/back_translate.cpp
@@ -1,8 +1,10 @@
-#include <internal/util/file_util.h>
-#include <iostream>
 #include <odr/document.h>
 #include <odr/file.h>
 #include <odr/html.h>
+
+#include <internal/util/file_util.h>
+
+#include <iostream>
 #include <string>
 
 using namespace odr;

diff --git a/cli/src/meta.cpp b/cli/src/meta.cpp
@@ -1,6 +1,8 @@
+#include <odr/file.h>
+
 #include <internal/util/odr_meta_util.h>
+
 #include <iostream>
-#include <odr/file.h>
 #include <string>
 
 using namespace odr;

diff --git a/cli/src/translate.cpp b/cli/src/translate.cpp
@@ -1,6 +1,7 @@
-#include <iostream>
 #include <odr/file.h>
 #include <odr/html.h>
+
+#include <iostream>
 #include <string>
 
 using namespace odr;

diff --git 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 <string>
+#include <vector>
 
 namespace odr {
 enum class FileType;

diff --git 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
@@ -1,9 +1,12 @@
-#include <internal/abstract/document.h>
-#include <internal/abstract/document_cursor.h>
-#include <internal/common/path.h>
 #include <odr/document.h>
+
 #include <odr/document_cursor.h>
 #include <odr/file.h>
+
+#include <internal/abstract/document.h>
+#include <internal/abstract/document_cursor.h>
+#include <internal/common/path.h>
+
 #include <stdexcept>
 #include <utility>
 

diff --git a/src/document_cursor.cpp b/src/document_cursor.cpp
@@ -1,9 +1,11 @@
+#include <odr/document_cursor.h>
+
+#include <odr/document_element.h>
+
 #include <internal/abstract/document.h>
 #include <internal/abstract/document_cursor.h>
 #include <internal/abstract/document_element.h>
 #include <internal/common/document_path.h>
-#include <odr/document_cursor.h>
-#include <odr/document_element.h>
 
 namespace odr {
 

diff --git a/src/document_element.cpp b/src/document_element.cpp
@@ -1,8 +1,10 @@
-#include <internal/abstract/document_element.h>
 #include <odr/document_element.h>
+
 #include <odr/file.h>
 #include <odr/style.h>
 
+#include <internal/abstract/document_element.h>
+
 namespace odr {
 
 Element::Element(const internal::abstract::Document *document,

diff --git a/src/exceptions.cpp b/src/exceptions.cpp
@@ -1,4 +1,5 @@
 #include <odr/exceptions.h>
+
 #include <odr/file.h>
 
 namespace odr {

diff --git a/src/file.cpp b/src/file.cpp
@@ -1,10 +1,12 @@
-#include <cstdint>
+#include <odr/file.h>
+
+#include <odr/document.h>
+#include <odr/exceptions.h>
+
 #include <internal/abstract/file.h>
 #include <internal/common/file.h>
 #include <internal/open_strategy.h>
-#include <odr/document.h>
-#include <odr/exceptions.h>
-#include <odr/file.h>
+
 #include <optional>
 #include <utility>
 

diff --git a/src/html.cpp b/src/html.cpp
@@ -1,12 +1,16 @@
-#include <filesystem>
+#include <odr/html.h>
+
+#include <odr/document.h>
+#include <odr/document_cursor.h>
+#include <odr/document_element.h>
+
 #include <internal/html/document.h>
 #include <internal/html/image_file.h>
 #include <internal/html/text_file.h>
+
 #include <nlohmann/json.hpp>
-#include <odr/document.h>
-#include <odr/document_cursor.h>
-#include <odr/document_element.h>
-#include <odr/html.h>
+
+#include <filesystem>
 
 using namespace odr::internal;
 namespace fs = std::filesystem;

diff --git 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 <memory>
 #include <odr/document.h>
 
+#include <memory>
+
 namespace odr {
 class File;
 enum class FileType;

diff --git 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 <memory>
 #include <odr/document_element.h>
+
+#include <memory>
 #include <optional>
 #include <string>
 

diff --git 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 <odr/file.h>
+
 #include <iosfwd>
 #include <memory>
-#include <odr/file.h>
 #include <string>
 
 namespace odr::internal::common {

diff --git a/src/internal/cfb/cfb_archive.cpp b/src/internal/cfb/cfb_archive.cpp
@@ -1,7 +1,6 @@
 #include <internal/cfb/cfb_archive.h>
-#include <internal/cfb/cfb_impl.h>
+
 #include <internal/cfb/cfb_util.h>
-#include <internal/common/path.h>
 #include <internal/util/string_util.h>
 
 namespace odr::internal::abstract {

diff --git a/src/internal/cfb/cfb_archive.h b/src/internal/cfb/cfb_archive.h
@@ -4,6 +4,7 @@
 #include <internal/cfb/cfb_impl.h>
 #include <internal/common/file.h>
 #include <internal/common/path.h>
+
 #include <iterator>
 #include <memory>
 #include <optional>

diff --git a/src/internal/cfb/cfb_impl.cpp b/src/internal/cfb/cfb_impl.cpp
@@ -1,7 +1,9 @@
-#include <algorithm>
-#include <cstring>
 #include <internal/cfb/cfb_impl.h>
+
 #include <odr/exceptions.h>
+
+#include <algorithm>
+#include <cstring>
 #include <stdexcept>
 
 namespace odr::internal::cfb::impl {

diff --git a/src/internal/cfb/cfb_util.cpp b/src/internal/cfb/cfb_util.cpp
@@ -1,9 +1,8 @@
-#include <algorithm>
-#include <cstdint>
-#include <internal/abstract/file.h>
-#include <internal/cfb/cfb_impl.h>
 #include <internal/cfb/cfb_util.h>
+
 #include <internal/common/file.h>
+
+#include <algorithm>
 #include <string>
 #include <utility>
 

diff --git 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 <odr/file.h>
+
 #include <internal/abstract/file.h>
 #include <internal/cfb/cfb_impl.h>
+
 #include <istream>
 #include <memory>
-#include <odr/file.h>
 #include <string>
 
 namespace odr::internal::common {

diff --git 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 <odr/exceptions.h>
+#include <odr/file.h>
+
 #include <internal/abstract/archive.h>
 #include <internal/abstract/file.h>
 #include <internal/common/filesystem.h>
-#include <odr/exceptions.h>
-#include <odr/file.h>
 
 namespace odr::internal::common {
 

diff --git a/src/internal/common/document_cursor.cpp b/src/internal/common/document_cursor.cpp
@@ -1,9 +1,5 @@
-#include <cstdint>
-#include <internal/abstract/document_cursor.h>
-#include <internal/abstract/document_element.h>
 #include <internal/common/document_cursor.h>
-#include <internal/common/document_path.h>
-#include <internal/common/style.h>
+
 #include <stdexcept>
 #include <variant>
 

diff --git 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 <cstdint>
-#include <functional>
 #include <internal/abstract/document_cursor.h>
 #include <internal/abstract/document_element.h>
 #include <internal/common/document_path.h>
 #include <internal/common/style.h>
-#include <optional>
+
 #include <pugixml.hpp>
+
+#include <cstdint>
+#include <functional>
+#include <optional>
 #include <string>
 #include <vector>
 

diff --git 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 <internal/abstract/document_element.h>
+
 #include <pugixml.hpp>
 
 namespace odr::internal::abstract {

diff --git a/src/internal/common/document_path.cpp b/src/internal/common/document_path.cpp
@@ -1,4 +1,5 @@
 #include <internal/common/document_path.h>
+
 #include <iterator>
 
 namespace odr::internal::common {

diff --git 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 <cstdint>
 #include <internal/util/string_util.h>
+
+#include <cstdint>
 #include <stdexcept>
 #include <string>
 #include <variant>

diff --git a/src/internal/common/file.cpp b/src/internal/common/file.cpp
@@ -1,11 +1,10 @@
-#include <cstdint>
-#include <filesystem>
-#include <fstream>
-#include <internal/abstract/file.h>
 #include <internal/common/file.h>
-#include <internal/common/path.h>
+
 #include <odr/exceptions.h>
 #include <odr/file.h>
+
+#include <filesystem>
+#include <fstream>
 #include <sstream>
 #include <utility>
 

diff --git a/src/internal/common/file.h b/src/internal/common/file.h
@@ -3,6 +3,7 @@
 
 #include <internal/abstract/file.h>
 #include <internal/common/path.h>
+
 #include <iosfwd>
 #include <memory>
 #include <string>

diff --git a/src/internal/common/filesystem.cpp b/src/internal/common/filesystem.cpp
@@ -1,14 +1,14 @@
-#include <cstdint>
-#include <filesystem>
-#include <fstream>
+#include <internal/common/filesystem.h>
+
+#include <odr/exceptions.h>
+
 #include <internal/abstract/file.h>
-#include <internal/abstract/filesystem.h>
 #include <internal/common/file.h>
-#include <internal/common/filesystem.h>
-#include <internal/common/path.h>
 #include <internal/util/stream_util.h>
+
+#include <filesystem>
+#include <fstream>
 #include <map>
-#include <odr/exceptions.h>
 #include <system_error>
 #include <utility>
 

diff --git a/src/internal/common/filesystem.h b/src/internal/common/filesystem.h
@@ -3,6 +3,7 @@
 
 #include <internal/abstract/filesystem.h>
 #include <internal/common/path.h>
+
 #include <iosfwd>
 #include <map>
 #include <memory>

diff --git a/src/internal/common/path.cpp b/src/internal/common/path.cpp
@@ -1,4 +1,5 @@
 #include <internal/common/path.h>
+
 #include <stdexcept>
 
 std::size_t std::hash<::odr::internal::common::Path>::operator()(

diff --git a/src/internal/common/random.cpp b/src/internal/common/random.cpp
@@ -1,6 +1,7 @@
-#include <algorithm>
 #include <internal/common/random.h>
 
+#include <algorithm>
+
 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
@@ -1,6 +1,4 @@
 #include <internal/common/style.h>
-#include <odr/style.h>
-#include <utility>
 
 namespace odr::internal::common {
 

diff --git a/src/internal/common/style.h b/src/internal/common/style.h
@@ -2,6 +2,7 @@
 #define ODR_INTERNAL_COMMON_STYLE_H
 
 #include <odr/style.h>
+
 #include <optional>
 
 namespace odr::internal::common {

diff --git a/src/internal/common/table_cursor.cpp b/src/internal/common/table_cursor.cpp
@@ -1,6 +1,5 @@
 #include <internal/common/table_cursor.h>
-#include <internal/common/table_position.h>
-#include <iterator>
+
 #include <list>
 
 namespace odr::internal::common {