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

List:       kde-commits
Subject:    [Phonon] 82210bc: Rename Q_DECLARE_SCOPED_PRIVATE back to Q_DECLARE_
From:       Harald Fernengel <harald () trolltech ! com>
Date:       2010-02-20 2:27:07
Message-ID: 201002200227.o1K2R7IA028845 () kore ! kollide ! net
[Download RAW message or body]

commit 82210bcd89e8c93eb83f1bc26c1b8c9eb3aa07d3
Author: Harald Fernengel <harald@trolltech.com>
Date:   Thu Aug 6 12:04:36 2009 +0200

    Rename Q_DECLARE_SCOPED_PRIVATE back to Q_DECLARE_PRIVATE
    
    Rationale: We're using template magic now to get the private
    pointer in qglobal.h, so no need to have two macros. Also
    keeps backward compatibility with outside (KDE) code.

diff --git a/phonon/abstractmediastream.h b/phonon/abstractmediastream.h
index 9f91ec9..87fa140 100644
--- a/phonon/abstractmediastream.h
+++ b/phonon/abstractmediastream.h
@@ -103,7 +103,7 @@ class AbstractMediaStreamPrivate;
 class PHONON_EXPORT AbstractMediaStream : public QObject
 {
     Q_OBJECT
-    Q_DECLARE_SCOPED_PRIVATE(AbstractMediaStream)
+    Q_DECLARE_PRIVATE(AbstractMediaStream)
     friend class MediaObject;
     friend class MediaObjectPrivate;
     friend class StreamInterface;
diff --git a/phonon/iodevicestream_p.h b/phonon/iodevicestream_p.h
index d9ec460..cca77e3 100644
--- a/phonon/iodevicestream_p.h
+++ b/phonon/iodevicestream_p.h
@@ -39,7 +39,7 @@ class IODeviceStreamPrivate;
 class IODeviceStream : public AbstractMediaStream
 {
     Q_OBJECT
-    Q_DECLARE_SCOPED_PRIVATE(IODeviceStream)
+    Q_DECLARE_PRIVATE(IODeviceStream)
     public:
         explicit IODeviceStream(QIODevice *ioDevice, QObject *parent = 0);
         ~IODeviceStream();
[prev in list] [next in list] [prev in thread] [next in thread]