KDE/kdelibs/phonon

[Matthias Kretz]

SVN commit 769117 by mkretz:

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


 M  +1 -1      effectparameter.h  
 M  +1 -1      mediacontroller.h  
 M  +1 -1      mediasource.h  
 M  +1 -1      objectdescription.h  
 M  +1 -1      objectdescriptionmodel.h  
 M  +2 -1      path.h  
 M  +2 -1      videoplayer.h  


--- trunk/KDE/kdelibs/phonon/effectparameter.h #769116:769117
@@ -205,7 +205,7 @@
          */
         int id() const;
 
-    private:
+    protected:
         /**
          * The data is implicitly shared.
          */
--- trunk/KDE/kdelibs/phonon/mediacontroller.h #769116:769117
@@ -102,7 +102,7 @@
         void availableTitlesChanged(int availableTitles);
         void titleChanged(int titleNumber);
 
-    private:
+    protected:
         MediaControllerPrivate *const d;
 };
 
--- trunk/KDE/kdelibs/phonon/mediasource.h #769116:769117
@@ -246,7 +246,7 @@
         QList<MediaSource> substreams() const;
 */
 
-    private:
+    protected:
         QExplicitlySharedDataPointer<MediaSourcePrivate> d;
 };
 
--- trunk/KDE/kdelibs/phonon/objectdescription.h #769116:769117
@@ -266,7 +266,7 @@
 
         ObjectDescription() : d(new ObjectDescriptionData(0)) {}
 
-    private:
+    protected:
         friend class ObjectDescriptionModel<T>;
         ObjectDescription(const QExplicitlySharedDataPointer<ObjectDescriptionData> &dd) : d(dd) {}
         QExplicitlySharedDataPointer<ObjectDescriptionData> d;
--- trunk/KDE/kdelibs/phonon/objectdescriptionmodel.h #769116:769117
@@ -338,7 +338,7 @@
              */
             inline QStringList mimeTypes() const { return d->mimeTypes(type); }
 
-        private:
+        protected:
             ObjectDescriptionModelData *const d;
     };
 
--- trunk/KDE/kdelibs/phonon/path.h #769116:769117
@@ -59,6 +59,7 @@
  */
 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 @@
          */
         bool operator!=(const Path &p) const;
 
-    private:
+    protected:
         friend class PathPrivate;
         QExplicitlySharedDataPointer<PathPrivate> d;
 };
--- trunk/KDE/kdelibs/phonon/videoplayer.h #769116:769117
@@ -180,9 +180,10 @@
          */
         void finished();
 
-    private:
+    protected:
         VideoPlayerPrivate *const d;
 
+    private:
         Q_PRIVATE_SLOT(d, void _k_stateChanged(Phonon::State, Phonon::State))
 };