[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    koffice/kexi/koproperty2/koproperty
From:       Marijn Kruisselbrink <m.kruisselbrink () student ! tue ! nl>
Date:       2008-12-22 11:24:25
Message-ID: 1229945065.938781.28069.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 900142 by mkruisselbrink:

with gcc4.0 on mac osx friendship isn't inherited by inner classes, so change \
Set::Private to SetPrivate and add an explicit friend relation to it in Property 


 M  +1 -0      Property.h  
 M  +6 -6      Set.cpp  
 M  +3 -2      Set.h  


--- trunk/koffice/kexi/koproperty2/koproperty/Property.h #900141:900142
@@ -445,6 +445,7 @@
     PropertyPrivate * const d;
 
     friend class Set;
+    friend class SetPrivate;
     friend class Buffer;
     friend class ComposedPropertyInterface;
 };
--- trunk/koffice/kexi/koproperty2/koproperty/Set.cpp #900141:900142
@@ -38,14 +38,14 @@
 static Property Set_nonConstNull;
 
 //! @internal
-class Set::Private
+class SetPrivate
 {
 public:
-    Private(KoProperty::Set *set) :
+    SetPrivate(KoProperty::Set *set) :
             q(set),
             readOnly(false),
             informAboutClearing(0) {}
-    ~Private() {}
+    ~SetPrivate() {}
 
     Set *q;
 // PropertyList properties;
@@ -253,7 +253,7 @@
 
 Set::Set(QObject *parent, const QString &typeName)
         : QObject(parent)
-        , d(new Private(this))
+        , d(new SetPrivate(this))
 {
     setObjectName(typeName.toLatin1());
 
@@ -265,7 +265,7 @@
 
 Set::Set(const Set &set)
         : QObject(0 /* implicit sharing the parent is dangerous */)
-        , d(new Private(this))
+        , d(new SetPrivate(this))
 {
     setObjectName(set.objectName());
     *this = set;
@@ -273,7 +273,7 @@
 
 Set::Set(bool propertyOwner)
         : QObject(0)
-        , d(new Private(this))
+        , d(new SetPrivate(this))
 {
     d->ownProperty = propertyOwner;
     d->groupDescriptions.insert("common", i18nc("General properties", "General"));
--- trunk/koffice/kexi/koproperty2/koproperty/Set.h #900141:900142
@@ -32,6 +32,7 @@
 {
 
 class Property;
+class SetPrivate;
 
 /*! \brief Lists holding properties in groups
 
@@ -240,8 +241,8 @@
     void aboutToBeDeleted();
 
 protected:
-    class Private;
-    Private * const d;
+    friend class SetPrivate;
+    SetPrivate * const d;
 
     friend class Iterator;
     friend class Property;


[prev in list] [next in list] [prev in thread] [next in thread]