summaryrefslogtreecommitdiff
path: root/libopie2/opiepim
authorzecke <zecke>2002-11-03 11:03:20 (UTC)
committer zecke <zecke>2002-11-03 11:03:20 (UTC)
commit207f7430db6c90e88825ea2bedc9ae1bf68e3d99 (patch) (side-by-side diff)
treefb69b58f130c0b0a17224989f26aa4af5939b33e /libopie2/opiepim
parent485fae36510cb42690c9df55fae64312b1e656ae (diff)
downloadopie-207f7430db6c90e88825ea2bedc9ae1bf68e3d99.zip
opie-207f7430db6c90e88825ea2bedc9ae1bf68e3d99.tar.gz
opie-207f7430db6c90e88825ea2bedc9ae1bf68e3d99.tar.bz2
Patch by Simon Hausmann to suit gcc3 needs
many thanks
Diffstat (limited to 'libopie2/opiepim') (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opiepim/backend/opimaccessbackend.h4
-rw-r--r--libopie2/opiepim/core/opimaccesstemplate.h10
-rw-r--r--libopie2/opiepim/orecordlist.h4
-rw-r--r--libopie2/opiepim/otodo.cpp2
4 files changed, 10 insertions, 10 deletions
diff --git a/libopie2/opiepim/backend/opimaccessbackend.h b/libopie2/opiepim/backend/opimaccessbackend.h
index 0bd2723..4f00bc9 100644
--- a/libopie2/opiepim/backend/opimaccessbackend.h
+++ b/libopie2/opiepim/backend/opimaccessbackend.h
@@ -59,3 +59,3 @@ public:
virtual T find(int uid, const QArray<int>& items,
- uint current, Frontend::CacheDirection )const ;
+ uint current, typename Frontend::CacheDirection )const ;
/**
@@ -129,3 +129,3 @@ template <class T>
T OPimAccessBackend<T>::find( int uid, const QArray<int>&,
- uint, Frontend::CacheDirection )const {
+ uint, typename Frontend::CacheDirection )const {
return find( uid );
diff --git a/libopie2/opiepim/core/opimaccesstemplate.h b/libopie2/opiepim/core/opimaccesstemplate.h
index c5523a8..6de68b1 100644
--- a/libopie2/opiepim/core/opimaccesstemplate.h
+++ b/libopie2/opiepim/core/opimaccesstemplate.h
@@ -81,3 +81,3 @@ public:
virtual T find( int uid, const QArray<int>&,
- uint current, CacheDirection dir = Forward )const;
+ uint current, typename OTemplateBase<T>::CacheDirection dir = OTemplateBase<T>::Forward )const;
@@ -167,3 +167,3 @@ bool OPimAccessTemplate<T>::save() {
template <class T>
-OPimAccessTemplate<T>::List OPimAccessTemplate<T>::allRecords()const {
+typename OPimAccessTemplate<T>::List OPimAccessTemplate<T>::allRecords()const {
QArray<int> ints = m_backEnd->allRecords();
@@ -173,3 +173,3 @@ OPimAccessTemplate<T>::List OPimAccessTemplate<T>::allRecords()const {
template <class T>
-OPimAccessTemplate<T>::List
+typename OPimAccessTemplate<T>::List
OPimAccessTemplate<T>::queryByExample( const T& t, int sortOrder ) {
@@ -188,3 +188,3 @@ template <class T>
T OPimAccessTemplate<T>::find( int uid, const QArray<int>& ar,
- uint current, CacheDirection dir )const {
+ uint current, typename OTemplateBase<T>::CacheDirection dir )const {
/*
@@ -232,3 +232,3 @@ void OPimAccessTemplate<T>::invalidateCache() {
template <class T>
-OPimAccessTemplate<T>::BackEnd* OPimAccessTemplate<T>::backEnd() {
+typename OPimAccessTemplate<T>::BackEnd* OPimAccessTemplate<T>::backEnd() {
return m_backEnd;
diff --git a/libopie2/opiepim/orecordlist.h b/libopie2/opiepim/orecordlist.h
index 8ed41e2..b77a4ab 100644
--- a/libopie2/opiepim/orecordlist.h
+++ b/libopie2/opiepim/orecordlist.h
@@ -249,3 +249,3 @@ ORecordList<T>::~ORecordList() {
template <class T>
-ORecordList<T>::Iterator ORecordList<T>::begin() {
+typename ORecordList<T>::Iterator ORecordList<T>::begin() {
Iterator it( m_ids, m_acc );
@@ -254,3 +254,3 @@ ORecordList<T>::Iterator ORecordList<T>::begin() {
template <class T>
-ORecordList<T>::Iterator ORecordList<T>::end() {
+typename ORecordList<T>::Iterator ORecordList<T>::end() {
Iterator it( m_ids, m_acc );
diff --git a/libopie2/opiepim/otodo.cpp b/libopie2/opiepim/otodo.cpp
index 0d5b1d3..4d5cb79 100644
--- a/libopie2/opiepim/otodo.cpp
+++ b/libopie2/opiepim/otodo.cpp
@@ -401,3 +401,3 @@ QString OTodo::type() const {
}
-QString OTodo::recordField(int id )const {
+QString OTodo::recordField(int /*id*/ )const {
return QString::null;