[libxml++] Remove the deprecated Schema and SchemaValidator classes



commit cf1758e08721a8c5b6f2ef533150e198a19c9e40
Author: Kjell Ahlstedt <kjell ahlstedt bredband net>
Date:   Tue Sep 22 09:45:16 2015 +0200

    Remove the deprecated Schema and SchemaValidator classes
    
    * libxml++/schema.[h|cc]:
    * libxml++/validators/schemavalidator.[h|cc]: Remove these files.
    * examples/schemavalidation/main.cc: Remove test of SchemaValidator.
    * libxml++/filelist.am: Remove schema.h and schemavalidator.h.
    * libxml++/libxml++.h: Remove schemavalidator.h. Bug #754673.

 examples/schemavalidation/main.cc      |   11 --
 libxml++/filelist.am                   |    2 -
 libxml++/libxml++.h                    |    1 -
 libxml++/schema.cc                     |  131 ------------------
 libxml++/schema.h                      |  111 ---------------
 libxml++/validators/schemavalidator.cc |  232 --------------------------------
 libxml++/validators/schemavalidator.h  |  155 ---------------------
 7 files changed, 0 insertions(+), 643 deletions(-)
---
diff --git a/examples/schemavalidation/main.cc b/examples/schemavalidation/main.cc
index 4cfddf3..f488bc0 100644
--- a/examples/schemavalidation/main.cc
+++ b/examples/schemavalidation/main.cc
@@ -51,11 +51,6 @@ int main(int argc, char* argv[])
   Glib::ustring phase;
   try
   {
-#ifndef LIBXMLXX_DISABLE_DEPRECATED
-    phase = "XML"; // XSD schema, old validator class
-    xmlpp::SchemaValidator schemavalidator(xsdschemafilepath);
-#endif // LIBXMLXX_DISABLE_DEPRECATED
-
     phase = "XSD";
     xmlpp::XsdValidator xsdvalidator(xsdschemafilepath);
 
@@ -67,12 +62,6 @@ int main(int argc, char* argv[])
       phase = "parsing";
       xmlpp::DomParser parser(docfilepath);
 
-#ifndef LIBXMLXX_DISABLE_DEPRECATED
-      phase = "XML validating";
-      schemavalidator.validate(parser.get_document());
-      std::cout << "Valid document, SchemaValidator" << std::endl;
-#endif // LIBXMLXX_DISABLE_DEPRECATED
-
       phase = "XSD validating";
       xsdvalidator.validate(parser.get_document());
       std::cout << "Valid document, XsdValidator" << std::endl;
diff --git a/libxml++/filelist.am b/libxml++/filelist.am
index b9b1f5b..aeedd0c 100644
--- a/libxml++/filelist.am
+++ b/libxml++/filelist.am
@@ -9,7 +9,6 @@ h_root_sources_public = \
   keepblanks.h \
   noncopyable.h \
   relaxngschema.h \
-  schema.h \
   schemabase.h \
   xsdschema.h
 h_exceptions_sources_public = \
@@ -42,7 +41,6 @@ h_parsers_sources_public = \
 h_validators_sources_public = \
   validators/dtdvalidator.h \
   validators/relaxngvalidator.h \
-  validators/schemavalidator.h \
   validators/schemavalidatorbase.h \
   validators/validator.h \
   validators/xsdvalidator.h
diff --git a/libxml++/libxml++.h b/libxml++/libxml++.h
index 8aafb5c..89cbf4e 100644
--- a/libxml++/libxml++.h
+++ b/libxml++/libxml++.h
@@ -73,7 +73,6 @@
 #include <libxml++/validators/validator.h>
 #include <libxml++/validators/dtdvalidator.h>
 #include <libxml++/validators/relaxngvalidator.h>
-#include <libxml++/validators/schemavalidator.h>
 #include <libxml++/validators/xsdvalidator.h>
 
 #endif //__LIBXMLCPP_H


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]