author | zecke <zecke> | 2002-11-03 11:03:20 (UTC) |
---|---|---|
committer | zecke <zecke> | 2002-11-03 11:03:20 (UTC) |
commit | 207f7430db6c90e88825ea2bedc9ae1bf68e3d99 (patch) (unidiff) | |
tree | fb69b58f130c0b0a17224989f26aa4af5939b33e /libopie/pim | |
parent | 485fae36510cb42690c9df55fae64312b1e656ae (diff) | |
download | opie-207f7430db6c90e88825ea2bedc9ae1bf68e3d99.zip opie-207f7430db6c90e88825ea2bedc9ae1bf68e3d99.tar.gz opie-207f7430db6c90e88825ea2bedc9ae1bf68e3d99.tar.bz2 |
Patch by Simon Hausmann to suit gcc3 needs
many thanks
-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 | |||
@@ -58,5 +58,5 @@ public: | |||
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 |
@@ -128,5 +128,5 @@ void OPimAccessBackend<T>::setSaneCacheSize( int size) { | |||
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 | } |
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 | |||
@@ -80,5 +80,5 @@ public: | |||
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 */ |
@@ -166,5 +166,5 @@ bool OPimAccessTemplate<T>::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 ); |
@@ -172,5 +172,5 @@ OPimAccessTemplate<T>::List OPimAccessTemplate<T>::allRecords()const { | |||
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 ); |
@@ -187,5 +187,5 @@ T OPimAccessTemplate<T>::find( int uid ) const{ | |||
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() |
@@ -231,5 +231,5 @@ void OPimAccessTemplate<T>::invalidateCache() { | |||
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 | } |
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 | |||
@@ -248,10 +248,10 @@ ORecordList<T>::~ORecordList() { | |||
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; |
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 | |||
@@ -400,5 +400,5 @@ 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 | } |