From 8c54a0e85d9abdafd82795a0459a54f14e7eb2d6 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Mon, 14 Aug 2017 16:49:00 +0200
Subject: [PATCH] Fix naming of files generated by xsd.

---
 src/CMakeLists.txt                                   | 9 +++++++--
 src/conference/local-conference-event-handler.cpp    | 2 +-
 src/conference/remote-conference-event-handler.cpp   | 2 +-
 src/xml/{conference-info.cxx => conference-info.cpp} | 2 +-
 src/xml/{conference-info.hxx => conference-info.h}   | 8 ++++----
 src/xml/{xml.cxx => xml.cpp}                         | 2 +-
 src/xml/{xml.hxx => xml.h}                           | 6 +++---
 7 files changed, 18 insertions(+), 13 deletions(-)
 rename src/xml/{conference-info.cxx => conference-info.cpp} (99%)
 rename src/xml/{conference-info.hxx => conference-info.h} (99%)
 rename src/xml/{xml.cxx => xml.cpp} (99%)
 rename src/xml/{xml.hxx => xml.h} (97%)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 8ed54e447..dc8c3dc3f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -21,7 +21,6 @@
 ############################################################################
 
 set(LINPHONE_CXX_OBJECTS_PRIVATE_HEADER_FILES
-	conference/conference-info.hxx
 	conference/conference-listener.h
 	conference/local-conference-event-handler.h
 	conference/remote-conference-event-handler.h
@@ -38,10 +37,11 @@ set(LINPHONE_CXX_OBJECTS_PRIVATE_HEADER_FILES
 	object/singleton.h
 	utils/general.h
 	utils/utils.h
+	xml/conference-info.h
+	xml/xml.h
 )
 
 set(LINPHONE_CXX_OBJECTS_SOURCE_FILES
-	conference/conference-info.cxx
 	conference/local-conference-event-handler.cpp
 	conference/remote-conference-event-handler.cpp
 	cpim/header/cpim-core-headers.cpp
@@ -52,8 +52,13 @@ set(LINPHONE_CXX_OBJECTS_SOURCE_FILES
 	cpim/parser/cpim-parser.cpp
 	object/object.cpp
 	utils/utils.cpp
+	xml/conference-info.cpp
+	xml/xml.cpp
 )
 
+ADD_XSD_WRAPPERS(xml/xml "XML XSD - xml.xsd")
+ADD_XSD_WRAPPERS(xml/conference-info "Conference info XSD - conference-info.xsd")
+
 set(LINPHONE_CXX_OBJECTS_DEFINITIONS "-DLIBLINPHONE_EXPORTS")
 set(LINPHONE_CXX_OBJECTS_INCLUDE_DIRS ${BELR_INCLUDE_DIRS} ${LIBXSD_INCLUDE_DIRS})
 
diff --git a/src/conference/local-conference-event-handler.cpp b/src/conference/local-conference-event-handler.cpp
index 7b49d5b7b..a0ccca42a 100644
--- a/src/conference/local-conference-event-handler.cpp
+++ b/src/conference/local-conference-event-handler.cpp
@@ -17,7 +17,7 @@
  */
 
 #include "local-conference-event-handler.h"
-#include "xml/conference-info.hxx"
+#include "xml/conference-info.h"
 #include "private.h"
 #include "object/object-p.h"
 
diff --git a/src/conference/remote-conference-event-handler.cpp b/src/conference/remote-conference-event-handler.cpp
index 4aa8561be..879d40c4a 100644
--- a/src/conference/remote-conference-event-handler.cpp
+++ b/src/conference/remote-conference-event-handler.cpp
@@ -17,7 +17,7 @@
  */
 
 #include "remote-conference-event-handler.h"
-#include "xml/conference-info.hxx"
+#include "xml/conference-info.h"
 #include "private.h"
 #include "object/object-p.h"
 
diff --git a/src/xml/conference-info.cxx b/src/xml/conference-info.cpp
similarity index 99%
rename from src/xml/conference-info.cxx
rename to src/xml/conference-info.cpp
index d43cb20d0..228e2fb9d 100644
--- a/src/xml/conference-info.cxx
+++ b/src/xml/conference-info.cpp
@@ -38,7 +38,7 @@
 
 #include <xsd/cxx/pre.hxx>
 
-#include "conference-info.hxx"
+#include "conference-info.h"
 
 namespace conference_info
 {
diff --git a/src/xml/conference-info.hxx b/src/xml/conference-info.h
similarity index 99%
rename from src/xml/conference-info.hxx
rename to src/xml/conference-info.h
index 70cdb386e..1626d55e3 100644
--- a/src/xml/conference-info.hxx
+++ b/src/xml/conference-info.h
@@ -31,8 +31,8 @@
 // in the accompanying FLOSSE file.
 //
 
-#ifndef CXX_USERS_REISBENJAMIN_DEVELOPPEMENT_LINPHONE_DESKTOP_SUBMODULES_LINPHONE_SRC_XML_CONFERENCE_INFO_HXX
-#define CXX_USERS_REISBENJAMIN_DEVELOPPEMENT_LINPHONE_DESKTOP_SUBMODULES_LINPHONE_SRC_XML_CONFERENCE_INFO_HXX
+#ifndef XML_CONFERENCE_INFO_H
+#define XML_CONFERENCE_INFO_H
 
 #ifndef XSD_CXX11
 #define XSD_CXX11
@@ -299,7 +299,7 @@ namespace conference_info
 
 #include <xsd/cxx/tree/containers-wildcard.hxx>
 
-#include "xml.hxx"
+#include "xml.h"
 
 namespace conference_info
 {
@@ -3859,4 +3859,4 @@ namespace conference_info
 //
 // End epilogue.
 
-#endif // CXX_USERS_REISBENJAMIN_DEVELOPPEMENT_LINPHONE_DESKTOP_SUBMODULES_LINPHONE_SRC_XML_CONFERENCE_INFO_HXX
+#endif // XML_CONFERENCE_INFO_H
diff --git a/src/xml/xml.cxx b/src/xml/xml.cpp
similarity index 99%
rename from src/xml/xml.cxx
rename to src/xml/xml.cpp
index be2199c9d..5be074eb8 100644
--- a/src/xml/xml.cxx
+++ b/src/xml/xml.cpp
@@ -38,7 +38,7 @@
 
 #include <xsd/cxx/pre.hxx>
 
-#include "xml.hxx"
+#include "xml.h"
 
 namespace namespace_
 {
diff --git a/src/xml/xml.hxx b/src/xml/xml.h
similarity index 97%
rename from src/xml/xml.hxx
rename to src/xml/xml.h
index d63650f40..916ef8807 100644
--- a/src/xml/xml.hxx
+++ b/src/xml/xml.h
@@ -31,8 +31,8 @@
 // in the accompanying FLOSSE file.
 //
 
-#ifndef CXX_USERS_REISBENJAMIN_DEVELOPPEMENT_LINPHONE_DESKTOP_SUBMODULES_LINPHONE_SRC_XML_XML_HXX
-#define CXX_USERS_REISBENJAMIN_DEVELOPPEMENT_LINPHONE_DESKTOP_SUBMODULES_LINPHONE_SRC_XML_XML_HXX
+#ifndef XML_XML_H
+#define XML_XML_H
 
 #ifndef XSD_CXX11
 #define XSD_CXX11
@@ -500,4 +500,4 @@ namespace namespace_
 //
 // End epilogue.
 
-#endif // CXX_USERS_REISBENJAMIN_DEVELOPPEMENT_LINPHONE_DESKTOP_SUBMODULES_LINPHONE_SRC_XML_XML_HXX
+#endif // XML_XML_H