Patch by Simon Hausmann to suit gcc3 needs

many thanks

14 files changed, 28 insertions, 33 deletions

diff --git a/libopie/oclickablelabel.cpp b/libopie/oclickablelabel.cpp
index 43a0524..5768529 100644
--- a/libopie/oclickablelabel.cpp
+++ b/libopie/oclickablelabel.cpp
@@ -17,7 +17,7 @@ void OClickableLabel::setToggleButton(bool t) {
     isToggle=t;
 }
 
-void OClickableLabel::mousePressEvent( QMouseEvent *e ) {
+void OClickableLabel::mousePressEvent( QMouseEvent * /*e*/ ) {
     if (isToggle && isDown) {
         showState(false);
     } else {
diff --git a/libopie/ofileselector.cc b/libopie/ofileselector.cc
index 9534667..6a6a300 100644
--- a/libopie/ofileselector.cc
+++ b/libopie/ofileselector.cc
@@ -375,7 +375,7 @@ QString OFileSelector::directory()const
   return QDir(m_currentDir).absPath();
 }
 
-int OFileSelector::fileCount()
+int OFileSelector::fileCount() const
 {
   int count;
   switch( m_selector ){
@@ -682,7 +682,7 @@ void OFileSelector::initVars()
   m_new = 0;
   m_close = 0;
 }
-void OFileSelector::addFile(const QString &mime, QFileInfo *info, bool symlink)
+void OFileSelector::addFile(const QString &/*mime*/, QFileInfo *info, bool symlink)
 {
   if(!m_files)
     return;
@@ -714,7 +714,7 @@ void OFileSelector::addFile(const QString &mime, QFileInfo *info, bool symlink)
                          QString::number( info->size() ),
                          dir, locked );
 }
-void OFileSelector::addDir(const QString &mime, QFileInfo *info, bool symlink )
+void OFileSelector::addDir(const QString &/*mime*/, QFileInfo *info, bool symlink )
 {
   if(!m_dir)
     return;
@@ -1018,7 +1018,6 @@ bool OFileSelector::compliesMime( const QString& mime ) {
     qWarning("list doesn't contain it ");
     QStringList::Iterator it2;
     int pos;
-    int pos2;
     for ( it2 = list.begin(); it2 != list.end(); ++it2 ) {
         pos = (*it2).findRev("/*");
         if ( pos >= 0 ) {
@@ -1105,7 +1104,7 @@ void OFileSelector::slotRightButton(int button, QListViewItem *item, const QPoin
     return;
   slotContextMenu( item );
 }
-void OFileSelector::slotContextMenu( QListViewItem *item)
+void OFileSelector::slotContextMenu( QListViewItem * /*item*/)
 {
 
 }
diff --git a/libopie/ofileselector.h b/libopie/ofileselector.h
index f2d5f84..17c494e 100644
--- a/libopie/ofileselector.h
+++ b/libopie/ofileselector.h
@@ -180,7 +180,7 @@ class OFileSelector : public QWidget {
   QStringList selectedPaths() const;
 
   QString directory()const;
-  int fileCount();
+  int fileCount() const;
 
   /* the user needs to delete it */
   DocLnk selectedDocument()const;
diff --git a/libopie/ofileselector/odefaultfactories.cpp b/libopie/ofileselector/odefaultfactories.cpp
index c8efffb..2f8ef9b 100644
--- a/libopie/ofileselector/odefaultfactories.cpp
+++ b/libopie/ofileselector/odefaultfactories.cpp
@@ -1,5 +1,4 @@
 #include "ofilelistview.h"
-#include "ofileiconview.h"
 #include "olocallister.h"
 
 
@@ -8,9 +7,6 @@
 extern "C" {
 
 
-    OFileView* newFileIconView( OFileSelector* sel, QWidget* parent ) {
-        return new OFileIconView( parent, sel );
-    }
 
     OFileView* newFileListView( OFileSelector* sel, QWidget* par ) {
         return new OFileListView(par, sel );
diff --git a/libopie/ofileselector/odefaultfactories.h b/libopie/ofileselector/odefaultfactories.h
index b4c35af..0cc90e5 100644
--- a/libopie/ofileselector/odefaultfactories.h
+++ b/libopie/ofileselector/odefaultfactories.h
@@ -5,7 +5,6 @@
 
 extern "C" {
 
-    OFileView* newFileIconView( OFileSelector*, QWidget* parent );
     OFileView* newFileListView( OFileSelector*, QWidget* parent );
 
     OLister* newLocalLister(OFileSelector* );
diff --git a/libopie/ofileselector/ofileselector.cpp b/libopie/ofileselector/ofileselector.cpp
index c6e923f..abc2889 100644
--- a/libopie/ofileselector/ofileselector.cpp
+++ b/libopie/ofileselector/ofileselector.cpp
@@ -976,7 +976,8 @@ void OFileSelector::initFactory() {
     m_fileFactory = new OFileFactory();
     m_fileFactory->addLister(tr("Files"), newLocalLister );
     m_fileFactory->addView(tr("List View"), newFileListView );
-    m_fileFactory->addView(tr("Documents"), newFileIconView );
+    /* dummy entry */
+    m_fileFactory->addView(tr("Documents"), newFileListView );
 }
 
 void OFileSelector::fillList() {
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
@@ -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/libopie/pim/opimaccesstemplate.h b/libopie/pim/opimaccesstemplate.h
index c5523a8..6de68b1 100644
--- a/libopie/pim/opimaccesstemplate.h
+++ b/libopie/pim/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/libopie/pim/orecordlist.h b/libopie/pim/orecordlist.h
index 8ed41e2..b77a4ab 100644
--- a/libopie/pim/orecordlist.h
+++ b/libopie/pim/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/libopie/pim/otodo.cpp b/libopie/pim/otodo.cpp
index 0d5b1d3..4d5cb79 100644
--- a/libopie/pim/otodo.cpp
+++ b/libopie/pim/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;
 }
 
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;
 }