diff -r 93b982ccede2 -r 5daf16870df6 src/gui/kernel/qsound_mac.mm --- a/src/gui/kernel/qsound_mac.mm Mon Jun 21 22:38:13 2010 +0100 +++ b/src/gui/kernel/qsound_mac.mm Thu Jul 22 16:41:55 2010 +0100 @@ -88,14 +88,14 @@ QT_USE_NAMESPACE -@interface QMacSoundDelegate : NSObject { +@interface QT_MANGLE_NAMESPACE(QMacSoundDelegate) : NSObject { QSound *qSound; // may be null. QAuServerMac* server; } -(id)initWithQSound:(QSound*)sound:(QAuServerMac*)server; @end -@implementation QMacSoundDelegate +@implementation QT_MANGLE_NAMESPACE(QMacSoundDelegate) -(id)initWithQSound:(QSound*)s:(QAuServerMac*)serv { self = [super init]; if(self) { @@ -172,7 +172,7 @@ { NSString *nsFileName = const_cast(reinterpret_cast(QCFString::toCFStringRef(fileName))); NSSound * const nsSound = [[NSSound alloc] initWithContentsOfFile: nsFileName byReference:YES]; - QMacSoundDelegate * const delegate = [[QMacSoundDelegate alloc] initWithQSound:qSound:this]; + QT_MANGLE_NAMESPACE(QMacSoundDelegate) * const delegate = [[QT_MANGLE_NAMESPACE(QMacSoundDelegate) alloc] initWithQSound:qSound:this]; [nsSound setDelegate:delegate]; [nsFileName release]; return nsSound;