10 files changed, 18 insertions, 23 deletions

diff --git a/libopie/oclickablelabel.cpp b/libopie/oclickablelabel.cpp
index 43a0524..5768529 100644
--- a/libopie/oclickablelabel.cpp
+++ b/libopie/oclickablelabel.cpp
@@ -19,3 +19,3 @@ void OClickableLabel::setToggleButton(bool t) {
 
-void OClickableLabel::mousePressEvent( QMouseEvent *e ) {
+void OClickableLabel::mousePressEvent( QMouseEvent * /*e*/ ) {
     if (isToggle && isDown) {
diff --git a/libopie/ofileselector.cc b/libopie/ofileselector.cc
index 9534667..6a6a300 100644
--- a/libopie/ofileselector.cc
+++ b/libopie/ofileselector.cc
@@ -377,3 +377,3 @@ QString OFileSelector::directory()const
 
-int OFileSelector::fileCount()
+int OFileSelector::fileCount() const
 {
@@ -684,3 +684,3 @@ void OFileSelector::initVars()
 }
-void OFileSelector::addFile(const QString &mime, QFileInfo *info, bool symlink)
+void OFileSelector::addFile(const QString &/*mime*/, QFileInfo *info, bool symlink)
 {
@@ -716,3 +716,3 @@ void OFileSelector::addFile(const QString &mime, QFileInfo *info, bool symlink)
 }
-void OFileSelector::addDir(const QString &mime, QFileInfo *info, bool symlink )
+void OFileSelector::addDir(const QString &/*mime*/, QFileInfo *info, bool symlink )
 {
@@ -1020,3 +1020,2 @@ bool OFileSelector::compliesMime( const QString& mime ) {
     int pos;
-    int pos2;
     for ( it2 = list.begin(); it2 != list.end(); ++it2 ) {
@@ -1107,3 +1106,3 @@ void OFileSelector::slotRightButton(int button, QListViewItem *item, const QPoin
 }
-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
@@ -182,3 +182,3 @@ class OFileSelector : public QWidget {
   QString directory()const;
-  int fileCount();
+  int fileCount() 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,3 +1,2 @@
 #include "ofilelistview.h"
-#include "ofileiconview.h"
 #include "olocallister.h"
@@ -10,5 +9,2 @@ extern "C" {
 
-    OFileView* newFileIconView( OFileSelector* sel, QWidget* parent ) {
-        return new OFileIconView( parent, 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
@@ -7,3 +7,2 @@ extern "C" {
 
-    OFileView* newFileIconView( OFileSelector*, QWidget* parent );
     OFileView* newFileListView( OFileSelector*, QWidget* parent );
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
@@ -978,3 +978,4 @@ void OFileSelector::initFactory() {
     m_fileFactory->addView(tr("List View"), newFileListView );
-    m_fileFactory->addView(tr("Documents"), newFileIconView );
+    /* dummy entry */
+    m_fileFactory->addView(tr("Documents"), newFileListView );
 }
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
@@ -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/libopie/pim/opimaccesstemplate.h b/libopie/pim/opimaccesstemplate.h
index c5523a8..6de68b1 100644
--- a/libopie/pim/opimaccesstemplate.h
+++ b/libopie/pim/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/libopie/pim/orecordlist.h b/libopie/pim/orecordlist.h
index 8ed41e2..b77a4ab 100644
--- a/libopie/pim/orecordlist.h
+++ b/libopie/pim/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/libopie/pim/otodo.cpp b/libopie/pim/otodo.cpp
index 0d5b1d3..4d5cb79 100644
--- a/libopie/pim/otodo.cpp
+++ b/libopie/pim/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;