Fix namespace compilation on OSX.

Change-Id: Ib579ae298a5f894b8b02a5d56567870109bd29bd
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>

diff --git a/src/plugins/platforms/cocoa/qcocoamenu.mm b/src/plugins/platforms/cocoa/qcocoamenu.mm
index e64386c..9c50541 100644 (file)
--- 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 ef48c84..4167538 100644 (file)
--- 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 fe9d0e0..0f5e96a 100644 (file)
--- 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 45ac878..e776e54 100644 (file)
--- 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)
 

diff --git a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp
index 4caca29..223211e 100644 (file)
--- a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp
+++ b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp
@@ -98,7 +98,7 @@ Q_DECLARE_METATYPE(QNetworkProxy)
 Q_DECLARE_METATYPE(QList<QNetworkProxy>)
 
 QT_FORWARD_DECLARE_CLASS(QTcpSocket)
-QT_FORWARD_DECLARE_CLASS(SocketPair)
+class SocketPair;
 
 class tst_QTcpSocket : public QObject
 {