From 0df2dc216075f9213437c67580b340a9e8cebaf1 Mon Sep 17 00:00:00 2001
From: Dzmitry Neviadomski <nevack.d@gmail.com>
Date: Sun, 10 Jan 2021 03:27:39 +0300
Subject: [PATCH] Resolve all warnings for Preferences target.

---
 Preferences/General/General.xcodeproj/project.pbxproj         | 4 +++-
 .../General.xcodeproj/xcshareddata/xcschemes/General.xcscheme | 2 +-
 Preferences/General/General_Prefix.pch                        | 1 +
 Preferences/General/MIDIPane.m                                | 2 +-
 Preferences/General/OutputsArrayController.h                  | 2 --
 Preferences/General/OutputsArrayController.m                  | 2 ++
 6 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/Preferences/General/General.xcodeproj/project.pbxproj b/Preferences/General/General.xcodeproj/project.pbxproj
index 1dac506f0..3ee2a52f6 100644
--- a/Preferences/General/General.xcodeproj/project.pbxproj
+++ b/Preferences/General/General.xcodeproj/project.pbxproj
@@ -363,7 +363,7 @@
 		089C1669FE841209C02AAC07 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1130;
+				LastUpgradeCheck = 1230;
 				TargetAttributes = {
 					8D5B49AC048680CD000E48DA = {
 						DevelopmentTeam = "";
@@ -567,6 +567,7 @@
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -613,6 +614,7 @@
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
diff --git a/Preferences/General/General.xcodeproj/xcshareddata/xcschemes/General.xcscheme b/Preferences/General/General.xcodeproj/xcshareddata/xcschemes/General.xcscheme
index 22310a339..592458693 100644
--- a/Preferences/General/General.xcodeproj/xcshareddata/xcschemes/General.xcscheme
+++ b/Preferences/General/General.xcodeproj/xcshareddata/xcschemes/General.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1150"
+   LastUpgradeVersion = "1230"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Preferences/General/General_Prefix.pch b/Preferences/General/General_Prefix.pch
index df2732e06..3b4aea554 100644
--- a/Preferences/General/General_Prefix.pch
+++ b/Preferences/General/General_Prefix.pch
@@ -3,5 +3,6 @@
 //
 
 #ifdef __OBJC__
+    #import <AssertMacros.h>
     #import <Cocoa/Cocoa.h>
 #endif
diff --git a/Preferences/General/MIDIPane.m b/Preferences/General/MIDIPane.m
index ddd610f66..4bea99e15 100644
--- a/Preferences/General/MIDIPane.m
+++ b/Preferences/General/MIDIPane.m
@@ -35,7 +35,7 @@
     if ( oldPath != nil )
         [panel setDirectoryURL:[NSURL fileURLWithPath:oldPath]];
     NSInteger result = [panel runModal];
-    if(result == NSOKButton)
+    if(result == NSModalResponseOK)
     {
         [[NSUserDefaults standardUserDefaults] setValue:[[panel URL] path] forKey:@"soundFontPath"];
     }
diff --git a/Preferences/General/OutputsArrayController.h b/Preferences/General/OutputsArrayController.h
index ea581f6ae..994aed016 100644
--- a/Preferences/General/OutputsArrayController.h
+++ b/Preferences/General/OutputsArrayController.h
@@ -2,8 +2,6 @@
 
 #import <Cocoa/Cocoa.h>
 
-#import <CoreAudio/AudioHardware.h>
-
 @interface OutputsArrayController : NSArrayController
 {
 }
diff --git a/Preferences/General/OutputsArrayController.m b/Preferences/General/OutputsArrayController.m
index 5477edd40..5db0766c1 100644
--- a/Preferences/General/OutputsArrayController.m
+++ b/Preferences/General/OutputsArrayController.m
@@ -1,5 +1,7 @@
 #import "OutputsArrayController.h"
 
+#import <CoreAudio/AudioHardware.h>
+
 @implementation OutputsArrayController
 
 - (void)awakeFromNib