wip

CMakeLists.txt

@@ -73,7 +73,6 @@ endif ()
 
 add_library(odr
         "src/odr/document.cpp"
-        "src/odr/document_cursor.cpp"
         "src/odr/document_element.cpp"
         "src/odr/exceptions.cpp"
         "src/odr/file.cpp"
@@ -93,7 +92,6 @@ add_library(odr
         "src/odr/internal/cfb/cfb_impl.cpp"
         "src/odr/internal/cfb/cfb_util.cpp"
 
-        "src/odr/internal/common/document_cursor.cpp"
         "src/odr/internal/common/document_path.cpp"
         "src/odr/internal/common/file.cpp"
         "src/odr/internal/common/filesystem.cpp"
@@ -123,7 +121,6 @@ add_library(odr
         "src/odr/internal/json/json_util.cpp"
 
         "src/odr/internal/odf/odf_crypto.cpp"
-        "src/odr/internal/odf/odf_cursor.cpp"
         "src/odr/internal/odf/odf_document.cpp"
         "src/odr/internal/odf/odf_element.cpp"
         "src/odr/internal/odf/odf_file.cpp"
@@ -133,14 +130,11 @@ add_library(odr
 
         "src/odr/internal/oldms/oldms_file.cpp"
 
-        "src/odr/internal/ooxml/presentation/ooxml_presentation_cursor.cpp"
         "src/odr/internal/ooxml/presentation/ooxml_presentation_document.cpp"
         "src/odr/internal/ooxml/presentation/ooxml_presentation_element.cpp"
-        "src/odr/internal/ooxml/spreadsheet/ooxml_spreadsheet_cursor.cpp"
         "src/odr/internal/ooxml/spreadsheet/ooxml_spreadsheet_document.cpp"
         "src/odr/internal/ooxml/spreadsheet/ooxml_spreadsheet_element.cpp"
         "src/odr/internal/ooxml/spreadsheet/ooxml_spreadsheet_style.cpp"
-        "src/odr/internal/ooxml/text/ooxml_text_cursor.cpp"
         "src/odr/internal/ooxml/text/ooxml_text_document.cpp"
         "src/odr/internal/ooxml/text/ooxml_text_element.cpp"
         "src/odr/internal/ooxml/text/ooxml_text_style.cpp"

src/odr/document.cpp

@@ -1,8 +1,7 @@
 #include <odr/document.hpp>
-#include <odr/document_cursor.hpp>
+#include <odr/document_element.hpp>
 #include <odr/file.hpp>
 #include <odr/internal/abstract/document.hpp>
-#include <odr/internal/abstract/document_cursor.hpp>
 #include <odr/internal/common/path.hpp>
 #include <stdexcept>
 #include <utility>
@@ -37,8 +36,8 @@ DocumentType Document::document_type() const noexcept {
   return m_document->document_type();
 }
 
-DocumentCursor Document::root_element() const {
-  return {m_document, m_document->root_element()};
+Element Document::root_element() const {
+  return {m_document.get(), m_document->root_element()};
 }
 
 } // namespace odr

src/odr/document.hpp

@@ -12,7 +12,7 @@ namespace odr {
 enum class FileType;
 enum class DocumentType;
 class DocumentFile;
-class DocumentCursor;
+class Element;
 
 class Document final {
 public:
@@ -27,7 +27,7 @@ class Document final {
   [[nodiscard]] FileType file_type() const noexcept;
   [[nodiscard]] DocumentType document_type() const noexcept;
 
-  [[nodiscard]] DocumentCursor root_element() const;
+  [[nodiscard]] Element root_element() const;
 
 private:
   std::shared_ptr<internal::abstract::Document> m_document;