* scribo/core/internal/doc_xml_serializer.hh: Rename as... * scribo/core/internal/doc_serializer.hh: ... this. * scribo/io/xml/internal/extended_page_xml_visitor.hh, * scribo/io/xml/internal/full_xml_visitor.hh, * scribo/io/xml/internal/page_xml_visitor.hh: Update inheritance. --- scribo/ChangeLog | 11 +++++++++ .../{doc_xml_serializer.hh => doc_serializer.hh} | 24 ++++++++++---------- .../io/xml/internal/extended_page_xml_visitor.hh | 3 +- scribo/scribo/io/xml/internal/full_xml_visitor.hh | 4 +- scribo/scribo/io/xml/internal/page_xml_visitor.hh | 4 +- 5 files changed, 29 insertions(+), 17 deletions(-) rename scribo/scribo/core/internal/{doc_xml_serializer.hh => doc_serializer.hh} (80%) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 33b036a..1de58fe 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,16 @@ 2011-03-14 Guillaume Lazzara <z@lrde.epita.fr> + Rename document serializer base class. + + * scribo/core/internal/doc_xml_serializer.hh: Rename as... + * scribo/core/internal/doc_serializer.hh: ... this. + + * scribo/io/xml/internal/extended_page_xml_visitor.hh, + * scribo/io/xml/internal/full_xml_visitor.hh, + * scribo/io/xml/internal/page_xml_visitor.hh: Update inheritance. + +2011-03-14 Guillaume Lazzara <z@lrde.epita.fr> + Store more information in scribo::document. * scribo/core/document.hh: Make a distinction between horizontal diff --git a/scribo/scribo/core/internal/doc_xml_serializer.hh b/scribo/scribo/core/internal/doc_serializer.hh similarity index 80% rename from scribo/scribo/core/internal/doc_xml_serializer.hh rename to scribo/scribo/core/internal/doc_serializer.hh index b64c9d4..2655100 100644 --- a/scribo/scribo/core/internal/doc_xml_serializer.hh +++ b/scribo/scribo/core/internal/doc_serializer.hh @@ -23,8 +23,8 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -#ifndef SCRIBO_CORE_INTERNAL_DOC_XML_SERIALIZER_HH -# define SCRIBO_CORE_INTERNAL_DOC_XML_SERIALIZER_HH +#ifndef SCRIBO_CORE_INTERNAL_DOC_SERIALIZER_HH +# define SCRIBO_CORE_INTERNAL_DOC_SERIALIZER_HH /// \file /// @@ -46,7 +46,7 @@ namespace scribo /// \brief Link functor concept. template <typename E> - class doc_xml_serializer : public SerializeVisitor<E> + class doc_serializer : public SerializeVisitor<E> { public: // Visit overloads @@ -80,55 +80,55 @@ namespace scribo template <typename E> template <typename L> void - doc_xml_serializer<E>::visit(const document<L>& doc) const + doc_serializer<E>::visit(const document<L>& doc) const { } template <typename E> template <typename L> void - doc_xml_serializer<E>::visit(const line_links<L>& llinks) const + doc_serializer<E>::visit(const line_links<L>& llinks) const { } template <typename E> template <typename L> void - doc_xml_serializer<E>::visit(const object_groups<L>& groups) const + doc_serializer<E>::visit(const object_groups<L>& groups) const { } template <typename E> template <typename L> void - doc_xml_serializer<E>::visit(const object_links<L>& links) const + doc_serializer<E>::visit(const object_links<L>& links) const { } template <typename E> template <typename L> void - doc_xml_serializer<E>::visit(const component_set<L>& comp_set) const + doc_serializer<E>::visit(const component_set<L>& comp_set) const { } template <typename E> void - doc_xml_serializer<E>::visit(const component_info& info) const + doc_serializer<E>::visit(const component_info& info) const { } template <typename E> template <typename L> void - doc_xml_serializer<E>::visit(const paragraph_set<L>& parset) const + doc_serializer<E>::visit(const paragraph_set<L>& parset) const { } template <typename E> template <typename L> void - doc_xml_serializer<E>::visit(const line_info<L>& line) const + doc_serializer<E>::visit(const line_info<L>& line) const { } @@ -137,4 +137,4 @@ namespace scribo } // end of namespace scribo -#endif // SCRIBO_CORE_INTERNAL_DOC_XML_SERIALIZER_HH +#endif // SCRIBO_CORE_INTERNAL_DOC_SERIALIZER_HH diff --git a/scribo/scribo/io/xml/internal/extended_page_xml_visitor.hh b/scribo/scribo/io/xml/internal/extended_page_xml_visitor.hh index 51e7ad3..e8c7689 100644 --- a/scribo/scribo/io/xml/internal/extended_page_xml_visitor.hh +++ b/scribo/scribo/io/xml/internal/extended_page_xml_visitor.hh @@ -32,6 +32,7 @@ # include <fstream> # include <scribo/core/internal/doc_xml_serializer.hh> +# include <scribo/core/internal/doc_serializer.hh> # include <scribo/core/document.hh> # include <scribo/core/component_set.hh> # include <scribo/core/paragraph_set.hh> @@ -57,7 +58,7 @@ namespace scribo { - class extended_page_xml_visitor : public doc_xml_serializer<extended_page_xml_visitor> + class extended_page_xml_visitor : public doc_serializer<extended_page_xml_visitor> { public: // Constructor diff --git a/scribo/scribo/io/xml/internal/full_xml_visitor.hh b/scribo/scribo/io/xml/internal/full_xml_visitor.hh index d466b34..28f43e9 100644 --- a/scribo/scribo/io/xml/internal/full_xml_visitor.hh +++ b/scribo/scribo/io/xml/internal/full_xml_visitor.hh @@ -34,7 +34,7 @@ # include <QByteArray> -# include <scribo/core/internal/doc_xml_serializer.hh> +# include <scribo/core/internal/doc_serializer.hh> # include <scribo/core/document.hh> # include <scribo/core/component_set.hh> # include <scribo/core/paragraph_set.hh> @@ -63,7 +63,7 @@ namespace scribo { - class full_xml_visitor : public doc_xml_serializer<full_xml_visitor> + class full_xml_visitor : public doc_serializer<full_xml_visitor> { public: // Constructor diff --git a/scribo/scribo/io/xml/internal/page_xml_visitor.hh b/scribo/scribo/io/xml/internal/page_xml_visitor.hh index 9dec1e7..19665d6 100644 --- a/scribo/scribo/io/xml/internal/page_xml_visitor.hh +++ b/scribo/scribo/io/xml/internal/page_xml_visitor.hh @@ -32,7 +32,7 @@ # include <fstream> -# include <scribo/core/internal/doc_xml_serializer.hh> +# include <scribo/core/internal/doc_serializer.hh> # include <scribo/convert/to_base64.hh> # include <scribo/io/xml/internal/print_box_coords.hh> @@ -63,7 +63,7 @@ namespace scribo http://schema.primaresearch.org/PAGE/gts/pagecontent/2009-03-16/pagecontent.... */ - class page_xml_visitor : public doc_xml_serializer<page_xml_visitor> + class page_xml_visitor : public doc_serializer<page_xml_visitor> { public: // Constructor -- 1.5.6.5