ekiga r5925 - in trunk/lib/engine: addressbook/skel framework presence/skel

[jpuydt svn gnome org]

Author: jpuydt
Date: Sun Jan 20 16:00:15 2008
New Revision: 5925
URL: http://svn.gnome.org/viewvc/ekiga?rev=5925&view=rev

Log:
Removed Ekiga::Lister's no_object_management... and all compiles!

Modified:
   trunk/lib/engine/addressbook/skel/book-impl.h
   trunk/lib/engine/framework/lister.h
   trunk/lib/engine/presence/skel/heap-impl.h

Modified: trunk/lib/engine/addressbook/skel/book-impl.h
==============================================================================
--- trunk/lib/engine/addressbook/skel/book-impl.h	(original)
+++ trunk/lib/engine/addressbook/skel/book-impl.h	Sun Jan 20 16:00:15 2008
@@ -77,7 +77,7 @@
    *    backend.
    */
   template<typename ContactType = Contact,
-	   typename ObjectManagementTrait = no_object_management<ContactType> >
+	   typename ObjectManagementTrait = delete_object_management<ContactType> >
   class BookImpl:
     public Book,
     protected Lister<ContactType, ObjectManagementTrait>

Modified: trunk/lib/engine/framework/lister.h
==============================================================================
--- trunk/lib/engine/framework/lister.h	(original)
+++ trunk/lib/engine/framework/lister.h	Sun Jan 20 16:00:15 2008
@@ -45,14 +45,6 @@
 {
 
   template<typename ObjectType>
-  struct no_object_management
-  {
-    static void announced_release (ObjectType &);
-
-    static void release (ObjectType &);
-  };
-
-  template<typename ObjectType>
   struct delete_object_management
   {
     static void announced_release (ObjectType &object);
@@ -88,7 +80,7 @@
    *    backend.
    */
   template<typename ObjectType,
-	   typename ObjectManagementTrait = no_object_management<ObjectType> >
+	   typename ObjectManagementTrait = delete_object_management<ObjectType> >
   class Lister
   {
 
@@ -197,21 +189,6 @@
 
 
 /* here begins the code from the template functions */
-template<typename ObjectType>
-void
-Ekiga::no_object_management<ObjectType>::announced_release (ObjectType &object)
-{
-  // nothing
-}
-
-
-template<typename ObjectType>
-void
-Ekiga::no_object_management<ObjectType>::release (ObjectType &object)
-{
-  // nothing
-}
-
 
 template<typename ObjectType>
 void

Modified: trunk/lib/engine/presence/skel/heap-impl.h
==============================================================================
--- trunk/lib/engine/presence/skel/heap-impl.h	(original)
+++ trunk/lib/engine/presence/skel/heap-impl.h	Sun Jan 20 16:00:15 2008
@@ -72,7 +72,7 @@
    *    backend.
    */
   template<typename PresentityType = Presentity,
-	   typename ObjectManagementTrait = no_object_management<PresentityType> >
+	   typename ObjectManagementTrait = delete_object_management<PresentityType> >
   class HeapImpl:
     public Heap,
     protected Lister<PresentityType, ObjectManagementTrait>