Diffstat (limited to 'libopie2/opiepim/orecordlist.h') (more/less context) (ignore whitespace changes)
-rw-r--r-- | libopie2/opiepim/orecordlist.h | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/libopie2/opiepim/orecordlist.h b/libopie2/opiepim/orecordlist.h index b6fa7fa..08f5c85 100644 --- a/libopie2/opiepim/orecordlist.h +++ b/libopie2/opiepim/orecordlist.h | |||
@@ -68,6 +68,7 @@ private: | |||
68 | const Base* m_temp; | 68 | const Base* m_temp; |
69 | bool m_end : 1; | 69 | bool m_end : 1; |
70 | T m_record; | 70 | T m_record; |
71 | bool m_direction :1; | ||
71 | 72 | ||
72 | /* d pointer for future versions */ | 73 | /* d pointer for future versions */ |
73 | class IteratorPrivate; | 74 | class IteratorPrivate; |
@@ -125,6 +126,8 @@ ORecordListIterator<T>::ORecordListIterator() { | |||
125 | m_temp = 0l; | 126 | m_temp = 0l; |
126 | m_end = true; | 127 | m_end = true; |
127 | m_record = T(); | 128 | m_record = T(); |
129 | /* forward */ | ||
130 | m_direction = TRUE; | ||
128 | } | 131 | } |
129 | template <class T> | 132 | template <class T> |
130 | ORecordListIterator<T>::~ORecordListIterator() { | 133 | ORecordListIterator<T>::~ORecordListIterator() { |
@@ -139,6 +142,7 @@ ORecordListIterator<T>::ORecordListIterator( const ORecordListIterator<T>& it) { | |||
139 | m_temp = it.m_temp; | 142 | m_temp = it.m_temp; |
140 | m_end = it.m_end; | 143 | m_end = it.m_end; |
141 | m_record = it.m_record; | 144 | m_record = it.m_record; |
145 | m_direction = it.m_direction; | ||
142 | } | 146 | } |
143 | 147 | ||
144 | template <class T> | 148 | template <class T> |
@@ -156,11 +160,9 @@ template <class T> | |||
156 | T ORecordListIterator<T>::operator*() { | 160 | T ORecordListIterator<T>::operator*() { |
157 | qWarning("operator* %d %d", m_current, m_uids[m_current] ); | 161 | qWarning("operator* %d %d", m_current, m_uids[m_current] ); |
158 | if (!m_end ) | 162 | if (!m_end ) |
159 | /* FIXME | 163 | m_record = m_temp->find( m_uids[m_current], m_uids, m_current, |
160 | * until the cache is in place | 164 | m_direction ? Base::Forward : |
161 | * we do the uid match uid check | 165 | Base::Reverse ); |
162 | */ | ||
163 | m_record = m_temp->find( m_uids[m_current] ); | ||
164 | else | 166 | else |
165 | m_record = T(); | 167 | m_record = T(); |
166 | 168 | ||
@@ -169,6 +171,7 @@ T ORecordListIterator<T>::operator*() { | |||
169 | 171 | ||
170 | template <class T> | 172 | template <class T> |
171 | ORecordListIterator<T> &ORecordListIterator<T>::operator++() { | 173 | ORecordListIterator<T> &ORecordListIterator<T>::operator++() { |
174 | m_direction = true; | ||
172 | if (m_current < m_uids.count() ) { | 175 | if (m_current < m_uids.count() ) { |
173 | m_end = false; | 176 | m_end = false; |
174 | ++m_current; | 177 | ++m_current; |
@@ -179,6 +182,7 @@ ORecordListIterator<T> &ORecordListIterator<T>::operator++() { | |||
179 | } | 182 | } |
180 | template <class T> | 183 | template <class T> |
181 | ORecordListIterator<T> &ORecordListIterator<T>::operator--() { | 184 | ORecordListIterator<T> &ORecordListIterator<T>::operator--() { |
185 | m_direction = false; | ||
182 | if ( m_current > 0 ) { | 186 | if ( m_current > 0 ) { |
183 | --m_current; | 187 | --m_current; |
184 | m_end = false; | 188 | m_end = false; |
@@ -207,7 +211,8 @@ bool ORecordListIterator<T>::operator!=( const ORecordListIterator<T>& it ) { | |||
207 | template <class T> | 211 | template <class T> |
208 | ORecordListIterator<T>::ORecordListIterator( const QArray<int> uids, | 212 | ORecordListIterator<T>::ORecordListIterator( const QArray<int> uids, |
209 | const Base* t ) | 213 | const Base* t ) |
210 | : m_uids( uids ), m_current( 0 ), m_temp( t ), m_end( false ) | 214 | : m_uids( uids ), m_current( 0 ), m_temp( t ), m_end( false ), |
215 | m_direction( false ) | ||
211 | { | 216 | { |
212 | } | 217 | } |
213 | template <class T> | 218 | template <class T> |
@@ -254,6 +259,7 @@ return m_ids.count(); | |||
254 | } | 259 | } |
255 | template <class T> | 260 | template <class T> |
256 | T ORecordList<T>::operator[]( uint i ) { | 261 | T ORecordList<T>::operator[]( uint i ) { |
257 | return m_acc->find( m_ids[i] ); | 262 | /* forward */ |
263 | return m_acc->find( m_ids[i], m_ids, i ); | ||
258 | } | 264 | } |
259 | #endif | 265 | #endif |