diff options
| author | Toby Tomkins <toby.tomkins@nokia.com> | 2012-06-12 12:51:32 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-14 03:03:38 +0200 |
| commit | 3e9c45c4cc0362a8fba319677cd2735e7eeab400 (patch) | |
| tree | 0c6b3a4a5b430767b72aeb8b4cbebc44b2dd769e /src/plugins/platforms/cocoa/qcocoamenu.mm | |
| parent | c190b596c54b1111f088985d15eb5c7a905d7638 (diff) | |
Fix namespace compilation on OSX.
Change-Id: Ib579ae298a5f894b8b02a5d56567870109bd29bd
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'src/plugins/platforms/cocoa/qcocoamenu.mm')
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoamenu.mm | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoamenu.mm b/src/plugins/platforms/cocoa/qcocoamenu.mm index e64386cc5a..9c50541d58 100644 --- a/src/plugins/platforms/cocoa/qcocoamenu.mm +++ b/src/plugins/platforms/cocoa/qcocoamenu.mm @@ -93,15 +93,17 @@ @end +QT_BEGIN_NAMESPACE + QCocoaMenu::QCocoaMenu() : m_enabled(true), m_tag(0) { - m_delegate = [[QCocoaMenuDelegate alloc] initWithMenu:this]; + m_delegate = [[QT_MANGLE_NAMESPACE(QCocoaMenuDelegate) alloc] initWithMenu:this]; m_nativeItem = [[NSMenuItem alloc] initWithTitle:@"" action:nil keyEquivalent:@""]; m_nativeMenu = [[NSMenu alloc] initWithTitle:@"Untitled"]; [m_nativeMenu setAutoenablesItems:YES]; - m_nativeMenu.delegate = (QCocoaMenuDelegate *) m_delegate; + m_nativeMenu.delegate = (QT_MANGLE_NAMESPACE(QCocoaMenuDelegate) *) m_delegate; [m_nativeItem setSubmenu:m_nativeMenu]; } @@ -281,3 +283,5 @@ void QCocoaMenu::syncModalState(bool modal) item->syncModalState(modal); } } + +QT_END_NAMESPACE |