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
@@ -1,18 +1,21 @@
 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
     
 3.) Have something like QProperty to expose attributes from OPimRecord.
     This would include exporting,importing of data, and translated names.
     This can be used for Cross Reference, Selector Widget, Generic Table
     Shower
     
 4.) Marshall/Demarshall all PIM Records correctly
 
 5.) Add the Private Backend to the OPimRecord ( private ) make the base
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
@@ -1266,24 +1266,24 @@ void OPimContact::setDefaultEmail( const QString &v )
         insertEmail( e );
 
 }
 
 
 void OPimContact::insertEmails( const QStringList &v )
 {
     for ( QStringList::ConstIterator it = v.begin(); it != v.end(); ++it )
         insertEmail( *it );
 }
 
 
-int OPimContact::rtti()
+int OPimContact::rtti() const
 {
     return OPimResolver::AddressBook;
 }
 
 
 void OPimContact::setUid( int i )
 {
     OPimRecord::setUid( i );
     replace( Qtopia::AddressUid , QString::number( i ) );
 }
 }
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
@@ -219,25 +219,25 @@ class QPC_EXPORT OPimContact : public OPimRecord
     void setUid( int i );
 
     QString toShortText() const;
     QString type() const;
     class QString recordField( int ) const;
 
     // Why private ? (eilers,se)
     QString emailSeparator() const { return " "; }
 
     // 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
     friend class OPimContactAccessBackend_XML;
 
     void insert( int key, const QString &value );
     void replace( int key, const QString &value );
     QString find( int key ) const;
     static QStringList fields();
 
     void save( QString &buf ) 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
@@ -472,25 +472,25 @@ QString OPimEvent::toShortText() const
 QString OPimEvent::type() const
 {
     return QString::fromLatin1( "OPimEvent" );
 }
 
 
 QString OPimEvent::recordField( int /*id */ ) const
 {
     return QString::null;
 }
 
 
-int OPimEvent::rtti()
+int OPimEvent::rtti() const
 {
     return OPimResolver::DateBook;
 }
 
 
 bool OPimEvent::loadFromStream( QDataStream& )
 {
     return true;
 }
 
 
 bool OPimEvent::saveToStream( QDataStream& ) 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
@@ -174,25 +174,25 @@ class OPimEvent : public OPimRecord
     void setParent( int uid );
 
 
     /* needed reimp */
     QString toRichText() const;
     QString toShortText() const;
     QString type() const;
 
     QMap<int, QString> toMap() const;
     void fromMap( const QMap<int, QString>& map );
     QString recordField( int ) const;
 
-    static int rtti();
+    int rtti() const;
 
     bool loadFromStream( QDataStream& );
     bool saveToStream( QDataStream& ) const;
 
     /*    bool operator==( const OPimEvent& );
         bool operator!=( const OPimEvent& );
         bool operator<( const OPimEvent& );
         bool operator<=( const OPimEvent& );
         bool operator>( const OPimEvent& );
         bool operator>=(const OPimEvent& );
     */
 
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
@@ -138,25 +138,25 @@ void OPimRecord::setUid( int uid )
 Qtopia::UidGen &OPimRecord::uidGen()
 {
     return m_uidGen;
 }
 
 
 OPimXRefManager &OPimRecord::xrefmanager()
 {
     return m_xrefman;
 }
 
 
-int OPimRecord::rtti()
+int OPimRecord::rtti() const
 {
     return 0;
 }
 
 /**
  * now let's put our data into the stream
  */
 /*
  * First read UID
  *            Categories
  *            XRef
  */
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
@@ -151,25 +151,25 @@ class OPimRecord : public Qtopia::Record
      */
     OPimXRefManager& xrefmanager();
 
     /**
      * set the uid
      */
     virtual void setUid( int uid );
 
     /*
      * used inside the Templates for casting
      * REIMPLEMENT in your ....
      */
-    static int rtti();
+    virtual int rtti() const;
 
     /**
      * some marshalling and de marshalling code
      * saves the OPimRecord
      * to and from a DataStream
      */
     virtual bool loadFromStream( QDataStream& );
     virtual bool saveToStream( QDataStream& stream ) const;
 
   protected:
     // need to be const cause it is called from const methods
     mutable int m_lastHit;
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
@@ -694,18 +694,18 @@ void OPimTodo::copy( OPimTodoData* src, OPimTodoData* dest )
 QString OPimTodo::type() const
 {
     return QString::fromLatin1( "OPimTodo" );
 }
 
 
 QString OPimTodo::recordField( int /*id*/ ) const
 {
     return QString::null;
 }
 
 
-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
@@ -286,25 +286,25 @@ class OPimTodo : public OPimRecord
 
 
     virtual bool match( const QRegExp &r ) const;
 
     bool operator<( const OPimTodo &toDoEvent ) const;
     bool operator<=( const OPimTodo &toDoEvent ) const;
     bool operator!=( const OPimTodo &toDoEvent ) const;
     bool operator>( const OPimTodo &toDoEvent ) const;
     bool operator>=( const OPimTodo &toDoEvent ) const;
     bool operator==( const OPimTodo &toDoEvent ) const;
     OPimTodo &operator=( const OPimTodo &toDoEvent );
 
-    static int rtti();
+    int rtti() const;
 
   private:
     class OPimTodoPrivate;
     struct OPimTodoData;
 
     void deref();
     inline void changeOrModify();
     void copy( OPimTodoData* src, OPimTodoData* dest );
     OPimTodoPrivate *d;
     OPimTodoData *data;
 
 };