| -rw-r--r-- | libopie2/opiepim/orecordlist.h | 53 |
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 @@ -47,8 +47,23 @@ public: 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; @@ -87,4 +102,11 @@ public: */ Iterator end(); + + /** + * the number of items in the list + */ + uint count()const; + + // FIXME implemenent remove /* ConstIterator begin()const; @@ -134,5 +156,10 @@ 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(); @@ -143,5 +170,5 @@ T ORecordListIterator<T>::operator*() { 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; @@ -184,5 +211,19 @@ ORecordListIterator<T>::ORecordListIterator( const QArray<int> uids, { } - +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, @@ -208,3 +249,7 @@ ORecordList<T>::Iterator ORecordList<T>::end() { return it; } +template <class T> +uint ORecordList<T>::count()const { +return m_ids.count(); +} #endif |