[Phonon/4.1] a1360e7 Make private d pointers protected. This is good fo

[Matthias Kretz]

commit a1360e7faffbe267e00626d0694ddb5081daf325
branch 4.1
Author: Matthias Kretz <kretz at kde.org>
Date:   Thu Jan 31 15:43:46 2008 +0000

    Make private d pointers protected. This is good for future-proofing the classes.
    
    This is BIC on Windows but as we never had an official release on Windows this
    should be fine.
    
    CCMAIL: kde-windows at kde.org

diff --git a/effectparameter.h b/effectparameter.h
index 10acb36..befdd62 100644
--- a/effectparameter.h
+++ b/effectparameter.h
@@ -205,7 +205,7 @@ class PHONON_EXPORT EffectParameter
          */
         int id() const;
 
-    private:
+    protected:
         /**
          * The data is implicitly shared.
          */
diff --git a/mediacontroller.h b/mediacontroller.h
index 55b1f7b..04f00ad 100644
--- a/mediacontroller.h
+++ b/mediacontroller.h
@@ -102,7 +102,7 @@ class PHONON_EXPORT MediaController : public QObject
         void availableTitlesChanged(int availableTitles);
         void titleChanged(int titleNumber);
 
-    private:
+    protected:
         MediaControllerPrivate *const d;
 };
 
diff --git a/mediasource.h b/mediasource.h
index c84ac0d..54ae591 100644
--- a/mediasource.h
+++ b/mediasource.h
@@ -246,7 +246,7 @@ class PHONON_EXPORT MediaSource
         QList<MediaSource> substreams() const;
 */
 
-    private:
+    protected:
         QExplicitlySharedDataPointer<MediaSourcePrivate> d;
 };
 
diff --git a/objectdescription.h b/objectdescription.h
index 32b1e68..3fb4055 100644
--- a/objectdescription.h
+++ b/objectdescription.h
@@ -266,7 +266,7 @@ class ObjectDescription
 
         ObjectDescription() : d(new ObjectDescriptionData(0)) {}
 
-    private:
+    protected:
         friend class ObjectDescriptionModel<T>;
         ObjectDescription(const QExplicitlySharedDataPointer<ObjectDescriptionData> &dd) : d(dd) {}
         QExplicitlySharedDataPointer<ObjectDescriptionData> d;
diff --git a/objectdescriptionmodel.h b/objectdescriptionmodel.h
index d47702f..e8888e9 100644
--- a/objectdescriptionmodel.h
+++ b/objectdescriptionmodel.h
@@ -338,7 +338,7 @@ namespace Phonon
              */
             inline QStringList mimeTypes() const { return d->mimeTypes(type); }
 
-        private:
+        protected:
             ObjectDescriptionModelData *const d;
     };
 
diff --git a/path.h b/path.h
index 6ce5ad3..b1e5f10 100644
--- a/path.h
+++ b/path.h
@@ -59,6 +59,7 @@ if (!effectList.isEmpty()) {
  */
 class PHONON_EXPORT Path
 {
+    friend class FactoryPrivate;
     public:
         /**
          * Destroys this reference to the Path. If the path was valid the connection is not broken
@@ -200,7 +201,7 @@ class PHONON_EXPORT Path
          */
         bool operator!=(const Path &p) const;
 
-    private:
+    protected:
         friend class PathPrivate;
         QExplicitlySharedDataPointer<PathPrivate> d;
 };
diff --git a/videoplayer.h b/videoplayer.h
index 4c535ad..47603aa 100644
--- a/videoplayer.h
+++ b/videoplayer.h
@@ -180,9 +180,10 @@ class PHONON_EXPORT VideoPlayer : public QWidget
          */
         void finished();
 
-    private:
+    protected:
         VideoPlayerPrivate *const d;
 
+    private:
         Q_PRIVATE_SLOT(d, void _k_stateChanged(Phonon::State, Phonon::State))
 };