mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-05-07 05:53:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix naming of files generated by xsd.

Browse source
This commit is contained in:
Ghislain MARY 2017-08-14 16:49:00 +02:00
parent c681332e72
commit 8c54a0e85d
7 changed files with 18 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/CMakeLists.txt
View file

@ -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})

2
src/conference/local-conference-event-handler.cpp
View file

@ -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"

2
src/conference/remote-conference-event-handler.cpp
View file

@ -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"

2
src/xml/conference-info.cxx → src/xml/conference-info.cpp
View file

@ -38,7 +38,7 @@
#include <xsd/cxx/pre.hxx>
#include "conference-info.hxx"
#include "conference-info.h"
namespace conference_info
{

8
src/xml/conference-info.hxx → src/xml/conference-info.h
View file

@ -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

2
src/xml/xml.cxx → src/xml/xml.cpp
View file

@ -38,7 +38,7 @@
#include <xsd/cxx/pre.hxx>
#include "xml.hxx"
#include "xml.h"
namespace namespace_
{

6
src/xml/xml.hxx → src/xml/xml.h
View file

@ -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