Merge branch 'xmlparser_refacto' of github.com:rolalaro/visp into xml…

…parser_refacto
lagadic · Dec 10, 2024 · e442cc7 · e442cc7
2 parents fc4fbfb + 523313c
commit e442cc7
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 12 deletions.
diff --git a/modules/core/include/visp3/core/vpXmlParser.h b/modules/core/include/visp3/core/vpXmlParser.h
@@ -1,6 +1,6 @@
 /*
  * ViSP, open source Visual Servoing Platform software.
- * Copyright (C) 2005 - 2023 by Inria. All rights reserved.
+ * Copyright (C) 2005 - 2024 by Inria. All rights reserved.
  *
  * This software is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -36,8 +36,8 @@
   \brief Tools to simplify the creation of xml parser based on the libXML2
 */
 
-#ifndef vpXmlParser_HH
-#define vpXmlParser_HH
+#ifndef VP_XML_PARSER_H
+#define VP_XML_PARSER_H
 
 #include <visp3/core/vpConfig.h>
 
@@ -113,7 +113,7 @@ BEGIN_VISP_NAMESPACE
       range,
       step,
       size_filter
-    }dataToParse
+    } dataToParse
 
     vpDataParser(){
       nodeMap["config"] = config;
@@ -125,8 +125,7 @@ BEGIN_VISP_NAMESPACE
     virtual void writeMainClass(xmlNodePtr node);
     virtual void readMainClass(xmlDocPtr doc, xmlNodePtr node);
 
-    // additionals methods specific to the data to parse
-    // such as: accessors
+    // additional methods specific to the data to parse such as: accessors
   }
   \endcode
 
@@ -192,7 +191,7 @@ class VISP_EXPORT vpXmlParser
 
     As the content of the function depends on the structure of the file to
     read, data name, data types and data values, it has to be reimplemented
-    for every type of filenam
+    for every type of filename.
 
     \param doc : a pointer representing the document
     \param node : the root node of the document
@@ -272,7 +271,7 @@ class VISP_EXPORT vpXmlParser
     dataToParse["size_filter"] = 3;
     \endcode
 
-    Or, you can use keyzord instead of number as key but it implies to declare
+    Or, you can use keyword instead of number as key but it implies to declare
     in the child class an enumeration type of the name. For example:
 
     \code

diff --git a/modules/core/src/tools/xml/vpXmlParser.cpp b/modules/core/src/tools/xml/vpXmlParser.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
  *
  * ViSP, open source Visual Servoing Platform software.
- * Copyright (C) 2005 - 2023 by Inria. All rights reserved.
+ * Copyright (C) 2005 - 2024 by Inria. All rights reserved.
  *
  * This software is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -30,15 +30,15 @@
  *
  * Description:
  * Tool to automatize the creation of xml parser based on the libXML2.
- *
-*****************************************************************************/
+ */
 
 #include <visp3/core/vpConfig.h>
-#include <visp3/core/vpXmlParser.h>
 
 #ifdef VISP_HAVE_XML2
 
 #include <libxml/parser.h>
+
+#include <visp3/core/vpXmlParser.h>
 #include <visp3/core/vpDebug.h>
 #include <visp3/core/vpException.h>