Merging changes from BRANCH_1_0 to HEAD

6 files changed, 35 insertions, 0 deletions

diff --git a/libopie2/opiepim/core/ocontactaccess.h b/libopie2/opiepim/core/ocontactaccess.h
index e90db32..9b0a719 100644
--- a/libopie2/opiepim/core/ocontactaccess.h
+++ b/libopie2/opiepim/core/ocontactaccess.h
@@ -14,12 +14,20 @@
  * ToDo: Define enum for query settings
  * =====================================================================
  * Version: $Id$
  * =====================================================================
  * History:
  * $Log$
+ * Revision 1.9  2003/08/01 12:30:16  eilers
+ * Merging changes from BRANCH_1_0 to HEAD
+ *
+ * Revision 1.8.2.1  2003/06/30 14:34:19  eilers
+ * Patches from Zecke:
+ * Fixing and cleaning up extraMap handling
+ * Adding d_ptr for binary compatibility in the future
+ *
  * Revision 1.8  2003/05/08 13:55:09  tille
  * search stuff
  * and match, toRichText & toShortText in oevent
  *
  * Revision 1.7  2003/04/13 18:07:10  zecke
  * More API doc
@@ -162,9 +170,12 @@ class OContactAccess: public QObject, public OPimAccessTemplate<OContact>
         OContactAccessBackend *m_backEnd;
         bool m_loading:1;
 
  private slots:
         void copMessage( const QCString &msg, const QByteArray &data );
 
+ private:
+        class Private;
+        Private *d;
 
 };
 #endif
diff --git a/libopie2/opiepim/core/oconversion.h b/libopie2/opiepim/core/oconversion.h
index 13367e1..4c0a497 100644
--- a/libopie2/opiepim/core/oconversion.h
+++ b/libopie2/opiepim/core/oconversion.h
@@ -34,10 +34,15 @@ public:
      * simple function to store DateTime as string and read from string
      * no timezone changing is done
      * DDMMYYYYHHMMSS is the simple format
      */
     static QString dateTimeToString( const QDateTime& );
     static QDateTime dateTimeFromString( const QString& );
+    
+private:
+    class Private;
+    Private* d;    
+    
 };
 
 #endif // __oconversion_h__
 
diff --git a/libopie2/opiepim/core/opimaccesstemplate.h b/libopie2/opiepim/core/opimaccesstemplate.h
index 8ff205c..ecbeb68 100644
--- a/libopie2/opiepim/core/opimaccesstemplate.h
+++ b/libopie2/opiepim/core/opimaccesstemplate.h
@@ -7,12 +7,13 @@
 #include <opie/opimaccessbackend.h>
 #include <opie/orecordlist.h>
 
 #include "opimcache.h"
 #include "otemplatebase.h"
 
+class OPimAccessTemplatePrivate;
 /**
  * Thats the frontend to our OPIE PIM
  * Library. Either you want to use it's
  * interface or you want to implement
  * your own Access lib
  * Just create a OPimRecord and inherit from
@@ -149,12 +150,15 @@ protected:
      * returns the backend
      */
     BackEnd* backEnd();
     BackEnd* m_backEnd;
     Cache m_cache;
 
+private:
+    OPimAccessTemplatePrivate *d;
+
 };
 
 template <class T>
 OPimAccessTemplate<T>::OPimAccessTemplate( BackEnd* end )
     : OTemplateBase<T>(), m_backEnd( end )
 {
diff --git a/libopie2/opiepim/core/opimcache.h b/libopie2/opiepim/core/opimcache.h
index 73414e5..7f7cff5 100644
--- a/libopie2/opiepim/core/opimcache.h
+++ b/libopie2/opiepim/core/opimcache.h
@@ -2,12 +2,14 @@
 #define OPIE_PIM_CACHE_H
 
 #include <qintcache.h>
 
 #include "opimrecord.h"
 
+class OPimCacheItemPrivate;
+
 template <class T = OPimRecord>
 class OPimCacheItem {
 public:
     OPimCacheItem( const T& t = T() );
     OPimCacheItem( const OPimCacheItem& );
     ~OPimCacheItem();
@@ -15,14 +17,17 @@ public:
     OPimCacheItem &operator=( const OPimCacheItem& );
 
     T record()const;
     void setRecord( const T& );
 private:
     T m_t;
+    OPimCacheItemPrivate *d;
 };
 
+
+class OPimCachePrivate;
 /**
  * OPimCache for caching the items
  * We support adding, removing
  * and finding
  */
 template <class T = OPimRecord>
@@ -43,12 +48,13 @@ public:
     void add( const T& );
     void remove( int uid );
     void replace( const T& );
 
 private:
     QIntCache<Item> m_cache;
+    OPimCachePrivate* d;
 };
 
 // Implementation
 template <class T>
 OPimCacheItem<T>::OPimCacheItem( const T& t )
     : m_t(t) {
diff --git a/libopie2/opiepim/core/opimxrefmanager.h b/libopie2/opiepim/core/opimxrefmanager.h
index 39e5eef..c485e98 100644
--- a/libopie2/opiepim/core/opimxrefmanager.h
+++ b/libopie2/opiepim/core/opimxrefmanager.h
@@ -33,9 +33,11 @@ public:
     OPimXRef::ValueList list()const;
     OPimXRef::ValueList list( const QString& service )const;
     OPimXRef::ValueList list( int uid )const;
 
 private:
     OPimXRef::ValueList m_list;
+    class Private;
+    Private *d;
 };
 
 #endif
diff --git a/libopie2/opiepim/core/otemplatebase.h b/libopie2/opiepim/core/otemplatebase.h
index 29fb6ec..cadac74 100644
--- a/libopie2/opiepim/core/otemplatebase.h
+++ b/libopie2/opiepim/core/otemplatebase.h
@@ -11,12 +11,13 @@
  * we've this class
  * this is here to give us the possibility
  * to have a common base class
  * You may not want to use that interface internaly
  * POOR mans interface
  */
+class OPimBasePrivate;
 struct OPimBase {
     /**
      * return the rtti
      */
     virtual int rtti()= 0;
     virtual OPimRecord* record()const = 0;
@@ -29,18 +30,21 @@ struct OPimBase {
     virtual bool save() = 0;
     virtual QArray<int> records()const = 0;
     /*
      * ADD editing here?
      * -zecke
      */
+private:
+    OPimBasePrivate* d;     
 
 };
 /**
  * internal template base
  * T needs to implement the copy c'tor!!!
  */
+class OTemplateBasePrivate;
 template <class T = OPimRecord>
 class OTemplateBase : public OPimBase {
 public:
     enum CacheDirection { Forward=0, Reverse };
     OTemplateBase() {
     };
@@ -58,12 +62,15 @@ public:
 
     /* reimplement of OPimBase */
     int rtti();
     OPimRecord* record()const;
     OPimRecord* record(int uid )const;
     static T* rec();
+    
+private:
+    OTemplateBasePrivate *d;    
 };
 
 /*
  * implementation
  */
 template <class T>