Branch 'c++/master' - c++/lib

Christian Mollekopf mollekopf at kolabsys.com
Mon Jan 30 22:43:31 CET 2012


 c++/lib/kcalconversions.h |   32 ++++++++++++++++----------------
 c++/lib/xcalconversions.h |   32 ++++++++++++++++----------------
 2 files changed, 32 insertions(+), 32 deletions(-)

New commits:
commit 04e0b64d4c9548e103c57eca893bf5c8f3edaca3
Author: Christian Mollekopf <mollekopf at kolabsys.com>
Date:   Mon Jan 30 22:43:21 2012 +0100

    Don't use typename where not needed, it's illegal in c++03.

diff --git a/c++/lib/kcalconversions.h b/c++/lib/kcalconversions.h
index cfabe13..00aa254 100644
--- a/c++/lib/kcalconversions.h
+++ b/c++/lib/kcalconversions.h
@@ -33,11 +33,11 @@ namespace Kolab {
 struct KCalCoreTypes
 {
     typedef KDateTime DateType;
-    typedef typename boost::shared_ptr<KDateTime> DatePtr;
-    typedef typename KCalCore::RecurrenceRule RecurrenceType;
-    typedef typename std::auto_ptr<KCalCore::RecurrenceRule> RecurrencePtr;
+    typedef boost::shared_ptr<KDateTime> DatePtr;
+    typedef KCalCore::RecurrenceRule RecurrenceType;
+    typedef std::auto_ptr<KCalCore::RecurrenceRule> RecurrencePtr;
     typedef QString StringType;
-    typedef typename KCalCore::Incidence IncidenceType;
+    typedef KCalCore::Incidence IncidenceType;
 };
 
 
@@ -67,12 +67,12 @@ void setString(icalendar_2_0::TextPropertyType &p, const QString &s)
 // }
 
 
-typedef typename KCalCoreTypes::RecurrencePtr RecurrencePtr;
+typedef KCalCoreTypes::RecurrencePtr RecurrencePtr;
 
 template <> struct DateTimeConverter<KDateTime>
 {
     typedef KDateTime Type;
-    typedef typename boost::shared_ptr<KDateTime> Ptr;
+    typedef boost::shared_ptr<KDateTime> Ptr;
 
     static Ptr toDate(const  xml_schema::date &dt)
     {
@@ -144,8 +144,8 @@ template <> struct DateTimeConverter<KDateTime>
 
 template <> struct RecurrenceConverter < KCalCore::RecurrenceRule >
 {
-    typedef typename KCalCoreTypes::RecurrenceType Type;
-    typedef typename KCalCoreTypes::RecurrencePtr& Ptr; //Pass by reference, otherwise auto_ptr deletes the pointer after the first pass to a function (unlike shared_ptr)
+    typedef KCalCoreTypes::RecurrenceType Type;
+    typedef KCalCoreTypes::RecurrencePtr& Ptr; //Pass by reference, otherwise auto_ptr deletes the pointer after the first pass to a function (unlike shared_ptr)
 
     static void setType(Ptr r, const icalendar_2_0::RecurType::freq_type &freq)
     {
@@ -369,7 +369,7 @@ std::auto_ptr< icalendar_2_0::RrulePropType > recurrenceProperty(const typename
 {
     using namespace icalendar_2_0;
     
-    typedef RecurrenceConverter< typename KCalCore::RecurrenceRule > RC;
+    typedef RecurrenceConverter< KCalCore::RecurrenceRule > RC;
     typedef DateTimeConverter< KDateTime> DC;
     
     std::auto_ptr< RrulePropType > rruleProp(new RrulePropType(RC::type(r)));
@@ -595,10 +595,10 @@ template <> struct IncidenceConverter < KCalCore::Incidence, KCalCore::Incidence
 
 template < > struct IncidenceTrait <KCalCore::Event>
 {
-    typedef typename icalendar_2_0::KolabEvent KolabType;
-    typedef typename KCalCore::Event IncidenceType;
-    typedef typename KCalCore::Event::Ptr IncidencePtr;
-    typedef typename KCalCore::Incidence Incidence;
+    typedef icalendar_2_0::KolabEvent KolabType;
+    typedef KCalCore::Event IncidenceType;
+    typedef KCalCore::Event::Ptr IncidencePtr;
+    typedef KCalCore::Incidence Incidence;
     
     static void writeIncidence(icalendar_2_0::KolabEvent& vevent, const KCalCore::Event &event)
     {
@@ -657,9 +657,9 @@ template < > struct IncidenceTrait <KCalCore::Event>
 
 template < > struct IncidenceTrait <KCalCore::Todo>
 {
-    typedef typename icalendar_2_0::KolabTodo KolabType;
-    typedef typename KCalCore::Todo IncidenceType;
-    typedef typename KCalCore::Incidence Incidence;
+    typedef icalendar_2_0::KolabTodo KolabType;
+    typedef KCalCore::Todo IncidenceType;
+    typedef KCalCore::Incidence Incidence;
     
     static void writeIncidence(icalendar_2_0::KolabTodo& vtodo, const KCalCore::Todo &todo)
     {
diff --git a/c++/lib/xcalconversions.h b/c++/lib/xcalconversions.h
index 26e3f17..e5eb50c 100644
--- a/c++/lib/xcalconversions.h
+++ b/c++/lib/xcalconversions.h
@@ -30,9 +30,9 @@ class Incidence;
 struct KolabTypes
 {
     typedef DateTime DateType;
-    typedef typename boost::shared_ptr<DateTime> DatePtr;
+    typedef boost::shared_ptr<DateTime> DatePtr;
     typedef RecurrenceRule RecurrenceType;
-    typedef typename std::auto_ptr<RecurrenceRule> RecurrencePtr;
+    typedef std::auto_ptr<RecurrenceRule> RecurrencePtr;
     typedef std::string StringType;
     typedef Incidence IncidenceType;
 };
@@ -68,7 +68,7 @@ std::string toString(const icalendar_2_0::TextPropertyType &s)
 template <> struct DateTimeConverter<DateTime>
 {
     typedef DateTime Type;
-    typedef typename boost::shared_ptr<DateTime> Ptr;
+    typedef boost::shared_ptr<DateTime> Ptr;
 
     static Ptr toDate(const  xml_schema::date &dt)
     {
@@ -131,8 +131,8 @@ template <> struct DateTimeConverter<DateTime>
 template <> struct RecurrenceConverter < RecurrenceRule >
 {
 
-    typedef typename KolabTypes::RecurrenceType Type;
-    typedef typename KolabTypes::RecurrencePtr& Ptr; //Pass by reference, otherwise auto_ptr deletes the pointer after the first pass to a function (unlike shared_ptr)
+    typedef KolabTypes::RecurrenceType Type;
+    typedef KolabTypes::RecurrencePtr& Ptr; //Pass by reference, otherwise auto_ptr deletes the pointer after the first pass to a function (unlike shared_ptr)
 
     static void setType(Ptr r, const icalendar_2_0::RecurType::freq_type &freq)
     {
@@ -522,7 +522,7 @@ std::auto_ptr< icalendar_2_0::RrulePropType > recurrenceProperty(const Recurrenc
 
 
 template <typename T, typename I>
-void getIncidenceProperties(T &prop, const I &inc) //TODO switch form Event to template
+void getIncidenceProperties(T &prop, const I &inc)
 {
     using namespace icalendar_2_0;
     
@@ -681,10 +681,10 @@ const char* const OPAQUE = "OPAQUE";
 
 template < > struct IncidenceTrait <Kolab::Event>
 {
-    typedef typename icalendar_2_0::KolabEvent KolabType;
-    typedef typename Kolab::Event IncidenceType;
-    typedef typename boost::shared_ptr<Kolab::Event> IncidencePtr;
-    typedef typename Kolab::Incidence Incidence;
+    typedef icalendar_2_0::KolabEvent KolabType;
+    typedef Kolab::Event IncidenceType;
+    typedef boost::shared_ptr<Kolab::Event> IncidencePtr;
+    typedef Kolab::Incidence Incidence;
     
     static void writeIncidence(icalendar_2_0::KolabEvent& vevent, const Kolab::Event &event)
     {
@@ -693,7 +693,7 @@ template < > struct IncidenceTrait <Kolab::Event>
         getIncidenceProperties<KolabType::properties_type>(prop, event);
 
         if (event.end().isValid()) {
-            prop.dtend(fromDate<KolabTypes, typename KolabType::properties_type::dtend_type>(event.end()));
+            prop.dtend(fromDate<KolabTypes, KolabType::properties_type::dtend_type>(event.end()));
         }/* else if (event.duration().isValid()) {
             //TODO
         }*/
@@ -753,10 +753,10 @@ template < > struct IncidenceTrait <Kolab::Event>
 
 template < > struct IncidenceTrait <Kolab::Todo>
 {
-    typedef typename icalendar_2_0::KolabTodo KolabType;
-    typedef typename Kolab::Todo IncidenceType;
-    typedef typename boost::shared_ptr<Kolab::Todo> IncidencePtr;
-    typedef typename Kolab::Incidence Incidence;
+    typedef icalendar_2_0::KolabTodo KolabType;
+    typedef Kolab::Todo IncidenceType;
+    typedef boost::shared_ptr<Kolab::Todo> IncidencePtr;
+    typedef Kolab::Incidence Incidence;
     
     static void writeIncidence(KolabType& vevent, const Kolab::Todo &todo)
     {
@@ -765,7 +765,7 @@ template < > struct IncidenceTrait <Kolab::Todo>
         getIncidenceProperties<KolabType::properties_type>(prop, todo);
 
         if (todo.due().isValid()) {
-            prop.due(fromDate<KolabTypes, typename KolabType::properties_type::due_type>(todo.due()));
+            prop.due(fromDate<KolabTypes, KolabType::properties_type::due_type>(todo.due()));
         }
 //         if (todo.transparency()) {
 //             prop.transp( icalendar_2_0::properties::transp_type(TRANSPARENT));





More information about the commits mailing list