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
@@ -19,2 +19,10 @@
  * $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
@@ -167,2 +175,5 @@ class OContactAccess: public QObject, public OPimAccessTemplate<OContact>
 
+ private:
+        class Private;
+	Private *d;
 
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
@@ -39,2 +39,7 @@ public:
     static QDateTime dateTimeFromString( const QString& );
+    
+private:
+    class Private;
+    Private* d;    
+    
 };
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
@@ -12,2 +12,3 @@
 
+class OPimAccessTemplatePrivate;
 /**
@@ -154,2 +155,5 @@ protected:
 
+private:
+    OPimAccessTemplatePrivate *d;
+
 };
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
@@ -7,2 +7,4 @@
 
+class OPimCacheItemPrivate;
+
 template <class T = OPimRecord>
@@ -20,4 +22,7 @@ private:
     T m_t;
+    OPimCacheItemPrivate *d;
 };
 
+
+class OPimCachePrivate;
 /**
@@ -48,2 +53,3 @@ private:
     QIntCache<Item> m_cache;
+    OPimCachePrivate* d;
 };
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
@@ -38,2 +38,4 @@ private:
     OPimXRef::ValueList m_list;
+    class Private;
+    Private *d;
 };
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
@@ -16,2 +16,3 @@
  */
+class OPimBasePrivate;
 struct OPimBase {
@@ -34,2 +35,4 @@ struct OPimBase {
      */
+private:
+    OPimBasePrivate* d;     
 
@@ -40,2 +43,3 @@ struct OPimBase {
  */
+class OTemplateBasePrivate;
 template <class T = OPimRecord>
@@ -63,2 +67,5 @@ public:
     static T* rec();
+    
+private:
+    OTemplateBasePrivate *d;    
 };