diff options
| author | Pavol Markovic <pavol.markovic@serato.com> | 2017-02-07 21:12:21 +1300 |
|---|---|---|
| committer | Pavol Markovic <pavol.markovic@serato.com> | 2017-02-22 20:16:59 +0000 |
| commit | dd4465f57cb82ad145a78da004545c986215d87c (patch) | |
| tree | 42237cba4fffde01bf1c15dc2ea476ab92eccd47 /src/corelib/kernel | |
| parent | 4e9f7807fbca948f355fa6aa17e0bbeb86d065a3 (diff) | |
Wrap RunLoopModeTracker into Objective-C namespace
RunLoopModeTracker as one of Qt Cocoa classes was not wrapped
in namespace which limited its use in Objective-C single symbol space.
Change-Id: Ida2c62c6f543a3bf5107f28c78d27435bcb3470d
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Diffstat (limited to 'src/corelib/kernel')
| -rw-r--r-- | src/corelib/kernel/qeventdispatcher_cf.mm | 5 | ||||
| -rw-r--r-- | src/corelib/kernel/qeventdispatcher_cf_p.h | 9 |
2 files changed, 6 insertions, 8 deletions
diff --git a/src/corelib/kernel/qeventdispatcher_cf.mm b/src/corelib/kernel/qeventdispatcher_cf.mm index 9ac48f144d..4defae559e 100644 --- a/src/corelib/kernel/qeventdispatcher_cf.mm +++ b/src/corelib/kernel/qeventdispatcher_cf.mm @@ -44,7 +44,6 @@ #include <QtCore/qthread.h> #include <QtCore/private/qcoreapplication_p.h> #include <QtCore/private/qcore_unix_p.h> -#include <QtCore/private/qcore_mac_p.h> #include <QtCore/private/qthread_p.h> #include <limits> @@ -59,11 +58,13 @@ QT_USE_NAMESPACE -@interface RunLoopModeTracker : NSObject { +@interface QT_MANGLE_NAMESPACE(RunLoopModeTracker) : NSObject { QStack<CFStringRef> m_runLoopModes; } @end +QT_NAMESPACE_ALIAS_OBJC_CLASS(RunLoopModeTracker); + @implementation RunLoopModeTracker - (id) init diff --git a/src/corelib/kernel/qeventdispatcher_cf_p.h b/src/corelib/kernel/qeventdispatcher_cf_p.h index e6581e2bac..8a234ebc40 100644 --- a/src/corelib/kernel/qeventdispatcher_cf_p.h +++ b/src/corelib/kernel/qeventdispatcher_cf_p.h @@ -90,14 +90,11 @@ #include <QtCore/qabstracteventdispatcher.h> #include <QtCore/private/qtimerinfo_unix_p.h> #include <QtCore/private/qcfsocketnotifier_p.h> +#include <QtCore/private/qcore_mac_p.h> #include <QtCore/qdebug.h> #include <CoreFoundation/CoreFoundation.h> -#ifdef __OBJC__ -@class RunLoopModeTracker; -#else -typedef struct objc_object RunLoopModeTracker; -#endif +Q_FORWARD_DECLARE_OBJC_CLASS(QT_MANGLE_NAMESPACE(RunLoopModeTracker)); QT_BEGIN_NAMESPACE @@ -253,7 +250,7 @@ private: RunLoopSource<> m_postedEventsRunLoopSource; RunLoopObserver<> m_runLoopActivityObserver; - RunLoopModeTracker *m_runLoopModeTracker; + QT_MANGLE_NAMESPACE(RunLoopModeTracker) *m_runLoopModeTracker; QTimerInfoList m_timerInfoList; CFRunLoopTimerRef m_runLoopTimer; |