Skip to content

Commit eae0f70

Browse files
mikepjmikepj
committed
Fix some deprecation warnings.
1 parent d37929c commit eae0f70

File tree

11 files changed

+55
-59
lines changed

11 files changed

+55
-59
lines changed

‎Controllers/XRGGraphWindow.m‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -281,8 +281,6 @@ - (void) setupSettingsFromDictionary:(NSDictionary *) defs {
281281
//turn off opaqueness
282282
[self setOpaque:NO];
283283

284-
[self useOptimizedDrawing:YES];
285-
286284
[self setHasShadow:self.appSettings.dropShadow];
287285

288286
// Set these after we have initialized the parentWindow

‎Data Miners/APSL/SMCInterface.m‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,6 @@ - (SMCCachedKeyInfo *) infoForKey:(FourCharCode) key result:(IOReturn *) outResu
246246
bzero(&stuffMeIn, sizeof(SMCParamStruct));
247247
bzero(&stuffMeOut, sizeof(SMCParamStruct));
248248

249-
UInt32 size = sizeof(SMCParamStruct);
250249
stuffMeIn.data8 = kSMCGetKeyInfo;
251250
stuffMeIn.key = CFSwapInt32HostToLittle( key );
252251

‎Graph Views/XRGBackgroundView.m‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -360,29 +360,29 @@ - (NSMenu *)menuForEvent:(NSEvent *)theEvent {
360360
NSMenu *myMenu = [[NSMenu alloc] initWithTitle:@"Background View"];
361361
NSMenuItem *tMI;
362362

363-
tMI = [[NSMenuItem allocWithZone:[NSMenu menuZone]] initWithTitle:@"About XRG" action:@selector(openAboutBox:) keyEquivalent:@""];
363+
tMI = [[NSMenuItem alloc] initWithTitle:@"About XRG" action:@selector(openAboutBox:) keyEquivalent:@""];
364364
[myMenu addItem:tMI];
365365

366-
tMI = [[NSMenuItem allocWithZone:[NSMenu menuZone]] initWithTitle:@"Preferences..." action:@selector(openPreferences:) keyEquivalent:@""];
366+
tMI = [[NSMenuItem alloc] initWithTitle:@"Preferences..." action:@selector(openPreferences:) keyEquivalent:@""];
367367
[myMenu addItem:tMI];
368368

369-
tMI = [[NSMenuItem allocWithZone:[NSMenu menuZone]] initWithTitle:@"XRG Help" action:@selector(openHelp:) keyEquivalent:@""];
369+
tMI = [[NSMenuItem alloc] initWithTitle:@"XRG Help" action:@selector(openHelp:) keyEquivalent:@""];
370370
[myMenu addItem:tMI];
371371

372372
[myMenu addItem:[NSMenuItem separatorItem]];
373373

374374
if (uiIsHidden) {
375-
tMI = [[NSMenuItem allocWithZone:[NSMenu menuZone]] initWithTitle:@"Show XRG Dock Icon" action:@selector(showUI:) keyEquivalent:@""];
375+
tMI = [[NSMenuItem alloc] initWithTitle:@"Show XRG Dock Icon" action:@selector(showUI:) keyEquivalent:@""];
376376
[myMenu addItem:tMI];
377377
}
378378
else {
379-
tMI = [[NSMenuItem allocWithZone:[NSMenu menuZone]] initWithTitle:@"Hide XRG Dock Icon (After Restart)" action:@selector(hideUI:) keyEquivalent:@""];
379+
tMI = [[NSMenuItem alloc] initWithTitle:@"Hide XRG Dock Icon (After Restart)" action:@selector(hideUI:) keyEquivalent:@""];
380380
[myMenu addItem:tMI];
381381
}
382382

383383
[myMenu addItem:[NSMenuItem separatorItem]];
384384

385-
tMI = [[NSMenuItem allocWithZone:[NSMenu menuZone]] initWithTitle:@"Quit XRG" action:@selector(quit:) keyEquivalent:@""];
385+
tMI = [[NSMenuItem alloc] initWithTitle:@"Quit XRG" action:@selector(quit:) keyEquivalent:@""];
386386
[myMenu addItem:tMI];
387387

388388
return myMenu;

‎Graph Views/XRGBatteryView.m‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -360,15 +360,15 @@ - (void)drawRect:(NSRect)rect {
360360
}
361361

362362
- (NSMenu *)menuForEvent:(NSEvent *)theEvent {
363-
NSMenu *myMenu = [[NSMenu allocWithZone:[NSMenu menuZone]] initWithTitle:@"Battery View"];
363+
NSMenu *myMenu = [[NSMenu alloc] initWithTitle:@"Battery View"];
364364
NSMenuItem *tMI;
365365

366366
if (@available(macOS 11, *)) {
367-
tMI = [[NSMenuItem allocWithZone:[NSMenu menuZone]] initWithTitle:@"Open Battery System Preferences..." action:@selector(openEnergySaverSystemPreferences:) keyEquivalent:@""];
367+
tMI = [[NSMenuItem alloc] initWithTitle:@"Open Battery System Preferences..." action:@selector(openEnergySaverSystemPreferences:) keyEquivalent:@""];
368368
[myMenu addItem:tMI];
369369
}
370370
else {
371-
tMI = [[NSMenuItem allocWithZone:[NSMenu menuZone]] initWithTitle:@"Open Energy Saver System Preferences..." action:@selector(openEnergySaverSystemPreferences:) keyEquivalent:@""];
371+
tMI = [[NSMenuItem alloc] initWithTitle:@"Open Energy Saver System Preferences..." action:@selector(openEnergySaverSystemPreferences:) keyEquivalent:@""];
372372
[myMenu addItem:tMI];
373373
}
374374

‎Graph Views/XRGCPUView.m‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -344,10 +344,10 @@ - (void)mouseUp:(NSEvent *)theEvent {
344344
}
345345

346346
- (NSMenu *)menuForEvent:(NSEvent *)theEvent {
347-
NSMenu *myMenu = [[NSMenu allocWithZone:[NSMenu menuZone]] initWithTitle:@"CPU View"];
347+
NSMenu *myMenu = [[NSMenu alloc] initWithTitle:@"CPU View"];
348348
NSMenuItem *tMI;
349349

350-
tMI = [[NSMenuItem allocWithZone:[NSMenu menuZone]] initWithTitle:@"Top 10 CPU Processes" action:@selector(emptyEvent:) keyEquivalent:@""];
350+
tMI = [[NSMenuItem alloc] initWithTitle:@"Top 10 CPU Processes" action:@selector(emptyEvent:) keyEquivalent:@""];
351351
[myMenu addItem:tMI];
352352

353353
// Need to get our process list.
@@ -359,21 +359,21 @@ - (NSMenu *)menuForEvent:(NSEvent *)theEvent {
359359
NSInteger pid = [process[XRGProcessID] intValue];
360360
NSString *command = process[XRGProcessCommand];
361361

362-
tMI = [[NSMenuItem allocWithZone:[NSMenu menuZone]] initWithTitle:[NSString stringWithFormat:@"%1.1f%% - %@ (id %ld)", cpu, command, (long)pid] action:@selector(emptyEvent:) keyEquivalent:@""];
362+
tMI = [[NSMenuItem alloc] initWithTitle:[NSString stringWithFormat:@"%1.1f%% - %@ (id %ld)", cpu, command, (long)pid] action:@selector(emptyEvent:) keyEquivalent:@""];
363363
[myMenu addItem:tMI];
364364
}
365365

366366
[myMenu addItem:[NSMenuItem separatorItem]];
367367

368-
tMI = [[NSMenuItem allocWithZone:[NSMenu menuZone]] initWithTitle:@"Reset Graph" action:@selector(clearData:) keyEquivalent:@""];
368+
tMI = [[NSMenuItem alloc] initWithTitle:@"Reset Graph" action:@selector(clearData:) keyEquivalent:@""];
369369
[myMenu addItem:tMI];
370370

371371
[myMenu addItem:[NSMenuItem separatorItem]];
372372

373-
tMI = [[NSMenuItem allocWithZone:[NSMenu menuZone]] initWithTitle:@"Open Activity Monitor..." action:@selector(openActivityMonitor:) keyEquivalent:@""];
373+
tMI = [[NSMenuItem alloc] initWithTitle:@"Open Activity Monitor..." action:@selector(openActivityMonitor:) keyEquivalent:@""];
374374
[myMenu addItem:tMI];
375375

376-
tMI = [[NSMenuItem allocWithZone:[NSMenu menuZone]] initWithTitle:@"Open XRG CPU Preferences..." action:@selector(openCPUPreferences:) keyEquivalent:@""];
376+
tMI = [[NSMenuItem alloc] initWithTitle:@"Open XRG CPU Preferences..." action:@selector(openCPUPreferences:) keyEquivalent:@""];
377377
[myMenu addItem:tMI];
378378

379379
[myMenu addItem:[NSMenuItem separatorItem]];

‎Graph Views/XRGDiskView.m‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -409,17 +409,17 @@ - (int)convertHeight:(int) yComponent {
409409
}
410410

411411
- (NSMenu *)menuForEvent:(NSEvent *)theEvent {
412-
NSMenu *myMenu = [[NSMenu allocWithZone:[NSMenu menuZone]] initWithTitle:@"Disk View"];
412+
NSMenu *myMenu = [[NSMenu alloc] initWithTitle:@"Disk View"];
413413

414-
NSMenuItem *tMI = [[NSMenuItem allocWithZone:[NSMenu menuZone]] initWithTitle:@"Reset Graph" action:@selector(clearData:) keyEquivalent:@""];
414+
NSMenuItem *tMI = [[NSMenuItem alloc] initWithTitle:@"Reset Graph" action:@selector(clearData:) keyEquivalent:@""];
415415
[myMenu addItem:tMI];
416416

417417
[myMenu addItem:[NSMenuItem separatorItem]];
418418

419-
tMI = [[NSMenuItem allocWithZone:[NSMenu menuZone]] initWithTitle:@"Open Disk Utility..." action:@selector(openDiskUtility:) keyEquivalent:@""];
419+
tMI = [[NSMenuItem alloc] initWithTitle:@"Open Disk Utility..." action:@selector(openDiskUtility:) keyEquivalent:@""];
420420
[myMenu addItem:tMI];
421421

422-
tMI = [[NSMenuItem allocWithZone:[NSMenu menuZone]] initWithTitle:@"Open XRG Disk Preferences..." action:@selector(openDiskPreferences:) keyEquivalent:@""];
422+
tMI = [[NSMenuItem alloc] initWithTitle:@"Open XRG Disk Preferences..." action:@selector(openDiskPreferences:) keyEquivalent:@""];
423423
[myMenu addItem:tMI];
424424

425425
return myMenu;

‎Graph Views/XRGMemoryView.m‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -253,10 +253,10 @@ - (void)drawMiniGraph:(NSRect)inRect {
253253
}
254254

255255
- (NSMenu *)menuForEvent:(NSEvent *)theEvent {
256-
NSMenu *myMenu = [[NSMenu allocWithZone:[NSMenu menuZone]] initWithTitle:@"Memory View"];
256+
NSMenu *myMenu = [[NSMenu alloc] initWithTitle:@"Memory View"];
257257
NSMenuItem *tMI;
258258

259-
tMI = [[NSMenuItem allocWithZone:[NSMenu menuZone]] initWithTitle:@"Top 10 Memory Processes" action:@selector(emptyEvent:) keyEquivalent:@""];
259+
tMI = [[NSMenuItem alloc] initWithTitle:@"Top 10 Memory Processes" action:@selector(emptyEvent:) keyEquivalent:@""];
260260
[myMenu addItem:tMI];
261261

262262
// Need to get our process list.
@@ -280,18 +280,18 @@ - (NSMenu *)menuForEvent:(NSEvent *)theEvent {
280280
memoryString = [NSString stringWithFormat:@"%dK", memory];
281281
}
282282

283-
tMI = [[NSMenuItem allocWithZone:[NSMenu menuZone]] initWithTitle:[NSString stringWithFormat:@"%@ - %@ (id %d)", memoryString, command, pid] action:@selector(emptyEvent:) keyEquivalent:@""];
283+
tMI = [[NSMenuItem alloc] initWithTitle:[NSString stringWithFormat:@"%@ - %@ (id %d)", memoryString, command, pid] action:@selector(emptyEvent:) keyEquivalent:@""];
284284
[myMenu addItem:tMI];
285285
}
286286

287287
[myMenu addItem:[NSMenuItem separatorItem]];
288288

289-
tMI = [[NSMenuItem allocWithZone:[NSMenu menuZone]] initWithTitle:@"Reset Graph" action:@selector(clearData:) keyEquivalent:@""];
289+
tMI = [[NSMenuItem alloc] initWithTitle:@"Reset Graph" action:@selector(clearData:) keyEquivalent:@""];
290290
[myMenu addItem:tMI];
291291

292292
[myMenu addItem:[NSMenuItem separatorItem]];
293293

294-
tMI = [[NSMenuItem allocWithZone:[NSMenu menuZone]] initWithTitle:@"Open XRG Memory Preferences..." action:@selector(openMemoryPreferences:) keyEquivalent:@""];
294+
tMI = [[NSMenuItem alloc] initWithTitle:@"Open XRG Memory Preferences..." action:@selector(openMemoryPreferences:) keyEquivalent:@""];
295295
[myMenu addItem:tMI];
296296

297297
return myMenu;

‎Graph Views/XRGNetView.m‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -255,31 +255,31 @@ - (NSInteger)convertHeight:(NSInteger) yComponent {
255255
}
256256

257257
- (NSMenu *)menuForEvent:(NSEvent *)theEvent {
258-
NSMenu *myMenu = [[NSMenu allocWithZone:[NSMenu menuZone]] initWithTitle:@"Network View"];
258+
NSMenu *myMenu = [[NSMenu alloc] initWithTitle:@"Network View"];
259259
NSMenuItem *tMI;
260260

261-
tMI = [[NSMenuItem allocWithZone:[NSMenu menuZone]] initWithTitle:@"Network Interface Traffic" action:@selector(emptyEvent:) keyEquivalent:@""];
261+
tMI = [[NSMenuItem alloc] initWithTitle:@"Network Interface Traffic" action:@selector(emptyEvent:) keyEquivalent:@""];
262262
[myMenu addItem:tMI];
263263

264264
for (NSInteger i = 0; i < self.miner.numInterfaces; i++) {
265-
tMI = [[NSMenuItem allocWithZone:[NSMenu menuZone]] initWithTitle:[NSString stringWithFormat:@"%s: RX(%1.1fM) TX(%1.1fM)", self.miner.interfaceStats[i].if_name, self.miner.interfaceStats[i].if_in.bytes / 1024. / 1024., self.miner.interfaceStats[i].if_out.bytes / 1024. / 1024.] action:@selector(emptyEvent:) keyEquivalent:@""];
265+
tMI = [[NSMenuItem alloc] initWithTitle:[NSString stringWithFormat:@"%s: RX(%1.1fM) TX(%1.1fM)", self.miner.interfaceStats[i].if_name, self.miner.interfaceStats[i].if_in.bytes / 1024. / 1024., self.miner.interfaceStats[i].if_out.bytes / 1024. / 1024.] action:@selector(emptyEvent:) keyEquivalent:@""];
266266
[myMenu addItem:tMI];
267267
}
268268

269269
[myMenu addItem:[NSMenuItem separatorItem]];
270270

271-
tMI = [[NSMenuItem allocWithZone:[NSMenu menuZone]] initWithTitle:@"Reset Graph" action:@selector(clearData:) keyEquivalent:@""];
271+
tMI = [[NSMenuItem alloc] initWithTitle:@"Reset Graph" action:@selector(clearData:) keyEquivalent:@""];
272272
[myMenu addItem:tMI];
273273

274274
[myMenu addItem:[NSMenuItem separatorItem]];
275275

276-
tMI = [[NSMenuItem allocWithZone:[NSMenu menuZone]] initWithTitle:@"Open Network System Preferences..." action:@selector(openNetworkSystemPreferences:) keyEquivalent:@""];
276+
tMI = [[NSMenuItem alloc] initWithTitle:@"Open Network System Preferences..." action:@selector(openNetworkSystemPreferences:) keyEquivalent:@""];
277277
[myMenu addItem:tMI];
278278

279-
tMI = [[NSMenuItem allocWithZone:[NSMenu menuZone]] initWithTitle:@"Open Network Utility..." action:@selector(openNetworkUtility:) keyEquivalent:@""];
279+
tMI = [[NSMenuItem alloc] initWithTitle:@"Open Network Utility..." action:@selector(openNetworkUtility:) keyEquivalent:@""];
280280
[myMenu addItem:tMI];
281281

282-
tMI = [[NSMenuItem allocWithZone:[NSMenu menuZone]] initWithTitle:@"Open XRG Network Preferences..." action:@selector(openNetworkPreferences:) keyEquivalent:@""];
282+
tMI = [[NSMenuItem alloc] initWithTitle:@"Open XRG Network Preferences..." action:@selector(openNetworkPreferences:) keyEquivalent:@""];
283283
[myMenu addItem:tMI];
284284

285285
return myMenu;

‎Graph Views/XRGStockView.m‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -465,29 +465,29 @@ - (int)convertHeight:(int) yComponent {
465465
}
466466

467467
- (NSMenu *)menuForEvent:(NSEvent *)theEvent {
468-
NSMenu *myMenu = [[NSMenu allocWithZone:[NSMenu menuZone]] initWithTitle:@"Stock View"];
468+
NSMenu *myMenu = [[NSMenu alloc] initWithTitle:@"Stock View"];
469469
NSMenuItem *tMI;
470470

471471
int i;
472472
for (i = 0; i < [stockObjects count]; i++) {
473-
tMI = [[NSMenuItem allocWithZone:[NSMenu menuZone]] initWithTitle:[NSString stringWithFormat:@"View Detailed Status for %@", [stockObjects[i] symbol]] action:@selector(openStock:) keyEquivalent:@""];
473+
tMI = [[NSMenuItem alloc] initWithTitle:[NSString stringWithFormat:@"View Detailed Status for %@", [stockObjects[i] symbol]] action:@selector(openStock:) keyEquivalent:@""];
474474
[tMI setTag:i];
475475
[myMenu addItem:tMI];
476476
}
477477

478478
[myMenu addItem:[NSMenuItem separatorItem]];
479479

480-
tMI = [[NSMenuItem allocWithZone:[NSMenu menuZone]] initWithTitle:@"View Detailed Status for DJIA" action:@selector(openDJIA:) keyEquivalent:@""];
480+
tMI = [[NSMenuItem alloc] initWithTitle:@"View Detailed Status for DJIA" action:@selector(openDJIA:) keyEquivalent:@""];
481481
[myMenu addItem:tMI];
482482

483483
[myMenu addItem:[NSMenuItem separatorItem]];
484484

485-
tMI = [[NSMenuItem allocWithZone:[NSMenu menuZone]] initWithTitle:@"Update Stock Graph Now" action:@selector(updateNow:) keyEquivalent:@""];
485+
tMI = [[NSMenuItem alloc] initWithTitle:@"Update Stock Graph Now" action:@selector(updateNow:) keyEquivalent:@""];
486486
[myMenu addItem:tMI];
487487

488488
[myMenu addItem:[NSMenuItem separatorItem]];
489489

490-
tMI = [[NSMenuItem allocWithZone:[NSMenu menuZone]] initWithTitle:@"Open XRG Stock Preferences..." action:@selector(openStockPreferences:) keyEquivalent:@""];
490+
tMI = [[NSMenuItem alloc] initWithTitle:@"Open XRG Stock Preferences..." action:@selector(openStockPreferences:) keyEquivalent:@""];
491491
[myMenu addItem:tMI];
492492

493493
return myMenu;

‎Graph Views/XRGTemperatureView.m‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -460,7 +460,7 @@ - (void)mouseUp:(NSEvent *)theEvent {
460460
}
461461

462462
- (NSMenu *)menuForEvent:(NSEvent *)theEvent {
463-
NSMenu *myMenu = [[NSMenu allocWithZone:[NSMenu menuZone]] initWithTitle:@"Temperature View"];
463+
NSMenu *myMenu = [[NSMenu alloc] initWithTitle:@"Temperature View"];
464464
NSMenuItem *tMI;
465465

466466
NSArray *locations = [[XRGTemperatureMiner shared] locationKeysIncludingUnknown:[XRGTemperatureView showUnknownSensors]];
@@ -485,7 +485,7 @@ - (NSMenu *)menuForEvent:(NSEvent *)theEvent {
485485
[s appendFormat:@"%3.0f%@", locationTemperature, units];
486486
}
487487

488-
tMI = [[NSMenuItem allocWithZone:[NSMenu menuZone]] initWithTitle:s
488+
tMI = [[NSMenuItem alloc] initWithTitle:s
489489
action:@selector(emptyEvent:)
490490
keyEquivalent:@""];
491491

@@ -494,15 +494,15 @@ - (NSMenu *)menuForEvent:(NSEvent *)theEvent {
494494

495495
[myMenu addItem:[NSMenuItem separatorItem]];
496496

497-
tMI = [[NSMenuItem allocWithZone:[NSMenu menuZone]] initWithTitle:@"Reset Graph" action:@selector(clearData:) keyEquivalent:@""];
497+
tMI = [[NSMenuItem alloc] initWithTitle:@"Reset Graph" action:@selector(clearData:) keyEquivalent:@""];
498498
[myMenu addItem:tMI];
499499

500500
[myMenu addItem:[NSMenuItem separatorItem]];
501501

502-
tMI = [[NSMenuItem allocWithZone:[NSMenu menuZone]] initWithTitle:@"Open XRG Temperature Preferences..." action:@selector(openTemperaturePreferences:) keyEquivalent:@""];
502+
tMI = [[NSMenuItem alloc] initWithTitle:@"Open XRG Temperature Preferences..." action:@selector(openTemperaturePreferences:) keyEquivalent:@""];
503503
[myMenu addItem:tMI];
504504

505-
tMI = [[NSMenuItem allocWithZone:[NSMenu menuZone]] initWithTitle:@"Open Temperature Sensors Window..." action:@selector(showSensorWindow:) keyEquivalent:@""];
505+
tMI = [[NSMenuItem alloc] initWithTitle:@"Open Temperature Sensors Window..." action:@selector(showSensorWindow:) keyEquivalent:@""];
506506
[myMenu addItem:tMI];
507507

508508
return myMenu;

0 commit comments

Comments
 (0)