diff options
author | Toby Tomkins <toby.tomkins@nokia.com> | 2011-11-28 11:33:08 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-29 03:44:58 +0100 |
commit | e881f4f5fdedf724ce2a5cd9fe2d448c4f8dbaa3 (patch) | |
tree | e7f0179e3263370dda392bf2125a5355696817a6 /src/plugins/platforms/cocoa | |
parent | a291519e3e391e6a9d59a35d0b51366f2e5583ae (diff) |
Fixed Qtbase OSX specific namespace compilation.
Change-Id: Idacfa679df7aa6417f8017f80928907830d15df2
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'src/plugins/platforms/cocoa')
-rw-r--r-- | src/plugins/platforms/cocoa/qcocoafiledialoghelper.h | 4 | ||||
-rw-r--r-- | src/plugins/platforms/cocoa/qcocoahelpers.h | 4 | ||||
-rw-r--r-- | src/plugins/platforms/cocoa/qcocoahelpers.mm | 3 | ||||
-rw-r--r-- | src/plugins/platforms/cocoa/qcocoawindow.h | 4 | ||||
-rw-r--r-- | src/plugins/platforms/cocoa/qmenu_mac.h | 5 |
5 files changed, 18 insertions, 2 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoafiledialoghelper.h b/src/plugins/platforms/cocoa/qcocoafiledialoghelper.h index c38ea90f19..c5c40c69a1 100644 --- a/src/plugins/platforms/cocoa/qcocoafiledialoghelper.h +++ b/src/plugins/platforms/cocoa/qcocoafiledialoghelper.h @@ -45,6 +45,8 @@ #include <QObject> #include <qplatformdialoghelper_qpa.h> +QT_BEGIN_NAMESPACE + class QFileDialog; class QFileDialogPrivate; @@ -87,4 +89,6 @@ private: void *mDelegate; }; +QT_END_NAMESPACE + #endif // QCOCOAFILEDIALOGHELPER_H diff --git a/src/plugins/platforms/cocoa/qcocoahelpers.h b/src/plugins/platforms/cocoa/qcocoahelpers.h index 57eaa2f54d..4ab19ee3fd 100644 --- a/src/plugins/platforms/cocoa/qcocoahelpers.h +++ b/src/plugins/platforms/cocoa/qcocoahelpers.h @@ -57,6 +57,8 @@ #include <private/qguiapplication_p.h> #include <QtGui/qscreen.h> +QT_BEGIN_NAMESPACE + class QPixmap; class QString; @@ -106,5 +108,7 @@ inline NSPoint qt_mac_flipPoint(const QPointF &p) NSRect qt_mac_flipRect(const QRect &rect, QWindow *window); +QT_END_NAMESPACE + #endif //QCOCOAHELPERS_H diff --git a/src/plugins/platforms/cocoa/qcocoahelpers.mm b/src/plugins/platforms/cocoa/qcocoahelpers.mm index 9777e0c473..1ac6911461 100644 --- a/src/plugins/platforms/cocoa/qcocoahelpers.mm +++ b/src/plugins/platforms/cocoa/qcocoahelpers.mm @@ -46,6 +46,8 @@ #include <QtCore> #include <QtGui> +QT_BEGIN_NAMESPACE + // // Conversion Functions // @@ -457,3 +459,4 @@ NSRect qt_mac_flipRect(const QRect &rect, QWindow *window) return NSMakeRect(rect.x(), flippedY, rect.width(), rect.height()); } +QT_END_NAMESPACE diff --git a/src/plugins/platforms/cocoa/qcocoawindow.h b/src/plugins/platforms/cocoa/qcocoawindow.h index 0b759f3fd4..9fa04a0ca2 100644 --- a/src/plugins/platforms/cocoa/qcocoawindow.h +++ b/src/plugins/platforms/cocoa/qcocoawindow.h @@ -50,8 +50,6 @@ #include "qcocoaglcontext.h" #include "qnsview.h" -QT_BEGIN_NAMESPACE - @interface QNSWindow : NSWindow { } @@ -66,6 +64,8 @@ QT_BEGIN_NAMESPACE - (BOOL)canBecomeKeyWindow; @end +QT_BEGIN_NAMESPACE + class QCocoaWindow : public QPlatformWindow { public: diff --git a/src/plugins/platforms/cocoa/qmenu_mac.h b/src/plugins/platforms/cocoa/qmenu_mac.h index 7c75a2e599..0bca25ff5f 100644 --- a/src/plugins/platforms/cocoa/qmenu_mac.h +++ b/src/plugins/platforms/cocoa/qmenu_mac.h @@ -46,6 +46,9 @@ #include <QtWidgets/qplatformmenu_qpa.h> @class NSMenuItem; + +QT_BEGIN_NAMESPACE + class QCocoaMenuAction : public QPlatformMenuAction { public: @@ -123,3 +126,5 @@ public: QList<QCocoaMenuAction*> actionItems; QMenuBar *qtMenuBar; }; + +QT_END_NAMESPACE |