-rw-r--r-- | libopie/pim/opimaccessbackend.h | 4 | ||||
-rw-r--r-- | libopie/pim/opimaccesstemplate.h | 10 | ||||
-rw-r--r-- | libopie/pim/orecordlist.h | 4 | ||||
-rw-r--r-- | libopie/pim/otodo.cpp | 2 |
4 files changed, 10 insertions, 10 deletions
diff --git a/libopie/pim/opimaccessbackend.h b/libopie/pim/opimaccessbackend.h index 0bd2723..4f00bc9 100644 --- a/libopie/pim/opimaccessbackend.h +++ b/libopie/pim/opimaccessbackend.h | |||
@@ -54,13 +54,13 @@ public: | |||
54 | * find the OPimRecord with uid @param uid | 54 | * find the OPimRecord with uid @param uid |
55 | * returns T and T.isEmpty() if nothing was found | 55 | * returns T and T.isEmpty() if nothing was found |
56 | */ | 56 | */ |
57 | virtual T find(int uid )const = 0; | 57 | virtual T find(int uid )const = 0; |
58 | 58 | ||
59 | virtual T find(int uid, const QArray<int>& items, | 59 | virtual T find(int uid, const QArray<int>& items, |
60 | uint current, Frontend::CacheDirection )const ; | 60 | uint current, typename Frontend::CacheDirection )const ; |
61 | /** | 61 | /** |
62 | * clear the back end | 62 | * clear the back end |
63 | */ | 63 | */ |
64 | virtual void clear() = 0; | 64 | virtual void clear() = 0; |
65 | 65 | ||
66 | /** | 66 | /** |
@@ -124,13 +124,13 @@ template <class T> | |||
124 | void OPimAccessBackend<T>::setSaneCacheSize( int size) { | 124 | void OPimAccessBackend<T>::setSaneCacheSize( int size) { |
125 | if (m_front ) | 125 | if (m_front ) |
126 | m_front->setSaneCacheSize( size ); | 126 | m_front->setSaneCacheSize( size ); |
127 | } | 127 | } |
128 | template <class T> | 128 | template <class T> |
129 | T OPimAccessBackend<T>::find( int uid, const QArray<int>&, | 129 | T OPimAccessBackend<T>::find( int uid, const QArray<int>&, |
130 | uint, Frontend::CacheDirection )const { | 130 | uint, typename Frontend::CacheDirection )const { |
131 | return find( uid ); | 131 | return find( uid ); |
132 | } | 132 | } |
133 | template <class T> | 133 | template <class T> |
134 | void OPimAccessBackend<T>::setReadAhead( uint count ) { | 134 | void OPimAccessBackend<T>::setReadAhead( uint count ) { |
135 | m_read = count; | 135 | m_read = count; |
136 | } | 136 | } |
diff --git a/libopie/pim/opimaccesstemplate.h b/libopie/pim/opimaccesstemplate.h index c5523a8..6de68b1 100644 --- a/libopie/pim/opimaccesstemplate.h +++ b/libopie/pim/opimaccesstemplate.h | |||
@@ -76,13 +76,13 @@ public: | |||
76 | virtual T find( int uid )const; | 76 | virtual T find( int uid )const; |
77 | 77 | ||
78 | /** | 78 | /** |
79 | * read ahead cache find method ;) | 79 | * read ahead cache find method ;) |
80 | */ | 80 | */ |
81 | virtual T find( int uid, const QArray<int>&, | 81 | virtual T find( int uid, const QArray<int>&, |
82 | uint current, CacheDirection dir = Forward )const; | 82 | uint current, typename OTemplateBase<T>::CacheDirection dir = OTemplateBase<T>::Forward )const; |
83 | 83 | ||
84 | /* invalidate cache here */ | 84 | /* invalidate cache here */ |
85 | /** | 85 | /** |
86 | * clears the backend and invalidates the backend | 86 | * clears the backend and invalidates the backend |
87 | */ | 87 | */ |
88 | virtual void clear() ; | 88 | virtual void clear() ; |
@@ -162,19 +162,19 @@ bool OPimAccessTemplate<T>::reload() { | |||
162 | } | 162 | } |
163 | template <class T> | 163 | template <class T> |
164 | bool OPimAccessTemplate<T>::save() { | 164 | bool OPimAccessTemplate<T>::save() { |
165 | return m_backEnd->save(); | 165 | return m_backEnd->save(); |
166 | } | 166 | } |
167 | template <class T> | 167 | template <class T> |
168 | OPimAccessTemplate<T>::List OPimAccessTemplate<T>::allRecords()const { | 168 | typename OPimAccessTemplate<T>::List OPimAccessTemplate<T>::allRecords()const { |
169 | QArray<int> ints = m_backEnd->allRecords(); | 169 | QArray<int> ints = m_backEnd->allRecords(); |
170 | List lis(ints, this ); | 170 | List lis(ints, this ); |
171 | return lis; | 171 | return lis; |
172 | } | 172 | } |
173 | template <class T> | 173 | template <class T> |
174 | OPimAccessTemplate<T>::List | 174 | typename OPimAccessTemplate<T>::List |
175 | OPimAccessTemplate<T>::queryByExample( const T& t, int sortOrder ) { | 175 | OPimAccessTemplate<T>::queryByExample( const T& t, int sortOrder ) { |
176 | QArray<int> ints = m_backEnd->queryByExample( t, sortOrder ); | 176 | QArray<int> ints = m_backEnd->queryByExample( t, sortOrder ); |
177 | 177 | ||
178 | List lis(ints, this ); | 178 | List lis(ints, this ); |
179 | return lis; | 179 | return lis; |
180 | } | 180 | } |
@@ -183,13 +183,13 @@ T OPimAccessTemplate<T>::find( int uid ) const{ | |||
183 | T t = m_backEnd->find( uid ); | 183 | T t = m_backEnd->find( uid ); |
184 | cache( t ); | 184 | cache( t ); |
185 | return t; | 185 | return t; |
186 | } | 186 | } |
187 | template <class T> | 187 | template <class T> |
188 | T OPimAccessTemplate<T>::find( int uid, const QArray<int>& ar, | 188 | T OPimAccessTemplate<T>::find( int uid, const QArray<int>& ar, |
189 | uint current, CacheDirection dir )const { | 189 | uint current, typename OTemplateBase<T>::CacheDirection dir )const { |
190 | /* | 190 | /* |
191 | * better do T.isEmpty() | 191 | * better do T.isEmpty() |
192 | * after a find this way we would | 192 | * after a find this way we would |
193 | * avoid two finds in QCache... | 193 | * avoid two finds in QCache... |
194 | */ | 194 | */ |
195 | // qWarning("find it now %d", uid ); | 195 | // qWarning("find it now %d", uid ); |
@@ -227,13 +227,13 @@ bool OPimAccessTemplate<T>::replace( const T& t ) { | |||
227 | } | 227 | } |
228 | template <class T> | 228 | template <class T> |
229 | void OPimAccessTemplate<T>::invalidateCache() { | 229 | void OPimAccessTemplate<T>::invalidateCache() { |
230 | m_cache.invalidate(); | 230 | m_cache.invalidate(); |
231 | } | 231 | } |
232 | template <class T> | 232 | template <class T> |
233 | OPimAccessTemplate<T>::BackEnd* OPimAccessTemplate<T>::backEnd() { | 233 | typename OPimAccessTemplate<T>::BackEnd* OPimAccessTemplate<T>::backEnd() { |
234 | return m_backEnd; | 234 | return m_backEnd; |
235 | } | 235 | } |
236 | template <class T> | 236 | template <class T> |
237 | bool OPimAccessTemplate<T>::wasChangedExternally()const { | 237 | bool OPimAccessTemplate<T>::wasChangedExternally()const { |
238 | return false; | 238 | return false; |
239 | } | 239 | } |
diff --git a/libopie/pim/orecordlist.h b/libopie/pim/orecordlist.h index 8ed41e2..b77a4ab 100644 --- a/libopie/pim/orecordlist.h +++ b/libopie/pim/orecordlist.h | |||
@@ -244,18 +244,18 @@ ORecordList<T>::ORecordList( const QArray<int>& ids, | |||
244 | } | 244 | } |
245 | template <class T> | 245 | template <class T> |
246 | ORecordList<T>::~ORecordList() { | 246 | ORecordList<T>::~ORecordList() { |
247 | /* nothing to do here */ | 247 | /* nothing to do here */ |
248 | } | 248 | } |
249 | template <class T> | 249 | template <class T> |
250 | ORecordList<T>::Iterator ORecordList<T>::begin() { | 250 | typename ORecordList<T>::Iterator ORecordList<T>::begin() { |
251 | Iterator it( m_ids, m_acc ); | 251 | Iterator it( m_ids, m_acc ); |
252 | return it; | 252 | return it; |
253 | } | 253 | } |
254 | template <class T> | 254 | template <class T> |
255 | ORecordList<T>::Iterator ORecordList<T>::end() { | 255 | typename ORecordList<T>::Iterator ORecordList<T>::end() { |
256 | Iterator it( m_ids, m_acc ); | 256 | Iterator it( m_ids, m_acc ); |
257 | it.m_end = true; | 257 | it.m_end = true; |
258 | it.m_current = m_ids.count(); | 258 | it.m_current = m_ids.count(); |
259 | 259 | ||
260 | return it; | 260 | return it; |
261 | } | 261 | } |
diff --git a/libopie/pim/otodo.cpp b/libopie/pim/otodo.cpp index 0d5b1d3..4d5cb79 100644 --- a/libopie/pim/otodo.cpp +++ b/libopie/pim/otodo.cpp | |||
@@ -396,10 +396,10 @@ void OTodo::copy( OTodoData* src, OTodoData* dest ) { | |||
396 | dest->state = src->state; | 396 | dest->state = src->state; |
397 | dest->recur = src->recur; | 397 | dest->recur = src->recur; |
398 | } | 398 | } |
399 | QString OTodo::type() const { | 399 | QString OTodo::type() const { |
400 | return QString::fromLatin1("OTodo"); | 400 | return QString::fromLatin1("OTodo"); |
401 | } | 401 | } |
402 | QString OTodo::recordField(int id )const { | 402 | QString OTodo::recordField(int /*id*/ )const { |
403 | return QString::null; | 403 | return QString::null; |
404 | } | 404 | } |
405 | 405 | ||