-rw-r--r-- | libopie/pim/orecordlist.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libopie/pim/orecordlist.h b/libopie/pim/orecordlist.h index 1fd0741..b6fa7fa 100644 --- a/libopie/pim/orecordlist.h +++ b/libopie/pim/orecordlist.h | |||
@@ -109,104 +109,103 @@ public: | |||
109 | 109 | ||
110 | T operator[]( uint i ); | 110 | T operator[]( uint i ); |
111 | // FIXME implemenent remove | 111 | // FIXME implemenent remove |
112 | /* | 112 | /* |
113 | ConstIterator begin()const; | 113 | ConstIterator begin()const; |
114 | ConstIterator end()const; | 114 | ConstIterator end()const; |
115 | */ | 115 | */ |
116 | private: | 116 | private: |
117 | QArray<int> m_ids; | 117 | QArray<int> m_ids; |
118 | const Base* m_acc; | 118 | const Base* m_acc; |
119 | }; | 119 | }; |
120 | 120 | ||
121 | /* ok now implement it */ | 121 | /* ok now implement it */ |
122 | template <class T> | 122 | template <class T> |
123 | ORecordListIterator<T>::ORecordListIterator() { | 123 | ORecordListIterator<T>::ORecordListIterator() { |
124 | m_current = 0; | 124 | m_current = 0; |
125 | m_temp = 0l; | 125 | m_temp = 0l; |
126 | m_end = true; | 126 | m_end = true; |
127 | m_record = T(); | 127 | m_record = T(); |
128 | } | 128 | } |
129 | template <class T> | 129 | template <class T> |
130 | ORecordListIterator<T>::~ORecordListIterator() { | 130 | ORecordListIterator<T>::~ORecordListIterator() { |
131 | /* nothing to delete */ | 131 | /* nothing to delete */ |
132 | } | 132 | } |
133 | 133 | ||
134 | template <class T> | 134 | template <class T> |
135 | ORecordListIterator<T>::ORecordListIterator( const ORecordListIterator<T>& it) { | 135 | ORecordListIterator<T>::ORecordListIterator( const ORecordListIterator<T>& it) { |
136 | // qWarning("ORecordListIterator copy c'tor"); | 136 | // qWarning("ORecordListIterator copy c'tor"); |
137 | m_uids = it.m_uids; | 137 | m_uids = it.m_uids; |
138 | m_current = it.m_current; | 138 | m_current = it.m_current; |
139 | m_temp = it.m_temp; | 139 | m_temp = it.m_temp; |
140 | m_end = it.m_end; | 140 | m_end = it.m_end; |
141 | m_record = it.m_record; | 141 | m_record = it.m_record; |
142 | } | 142 | } |
143 | 143 | ||
144 | template <class T> | 144 | template <class T> |
145 | ORecordListIterator<T> &ORecordListIterator<T>::operator=( const ORecordListIterator<T>& it) { | 145 | ORecordListIterator<T> &ORecordListIterator<T>::operator=( const ORecordListIterator<T>& it) { |
146 | m_uids = it.m_uids; | 146 | m_uids = it.m_uids; |
147 | m_current = it.m_current; | 147 | m_current = it.m_current; |
148 | m_temp = it.m_temp; | 148 | m_temp = it.m_temp; |
149 | m_end = it.m_end; | 149 | m_end = it.m_end; |
150 | m_record = it.m_record; | 150 | m_record = it.m_record; |
151 | 151 | ||
152 | return *this; | 152 | return *this; |
153 | } | 153 | } |
154 | 154 | ||
155 | template <class T> | 155 | template <class T> |
156 | T ORecordListIterator<T>::operator*() { | 156 | T ORecordListIterator<T>::operator*() { |
157 | // qWarning("operator* %d %d", m_current, m_uids[m_current] ); | 157 | qWarning("operator* %d %d", m_current, m_uids[m_current] ); |
158 | if (!m_end ) | 158 | if (!m_end ) |
159 | /* FIXME | 159 | /* FIXME |
160 | * until the cache is in place | 160 | * until the cache is in place |
161 | * we do the uid match uid check | 161 | * we do the uid match uid check |
162 | */ | 162 | */ |
163 | if(m_record.uid() != m_uids[m_current] ) | 163 | m_record = m_temp->find( m_uids[m_current] ); |
164 | m_record = m_temp->find( m_uids[m_current] ); | ||
165 | else | 164 | else |
166 | m_record = T(); | 165 | m_record = T(); |
167 | 166 | ||
168 | return m_record; | 167 | return m_record; |
169 | } | 168 | } |
170 | 169 | ||
171 | template <class T> | 170 | template <class T> |
172 | ORecordListIterator<T> &ORecordListIterator<T>::operator++() { | 171 | ORecordListIterator<T> &ORecordListIterator<T>::operator++() { |
173 | if (m_current < m_uids.count() ) { | 172 | if (m_current < m_uids.count() ) { |
174 | m_end = false; | 173 | m_end = false; |
175 | ++m_current; | 174 | ++m_current; |
176 | }else | 175 | }else |
177 | m_end = true; | 176 | m_end = true; |
178 | 177 | ||
179 | return *this; | 178 | return *this; |
180 | } | 179 | } |
181 | template <class T> | 180 | template <class T> |
182 | ORecordListIterator<T> &ORecordListIterator<T>::operator--() { | 181 | ORecordListIterator<T> &ORecordListIterator<T>::operator--() { |
183 | if ( m_current > 0 ) { | 182 | if ( m_current > 0 ) { |
184 | --m_current; | 183 | --m_current; |
185 | m_end = false; | 184 | m_end = false; |
186 | } else | 185 | } else |
187 | m_end = true; | 186 | m_end = true; |
188 | 187 | ||
189 | return *this; | 188 | return *this; |
190 | } | 189 | } |
191 | 190 | ||
192 | template <class T> | 191 | template <class T> |
193 | bool ORecordListIterator<T>::operator==( const ORecordListIterator<T>& it ) { | 192 | bool ORecordListIterator<T>::operator==( const ORecordListIterator<T>& it ) { |
194 | 193 | ||
195 | /* if both are at we're the same.... */ | 194 | /* if both are at we're the same.... */ |
196 | if ( m_end == it.m_end ) return true; | 195 | if ( m_end == it.m_end ) return true; |
197 | 196 | ||
198 | if ( m_uids != it.m_uids ) return false; | 197 | if ( m_uids != it.m_uids ) return false; |
199 | if ( m_current != it.m_current ) return false; | 198 | if ( m_current != it.m_current ) return false; |
200 | if ( m_temp != it.m_temp ) return false; | 199 | if ( m_temp != it.m_temp ) return false; |
201 | 200 | ||
202 | return true; | 201 | return true; |
203 | } | 202 | } |
204 | template <class T> | 203 | template <class T> |
205 | bool ORecordListIterator<T>::operator!=( const ORecordListIterator<T>& it ) { | 204 | bool ORecordListIterator<T>::operator!=( const ORecordListIterator<T>& it ) { |
206 | return !(*this == it ); | 205 | return !(*this == it ); |
207 | } | 206 | } |
208 | template <class T> | 207 | template <class T> |
209 | ORecordListIterator<T>::ORecordListIterator( const QArray<int> uids, | 208 | ORecordListIterator<T>::ORecordListIterator( const QArray<int> uids, |
210 | const Base* t ) | 209 | const Base* t ) |
211 | : m_uids( uids ), m_current( 0 ), m_temp( t ), m_end( false ) | 210 | : m_uids( uids ), m_current( 0 ), m_temp( t ), m_end( false ) |
212 | { | 211 | { |