9 files changed, 11 insertions, 8 deletions

diff --git a/libopie2/opiepim/TODO b/libopie2/opiepim/TODO
index cdde11c..c3420cf 100644
--- a/libopie2/opiepim/TODO
+++ b/libopie2/opiepim/TODO
@@ -5,4 +5,7 @@ As to popular request....
     The API frontend used by the developer should not be used
     
+	Rename ODateBookAccess* to OPimDateBookAccess*
+	Fix filenames to OPim* ...    
+
 2.) Move sorting, Query By Example, Exposing of Attributes of a Record
     available to the Ptr base class and have sane implementation
diff --git a/libopie2/opiepim/core/opimcontact.cpp b/libopie2/opiepim/core/opimcontact.cpp
index 4a774e8..c1e06c8 100644
--- a/libopie2/opiepim/core/opimcontact.cpp
+++ b/libopie2/opiepim/core/opimcontact.cpp
@@ -1276,5 +1276,5 @@ void OPimContact::insertEmails( const QStringList &v )
 
 
-int OPimContact::rtti()
+int OPimContact::rtti() const
 {
     return OPimResolver::AddressBook;
diff --git a/libopie2/opiepim/core/opimcontact.h b/libopie2/opiepim/core/opimcontact.h
index 9d3cacc..6891dd6 100644
--- a/libopie2/opiepim/core/opimcontact.h
+++ b/libopie2/opiepim/core/opimcontact.h
@@ -229,5 +229,5 @@ class QPC_EXPORT OPimContact : public OPimRecord
     void setEmails( const QString &v );
     QString emails() const { return find( Qtopia::Emails ); }
-    static int rtti();
+    int rtti() const;
 
   private:
diff --git a/libopie2/opiepim/core/opimevent.cpp b/libopie2/opiepim/core/opimevent.cpp
index 77730e9..8bf8b25 100644
--- a/libopie2/opiepim/core/opimevent.cpp
+++ b/libopie2/opiepim/core/opimevent.cpp
@@ -482,5 +482,5 @@ QString OPimEvent::recordField( int /*id */ ) const
 
 
-int OPimEvent::rtti()
+int OPimEvent::rtti() const
 {
     return OPimResolver::DateBook;
diff --git a/libopie2/opiepim/core/opimevent.h b/libopie2/opiepim/core/opimevent.h
index 949f263..56fe917 100644
--- a/libopie2/opiepim/core/opimevent.h
+++ b/libopie2/opiepim/core/opimevent.h
@@ -184,5 +184,5 @@ class OPimEvent : public OPimRecord
     QString recordField( int ) const;
 
-    static int rtti();
+    int rtti() const;
 
     bool loadFromStream( QDataStream& );
diff --git a/libopie2/opiepim/core/opimrecord.cpp b/libopie2/opiepim/core/opimrecord.cpp
index 67eed41..c783092 100644
--- a/libopie2/opiepim/core/opimrecord.cpp
+++ b/libopie2/opiepim/core/opimrecord.cpp
@@ -148,5 +148,5 @@ OPimXRefManager &OPimRecord::xrefmanager()
 
 
-int OPimRecord::rtti()
+int OPimRecord::rtti() const
 {
     return 0;
diff --git a/libopie2/opiepim/core/opimrecord.h b/libopie2/opiepim/core/opimrecord.h
index 4981a41..127439a 100644
--- a/libopie2/opiepim/core/opimrecord.h
+++ b/libopie2/opiepim/core/opimrecord.h
@@ -161,5 +161,5 @@ class OPimRecord : public Qtopia::Record
      * REIMPLEMENT in your ....
      */
-    static int rtti();
+    virtual int rtti() const;
 
     /**
diff --git a/libopie2/opiepim/core/opimtodo.cpp b/libopie2/opiepim/core/opimtodo.cpp
index f246bfd..47433e0 100644
--- a/libopie2/opiepim/core/opimtodo.cpp
+++ b/libopie2/opiepim/core/opimtodo.cpp
@@ -704,5 +704,5 @@ QString OPimTodo::recordField( int /*id*/ ) const
 
 
-int OPimTodo::rtti()
+int OPimTodo::rtti() const
 {
     return OPimResolver::TodoList;
diff --git a/libopie2/opiepim/core/opimtodo.h b/libopie2/opiepim/core/opimtodo.h
index 5304180..e17fe6a 100644
--- a/libopie2/opiepim/core/opimtodo.h
+++ b/libopie2/opiepim/core/opimtodo.h
@@ -296,5 +296,5 @@ class OPimTodo : public OPimRecord
     OPimTodo &operator=( const OPimTodo &toDoEvent );
 
-    static int rtti();
+    int rtti() const;
 
   private: