Add some hooks to ORecordList and Iterator

current() for Iterator
setCurrent() for Iterator
count() for both

1 files changed, 49 insertions, 4 deletions

diff --git a/libopie2/opiepim/orecordlist.h b/libopie2/opiepim/orecordlist.h
index 1795938..c63d813 100644
--- a/libopie2/opiepim/orecordlist.h
+++ b/libopie2/opiepim/orecordlist.h
@@ -37,28 +37,43 @@ public:
     ORecordListIterator &operator=(const ORecordListIterator& );
 
     /**
      * a * operator ;)
      * use it like this T = (*it);
      */
     T operator*();
     ORecordListIterator &operator++();
     ORecordListIterator &operator--();
 
     bool operator==( const ORecordListIterator& it );
     bool operator!=( const ORecordListIterator& it );
+    
+    /**
+     * the current item
+     */
+    uint current()const;
+    
+    /**
+     * the number of items
+     */
+    uint count()const;
+    
+    /**
+     * sets the current item
+     */
+    void setCurrent( uint cur );
 
 private:
     QArray<int> m_uids;
-    int m_current;
+    uint m_current;
     const Base* m_temp;
     bool m_end : 1;
     T m_record;
 
     /* d pointer for future versions */
     class IteratorPrivate;
     IteratorPrivate *d;
 };
 /**
  * The recordlist used as a return type
  * from OPimAccessTemplate
  */
@@ -77,24 +92,31 @@ public:
                  const Base* );
     ~ORecordList();
 
     /**
      * the first iterator
      */
     Iterator begin();
 
     /**
      * the end
      */
     Iterator end();
+    
+    /**
+     * the number of items in the list
+     */
+     uint count()const;
+     
+     // FIXME implemenent remove
     /*
       ConstIterator begin()const;
       ConstIterator end()const;
     */
 private:
     QArray<int> m_ids;
     const Base* m_acc;
 };
 
 /* ok now implement it  */
 template <class T>
 ORecordListIterator<T>::ORecordListIterator() {
@@ -124,34 +146,39 @@ ORecordListIterator<T> &ORecordListIterator<T>::operator=( const ORecordListIter
     m_current = it.m_current;
     m_temp = it.m_temp;
     m_end = it.m_end;
 //    m_record = it.m_record;
 
     return *this;
 }
 
 template <class T>
 T ORecordListIterator<T>::operator*() {
 //    qWarning("operator* %d %d", m_current,  m_uids[m_current] );
     if (!m_end )
-        m_record = m_temp->find( m_uids[m_current] );
+        /* FIXME
+         * until the cache is in place
+         * we do the uid match uid check
+         */
+        if(m_record.uid() != m_uids[m_current] )
+           m_record = m_temp->find( m_uids[m_current] );
     else
         m_record = T();
 
     return m_record;
 }
 
 template <class T>
 ORecordListIterator<T> &ORecordListIterator<T>::operator++() {
-    if (m_current < (int)m_uids.count() ) {
+    if (m_current < m_uids.count() ) {
         m_end = false;
         ++m_current;
     }else
         m_end = true;
 
     return *this;
 }
 template <class T>
 ORecordListIterator<T> &ORecordListIterator<T>::operator--() {
     if ( m_current > 0 ) {
         --m_current;
         m_end = false;
@@ -174,37 +201,55 @@ bool ORecordListIterator<T>::operator==( const ORecordListIterator<T>& it ) {
     return true;
 }
 template <class T>
 bool ORecordListIterator<T>::operator!=( const ORecordListIterator<T>& it ) {
     return !(*this == it );
 }
 template <class T>
 ORecordListIterator<T>::ORecordListIterator( const QArray<int> uids,
                                   const Base* t )
     : m_uids( uids ), m_current( 0 ),  m_temp( t ), m_end( false )
 {
 }
-
+template <class T>
+uint ORecordListIterator<T>::current()const {
+    return m_current;
+}
+template <class T>
+void ORecordListIterator<T>::setCurrent( uint cur ) {
+    if( cur < m_uids.count() ) {
+        m_end = false;
+        m_current= cur;
+    }
+}
+template <class T>
+uint ORecordListIterator<T>::count()const {
+ return m_uids.count();
+}
 template <class T>
 ORecordList<T>::ORecordList( const QArray<int>& ids,
                              const Base* acc )
     : m_ids( ids ), m_acc( acc )
 {
 }
 template <class T>
 ORecordList<T>::~ORecordList() {
 /* nothing to do here */
 }
 template <class T>
 ORecordList<T>::Iterator ORecordList<T>::begin() {
     Iterator it( m_ids, m_acc );
     return it;
 }
 template <class T>
 ORecordList<T>::Iterator ORecordList<T>::end() {
     Iterator it( m_ids, m_acc );
     it.m_end = true;
     it.m_current = m_ids.count();
 
     return it;
 }
+template <class T>
+uint ORecordList<T>::count()const {
+return m_ids.count();
+}
 #endif