From 207f7430db6c90e88825ea2bedc9ae1bf68e3d99 Mon Sep 17 00:00:00 2001
From: zecke <zecke>
Date: Sun, 03 Nov 2002 11:03:20 +0000
Subject: Patch by Simon Hausmann to suit gcc3 needs

many thanks
---
(limited to 'libopie2')

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
@@ -57,7 +57,7 @@ public:
     virtual T find(int uid )const  = 0;
 
     virtual T find(int uid, const QArray<int>& items,
-                   uint current, Frontend::CacheDirection )const ;
+                   uint current, typename Frontend::CacheDirection )const ;
     /**
      * clear the back end
      */
@@ -127,7 +127,7 @@ void OPimAccessBackend<T>::setSaneCacheSize( int size) {
 }
 template <class T>
 T OPimAccessBackend<T>::find( int uid, const QArray<int>&,
-                              uint, Frontend::CacheDirection )const {
+                              uint, typename Frontend::CacheDirection )const {
     return find( uid );
 }
 template <class T>
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
@@ -79,7 +79,7 @@ public:
      * read ahead cache find method ;)
      */
     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;
 
     /* invalidate cache here */
     /**
@@ -165,13 +165,13 @@ bool OPimAccessTemplate<T>::save() {
     return m_backEnd->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();
     List lis(ints, this );
     return lis;
 }
 template <class T>
-OPimAccessTemplate<T>::List
+typename OPimAccessTemplate<T>::List
 OPimAccessTemplate<T>::queryByExample( const T& t, int sortOrder ) {
     QArray<int> ints = m_backEnd->queryByExample( t, sortOrder );
 
@@ -186,7 +186,7 @@ T OPimAccessTemplate<T>::find( int uid ) const{
 }
 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 {
     /*
      * better do T.isEmpty()
      * after a find this way we would
@@ -230,7 +230,7 @@ void OPimAccessTemplate<T>::invalidateCache() {
     m_cache.invalidate();
 }
 template <class T>
-OPimAccessTemplate<T>::BackEnd* OPimAccessTemplate<T>::backEnd() {
+typename OPimAccessTemplate<T>::BackEnd* OPimAccessTemplate<T>::backEnd() {
     return m_backEnd;
 }
 template <class T>
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
@@ -247,12 +247,12 @@ ORecordList<T>::~ORecordList() {
 /* nothing to do here */
 }
 template <class T>
-ORecordList<T>::Iterator ORecordList<T>::begin() {
+typename ORecordList<T>::Iterator ORecordList<T>::begin() {
     Iterator it( m_ids, m_acc );
     return it;
 }
 template <class T>
-ORecordList<T>::Iterator ORecordList<T>::end() {
+typename ORecordList<T>::Iterator ORecordList<T>::end() {
     Iterator it( m_ids, m_acc );
     it.m_end = true;
     it.m_current = m_ids.count();
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
@@ -399,7 +399,7 @@ void OTodo::copy( OTodoData* src, OTodoData* dest ) {
 QString OTodo::type() const {
     return QString::fromLatin1("OTodo");
 }
-QString OTodo::recordField(int id )const {
+QString OTodo::recordField(int /*id*/ )const {
     return QString::null;
 }
 
--
cgit v0.9.0.2