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

List:       kde-commits
Subject:    [Phonon] c830335: Squashed commit of the topic/exceptions branch.
From:       Harald Fernengel <harald () trolltech ! com>
Date:       2010-02-20 2:27:07
Message-ID: 201002200227.o1K2R7Ev028831 () kore ! kollide ! net
[Download RAW message or body]

commit c83033579c069890d1af5b7790ee96e50fc43c43
Author: Harald Fernengel <harald@trolltech.com>
Date:   Mon Aug 3 15:12:46 2009 +0200

    Squashed commit of the topic/exceptions branch.
    
    Contains some smaller fixes and renaming of macros. Looks big,
    but isn't scary at all ;)

diff --git a/phonon/abstractmediastream.h b/phonon/abstractmediastream.h
index 87fa140..9f91ec9 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_PRIVATE(AbstractMediaStream)
+    Q_DECLARE_SCOPED_PRIVATE(AbstractMediaStream)
     friend class MediaObject;
     friend class MediaObjectPrivate;
     friend class StreamInterface;
diff --git a/phonon/iodevicestream_p.h b/phonon/iodevicestream_p.h
index cca77e3..d9ec460 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_PRIVATE(IODeviceStream)
+    Q_DECLARE_SCOPED_PRIVATE(IODeviceStream)
     public:
         explicit IODeviceStream(QIODevice *ioDevice, QObject *parent = 0);
         ~IODeviceStream();
[prev in list] [next in list] [prev in thread] [next in thread]