ekiga r7430 - trunk/lib/engine/presence/skel

[jpuydt svn gnome org]

Author: jpuydt
Date: Fri Dec  5 04:09:22 2008
New Revision: 7430
URL: http://svn.gnome.org/viewvc/ekiga?rev=7430&view=rev

Log:
Added back iterators to the presence stack -impl objects

Modified:
   trunk/lib/engine/presence/skel/cluster-impl.h
   trunk/lib/engine/presence/skel/heap-impl.h

Modified: trunk/lib/engine/presence/skel/cluster-impl.h
==============================================================================
--- trunk/lib/engine/presence/skel/cluster-impl.h	(original)
+++ trunk/lib/engine/presence/skel/cluster-impl.h	Fri Dec  5 04:09:22 2008
@@ -73,8 +73,8 @@
 
   public:
 
-    //typedef typename Lister<HeapType>::iterator iterator;
-    //typedef typename Lister<HeapType>::const_iterator const_iterator;
+    typedef typename RefLister<HeapType>::iterator iterator;
+    typedef typename RefLister<HeapType>::const_iterator const_iterator;
 
     ClusterImpl ();
 
@@ -88,6 +88,11 @@
 
     void remove_heap (gmref_ptr<HeapType> heap);
 
+    iterator begin ();
+    iterator end ();
+    const_iterator begin () const;
+    const_iterator end () const;
+
   private:
 
     void common_removal_steps (gmref_ptr<HeapType> heap);
@@ -171,4 +176,32 @@
   presentity_removed.emit (heap, presentity);
 }
 
+template<typename HeapType>
+typename Ekiga::ClusterImpl<HeapType>::iterator
+Ekiga::ClusterImpl<HeapType>::begin ()
+{
+  return RefLister<HeapType>::begin ();
+}
+
+template<typename HeapType>
+typename Ekiga::ClusterImpl<HeapType>::const_iterator
+Ekiga::ClusterImpl<HeapType>::begin () const
+{
+  return RefLister<HeapType>::begin ();
+}
+
+template<typename HeapType>
+typename Ekiga::ClusterImpl<HeapType>::iterator
+Ekiga::ClusterImpl<HeapType>::end ()
+{
+  return RefLister<HeapType>::end ();
+}
+
+template<typename HeapType>
+typename Ekiga::ClusterImpl<HeapType>::const_iterator
+Ekiga::ClusterImpl<HeapType>::end () const
+{
+  return RefLister<HeapType>::end ();
+}
+
 #endif

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	Fri Dec  5 04:09:22 2008
@@ -71,8 +71,8 @@
 
   public:
 
-    //typedef typename Lister<PresentityType>::iterator iterator;
-    //typedef typename Lister<PresentityType>::const_iterator const_iterator;
+    typedef typename RefLister<PresentityType>::iterator iterator;
+    typedef typename RefLister<PresentityType>::const_iterator const_iterator;
 
     HeapImpl ();
 
@@ -80,13 +80,13 @@
 
     void visit_presentities (sigc::slot1<bool, gmref_ptr<Presentity> > visitor);
 
-    //const_iterator begin () const;
+    const_iterator begin () const;
 
-    //iterator begin ();
+    iterator begin ();
 
-    //const_iterator end () const;
+    const_iterator end () const;
 
-    //iterator end ();
+    iterator end ();
 
   protected:
 
@@ -124,33 +124,33 @@
   RefLister<PresentityType>::visit_objects (visitor);
 }
 
-// template<typename PresentityType>
-// typename Ekiga::HeapImpl<PresentityType>::iterator
-// Ekiga::HeapImpl<PresentityType>::begin ()
-// {
-//   return Lister<PresentityType>::begin ();
-// }
-
-// template<typename PresentityType>
-// typename Ekiga::HeapImpl<PresentityType>::iterator
-// Ekiga::HeapImpl<PresentityType>::end ()
-// {
-//   return Lister<PresentityType>::end ();
-// }
-
-// template<typename PresentityType>
-// typename Ekiga::HeapImpl<PresentityType>::const_iterator
-// Ekiga::HeapImpl<PresentityType>::begin () const
-// {
-//   return Lister<PresentityType>::begin ();
-// }
-
-// template<typename PresentityType>
-// typename Ekiga::HeapImpl<PresentityType>::const_iterator
-// Ekiga::HeapImpl<PresentityType>::end () const
-// {
-//   return Lister<PresentityType>::end ();
-// }
+template<typename PresentityType>
+typename Ekiga::HeapImpl<PresentityType>::iterator
+Ekiga::HeapImpl<PresentityType>::begin ()
+{
+  return RefLister<PresentityType>::begin ();
+}
+
+template<typename PresentityType>
+typename Ekiga::HeapImpl<PresentityType>::iterator
+Ekiga::HeapImpl<PresentityType>::end ()
+{
+  return RefLister<PresentityType>::end ();
+}
+
+template<typename PresentityType>
+typename Ekiga::HeapImpl<PresentityType>::const_iterator
+Ekiga::HeapImpl<PresentityType>::begin () const
+{
+  return RefLister<PresentityType>::begin ();
+}
+
+template<typename PresentityType>
+typename Ekiga::HeapImpl<PresentityType>::const_iterator
+Ekiga::HeapImpl<PresentityType>::end () const
+{
+  return RefLister<PresentityType>::end ();
+}
 
 template<typename PresentityType>
 void