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 | |
parent | c190b596c54b1111f088985d15eb5c7a905d7638 (diff) |
Fix namespace compilation on OSX.
Change-Id: Ib579ae298a5f894b8b02a5d56567870109bd29bd
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/plugins/platforms/cocoa/qcocoamenu.mm | 8 | ||||
-rw-r--r-- | src/plugins/platforms/cocoa/qcocoamenubar.h | 5 | ||||
-rw-r--r-- | src/plugins/platforms/cocoa/qcocoamenuloader.h | 4 | ||||
-rw-r--r-- | src/plugins/platforms/cocoa/qcocoamenuloader.mm | 4 |
4 files changed, 17 insertions, 4 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 diff --git a/src/plugins/platforms/cocoa/qcocoamenubar.h b/src/plugins/platforms/cocoa/qcocoamenubar.h index ef48c84712..41675380d2 100644 --- a/src/plugins/platforms/cocoa/qcocoamenubar.h +++ b/src/plugins/platforms/cocoa/qcocoamenubar.h @@ -48,6 +48,9 @@ #include "qcocoamenu.h" @class NSMenu; + +QT_BEGIN_NAMESPACE + class QCocoaWindow; class QCocoaMenuBar : public QPlatformMenuBar @@ -79,4 +82,6 @@ private: QCocoaWindow *m_window; }; +QT_END_NAMESPACE + #endif diff --git a/src/plugins/platforms/cocoa/qcocoamenuloader.h b/src/plugins/platforms/cocoa/qcocoamenuloader.h index fe9d0e0af5..0f5e96a381 100644 --- a/src/plugins/platforms/cocoa/qcocoamenuloader.h +++ b/src/plugins/platforms/cocoa/qcocoamenuloader.h @@ -92,6 +92,10 @@ - (NSArray *)mergeable; @end +QT_BEGIN_NAMESPACE + void qt_mac_loadMenuNib(QT_MANGLE_NAMESPACE(QCocoaMenuLoader) *qtMenuLoader); +QT_END_NAMESPACE + #endif // QCOCOAMENULOADER_P_H diff --git a/src/plugins/platforms/cocoa/qcocoamenuloader.mm b/src/plugins/platforms/cocoa/qcocoamenuloader.mm index 45ac878ea4..e776e540f6 100644 --- a/src/plugins/platforms/cocoa/qcocoamenuloader.mm +++ b/src/plugins/platforms/cocoa/qcocoamenuloader.mm @@ -55,7 +55,7 @@ QT_FORWARD_DECLARE_CLASS(QCFString) QT_FORWARD_DECLARE_CLASS(QString) -QT_USE_NAMESPACE +QT_BEGIN_NAMESPACE #ifndef QT_NO_TRANSLATION static const char *application_menu_strings[] = { @@ -125,7 +125,7 @@ void qt_mac_loadMenuNib(QT_MANGLE_NAMESPACE(QCocoaMenuLoader) *qtMenuLoader) } } - +QT_END_NAMESPACE @implementation QT_MANGLE_NAMESPACE(QCocoaMenuLoader) |