From a760289038f3775cc399a8f47c36b9bce525c1a1 Mon Sep 17 00:00:00 2001
From: Sarah Smith <sarah.j.smith@nokia.com>
Date: Wed, 21 Mar 2012 16:45:32 +1000
Subject: Fix qtnamespace compile break on Mac.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Appears as though the QT_NAMESPACE macros are incorrect here.

In fact in qisenum.h because the #define is no respecter of a namespace
in most of these conditional compile cases they will be ignored
effectively. The QT_HEADER also - if qtypetraits.h conditional compile
occurs then it will result in adding extern "C" { twice.  For the macros
invoking them will not cause the extern "C" { to be used anyway, so just
remove this altogether.

Task-number: QTBUG-24903
Change-Id: I710dc330f58357f395241a0cf3172e41a5864576
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
Reviewed-by: Glenn Watson <glenn.watson@nokia.com>
Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
---
 src/corelib/global/qisenum.h                         | 6 ------
 src/plugins/platforms/cocoa/qcocoanativeinterface.h  | 4 ++++
 src/plugins/platforms/cocoa/qcocoanativeinterface.mm | 4 ++++
 src/plugins/platforms/cocoa/qcocoawindow.h           | 4 ++--
 src/plugins/platforms/cocoa/qmacclipboard.h          | 4 ++++
 src/plugins/platforms/cocoa/qmacclipboard.mm         | 4 ----
 src/plugins/platforms/cocoa/qmacmime.h               | 4 ++++
 7 files changed, 18 insertions(+), 12 deletions(-)

(limited to 'src')

diff --git a/src/corelib/global/qisenum.h b/src/corelib/global/qisenum.h
index c9b6ec6695..40b576e831 100644
--- a/src/corelib/global/qisenum.h
+++ b/src/corelib/global/qisenum.h
@@ -44,9 +44,6 @@
 #ifndef QISENUM_H
 #define QISENUM_H
 
-QT_BEGIN_HEADER
-QT_BEGIN_NAMESPACE
-
 #ifndef Q_IS_ENUM
 #  if defined(Q_CC_GNU) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3))
 #    define Q_IS_ENUM(x) __is_enum(x)
@@ -58,7 +55,4 @@ QT_BEGIN_NAMESPACE
 #  endif
 #endif
 
-QT_END_HEADER
-QT_END_NAMESPACE
-
 #endif // QISENUM_H
diff --git a/src/plugins/platforms/cocoa/qcocoanativeinterface.h b/src/plugins/platforms/cocoa/qcocoanativeinterface.h
index 8856e90cf3..bb4d0f9f6c 100644
--- a/src/plugins/platforms/cocoa/qcocoanativeinterface.h
+++ b/src/plugins/platforms/cocoa/qcocoanativeinterface.h
@@ -45,6 +45,8 @@
 #include <QtGui/QPlatformNativeInterface>
 #include <QtPrintSupport/QPlatformPrinterSupport>
 
+QT_BEGIN_NAMESPACE
+
 class QWidget;
 
 class QCocoaNativeInterface : public QPlatformNativeInterface
@@ -74,3 +76,5 @@ private:
 };
 
 #endif // QCOCOANATIVEINTERFACE_H
+
+QT_END_NAMESPACE
diff --git a/src/plugins/platforms/cocoa/qcocoanativeinterface.mm b/src/plugins/platforms/cocoa/qcocoanativeinterface.mm
index 29c2e58959..ca15b6bbfb 100644
--- a/src/plugins/platforms/cocoa/qcocoanativeinterface.mm
+++ b/src/plugins/platforms/cocoa/qcocoanativeinterface.mm
@@ -54,6 +54,8 @@
 
 #include "qprintengine_mac_p.h"
 
+QT_BEGIN_NAMESPACE
+
 void *QCocoaNativeInterface::nativeResourceForWindow(const QByteArray &resourceString, QWindow *window)
 {
     if (!window->handle()) {
@@ -81,3 +83,5 @@ void *QCocoaNativeInterface::NSPrintInfoForPrintEngine(QPrintEngine *printEngine
     QMacPrintEngine *macPrintEngine = static_cast<QMacPrintEngine *>(printEngine);
     return macPrintEngine->d_func()->printInfo;
 }
+
+QT_END_NAMESPACE
diff --git a/src/plugins/platforms/cocoa/qcocoawindow.h b/src/plugins/platforms/cocoa/qcocoawindow.h
index 90c5a050d0..2358f7554f 100644
--- a/src/plugins/platforms/cocoa/qcocoawindow.h
+++ b/src/plugins/platforms/cocoa/qcocoawindow.h
@@ -49,7 +49,7 @@
 
 #include "qcocoaglcontext.h"
 #include "qnsview.h"
-class QCocoaWindow;
+class QT_PREPEND_NAMESPACE(QCocoaWindow);
 
 @interface QNSWindow : NSWindow {
     @public QCocoaWindow *m_cocoaPlatformWindow;
@@ -59,7 +59,7 @@ class QCocoaWindow;
 @end
 
 @interface QNSPanel : NSPanel {
-    @public QCocoaWindow *m_cocoaPlatformWindow;
+    @public QT_PREPEND_NAMESPACE(QCocoaWindow) *m_cocoaPlatformWindow;
 }
 - (BOOL)canBecomeKeyWindow;
 @end
diff --git a/src/plugins/platforms/cocoa/qmacclipboard.h b/src/plugins/platforms/cocoa/qmacclipboard.h
index 9371aca459..634d29a60f 100644
--- a/src/plugins/platforms/cocoa/qmacclipboard.h
+++ b/src/plugins/platforms/cocoa/qmacclipboard.h
@@ -49,6 +49,8 @@
 
 #import <Cocoa/Cocoa.h>
 
+QT_BEGIN_NAMESPACE
+
 class QMacPasteboard
 {
     struct Promise {
@@ -90,4 +92,6 @@ public:
 
 QString qt_mac_get_pasteboardString(PasteboardRef paste);
 
+QT_END_NAMESPACE
+
 #endif
diff --git a/src/plugins/platforms/cocoa/qmacclipboard.mm b/src/plugins/platforms/cocoa/qmacclipboard.mm
index eff2c5b07a..73abd8945c 100644
--- a/src/plugins/platforms/cocoa/qmacclipboard.mm
+++ b/src/plugins/platforms/cocoa/qmacclipboard.mm
@@ -56,8 +56,6 @@
 
 QT_BEGIN_NAMESPACE
 
-QT_USE_NAMESPACE
-
 /*****************************************************************************
   QClipboard debug facilities
  *****************************************************************************/
@@ -548,6 +546,4 @@ QString qt_mac_get_pasteboardString(PasteboardRef paste)
     return QString();
 }
 
-
-
 QT_END_NAMESPACE
diff --git a/src/plugins/platforms/cocoa/qmacmime.h b/src/plugins/platforms/cocoa/qmacmime.h
index 7226caef28..12c9aff039 100644
--- a/src/plugins/platforms/cocoa/qmacmime.h
+++ b/src/plugins/platforms/cocoa/qmacmime.h
@@ -46,6 +46,8 @@
 
 #include <CoreFoundation/CoreFoundation.h>
 
+QT_BEGIN_NAMESPACE
+
 class Q_GUI_EXPORT QMacPasteboardMime {
     char type;
 public:
@@ -74,5 +76,7 @@ public:
     virtual QList<QByteArray> convertFromMime(const QString &mime, QVariant data, QString flav) = 0;
 };
 
+QT_END_NAMESPACE
+
 #endif
 
-- 
cgit v1.2.3