internal renamings

Author: andiwand

src/odr/archive.cpp

@@ -19,7 +19,7 @@ Archive::Archive(std::shared_ptr<internal::abstract::Archive> impl)
 Filesystem Archive::as_filesystem() const {
   return Filesystem(
       std::dynamic_pointer_cast<internal::abstract::ReadableFilesystem>(
-          m_impl->filesystem()));
+          m_impl->as_filesystem()));
 }
 
 void Archive::save(std::ostream &out) const { m_impl->save(out); }

src/odr/document.cpp

@@ -1,6 +1,7 @@
 #include <odr/document.hpp>
 
 #include <odr/document_element.hpp>
+#include <odr/exceptions.hpp>
 #include <odr/file.hpp>
 #include <odr/filesystem.hpp>
 
@@ -14,7 +15,7 @@ namespace odr {
 Document::Document(std::shared_ptr<internal::abstract::Document> impl)
     : m_impl{std::move(impl)} {
   if (!m_impl) {
-    throw std::runtime_error("document is null");
+    throw NullPointerError("document is null");
   }
 }
 
@@ -44,7 +45,7 @@ Element Document::root_element() const {
 }
 
 Filesystem Document::as_filesystem() const {
-  return Filesystem(m_impl->files());
+  return Filesystem(m_impl->as_filesystem());
 }
 
 } // namespace odr

src/odr/internal/abstract/archive.hpp

@@ -13,7 +13,7 @@ class Archive {
 public:
   virtual ~Archive() = default;
 
-  [[nodiscard]] virtual std::shared_ptr<Filesystem> filesystem() const = 0;
+  [[nodiscard]] virtual std::shared_ptr<Filesystem> as_filesystem() const = 0;
 
   virtual void save(std::ostream &out) const = 0;
 };

src/odr/internal/abstract/document.hpp

@@ -44,7 +44,7 @@ class Document {
 
   /// \return the underlying filesystem of the document.
   [[nodiscard]] virtual std::shared_ptr<ReadableFilesystem>
-  files() const noexcept = 0;
+  as_filesystem() const noexcept = 0;
 
   /// \return cursor to the root element of the document.
   [[nodiscard]] virtual Element *root_element() const = 0;

src/odr/internal/cfb/cfb_archive.cpp

@@ -18,7 +18,7 @@ namespace odr::internal::cfb {
 CfbArchive::CfbArchive(std::shared_ptr<util::Archive> archive)
     : m_cfb{std::move(archive)} {}
 
-std::shared_ptr<abstract::Filesystem> CfbArchive::filesystem() const {
+std::shared_ptr<abstract::Filesystem> CfbArchive::as_filesystem() const {
   auto filesystem = std::make_shared<common::VirtualFilesystem>();
 
   for (const auto &e : *m_cfb) {

src/odr/internal/cfb/cfb_archive.hpp

@@ -33,7 +33,8 @@ class CfbArchive final : public abstract::Archive {
 public:
   explicit CfbArchive(std::shared_ptr<util::Archive> archive);
 
-  [[nodiscard]] std::shared_ptr<abstract::Filesystem> filesystem() const final;
+  [[nodiscard]] std::shared_ptr<abstract::Filesystem>
+  as_filesystem() const final;
 
   void save(std::ostream &out) const final;
 

src/odr/internal/common/document.cpp

@@ -18,7 +18,8 @@ DocumentType Document::document_type() const noexcept {
   return m_document_type;
 }
 
-std::shared_ptr<abstract::ReadableFilesystem> Document::files() const noexcept {
+std::shared_ptr<abstract::ReadableFilesystem>
+Document::as_filesystem() const noexcept {
   return m_filesystem;
 }
 

src/odr/internal/common/document.hpp

@@ -20,7 +20,7 @@ class Document : public abstract::Document {
   [[nodiscard]] DocumentType document_type() const noexcept final;
 
   [[nodiscard]] std::shared_ptr<abstract::ReadableFilesystem>
-  files() const noexcept final;
+  as_filesystem() const noexcept final;
 
 protected:
   FileType m_file_type;

src/odr/internal/odf/odf_crypto.cpp

@@ -181,7 +181,7 @@ odf::decrypt(const std::shared_ptr<abstract::ReadableFilesystem> &filesystem,
 
       auto memory_file =
           std::make_shared<common::MemoryFile>(std::move(decrypt));
-      return zip::ZipFile(memory_file).archive()->filesystem();
+      return zip::ZipFile(memory_file).archive()->as_filesystem();
     } catch (...) {
       throw WrongPasswordError();
     }

src/odr/internal/odf/odf_element.cpp

@@ -437,11 +437,11 @@ GraphicStyle CustomShape::style(const abstract::Document *document) const {
 
 bool Image::is_internal(const abstract::Document *document) const {
   auto doc = document_(document);
-  if (!doc || !doc->files()) {
+  if (!doc || !doc->as_filesystem()) {
     return false;
   }
   try {
-    return doc->files()->is_file(common::Path(href(document)));
+    return doc->as_filesystem()->is_file(common::Path(href(document)));
   } catch (...) {
   }
   return false;
@@ -452,7 +452,7 @@ std::optional<odr::File> Image::file(const abstract::Document *document) const {
   if (!doc || !is_internal(document)) {
     return {};
   }
-  return File(doc->files()->open(common::Path(href(document))));
+  return File(doc->as_filesystem()->open(common::Path(href(document))));
 }
 
 std::string Image::href(const abstract::Document *) const {