Kaydet (Commit) 4d3628ca authored tarafından Tor Lillqvist's avatar Tor Lillqvist

The macOS SDK 10.15 has a tighter declaration of objc_msgSend()

Change-Id: I51734b92965a9fa1f06aa18017d39b4b0d532456
üst 4378eae8
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
// So instead of this: // So instead of this:
// [parser setDelegate:self]; // [parser setDelegate:self];
// do this: // do this:
objc_msgSend(parser, @selector(setDelegate:), self); ((id (*)(id, SEL, ...))objc_msgSend)(parser, @selector(setDelegate:), self);
[parser setShouldResolveExternalEntities:NO]; [parser setShouldResolveExternalEntities:NO];
[parser parse]; [parser parse];
......
...@@ -95,7 +95,7 @@ static NSDictionary *metaXML2MDIKeys; ...@@ -95,7 +95,7 @@ static NSDictionary *metaXML2MDIKeys;
// So instead of this: // So instead of this:
// [parser setDelegate:self]; // [parser setDelegate:self];
// do this: // do this:
objc_msgSend(parser, @selector(setDelegate:), self); ((id (*)(id, SEL, ...))objc_msgSend)(parser, @selector(setDelegate:), self);
[parser setShouldResolveExternalEntities:NO]; [parser setShouldResolveExternalEntities:NO];
[parser parse]; [parser parse];
......
...@@ -162,7 +162,7 @@ sal_Int16 SAL_CALL SalAquaFilePicker::execute() ...@@ -162,7 +162,7 @@ sal_Int16 SAL_CALL SalAquaFilePicker::execute()
// So instead of: // So instead of:
// [m_pDialog setDelegate:m_pDelegate]; // [m_pDialog setDelegate:m_pDelegate];
// do: // do:
objc_msgSend(m_pDialog, @selector(setDelegate:), m_pDelegate); ((id (*)(id, SEL, ...))objc_msgSend)(m_pDialog, @selector(setDelegate:), m_pDelegate);
int nStatus = runandwaitforresult(); int nStatus = runandwaitforresult();
......
...@@ -351,7 +351,7 @@ static void appendRecentMenu( NSMenu* i_pMenu, NSMenu* i_pDockMenu, const OUStri ...@@ -351,7 +351,7 @@ static void appendRecentMenu( NSMenu* i_pMenu, NSMenu* i_pDockMenu, const OUStri
// confused. Anyway, to avoid warnings, instead of this: // confused. Anyway, to avoid warnings, instead of this:
// [pRecentMenu setDelegate: pRecentDelegate]; // [pRecentMenu setDelegate: pRecentDelegate];
// do this: // do this:
objc_msgSend(pRecentMenu, @selector(setDelegate:), pRecentDelegate); ((id (*)(id, SEL, ...))objc_msgSend)(pRecentMenu, @selector(setDelegate:), pRecentDelegate);
[pRecentMenu setAutoenablesItems: NO]; [pRecentMenu setAutoenablesItems: NO];
[pItem setSubmenu: pRecentMenu]; [pItem setSubmenu: pRecentMenu];
...@@ -368,7 +368,7 @@ static void appendRecentMenu( NSMenu* i_pMenu, NSMenu* i_pDockMenu, const OUStri ...@@ -368,7 +368,7 @@ static void appendRecentMenu( NSMenu* i_pMenu, NSMenu* i_pDockMenu, const OUStri
// See above // See above
// [pRecentMenu setDelegate: pRecentDelegate]; // [pRecentMenu setDelegate: pRecentDelegate];
objc_msgSend(pRecentMenu, @selector(setDelegate:), pRecentDelegate); ((id (*)(id, SEL, ...))objc_msgSend)(pRecentMenu, @selector(setDelegate:), pRecentDelegate);
[pRecentMenu setAutoenablesItems: NO]; [pRecentMenu setAutoenablesItems: NO];
[pItem setSubmenu: pRecentMenu]; [pItem setSubmenu: pRecentMenu];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment