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
@@ -6,2 +6,5 @@ As to popular request....
     
+	Rename ODateBookAccess* to OPimDateBookAccess*
+	Fix filenames to OPim* ...    
+
 2.) Move sorting, Query By Example, Exposing of Attributes of a Record
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
@@ -1277,3 +1277,3 @@ void OPimContact::insertEmails( const QStringList &v )
 
-int OPimContact::rtti()
+int OPimContact::rtti() const
 {
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
@@ -230,3 +230,3 @@ class QPC_EXPORT OPimContact : public OPimRecord
     QString emails() const { return find( Qtopia::Emails ); }
-    static int rtti();
+    int rtti() const;
 
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
@@ -483,3 +483,3 @@ QString OPimEvent::recordField( int /*id */ ) const
 
-int OPimEvent::rtti()
+int OPimEvent::rtti() const
 {
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
@@ -185,3 +185,3 @@ class OPimEvent : public OPimRecord
 
-    static int rtti();
+    int rtti() const;
 
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
@@ -149,3 +149,3 @@ OPimXRefManager &OPimRecord::xrefmanager()
 
-int OPimRecord::rtti()
+int OPimRecord::rtti() const
 {
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
@@ -162,3 +162,3 @@ class OPimRecord : public Qtopia::Record
      */
-    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
@@ -705,3 +705,3 @@ QString OPimTodo::recordField( int /*id*/ ) const
 
-int OPimTodo::rtti()
+int OPimTodo::rtti() const
 {
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
@@ -297,3 +297,3 @@ class OPimTodo : public OPimRecord
 
-    static int rtti();
+    int rtti() const;