mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-25 07:08:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Xsd generated now uses our own coding style.

Browse source
This commit is contained in:
Ghislain MARY 2017-09-20 17:33:56 +02:00
parent 6b143b0cad
commit 8bd249e81a
11 changed files with 15928 additions and 15810 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -20,28 +20,19 @@
#include "conference/participant.h"
#include "local-conference-event-handler.h"
#include "object/object-p.h"
#if __clang__ || __GNUC__ >= 4
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wsuggest-override"
#endif
#include "xml/conference-info.h"
#if __clang__ || __GNUC__ >= 4
#pragma GCC diagnostic pop
#endif
/* Needs to be included after xml/conference-info.h because of _() macro definition that breaks everything */
#include "private.h"
// =============================================================================
using namespace std;
using namespace conference_info;
LINPHONE_BEGIN_NAMESPACE
using namespace Xsd::ConferenceInfo;
class LocalConferenceEventHandlerPrivate : public ObjectPrivate {
public:
void notifyFullState(string notify, LinphoneEvent *lev);
@ -94,15 +85,15 @@ LocalConferenceEventHandler::~LocalConferenceEventHandler() {
string LocalConferenceEventHandler::subscribeReceived(LinphoneEvent *lev) {
L_D(LocalConferenceEventHandler);
string entity = d->conf->getMe()->getAddress().asStringUriOnly();
Conference_type confInfo = Conference_type(entity);
Users_type users;
ConferenceType confInfo = ConferenceType(entity);
UsersType users;
confInfo.setUsers(users);
xml_schema::NamespaceInfomap map;
Xsd::XmlSchema::NamespaceInfomap map;
map[""].name = "urn:ietf:params:xml:ns:conference-info";
for (const auto &participant : d->conf->getParticipants()) {
User_type user = User_type();
User_roles_type roles;
UserType user = UserType();
UserRolesType roles;
user.setRoles(roles);
user.setEntity(participant->getAddress().asStringUriOnly());
user.getRoles()->getEntry().push_back(participant->isAdmin() ? "admin" : "participant");
@ -111,7 +102,7 @@ string LocalConferenceEventHandler::subscribeReceived(LinphoneEvent *lev) {
}
stringstream notify;
serializeConference_info(notify, confInfo, map);
serializeConferenceInfo(notify, confInfo, map);
//d->notifyFullState(notify.str(), lev);
return notify.str();
}
@ -119,21 +110,21 @@ string LocalConferenceEventHandler::subscribeReceived(LinphoneEvent *lev) {
string LocalConferenceEventHandler::notifyParticipantAdded(const Address &addr) {
L_D(LocalConferenceEventHandler);
string entity = d->conf->getMe()->getAddress().asStringUriOnly();
Conference_type confInfo = Conference_type(entity);
Users_type users;
ConferenceType confInfo = ConferenceType(entity);
UsersType users;
confInfo.setUsers(users);
User_type user = User_type();
User_roles_type roles;
UserType user = UserType();
UserRolesType roles;
user.setRoles(roles);
user.setEntity(addr.asStringUriOnly());
user.getRoles()->getEntry().push_back("participant");
user.setState("full");
confInfo.getUsers()->getUser().push_back(user);
xml_schema::NamespaceInfomap map;
Xsd::XmlSchema::NamespaceInfomap map;
stringstream notify;
serializeConference_info(notify, confInfo, map);
serializeConferenceInfo(notify, confInfo, map);
//d->notifyAllExcept(notify.str(), addr);
return notify.str();
}
@ -141,18 +132,18 @@ string LocalConferenceEventHandler::notifyParticipantAdded(const Address &addr)
string LocalConferenceEventHandler::notifyParticipantRemoved(const Address &addr) {
L_D(LocalConferenceEventHandler);
string entity = d->conf->getMe()->getAddress().asStringUriOnly();
Conference_type confInfo = Conference_type(entity);
Users_type users;
ConferenceType confInfo = ConferenceType(entity);
UsersType users;
confInfo.setUsers(users);
User_type user = User_type();
UserType user = UserType();
user.setEntity(addr.asStringUriOnly());
user.setState("deleted");
confInfo.getUsers()->getUser().push_back(user);
xml_schema::NamespaceInfomap map;
Xsd::XmlSchema::NamespaceInfomap map;
stringstream notify;
serializeConference_info(notify, confInfo, map);
serializeConferenceInfo(notify, confInfo, map);
//d->notifyAllExcept(notify.str(), addr);
return notify.str();
}
@ -160,21 +151,21 @@ string LocalConferenceEventHandler::notifyParticipantRemoved(const Address &addr
string LocalConferenceEventHandler::notifyParticipantSetAdmin(const Address &addr, bool isAdmin) {
L_D(LocalConferenceEventHandler);
string entity = d->conf->getMe()->getAddress().asStringUriOnly();
Conference_type confInfo = Conference_type(entity);
Users_type users;
ConferenceType confInfo = ConferenceType(entity);
UsersType users;
confInfo.setUsers(users);
User_type user = User_type();
User_roles_type roles;
UserType user = UserType();
UserRolesType roles;
user.setRoles(roles);
user.setEntity(addr.asStringUriOnly());
user.getRoles()->getEntry().push_back(isAdmin ? "admin" : "participant");
user.setState("partial");
confInfo.getUsers()->getUser().push_back(user);
xml_schema::NamespaceInfomap map;
Xsd::XmlSchema::NamespaceInfomap map;
stringstream notify;
serializeConference_info(notify, confInfo, map);
serializeConferenceInfo(notify, confInfo, map);
//d->notifyAllExcept(notify.str(), addr);
return notify.str();
}

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

@ -18,28 +18,19 @@
#include "remote-conference-event-handler.h"
#include "object/object-p.h"
#if __clang__ || __GNUC__ >= 4
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wsuggest-override"
#endif
#include "xml/conference-info.h"
#if __clang__ || __GNUC__ >= 4
#pragma GCC diagnostic pop
#endif
/* Needs to be included after xml/conference-info.h because of _() macro definition that breaks everything */
#include "private.h"
// =============================================================================
using namespace std;
using namespace conference_info;
LINPHONE_BEGIN_NAMESPACE
using namespace Xsd::ConferenceInfo;
class RemoteConferenceEventHandlerPrivate : public ObjectPrivate {
public:
LinphoneCore *core = nullptr;
@ -89,7 +80,7 @@ void RemoteConferenceEventHandler::unsubscribe() {
void RemoteConferenceEventHandler::notifyReceived(string xmlBody) {
L_D(RemoteConferenceEventHandler);
istringstream data(xmlBody);
unique_ptr<Conference_type> confInfo = parseConference_info(data, xml_schema::Flags::dont_validate);
unique_ptr<ConferenceType> confInfo = parseConferenceInfo(data, Xsd::XmlSchema::Flags::dont_validate);
if (confInfo->getEntity() == d->confAddr.asString()) {
for (const auto &user : confInfo->getUsers()->getUser()) {
LinphoneAddress *cAddr = linphone_core_interpret_url(d->core, user.getEntity()->c_str());

17850
src/xml/conference-info.cpp
View file

File diff suppressed because it is too large Load diff

6864
src/xml/conference-info.h
View file

File diff suppressed because it is too large Load diff

3
src/xml/epilogue.txt Normal file
View file

@ -0,0 +1,3 @@
#if __clang__ || __GNUC__ >= 4
#pragma GCC diagnostic pop
#endif

53
src/xml/generate.py
View file

@ -30,21 +30,6 @@ def find_xsdcxx():
xsdcxx = find_executable("xsd")
return xsdcxx
def get_prologue():
return """
#if __clang__ || __GNUC__ >= 4
\t#pragma GCC diagnostic push
\t#pragma GCC diagnostic ignored "-Wsuggest-override"
#endif
"""
def get_epilogue():
return """
#if __clang__ || __GNUC__ >= 4
\t#pragma GCC diagnostic pop
#endif
"""
def generate(name):
xsdcxx = find_xsdcxx()
if xsdcxx is None:
@ -56,6 +41,8 @@ def generate(name):
source_file = name + ".xsd"
print("Generating code from " + source_file)
source_file = os.path.join("xml", source_file)
prologue_file = os.path.join("xml", "prologue.txt")
epilogue_file = os.path.join("xml", "epilogue.txt")
work_dir = os.path.join(script_dir, "..")
os.chdir(work_dir)
p = Popen([xsdcxx,
@ -67,15 +54,43 @@ def generate(name):
"--std", "c++11",
"--type-naming", "java",
"--function-naming", "java",
"--location-regex-trace",
"--show-sloc",
"--hxx-suffix", ".h",
"--ixx-suffix", ".h",
"--cxx-suffix", ".cpp",
"--prologue", get_prologue(),
"--epilogue", get_epilogue(),
"--location-regex", "%http://.+/(.+)%$1%",
"--output-dir", "xml",
"--show-sloc",
"--prologue-file", prologue_file,
"--epilogue-file", epilogue_file,
"--type-regex", "%(?:[^ ]* )?([^,-]+)-([^,-]+)-([^,-]+)-?([^,-]*)%\\u$1\\u$2\\u$3\\u$4%",
"--type-regex", "%(?:[^ ]* )?([^,-]+)-([^,-]+)-?([^,-]*)%\\u$1\\u$2\\u$3%",
"--type-regex", "%(?:[^ ]* )?([^,-]+)-?([^,-]*)%\\u$1\\u$2%",
"--type-regex", "%(?:[^ ]* )?([^,-]+)-([^,-]+)-([^,-]+)-?([^,-]*),([^,]+)%\\u$1\\u$2\\u$3\\u$4\\l\\u$5%",
"--type-regex", "%(?:[^ ]* )?([^,-]+)-([^,-]+)-?([^,-]*),([^,]+)%\\u$1\\u$2\\u$3\\l\\u$4%",
"--type-regex", "%(?:[^ ]* )?([^,-]+)-?([^,-]*),([^,]+)%\\u$1\\u$2\\l\\u$3%",
"--type-regex", "%(?:[^ ]* )?([^,-]+)-([^,-]+)-([^,-]+)-?([^,-]*),([^,]+),([^,]+)%\\u$1\\u$2\\u$3\\u$4\\l\\u$5\\u$6%",
"--type-regex", "%(?:[^ ]* )?([^,-]+)-([^,-]+)-?([^,-]*),([^,]+),([^,]+)%\\u$1\\u$2\\u$3\\l\\u$4\\u$5%",
"--type-regex", "%(?:[^ ]* )?([^,-]+)-?([^,-]*),([^,]+),([^,]+)%\\u$1\\u$2\\l\\u$3\\u$4%",
"--type-regex", "%(?:[^ ]* )?([^,-]+)-([^,-]+)-([^,-]+)-?([^,-]*),([^,]+),([^,]+),([^,]+)%\\u$1\\u$2\\u$3\\u$4\\l\\u$5\\u$6\\u$7%",
"--type-regex", "%(?:[^ ]* )?([^,-]+)-([^,-]+)-?([^,-]*),([^,]+),([^,]+),([^,]+)%\\u$1\\u$2\\u$3\\l\\u$4\\u$5\\u$6%",
"--type-regex", "%(?:[^ ]* )?([^,-]+)-?([^,-]*),([^,]+),([^,]+),([^,]+)%\\u$1\\u$2\\l\\u$3\\u$4\\u$5%",
"--accessor-regex", "%([^,-]+)-([^,-]+)-?([^,-]*)%get\\u$1\\u$2\\u$3%",
"--accessor-regex", "%([^,-]+)-?([^,-]*)%get\\u$1\\u$2%",
"--accessor-regex", "%([^,-]+)-([^,-]+)-?([^,-]*),([^,]+)%get\\u$1\\u$2\\u$3\\l\\u$4%",
"--accessor-regex", "%([^,-]+)-?([^,-]*),([^,]+)%get\\u$1\\u$2\\l\\u$3%",
"--accessor-regex", "%([^,-]+)-([^,-]+)-?([^,-]*),([^,]+),([^,]+)%get\\u$1\\u$2\\u$3\\l\\u$4\\u$5%",
"--accessor-regex", "%([^,-]+)-?([^,-]*),([^,]+),([^,]+)%get\\u$1\\u$2\\l\\u$3\\u$4%",
"--modifier-regex", "%([^,-]+)-([^,-]+)-?([^,-]*)%set\\u$1\\u$2\\u$3%",
"--modifier-regex", "%([^,-]+)-?([^,-]*)%set\\u$1\\u$2%",
"--modifier-regex", "%([^,-]+)-([^,-]+)-?([^,-]*),([^,]+)%set\\u$1\\u$2\\u$3\\l\\u$4%",
"--modifier-regex", "%([^,-]+)-?([^,-]*),([^,]+)%set\\u$1\\u$2\\l\\u$3%",
"--modifier-regex", "%([^,-]+)-([^,-]+)-?([^,-]*),([^,]+),([^,]+)%set\\u$1\\u$2\\u$3\\l\\u$4\\u$5%",
"--modifier-regex", "%([^,-]+)-?([^,-]*),([^,]+),([^,]+)%set\\u$1\\u$2\\l\\u$3\\u$4%",
"--parser-regex", "%([^-]+)-?([^-]*)%parse\\u$1\\u$2%",
"--serializer-regex", "%([^-]+)-?([^-]*)%serialize\\u$1\\u$2%",
"--namespace-map", "http://www.w3.org/2001/XMLSchema=LinphonePrivate::Xsd::XmlSchema",
"--namespace-map", "urn:ietf:params:xml:ns:conference-info=LinphonePrivate::Xsd::ConferenceInfo",
"--namespace-map", "urn:ietf:params:xml:ns:resource-lists=LinphonePrivate::Xsd::ResourceLists",
source_file
], shell=False)
p.communicate()

4
src/xml/prologue.txt Normal file
View file

@ -0,0 +1,4 @@
#if __clang__ || __GNUC__ >= 4
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wsuggest-override"
#endif

4510
src/xml/resource-lists.cpp
View file

File diff suppressed because it is too large Load diff

1854
src/xml/resource-lists.h
View file

File diff suppressed because it is too large Load diff

150
src/xml/xml.cpp
View file

@ -33,12 +33,10 @@
// Begin prologue.
//
#if __clang__ || __GNUC__ >= 4
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wsuggest-override"
#endif
//
// End prologue.
@ -53,21 +51,21 @@ namespace namespace_
Lang::
Lang (const char* s)
: ::xml_schema::String (s)
: ::LinphonePrivate::Xsd::XmlSchema::String (s)
{
}
Lang::
Lang (const ::std::string& s)
: ::xml_schema::String (s)
: ::LinphonePrivate::Xsd::XmlSchema::String (s)
{
}
Lang::
Lang (const Lang& o,
::xml_schema::Flags f,
::xml_schema::Container* c)
: ::xml_schema::String (o, f, c)
::LinphonePrivate::Xsd::XmlSchema::Flags f,
::LinphonePrivate::Xsd::XmlSchema::Container* c)
: ::LinphonePrivate::Xsd::XmlSchema::String (o, f, c)
{
}
@ -76,41 +74,41 @@ namespace namespace_
Space::
Space (Value v)
: ::xml_schema::Ncname (_xsd_Space_literals_[v])
: ::LinphonePrivate::Xsd::XmlSchema::Ncname (_xsd_Space_literals_[v])
{
}
Space::
Space (const char* v)
: ::xml_schema::Ncname (v)
: ::LinphonePrivate::Xsd::XmlSchema::Ncname (v)
{
}
Space::
Space (const ::std::string& v)
: ::xml_schema::Ncname (v)
: ::LinphonePrivate::Xsd::XmlSchema::Ncname (v)
{
}
Space::
Space (const ::xml_schema::Ncname& v)
: ::xml_schema::Ncname (v)
Space (const ::LinphonePrivate::Xsd::XmlSchema::Ncname& v)
: ::LinphonePrivate::Xsd::XmlSchema::Ncname (v)
{
}
Space::
Space (const Space& v,
::xml_schema::Flags f,
::xml_schema::Container* c)
: ::xml_schema::Ncname (v, f, c)
::LinphonePrivate::Xsd::XmlSchema::Flags f,
::LinphonePrivate::Xsd::XmlSchema::Container* c)
: ::LinphonePrivate::Xsd::XmlSchema::Ncname (v, f, c)
{
}
Space& Space::
operator= (Value v)
{
static_cast< ::xml_schema::Ncname& > (*this) =
::xml_schema::Ncname (_xsd_Space_literals_[v]);
static_cast< ::LinphonePrivate::Xsd::XmlSchema::Ncname& > (*this) =
::LinphonePrivate::Xsd::XmlSchema::Ncname (_xsd_Space_literals_[v]);
return *this;
}
@ -121,41 +119,41 @@ namespace namespace_
Lang_member::
Lang_member (Value v)
: ::xml_schema::String (_xsd_Lang_member_literals_[v])
: ::LinphonePrivate::Xsd::XmlSchema::String (_xsd_Lang_member_literals_[v])
{
}
Lang_member::
Lang_member (const char* v)
: ::xml_schema::String (v)
: ::LinphonePrivate::Xsd::XmlSchema::String (v)
{
}
Lang_member::
Lang_member (const ::std::string& v)
: ::xml_schema::String (v)
: ::LinphonePrivate::Xsd::XmlSchema::String (v)
{
}
Lang_member::
Lang_member (const ::xml_schema::String& v)
: ::xml_schema::String (v)
Lang_member (const ::LinphonePrivate::Xsd::XmlSchema::String& v)
: ::LinphonePrivate::Xsd::XmlSchema::String (v)
{
}
Lang_member::
Lang_member (const Lang_member& v,
::xml_schema::Flags f,
::xml_schema::Container* c)
: ::xml_schema::String (v, f, c)
::LinphonePrivate::Xsd::XmlSchema::Flags f,
::LinphonePrivate::Xsd::XmlSchema::Container* c)
: ::LinphonePrivate::Xsd::XmlSchema::String (v, f, c)
{
}
Lang_member& Lang_member::
operator= (Value v)
{
static_cast< ::xml_schema::String& > (*this) =
::xml_schema::String (_xsd_Lang_member_literals_[v]);
static_cast< ::LinphonePrivate::Xsd::XmlSchema::String& > (*this) =
::LinphonePrivate::Xsd::XmlSchema::String (_xsd_Lang_member_literals_[v]);
return *this;
}
@ -172,32 +170,32 @@ namespace namespace_
Lang::
Lang (const ::xercesc::DOMElement& e,
::xml_schema::Flags f,
::xml_schema::Container* c)
: ::xml_schema::String (e, f, c)
::LinphonePrivate::Xsd::XmlSchema::Flags f,
::LinphonePrivate::Xsd::XmlSchema::Container* c)
: ::LinphonePrivate::Xsd::XmlSchema::String (e, f, c)
{
}
Lang::
Lang (const ::xercesc::DOMAttr& a,
::xml_schema::Flags f,
::xml_schema::Container* c)
: ::xml_schema::String (a, f, c)
::LinphonePrivate::Xsd::XmlSchema::Flags f,
::LinphonePrivate::Xsd::XmlSchema::Container* c)
: ::LinphonePrivate::Xsd::XmlSchema::String (a, f, c)
{
}
Lang::
Lang (const ::std::string& s,
const ::xercesc::DOMElement* e,
::xml_schema::Flags f,
::xml_schema::Container* c)
: ::xml_schema::String (s, e, f, c)
::LinphonePrivate::Xsd::XmlSchema::Flags f,
::LinphonePrivate::Xsd::XmlSchema::Container* c)
: ::LinphonePrivate::Xsd::XmlSchema::String (s, e, f, c)
{
}
Lang* Lang::
_clone (::xml_schema::Flags f,
::xml_schema::Container* c) const
_clone (::LinphonePrivate::Xsd::XmlSchema::Flags f,
::LinphonePrivate::Xsd::XmlSchema::Container* c) const
{
return new class Lang (*this, f, c);
}
@ -207,18 +205,18 @@ namespace namespace_
Space::
Space (const ::xercesc::DOMElement& e,
::xml_schema::Flags f,
::xml_schema::Container* c)
: ::xml_schema::Ncname (e, f, c)
::LinphonePrivate::Xsd::XmlSchema::Flags f,
::LinphonePrivate::Xsd::XmlSchema::Container* c)
: ::LinphonePrivate::Xsd::XmlSchema::Ncname (e, f, c)
{
_xsd_Space_convert ();
}
Space::
Space (const ::xercesc::DOMAttr& a,
::xml_schema::Flags f,
::xml_schema::Container* c)
: ::xml_schema::Ncname (a, f, c)
::LinphonePrivate::Xsd::XmlSchema::Flags f,
::LinphonePrivate::Xsd::XmlSchema::Container* c)
: ::LinphonePrivate::Xsd::XmlSchema::Ncname (a, f, c)
{
_xsd_Space_convert ();
}
@ -226,16 +224,16 @@ namespace namespace_
Space::
Space (const ::std::string& s,
const ::xercesc::DOMElement* e,
::xml_schema::Flags f,
::xml_schema::Container* c)
: ::xml_schema::Ncname (s, e, f, c)
::LinphonePrivate::Xsd::XmlSchema::Flags f,
::LinphonePrivate::Xsd::XmlSchema::Container* c)
: ::LinphonePrivate::Xsd::XmlSchema::Ncname (s, e, f, c)
{
_xsd_Space_convert ();
}
Space* Space::
_clone (::xml_schema::Flags f,
::xml_schema::Container* c) const
_clone (::LinphonePrivate::Xsd::XmlSchema::Flags f,
::LinphonePrivate::Xsd::XmlSchema::Container* c) const
{
return new class Space (*this, f, c);
}
@ -277,18 +275,18 @@ namespace namespace_
Lang_member::
Lang_member (const ::xercesc::DOMElement& e,
::xml_schema::Flags f,
::xml_schema::Container* c)
: ::xml_schema::String (e, f, c)
::LinphonePrivate::Xsd::XmlSchema::Flags f,
::LinphonePrivate::Xsd::XmlSchema::Container* c)
: ::LinphonePrivate::Xsd::XmlSchema::String (e, f, c)
{
_xsd_Lang_member_convert ();
}
Lang_member::
Lang_member (const ::xercesc::DOMAttr& a,
::xml_schema::Flags f,
::xml_schema::Container* c)
: ::xml_schema::String (a, f, c)
::LinphonePrivate::Xsd::XmlSchema::Flags f,
::LinphonePrivate::Xsd::XmlSchema::Container* c)
: ::LinphonePrivate::Xsd::XmlSchema::String (a, f, c)
{
_xsd_Lang_member_convert ();
}
@ -296,16 +294,16 @@ namespace namespace_
Lang_member::
Lang_member (const ::std::string& s,
const ::xercesc::DOMElement* e,
::xml_schema::Flags f,
::xml_schema::Container* c)
: ::xml_schema::String (s, e, f, c)
::LinphonePrivate::Xsd::XmlSchema::Flags f,
::LinphonePrivate::Xsd::XmlSchema::Container* c)
: ::LinphonePrivate::Xsd::XmlSchema::String (s, e, f, c)
{
_xsd_Lang_member_convert ();
}
Lang_member* Lang_member::
_clone (::xml_schema::Flags f,
::xml_schema::Container* c) const
_clone (::LinphonePrivate::Xsd::XmlSchema::Flags f,
::LinphonePrivate::Xsd::XmlSchema::Container* c) const
{
return new class Lang_member (*this, f, c);
}
@ -348,7 +346,7 @@ namespace namespace_
::std::ostream&
operator<< (::std::ostream& o, const Lang& i)
{
return o << static_cast< const ::xml_schema::String& > (i);
return o << static_cast< const ::LinphonePrivate::Xsd::XmlSchema::String& > (i);
}
::std::ostream&
@ -360,7 +358,7 @@ namespace namespace_
::std::ostream&
operator<< (::std::ostream& o, const Space& i)
{
return o << static_cast< const ::xml_schema::Ncname& > (i);
return o << static_cast< const ::LinphonePrivate::Xsd::XmlSchema::Ncname& > (i);
}
::std::ostream&
@ -372,7 +370,7 @@ namespace namespace_
::std::ostream&
operator<< (::std::ostream& o, const Lang_member& i)
{
return o << static_cast< const ::xml_schema::String& > (i);
return o << static_cast< const ::LinphonePrivate::Xsd::XmlSchema::String& > (i);
}
}
@ -393,58 +391,58 @@ namespace namespace_
void
operator<< (::xercesc::DOMElement& e, const Lang& i)
{
e << static_cast< const ::xml_schema::String& > (i);
e << static_cast< const ::LinphonePrivate::Xsd::XmlSchema::String& > (i);
}
void
operator<< (::xercesc::DOMAttr& a, const Lang& i)
{
a << static_cast< const ::xml_schema::String& > (i);
a << static_cast< const ::LinphonePrivate::Xsd::XmlSchema::String& > (i);
}
void
operator<< (::xml_schema::ListStream& l,
operator<< (::LinphonePrivate::Xsd::XmlSchema::ListStream& l,
const Lang& i)
{
l << static_cast< const ::xml_schema::String& > (i);
l << static_cast< const ::LinphonePrivate::Xsd::XmlSchema::String& > (i);
}
void
operator<< (::xercesc::DOMElement& e, const Space& i)
{
e << static_cast< const ::xml_schema::Ncname& > (i);
e << static_cast< const ::LinphonePrivate::Xsd::XmlSchema::Ncname& > (i);
}
void
operator<< (::xercesc::DOMAttr& a, const Space& i)
{
a << static_cast< const ::xml_schema::Ncname& > (i);
a << static_cast< const ::LinphonePrivate::Xsd::XmlSchema::Ncname& > (i);
}
void
operator<< (::xml_schema::ListStream& l,
operator<< (::LinphonePrivate::Xsd::XmlSchema::ListStream& l,
const Space& i)
{
l << static_cast< const ::xml_schema::Ncname& > (i);
l << static_cast< const ::LinphonePrivate::Xsd::XmlSchema::Ncname& > (i);
}
void
operator<< (::xercesc::DOMElement& e, const Lang_member& i)
{
e << static_cast< const ::xml_schema::String& > (i);
e << static_cast< const ::LinphonePrivate::Xsd::XmlSchema::String& > (i);
}
void
operator<< (::xercesc::DOMAttr& a, const Lang_member& i)
{
a << static_cast< const ::xml_schema::String& > (i);
a << static_cast< const ::LinphonePrivate::Xsd::XmlSchema::String& > (i);
}
void
operator<< (::xml_schema::ListStream& l,
operator<< (::LinphonePrivate::Xsd::XmlSchema::ListStream& l,
const Lang_member& i)
{
l << static_cast< const ::xml_schema::String& > (i);
l << static_cast< const ::LinphonePrivate::Xsd::XmlSchema::String& > (i);
}
}
@ -452,11 +450,9 @@ namespace namespace_
// Begin epilogue.
//
#if __clang__ || __GNUC__ >= 4
#pragma GCC diagnostic pop
#endif
//
// End epilogue.

376
src/xml/xml.h
View file

@ -48,12 +48,10 @@
// Begin prologue.
//
#if __clang__ || __GNUC__ >= 4
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wsuggest-override"
#endif
//
// End prologue.
@ -106,155 +104,161 @@
#include <xsd/cxx/tree/std-ostream-operators.hxx>
namespace xml_schema
namespace LinphonePrivate
{
// anyType and anySimpleType.
//
typedef ::xsd::cxx::tree::type Type;
typedef ::xsd::cxx::tree::simple_type< char, Type > SimpleType;
typedef ::xsd::cxx::tree::type Container;
// 8-bit
//
typedef signed char Byte;
typedef unsigned char UnsignedByte;
// 16-bit
//
typedef short Short;
typedef unsigned short UnsignedShort;
// 32-bit
//
typedef int Int;
typedef unsigned int UnsignedInt;
// 64-bit
//
typedef long long Long;
typedef unsigned long long UnsignedLong;
// Supposed to be arbitrary-length integral types.
//
typedef long long Integer;
typedef long long NonPositiveInteger;
typedef unsigned long long NonNegativeInteger;
typedef unsigned long long PositiveInteger;
typedef long long NegativeInteger;
// Boolean.
//
typedef bool Boolean;
// Floating-point types.
//
typedef float Float;
typedef double Double;
typedef double Decimal;
// String types.
//
typedef ::xsd::cxx::tree::string< char, SimpleType > String;
typedef ::xsd::cxx::tree::normalized_string< char, String > NormalizedString;
typedef ::xsd::cxx::tree::token< char, NormalizedString > Token;
typedef ::xsd::cxx::tree::name< char, Token > Name;
typedef ::xsd::cxx::tree::nmtoken< char, Token > Nmtoken;
typedef ::xsd::cxx::tree::nmtokens< char, SimpleType, Nmtoken > Nmtokens;
typedef ::xsd::cxx::tree::ncname< char, Name > Ncname;
typedef ::xsd::cxx::tree::language< char, Token > Language;
// ID/IDREF.
//
typedef ::xsd::cxx::tree::id< char, Ncname > Id;
typedef ::xsd::cxx::tree::idref< char, Ncname, Type > Idref;
typedef ::xsd::cxx::tree::idrefs< char, SimpleType, Idref > Idrefs;
// URI.
//
typedef ::xsd::cxx::tree::uri< char, SimpleType > Uri;
// Qualified name.
//
typedef ::xsd::cxx::tree::qname< char, SimpleType, Uri, Ncname > Qname;
// Binary.
//
typedef ::xsd::cxx::tree::buffer< char > Buffer;
typedef ::xsd::cxx::tree::base64_binary< char, SimpleType > Base64Binary;
typedef ::xsd::cxx::tree::hex_binary< char, SimpleType > HexBinary;
// Date/time.
//
typedef ::xsd::cxx::tree::time_zone TimeZone;
typedef ::xsd::cxx::tree::date< char, SimpleType > Date;
typedef ::xsd::cxx::tree::date_time< char, SimpleType > DateTime;
typedef ::xsd::cxx::tree::duration< char, SimpleType > Duration;
typedef ::xsd::cxx::tree::gday< char, SimpleType > Gday;
typedef ::xsd::cxx::tree::gmonth< char, SimpleType > Gmonth;
typedef ::xsd::cxx::tree::gmonth_day< char, SimpleType > GmonthDay;
typedef ::xsd::cxx::tree::gyear< char, SimpleType > Gyear;
typedef ::xsd::cxx::tree::gyear_month< char, SimpleType > GyearMonth;
typedef ::xsd::cxx::tree::time< char, SimpleType > Time;
// Entity.
//
typedef ::xsd::cxx::tree::entity< char, Ncname > Entity;
typedef ::xsd::cxx::tree::entities< char, SimpleType, Entity > Entities;
typedef ::xsd::cxx::tree::content_order ContentOrder;
// Namespace information and list stream. Used in
// serialization functions.
//
typedef ::xsd::cxx::xml::dom::namespace_info< char > NamespaceInfo;
typedef ::xsd::cxx::xml::dom::namespace_infomap< char > NamespaceInfomap;
typedef ::xsd::cxx::tree::list_stream< char > ListStream;
typedef ::xsd::cxx::tree::as_double< Double > AsDouble;
typedef ::xsd::cxx::tree::as_decimal< Decimal > AsDecimal;
typedef ::xsd::cxx::tree::facet Facet;
// Flags and properties.
//
typedef ::xsd::cxx::tree::flags Flags;
typedef ::xsd::cxx::tree::properties< char > Properties;
// Parsing/serialization diagnostics.
//
typedef ::xsd::cxx::tree::severity Severity;
typedef ::xsd::cxx::tree::error< char > Error;
typedef ::xsd::cxx::tree::diagnostics< char > Diagnostics;
// Exceptions.
//
typedef ::xsd::cxx::tree::exception< char > Exception;
typedef ::xsd::cxx::tree::bounds< char > Bounds;
typedef ::xsd::cxx::tree::duplicate_id< char > DuplicateId;
typedef ::xsd::cxx::tree::parsing< char > Parsing;
typedef ::xsd::cxx::tree::expected_element< char > ExpectedElement;
typedef ::xsd::cxx::tree::unexpected_element< char > UnexpectedElement;
typedef ::xsd::cxx::tree::expected_attribute< char > ExpectedAttribute;
typedef ::xsd::cxx::tree::unexpected_enumerator< char > UnexpectedEnumerator;
typedef ::xsd::cxx::tree::expected_text_content< char > ExpectedTextContent;
typedef ::xsd::cxx::tree::no_prefix_mapping< char > NoPrefixMapping;
typedef ::xsd::cxx::tree::serialization< char > Serialization;
// Error handler callback interface.
//
typedef ::xsd::cxx::xml::error_handler< char > ErrorHandler;
// DOM interaction.
//
namespace dom
namespace Xsd
{
// Automatic pointer for DOMDocument.
//
using ::xsd::cxx::xml::dom::unique_ptr;
namespace XmlSchema
{
// anyType and anySimpleType.
//
typedef ::xsd::cxx::tree::type Type;
typedef ::xsd::cxx::tree::simple_type< char, Type > SimpleType;
typedef ::xsd::cxx::tree::type Container;
#ifndef XSD_CXX_TREE_TREE_NODE_KEY__XML_SCHEMA
#define XSD_CXX_TREE_TREE_NODE_KEY__XML_SCHEMA
// DOM user data key for back pointers to tree nodes.
//
const XMLCh* const treeNodeKey = ::xsd::cxx::tree::user_data_keys::node;
// 8-bit
//
typedef signed char Byte;
typedef unsigned char UnsignedByte;
// 16-bit
//
typedef short Short;
typedef unsigned short UnsignedShort;
// 32-bit
//
typedef int Int;
typedef unsigned int UnsignedInt;
// 64-bit
//
typedef long long Long;
typedef unsigned long long UnsignedLong;
// Supposed to be arbitrary-length integral types.
//
typedef long long Integer;
typedef long long NonPositiveInteger;
typedef unsigned long long NonNegativeInteger;
typedef unsigned long long PositiveInteger;
typedef long long NegativeInteger;
// Boolean.
//
typedef bool Boolean;
// Floating-point types.
//
typedef float Float;
typedef double Double;
typedef double Decimal;
// String types.
//
typedef ::xsd::cxx::tree::string< char, SimpleType > String;
typedef ::xsd::cxx::tree::normalized_string< char, String > NormalizedString;
typedef ::xsd::cxx::tree::token< char, NormalizedString > Token;
typedef ::xsd::cxx::tree::name< char, Token > Name;
typedef ::xsd::cxx::tree::nmtoken< char, Token > Nmtoken;
typedef ::xsd::cxx::tree::nmtokens< char, SimpleType, Nmtoken > Nmtokens;
typedef ::xsd::cxx::tree::ncname< char, Name > Ncname;
typedef ::xsd::cxx::tree::language< char, Token > Language;
// ID/IDREF.
//
typedef ::xsd::cxx::tree::id< char, Ncname > Id;
typedef ::xsd::cxx::tree::idref< char, Ncname, Type > Idref;
typedef ::xsd::cxx::tree::idrefs< char, SimpleType, Idref > Idrefs;
// URI.
//
typedef ::xsd::cxx::tree::uri< char, SimpleType > Uri;
// Qualified name.
//
typedef ::xsd::cxx::tree::qname< char, SimpleType, Uri, Ncname > Qname;
// Binary.
//
typedef ::xsd::cxx::tree::buffer< char > Buffer;
typedef ::xsd::cxx::tree::base64_binary< char, SimpleType > Base64Binary;
typedef ::xsd::cxx::tree::hex_binary< char, SimpleType > HexBinary;
// Date/time.
//
typedef ::xsd::cxx::tree::time_zone TimeZone;
typedef ::xsd::cxx::tree::date< char, SimpleType > Date;
typedef ::xsd::cxx::tree::date_time< char, SimpleType > DateTime;
typedef ::xsd::cxx::tree::duration< char, SimpleType > Duration;
typedef ::xsd::cxx::tree::gday< char, SimpleType > Gday;
typedef ::xsd::cxx::tree::gmonth< char, SimpleType > Gmonth;
typedef ::xsd::cxx::tree::gmonth_day< char, SimpleType > GmonthDay;
typedef ::xsd::cxx::tree::gyear< char, SimpleType > Gyear;
typedef ::xsd::cxx::tree::gyear_month< char, SimpleType > GyearMonth;
typedef ::xsd::cxx::tree::time< char, SimpleType > Time;
// Entity.
//
typedef ::xsd::cxx::tree::entity< char, Ncname > Entity;
typedef ::xsd::cxx::tree::entities< char, SimpleType, Entity > Entities;
typedef ::xsd::cxx::tree::content_order ContentOrder;
// Namespace information and list stream. Used in
// serialization functions.
//
typedef ::xsd::cxx::xml::dom::namespace_info< char > NamespaceInfo;
typedef ::xsd::cxx::xml::dom::namespace_infomap< char > NamespaceInfomap;
typedef ::xsd::cxx::tree::list_stream< char > ListStream;
typedef ::xsd::cxx::tree::as_double< Double > AsDouble;
typedef ::xsd::cxx::tree::as_decimal< Decimal > AsDecimal;
typedef ::xsd::cxx::tree::facet Facet;
// Flags and properties.
//
typedef ::xsd::cxx::tree::flags Flags;
typedef ::xsd::cxx::tree::properties< char > Properties;
// Parsing/serialization diagnostics.
//
typedef ::xsd::cxx::tree::severity Severity;
typedef ::xsd::cxx::tree::error< char > Error;
typedef ::xsd::cxx::tree::diagnostics< char > Diagnostics;
// Exceptions.
//
typedef ::xsd::cxx::tree::exception< char > Exception;
typedef ::xsd::cxx::tree::bounds< char > Bounds;
typedef ::xsd::cxx::tree::duplicate_id< char > DuplicateId;
typedef ::xsd::cxx::tree::parsing< char > Parsing;
typedef ::xsd::cxx::tree::expected_element< char > ExpectedElement;
typedef ::xsd::cxx::tree::unexpected_element< char > UnexpectedElement;
typedef ::xsd::cxx::tree::expected_attribute< char > ExpectedAttribute;
typedef ::xsd::cxx::tree::unexpected_enumerator< char > UnexpectedEnumerator;
typedef ::xsd::cxx::tree::expected_text_content< char > ExpectedTextContent;
typedef ::xsd::cxx::tree::no_prefix_mapping< char > NoPrefixMapping;
typedef ::xsd::cxx::tree::serialization< char > Serialization;
// Error handler callback interface.
//
typedef ::xsd::cxx::xml::error_handler< char > ErrorHandler;
// DOM interaction.
//
namespace dom
{
// Automatic pointer for DOMDocument.
//
using ::xsd::cxx::xml::dom::unique_ptr;
#ifndef XSD_CXX_TREE_TREE_NODE_KEY__LINPHONEPRIVATE__XSD__XMLSCHEMA
#define XSD_CXX_TREE_TREE_NODE_KEY__LINPHONEPRIVATE__XSD__XMLSCHEMA
// DOM user data key for back pointers to tree nodes.
//
const XMLCh* const treeNodeKey = ::xsd::cxx::tree::user_data_keys::node;
#endif
}
}
}
}
@ -286,7 +290,7 @@ namespace namespace_
namespace namespace_
{
class Lang: public ::xml_schema::String
class Lang: public ::LinphonePrivate::Xsd::XmlSchema::String
{
public:
@ -295,28 +299,28 @@ namespace namespace_
Lang (const ::std::string& v);
Lang (const ::xercesc::DOMElement& e,
::xml_schema::Flags f = 0,
::xml_schema::Container* c = 0);
::LinphonePrivate::Xsd::XmlSchema::Flags f = 0,
::LinphonePrivate::Xsd::XmlSchema::Container* c = 0);
Lang (const ::xercesc::DOMAttr& a,
::xml_schema::Flags f = 0,
::xml_schema::Container* c = 0);
::LinphonePrivate::Xsd::XmlSchema::Flags f = 0,
::LinphonePrivate::Xsd::XmlSchema::Container* c = 0);
Lang (const ::std::string& s,
const ::xercesc::DOMElement* e,
::xml_schema::Flags f = 0,
::xml_schema::Container* c = 0);
::LinphonePrivate::Xsd::XmlSchema::Flags f = 0,
::LinphonePrivate::Xsd::XmlSchema::Container* c = 0);
Lang (const Lang& x,
::xml_schema::Flags f = 0,
::xml_schema::Container* c = 0);
::LinphonePrivate::Xsd::XmlSchema::Flags f = 0,
::LinphonePrivate::Xsd::XmlSchema::Container* c = 0);
virtual Lang*
_clone (::xml_schema::Flags f = 0,
::xml_schema::Container* c = 0) const;
_clone (::LinphonePrivate::Xsd::XmlSchema::Flags f = 0,
::LinphonePrivate::Xsd::XmlSchema::Container* c = 0) const;
};
class Space: public ::xml_schema::Ncname
class Space: public ::LinphonePrivate::Xsd::XmlSchema::Ncname
{
public:
enum Value
@ -331,28 +335,28 @@ namespace namespace_
Space (const ::std::string& v);
Space (const ::xml_schema::Ncname& v);
Space (const ::LinphonePrivate::Xsd::XmlSchema::Ncname& v);
Space (const ::xercesc::DOMElement& e,
::xml_schema::Flags f = 0,
::xml_schema::Container* c = 0);
::LinphonePrivate::Xsd::XmlSchema::Flags f = 0,
::LinphonePrivate::Xsd::XmlSchema::Container* c = 0);
Space (const ::xercesc::DOMAttr& a,
::xml_schema::Flags f = 0,
::xml_schema::Container* c = 0);
::LinphonePrivate::Xsd::XmlSchema::Flags f = 0,
::LinphonePrivate::Xsd::XmlSchema::Container* c = 0);
Space (const ::std::string& s,
const ::xercesc::DOMElement* e,
::xml_schema::Flags f = 0,
::xml_schema::Container* c = 0);
::LinphonePrivate::Xsd::XmlSchema::Flags f = 0,
::LinphonePrivate::Xsd::XmlSchema::Container* c = 0);
Space (const Space& x,
::xml_schema::Flags f = 0,
::xml_schema::Container* c = 0);
::LinphonePrivate::Xsd::XmlSchema::Flags f = 0,
::LinphonePrivate::Xsd::XmlSchema::Container* c = 0);
virtual Space*
_clone (::xml_schema::Flags f = 0,
::xml_schema::Container* c = 0) const;
_clone (::LinphonePrivate::Xsd::XmlSchema::Flags f = 0,
::LinphonePrivate::Xsd::XmlSchema::Container* c = 0) const;
Space&
operator= (Value v);
@ -372,7 +376,7 @@ namespace namespace_
static const Value _xsd_Space_indexes_[2];
};
class Lang_member: public ::xml_schema::String
class Lang_member: public ::LinphonePrivate::Xsd::XmlSchema::String
{
public:
enum Value
@ -386,28 +390,28 @@ namespace namespace_
Lang_member (const ::std::string& v);
Lang_member (const ::xml_schema::String& v);
Lang_member (const ::LinphonePrivate::Xsd::XmlSchema::String& v);
Lang_member (const ::xercesc::DOMElement& e,
::xml_schema::Flags f = 0,
::xml_schema::Container* c = 0);
::LinphonePrivate::Xsd::XmlSchema::Flags f = 0,
::LinphonePrivate::Xsd::XmlSchema::Container* c = 0);
Lang_member (const ::xercesc::DOMAttr& a,
::xml_schema::Flags f = 0,
::xml_schema::Container* c = 0);
::LinphonePrivate::Xsd::XmlSchema::Flags f = 0,
::LinphonePrivate::Xsd::XmlSchema::Container* c = 0);
Lang_member (const ::std::string& s,
const ::xercesc::DOMElement* e,
::xml_schema::Flags f = 0,
::xml_schema::Container* c = 0);
::LinphonePrivate::Xsd::XmlSchema::Flags f = 0,
::LinphonePrivate::Xsd::XmlSchema::Container* c = 0);
Lang_member (const Lang_member& x,
::xml_schema::Flags f = 0,
::xml_schema::Container* c = 0);
::LinphonePrivate::Xsd::XmlSchema::Flags f = 0,
::LinphonePrivate::Xsd::XmlSchema::Container* c = 0);
virtual Lang_member*
_clone (::xml_schema::Flags f = 0,
::xml_schema::Container* c = 0) const;
_clone (::LinphonePrivate::Xsd::XmlSchema::Flags f = 0,
::LinphonePrivate::Xsd::XmlSchema::Container* c = 0) const;
Lang_member&
operator= (Value v);
@ -475,7 +479,7 @@ namespace namespace_
operator<< (::xercesc::DOMAttr&, const Lang&);
void
operator<< (::xml_schema::ListStream&,
operator<< (::LinphonePrivate::Xsd::XmlSchema::ListStream&,
const Lang&);
void
@ -485,7 +489,7 @@ namespace namespace_
operator<< (::xercesc::DOMAttr&, const Space&);
void
operator<< (::xml_schema::ListStream&,
operator<< (::LinphonePrivate::Xsd::XmlSchema::ListStream&,
const Space&);
void
@ -495,7 +499,7 @@ namespace namespace_
operator<< (::xercesc::DOMAttr&, const Lang_member&);
void
operator<< (::xml_schema::ListStream&,
operator<< (::LinphonePrivate::Xsd::XmlSchema::ListStream&,
const Lang_member&);
}
@ -503,11 +507,9 @@ namespace namespace_
// Begin epilogue.
//
#if __clang__ || __GNUC__ >= 4
#pragma GCC diagnostic pop
#endif
//
// End epilogue.