mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

REVIEW: fix possible -Wdeprecated-declarations warnings

Browse source
This commit is contained in:
deepak1556 2019-02-04 22:37:51 +05:30
parent 2ccf5904e0
commit d7fea1b484
4 changed files with 22 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

14
atom/browser/browser_mac.mm
View file

@ -232,9 +232,10 @@ LSSharedFileListItemRef GetLoginItemForApp() {
for (NSUInteger i = 0; i < [login_items_array count]; ++i) { for (NSUInteger i = 0; i < [login_items_array count]; ++i) {
LSSharedFileListItemRef item = LSSharedFileListItemRef item =
reinterpret_cast<LSSharedFileListItemRef>(login_items_array[i]); reinterpret_cast<LSSharedFileListItemRef>(login_items_array[i]);
CFURLRef item_url_ref = NULL; base::ScopedCFTypeRef<CFErrorRef> error;
if (LSSharedFileListItemResolve(item, 0, &item_url_ref, NULL) == noErr && CFURLRef item_url_ref =
item_url_ref) { LSSharedFileListItemCopyResolvedURL(item, 0, error.InitializeInto());
if (!error && item_url_ref) {
base::ScopedCFTypeRef<CFURLRef> item_url(item_url_ref); base::ScopedCFTypeRef<CFURLRef> item_url(item_url_ref);
if (CFEqual(item_url, url)) { if (CFEqual(item_url, url)) {
CFRetain(item); CFRetain(item);
@ -265,9 +266,10 @@ void RemoveFromLoginItems() {
for (NSUInteger i = 0; i < [login_items_array count]; ++i) { for (NSUInteger i = 0; i < [login_items_array count]; ++i) {
LSSharedFileListItemRef item = LSSharedFileListItemRef item =
reinterpret_cast<LSSharedFileListItemRef>(login_items_array[i]); reinterpret_cast<LSSharedFileListItemRef>(login_items_array[i]);
CFURLRef url_ref = NULL; base::ScopedCFTypeRef<CFErrorRef> error;
if (LSSharedFileListItemResolve(item, 0, &url_ref, NULL) == noErr && CFURLRef url_ref =
item) { LSSharedFileListItemCopyResolvedURL(item, 0, error.InitializeInto());
if (!error && url_ref) {
base::ScopedCFTypeRef<CFURLRef> url(url_ref); base::ScopedCFTypeRef<CFURLRef> url(url_ref);
if ([[base::mac::CFToNSCast(url.get()) path] if ([[base::mac::CFToNSCast(url.get()) path]
hasPrefix:[[NSBundle mainBundle] bundlePath]]) hasPrefix:[[NSBundle mainBundle] bundlePath]])

19
atom/browser/ui/cocoa/atom_bundle_mover.mm
View file

@ -167,20 +167,11 @@ NSString* AtomBundleMover::ContainingDiskImageDevice(NSString* bundlePath) {
NSData* data = NSData* data =
[[[hdiutil standardOutput] fileHandleForReading] readDataToEndOfFile]; [[[hdiutil standardOutput] fileHandleForReading] readDataToEndOfFile];
NSDictionary* info = nil; NSDictionary* info =
if (floor(NSAppKitVersionNumber) > NSAppKitVersionNumber10_5) { [NSPropertyListSerialization propertyListWithData:data
info = [NSPropertyListSerialization options:NSPropertyListImmutable
propertyListWithData:data format:NULL
options:NSPropertyListImmutable error:NULL];
format:NULL
error:NULL];
} else {
info = [NSPropertyListSerialization
propertyListFromData:data
mutabilityOption:NSPropertyListImmutable
format:NULL
errorDescription:NULL];
}
if (![info isKindOfClass:[NSDictionary class]]) if (![info isKindOfClass:[NSDictionary class]])
return nil; return nil;

6
atom/browser/ui/message_box_mac.mm
View file

@ -157,10 +157,13 @@ int ShowMessageBox(NativeWindow* parent_window,
callEndModal:true]; callEndModal:true];
NSWindow* window = parent_window->GetNativeWindow().GetNativeNSWindow(); NSWindow* window = parent_window->GetNativeWindow().GetNativeNSWindow();
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
[alert beginSheetModalForWindow:window [alert beginSheetModalForWindow:window
modalDelegate:delegate modalDelegate:delegate
didEndSelector:@selector(alertDidEnd:returnCode:contextInfo:) didEndSelector:@selector(alertDidEnd:returnCode:contextInfo:)
contextInfo:nil]; contextInfo:nil];
#pragma clang diagnostic pop
[NSApp runModalForWindow:window]; [NSApp runModalForWindow:window];
return ret_code; return ret_code;
@ -196,11 +199,14 @@ void ShowMessageBox(NativeWindow* parent_window,
NSWindow* window = NSWindow* window =
parent_window ? parent_window->GetNativeWindow().GetNativeNSWindow() parent_window ? parent_window->GetNativeWindow().GetNativeNSWindow()
: nil; : nil;
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
[alert [alert
beginSheetModalForWindow:window beginSheetModalForWindow:window
modalDelegate:delegate modalDelegate:delegate
didEndSelector:@selector(alertDidEnd:returnCode:contextInfo:) didEndSelector:@selector(alertDidEnd:returnCode:contextInfo:)
contextInfo:nil]; contextInfo:nil];
#pragma clang diagnostic pop
} }
} }

3
atom/common/platform_util_mac.mm
View file

@ -141,8 +141,11 @@ void Beep() {
bool GetLoginItemEnabled() { bool GetLoginItemEnabled() {
BOOL enabled = NO; BOOL enabled = NO;
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
// SMJobCopyDictionary does not work in sandbox (see rdar://13626319) // SMJobCopyDictionary does not work in sandbox (see rdar://13626319)
CFArrayRef jobs = SMCopyAllJobDictionaries(kSMDomainUserLaunchd); CFArrayRef jobs = SMCopyAllJobDictionaries(kSMDomainUserLaunchd);
#pragma clang diagnostic pop
NSArray* jobs_ = CFBridgingRelease(jobs); NSArray* jobs_ = CFBridgingRelease(jobs);
NSString* identifier = GetLoginHelperBundleIdentifier(); NSString* identifier = GetLoginHelperBundleIdentifier();
if (jobs_ && [jobs_ count] > 0) { if (jobs_ && [jobs_ count] > 0) {