Kolab Groupware OBS

libkolabxml-1.2.1.tar.gz/CMakeLists.txt -> libkolabxml-1.3.0.tar.gz/CMakeLists.txt Changed

@@ -38,9 +38,9 @@
 # 0.2 (0.2 development version)
 
 set (Libkolabxml_VERSION_MAJOR 1)
-set (Libkolabxml_VERSION_MINOR 2)
+set (Libkolabxml_VERSION_MINOR 3)
 # Enable the full x.y.z version only for release versions
-set (Libkolabxml_VERSION_PATCH 1)
+set (Libkolabxml_VERSION_PATCH 0)
 set (Libkolabxml_VERSION "${Libkolabxml_VERSION_MAJOR}.${Libkolabxml_VERSION_MINOR}.${Libkolabxml_VERSION_PATCH}" )
 #set (Libkolabxml_VERSION "${Libkolabxml_VERSION_MAJOR}.${Libkolabxml_VERSION_MINOR}" )
 
@@ -145,7 +145,7 @@
 # --generate-inline --extern-xml-schema xml-schema.xsd
 # --cxx-suffix .cpp --hxx-suffix .h   
 add_custom_command(OUTPUT ${SCHEMA_SOURCEFILES}
-    COMMAND ${XSDCXX} cxx-tree --generate-polymorphic --generate-serialization  --namespace-map http://kolab.org=KolabXSD --root-element icalendar --root-element vcards --root-element note --root-element configuration --root-element file --output-dir ${CMAKE_BINARY_DIR}/bindings ${SCHEMAS}
+    COMMAND ${XSDCXX} cxx-tree --std c++11 --generate-polymorphic --generate-serialization  --namespace-map http://kolab.org=KolabXSD --root-element icalendar --root-element vcards --root-element note --root-element configuration --root-element file --output-dir ${CMAKE_BINARY_DIR}/bindings ${SCHEMAS}
     COMMENT "Generating XSD bindings"
     WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
     DEPENDS ${SCHEMAS}

libkolabxml-1.2.1.tar.gz/compiled/XMLParserWrapper.cpp -> libkolabxml-1.3.0.tar.gz/compiled/XMLParserWrapper.cpp Changed

@@ -17,7 +17,7 @@
 
 #include "XMLParserWrapper.h"
 
-#include <memory> // std::auto_ptr
+#include <memory> // std::unique_ptr
 #include <fstream>
 #include <iostream>
 
@@ -226,7 +226,7 @@
 
 }
 
-xsd::cxx::xml::dom::auto_ptr< xercesc::DOMDocument > XMLParserWrapper::parseFile(const std::string& url)
+std::unique_ptr< xercesc::DOMDocument > XMLParserWrapper::parseFile(const std::string& url)
 {
 try {
 std::ifstream ifs;
@@ -237,17 +237,17 @@
 {
 std::cerr << ": unable to open or read failure" << std::endl;
 }
- return xsd::cxx::xml::dom::auto_ptr< xercesc::DOMDocument >();
+ return std::unique_ptr< xercesc::DOMDocument >();
 }
 
-xsd::cxx::xml::dom::auto_ptr< xercesc::DOMDocument > XMLParserWrapper::parseString(const std::string& s)
+std::unique_ptr< xercesc::DOMDocument > XMLParserWrapper::parseString(const std::string& s)
 {
 std::istringstream is(s);
 return parse(is, ""); //TODO set identifier?
 }
 
 
-xml_schema::dom::auto_ptr<xercesc::DOMDocument> XMLParserWrapper::parse(std::istream &ifs, const std::string &name)
+std::unique_ptr<xercesc::DOMDocument> XMLParserWrapper::parse(std::istream &ifs, const std::string &name)
 {
 using namespace std;
 
@@ -268,9 +268,9 @@
 // Parse XML to DOM.
 //
 #if _XERCES_VERSION >= 30000
- xml_schema::dom::auto_ptr<DOMDocument> doc (parser->parse (&wrap));
+ std::unique_ptr<DOMDocument> doc (parser->parse (&wrap));
 #else
- xml_schema::dom::auto_ptr<DOMDocument> doc (parser->parse (wrap));
+ std::unique_ptr<DOMDocument> doc (parser->parse (wrap));
 #endif
 
 eh.throw_if_failed<xml_schema::parsing> ();
@@ -291,5 +291,5 @@
 cerr << ": unknown exception thrown" << endl;
 }
 eh.reset();
- return xml_schema::dom::auto_ptr<xercesc::DOMDocument>();
+ return std::unique_ptr<xercesc::DOMDocument>();
 }

libkolabxml-1.2.1.tar.gz/compiled/XMLParserWrapper.h -> libkolabxml-1.3.0.tar.gz/compiled/XMLParserWrapper.h Changed

libkolabxml-1.2.1.tar.gz/compiled/xsdbin.cxx -> libkolabxml-1.3.0.tar.gz/compiled/xsdbin.cxx Changed

libkolabxml-1.2.1.tar.gz/src/CMakeLists.txt -> libkolabxml-1.3.0.tar.gz/src/CMakeLists.txt Changed

libkolabxml-1.2.1.tar.gz/src/containers/kolabcontainers.cpp -> libkolabxml-1.3.0.tar.gz/src/containers/kolabcontainers.cpp Changed

libkolabxml-1.2.1.tar.gz/src/kolabconversions.h -> libkolabxml-1.3.0.tar.gz/src/kolabconversions.h Changed

@@ -409,16 +409,16 @@
 boost::shared_ptr<Kolab::Note> deserializeObject <Kolab::Note> (const std::string& s, bool isUrl)
 {
 try {
- std::auto_ptr<KolabXSD::Note> note;
+ std::unique_ptr<KolabXSD::Note> note;
 if (isUrl) {
- xsd::cxx::xml::dom::auto_ptr <xercesc::DOMDocument > doc = XMLParserWrapper::inst().parseFile(s);
+ std::unique_ptr <xercesc::DOMDocument > doc = XMLParserWrapper::inst().parseFile(s);
 if (doc.get()) {
- note = KolabXSD::note(doc);
+ note = KolabXSD::note(*doc);
 }
 } else {
- xsd::cxx::xml::dom::auto_ptr <xercesc::DOMDocument > doc = XMLParserWrapper::inst().parseString(s);
+ std::unique_ptr <xercesc::DOMDocument > doc = XMLParserWrapper::inst().parseString(s);
 if (doc.get()) {
- note = KolabXSD::note(doc);
+ note = KolabXSD::note(*doc);
 }
 }
 
@@ -499,16 +499,16 @@
 boost::shared_ptr<Kolab::Configuration> deserializeObject <Kolab::Configuration> (const std::string& s, bool isUrl)
 {
 try {
- std::auto_ptr<KolabXSD::Configuration> configuration;
+ std::unique_ptr<KolabXSD::Configuration> configuration;
 if (isUrl) {
- xsd::cxx::xml::dom::auto_ptr <xercesc::DOMDocument > doc = XMLParserWrapper::inst().parseFile(s);
+ std::unique_ptr <xercesc::DOMDocument > doc = XMLParserWrapper::inst().parseFile(s);
 if (doc.get()) {
- configuration = KolabXSD::configuration(doc);
+ configuration = KolabXSD::configuration(*doc);
 }
 } else {
- xsd::cxx::xml::dom::auto_ptr <xercesc::DOMDocument > doc = XMLParserWrapper::inst().parseString(s);
+ std::unique_ptr <xercesc::DOMDocument > doc = XMLParserWrapper::inst().parseString(s);
 if (doc.get()) {
- configuration = KolabXSD::configuration(doc);
+ configuration = KolabXSD::configuration(*doc);
 }
 }
 
@@ -629,16 +629,16 @@
 boost::shared_ptr<Kolab::File> deserializeObject <Kolab::File> (const std::string& s, bool isUrl)
 {
 try {
- std::auto_ptr<KolabXSD::File> file;
+ std::unique_ptr<KolabXSD::File> file;
 if (isUrl) {
- xsd::cxx::xml::dom::auto_ptr <xercesc::DOMDocument > doc = XMLParserWrapper::inst().parseFile(s);
+ std::unique_ptr <xercesc::DOMDocument > doc = XMLParserWrapper::inst().parseFile(s);
 if (doc.get()) {
- file = KolabXSD::file(doc);
+ file = KolabXSD::file(*doc);
 }
 } else {
- xsd::cxx::xml::dom::auto_ptr <xercesc::DOMDocument > doc = XMLParserWrapper::inst().parseString(s);
+ std::unique_ptr <xercesc::DOMDocument > doc = XMLParserWrapper::inst().parseString(s);
 if (doc.get()) {
- file = KolabXSD::file(doc);
+ file = KolabXSD::file(*doc);
 }
 }

libkolabxml-1.2.1.tar.gz/src/php/CMakeLists.txt -> libkolabxml-1.3.0.tar.gz/src/php/CMakeLists.txt Changed

libkolabxml-1.2.1.tar.gz/src/xcalconversions.h -> libkolabxml-1.3.0.tar.gz/src/xcalconversions.h Changed

@@ -132,9 +132,9 @@
 }
 
 template <typename T>
-std::auto_ptr<T> fromStringList(const std::vector<std::string> &list)
+std::unique_ptr<T> fromStringList(const std::vector<std::string> &list)
 {
- std::auto_ptr<T> ptr(new T());
+ std::unique_ptr<T> ptr(new T());
 std::copy(list.begin(), list.end(), std::back_inserter(ptr->text()));
 return ptr;
 }
@@ -509,9 +509,9 @@
 }
 
 template <typename I>
-std::auto_ptr fromDate(const cDateTime &dt)
+std::unique_ptr fromDate(const cDateTime &dt)
 {
- std::auto_ptr ptr(new I);
+ std::unique_ptr ptr(new I);
 if (dt.isDateOnly()) {
 ptr->date(Shared::fromDate(dt));
 } else {
@@ -557,10 +557,10 @@
 }
 
 template <typename I>
-std::auto_ptr fromDateTimeList(const std::vector<cDateTime> &dtlist)
+std::unique_ptr fromDateTimeList(const std::vector<cDateTime> &dtlist)
 {
 
- std::auto_ptr ptr(new I);
+ std::unique_ptr ptr(new I);
 BOOST_FOREACH(const cDateTime &dt, dtlist) {
 if (dt.isDateOnly()) {
 ptr->date().push_back(Shared::fromDate(dt));
@@ -678,7 +678,7 @@
 
 //=== Recurrence Rule ===
 
- typedef std::auto_ptr<RecurrenceRule> RecurrencePtr;
+ typedef std::unique_ptr<RecurrenceRule> RecurrencePtr;
 
 
 RecurrenceRule::Frequency mapRecurrenceFrequency(const icalendar_2_0::RecurType::freq_type &freq)
@@ -1031,11 +1031,11 @@
 return list;
 }
 
-std::auto_ptr< icalendar_2_0::RrulePropType > recurrenceProperty(const RecurrenceRule &r)
+std::unique_ptr< icalendar_2_0::RrulePropType > recurrenceProperty(const RecurrenceRule &r)
 {
 using namespace icalendar_2_0;
 
- std::auto_ptr< RrulePropType > rruleProp(new RrulePropType(mapRecurrenceFrequency(r.frequency())));
+ std::unique_ptr< RrulePropType > rruleProp(new RrulePropType(mapRecurrenceFrequency(r.frequency())));
 
 RecurPropertyType::recur_type &recur = rruleProp->recur();
 const cDateTime &endDate = r.end();
@@ -1271,7 +1271,7 @@
 }
 
 if (inc.recurrenceID().isValid()) {
- std::auto_ptr<typename properties::recurrence_id_type> recurrenceId = fromDate<typename properties::recurrence_id_type>(inc.recurrenceID());
+ std::unique_ptr<typename properties::recurrence_id_type> recurrenceId = fromDate<typename properties::recurrence_id_type>(inc.recurrenceID());
 if (inc.thisAndFuture()) {
 if (!recurrenceId->parameters()) {
 recurrenceId->parameters(typename properties::recurrence_id_type::parameters_type());
@@ -1281,7 +1281,7 @@
 parameters.baseParameter().push_back(range);
 }
 
- prop.recurrence_id(recurrenceId);
+ prop.recurrence_id(std::move(recurrenceId));
 }
 
 if (inc.priority() != 0) {
@@ -1332,14 +1332,14 @@
 trigger.parameters(parameters);
 }
 
- std::auto_ptr<PropType> p;
+ std::unique_ptr<PropType> p;
 switch(alarm.type()) {
 case Kolab::Alarm::DisplayAlarm:
- p = std::auto_ptr<PropType>(new PropType(PropType::action_type(DISPLAYALARM), trigger));
+ p = std::unique_ptr<PropType>(new PropType(PropType::action_type(DISPLAYALARM), trigger));
 p->description(PropType::description_type(alarm.description()));
 break;
 case Kolab::Alarm::EMailAlarm: {
- p = std::auto_ptr<PropType>(new PropType(PropType::action_type(EMAILALARM), trigger));
+ p = std::unique_ptr<PropType>(new PropType(PropType::action_type(EMAILALARM), trigger));
 p->summary(PropType::summary_type(alarm.summary()));
 p->description(PropType::description_type(alarm.description()));
 const std::vector<Kolab::ContactReference> &l = alarm.attendees();
@@ -1349,7 +1349,7 @@
 break;
 }
 case Kolab::Alarm::AudioAlarm:
- p = std::auto_ptr<PropType>(new PropType(PropType::action_type(AUDIOALARM), trigger));
+ p = std::unique_ptr<PropType>(new PropType(PropType::action_type(AUDIOALARM), trigger));
 p->description(PropType::description_type(alarm.description()));
 if (alarm.audioFile().isValid()) {
 p->attach(fromAttachment(alarm.audioFile()));
@@ -1363,7 +1363,7 @@
 p->repeat(PropType::repeat_type(fromInt<PropType::repeat_type::integer_type>(alarm.numrepeat())));
 }
 
- components.valarm().push_back(icalendar_2_0::ValarmType(p));
+ components.valarm().push_back(icalendar_2_0::ValarmType(std::move(p)));
 }
 }
 
@@ -1926,19 +1926,19 @@
 typedef typename T::KolabType KolabType;
 
 try {
- std::auto_ptr<icalendar_2_0::IcalendarType> icalendar;
+ std::unique_ptr<icalendar_2_0::IcalendarType> icalendar;
 if (isUrl) {
- xsd::cxx::xml::dom::auto_ptr <xercesc::DOMDocument > doc = XMLParserWrapper::inst().parseFile(s);
+ std::unique_ptr <xercesc::DOMDocument > doc = XMLParserWrapper::inst().parseFile(s);
 if (doc.get()) {
- icalendar = icalendar_2_0::icalendar(doc);
+ icalendar = icalendar_2_0::icalendar(*doc);
 }
 } else {
- xsd::cxx::xml::dom::auto_ptr <xercesc::DOMDocument > doc = XMLParserWrapper::inst().parseString(s);
+ std::unique_ptr <xercesc::DOMDocument > doc = XMLParserWrapper::inst().parseString(s);
 if (doc.get()) {
- icalendar = icalendar_2_0::icalendar(doc);
+ icalendar = icalendar_2_0::icalendar(*doc);
 }
 }
- 
+
 if (!icalendar.get()) {
 CRITICAL("Failed to parse calendar!");
 return IncidencePtr();

libkolabxml-1.2.1.tar.gz/src/xcardconversions.h -> libkolabxml-1.3.0.tar.gz/src/xcardconversions.h Changed

libkolabxml-1.2.1.tar.gz/tests/CMakeLists.txt -> libkolabxml-1.3.0.tar.gz/tests/CMakeLists.txt Changed

Changes of Revision 6