OOps.. Forgot to commit modification of rtti from static to nonstatic (virtual)

9 files changed, 12 insertions, 9 deletions

diff --git a/libopie2/opiepim/TODO b/libopie2/opiepim/TODO
index cdde11c..c3420cf 100644
--- a/libopie2/opiepim/TODO
+++ b/libopie2/opiepim/TODO
@@ -3,7 +3,10 @@ As to popular request....
 1.) fix up the core/backend mess.
     The actual Backend Implementation + Interface should be there
     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
     on the template level
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
@@ -1275,7 +1275,7 @@ 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
@@ -228,7 +228,7 @@ class QPC_EXPORT OPimContact : public OPimRecord
     // the emails should be seperated by a comma
     void setEmails( const QString &v );
     QString emails() const { return find( Qtopia::Emails ); }
-    static int rtti();
+    int rtti() const;
 
   private:
     // The XML Backend needs some access to the private functions
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
@@ -481,7 +481,7 @@ 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
@@ -183,7 +183,7 @@ class OPimEvent : public OPimRecord
     void fromMap( const QMap<int, QString>& map );
     QString recordField( int ) const;
 
-    static int rtti();
+    int rtti() const;
 
     bool loadFromStream( QDataStream& );
     bool saveToStream( QDataStream& ) 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
@@ -147,7 +147,7 @@ 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
@@ -160,7 +160,7 @@ class OPimRecord : public Qtopia::Record
      * used inside the Templates for casting
      * REIMPLEMENT in your ....
      */
-    static int rtti();
+    virtual int rtti() const;
 
     /**
      * some marshalling and de marshalling code
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
@@ -703,7 +703,7 @@ 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
@@ -295,7 +295,7 @@ class OPimTodo : public OPimRecord
     bool operator==( const OPimTodo &toDoEvent ) const;
     OPimTodo &operator=( const OPimTodo &toDoEvent );
 
-    static int rtti();
+    int rtti() const;
 
   private:
     class OPimTodoPrivate;