ekiga r7429 - trunk/lib/engine/addressbook/skel

[jpuydt svn gnome org]

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

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

Modified:
   trunk/lib/engine/addressbook/skel/book-impl.h
   trunk/lib/engine/addressbook/skel/source-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	Fri Dec  5 04:09:16 2008
@@ -78,8 +78,8 @@
 
   public:
 
-    //    typedef typename Lister<ContactType>::iterator iterator;
-    //typedef typename Lister<ContactType>::const_iterator const_iterator;
+    typedef typename RefLister<ContactType>::iterator iterator;
+    typedef typename RefLister<ContactType>::const_iterator const_iterator;
 
     /** The constructor
      */
@@ -100,19 +100,19 @@
 
     /** Returns an iterator to the first Contact of the collection
      */
-    //    iterator begin ();
+    iterator begin ();
 
     /** Returns an iterator to the last Contact of the collection
      */
-    //iterator end ();
+    iterator end ();
 
     /** Returns a const iterator to the first Contact of the collection
      */
-    //const_iterator begin () const;
+    const_iterator begin () const;
 
     /** Returns a const iterator to the last Contact of the collection
      */
-    //const_iterator end () const;
+    const_iterator end () const;
 
     /** Adds a contact to the Ekiga::Book.
      * @param: The contact to be added.
@@ -166,36 +166,36 @@
 }
 
 
-// template<typename ContactType>
-// typename Ekiga::BookImpl<ContactType>::iterator
-// Ekiga::BookImpl<ContactType>::begin ()
-// {
-//   return Lister<ContactType>::begin ();
-// }
-
-
-// template<typename ContactType>
-// typename Ekiga::BookImpl<ContactType>::iterator
-// Ekiga::BookImpl<ContactType>::end ()
-// {
-//   return Lister<ContactType>::end ();
-// }
-
-
-// template<typename ContactType>
-// typename Ekiga::BookImpl<ContactType>::const_iterator
-// Ekiga::BookImpl<ContactType>::begin () const
-// {
-//   return Lister<ContactType>::begin ();
-// }
-
-
-// template<typename ContactType>
-// typename Ekiga::BookImpl<ContactType>::const_iterator
-// Ekiga::BookImpl<ContactType>::end () const
-// {
-//   return Lister<ContactType>::end ();
-// }
+template<typename ContactType>
+typename Ekiga::BookImpl<ContactType>::iterator
+Ekiga::BookImpl<ContactType>::begin ()
+{
+  return RefLister<ContactType>::begin ();
+}
+
+
+template<typename ContactType>
+typename Ekiga::BookImpl<ContactType>::iterator
+Ekiga::BookImpl<ContactType>::end ()
+{
+  return RefLister<ContactType>::end ();
+}
+
+
+template<typename ContactType>
+typename Ekiga::BookImpl<ContactType>::const_iterator
+Ekiga::BookImpl<ContactType>::begin () const
+{
+  return RefLister<ContactType>::begin ();
+}
+
+
+template<typename ContactType>
+typename Ekiga::BookImpl<ContactType>::const_iterator
+Ekiga::BookImpl<ContactType>::end () const
+{
+  return RefLister<ContactType>::end ();
+}
 
 
 template<typename ContactType>

Modified: trunk/lib/engine/addressbook/skel/source-impl.h
==============================================================================
--- trunk/lib/engine/addressbook/skel/source-impl.h	(original)
+++ trunk/lib/engine/addressbook/skel/source-impl.h	Fri Dec  5 04:09:16 2008
@@ -84,8 +84,8 @@
 
   public:
 
-    //typedef typename Lister<BookType>::iterator iterator;
-    //typedef typename Lister<BookType>::const_iterator const_iterator;
+    typedef typename RefLister<BookType>::iterator iterator;
+    typedef typename RefLister<BookType>::const_iterator const_iterator;
 
     /** The constructor
      */
@@ -123,6 +123,25 @@
     void remove_book (gmref_ptr<BookType> book);
 
 
+  protected:
+
+    /** Returns an iterator to the first Book of the collection
+     */
+    iterator begin ();
+
+    /** Returns an iterator to the last Book of the collection
+     */
+    iterator end ();
+
+    /** Returns a const iterator to the first Book of the collection
+     */
+    const_iterator begin () const;
+
+    /** Returns a const iterator to the last Book of the collection
+     */
+    const_iterator end () const;
+
+
   private:
 
     /** Disconnects the signals for the Ekiga::Book, emits the 'book_removed'
@@ -205,4 +224,35 @@
   remove_object (book);
 }
 
+template<typename BookType>
+typename Ekiga::SourceImpl<BookType>::iterator
+Ekiga::SourceImpl<BookType>::begin ()
+{
+  return RefLister<BookType>::begin ();
+}
+
+
+template<typename BookType>
+typename Ekiga::SourceImpl<BookType>::iterator
+Ekiga::SourceImpl<BookType>::end ()
+{
+  return RefLister<BookType>::end ();
+}
+
+
+template<typename BookType>
+typename Ekiga::SourceImpl<BookType>::const_iterator
+Ekiga::SourceImpl<BookType>::begin () const
+{
+  return RefLister<BookType>::begin ();
+}
+
+
+template<typename BookType>
+typename Ekiga::SourceImpl<BookType>::const_iterator
+Ekiga::SourceImpl<BookType>::end () const
+{
+  return RefLister<BookType>::end ();
+}
+
 #endif