X-Git-Url: https://git.yukkurigames.com/?p=enjoyable.git;a=blobdiff_plain;f=Enjoyable.xcodeproj%2Fproject.pbxproj;h=ccdd256140e82c3a27607f68feff1cdad4aabb4b;hp=c633833e09e67b197ee8a166e8a3c72a7275a04f;hb=d0f4d54bb9eb66cbd19fa4dabb56fc09f42bd22d;hpb=dcedf147ddcb6c21768cea94a2f06b93007d2a82

diff --git a/Enjoyable.xcodeproj/project.pbxproj b/Enjoyable.xcodeproj/project.pbxproj
index c633833..ccdd256 100644
--- a/Enjoyable.xcodeproj/project.pbxproj
+++ b/Enjoyable.xcodeproj/project.pbxproj
@@ -27,9 +27,9 @@
 		D5617FE70FAFDB5800928B3A /* NJKeyInputField.m in Sources */ = {isa = PBXBuildFile; fileRef = D5617FE60FAFDB5800928B3A /* NJKeyInputField.m */; };
 		D594BE860FAE6219007A85F2 /* NJDevice.m in Sources */ = {isa = PBXBuildFile; fileRef = D594BE850FAE6219007A85F2 /* NJDevice.m */; };
 		D594BE8A0FAE64AD007A85F2 /* NJInput.m in Sources */ = {isa = PBXBuildFile; fileRef = D594BE890FAE64AD007A85F2 /* NJInput.m */; };
-		D594BEF90FAE6FF2007A85F2 /* NJInputController.m in Sources */ = {isa = PBXBuildFile; fileRef = D594BEF80FAE6FF2007A85F2 /* NJInputController.m */; };
+		D594BEF90FAE6FF2007A85F2 /* NJDeviceController.m in Sources */ = {isa = PBXBuildFile; fileRef = D594BEF80FAE6FF2007A85F2 /* NJDeviceController.m */; };
 		D594BF000FAE7397007A85F2 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D594BEFF0FAE7397007A85F2 /* IOKit.framework */; };
-		D594BF830FAE9661007A85F2 /* ApplicationController.m in Sources */ = {isa = PBXBuildFile; fileRef = D594BF820FAE9661007A85F2 /* ApplicationController.m */; };
+		D594BF830FAE9661007A85F2 /* EnjoyableApplicationDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = D594BF820FAE9661007A85F2 /* EnjoyableApplicationDelegate.m */; };
 		D5F809710FB093400006A4DE /* NJOutputMapping.m in Sources */ = {isa = PBXBuildFile; fileRef = D5F809700FB093400006A4DE /* NJOutputMapping.m */; };
 		D5F80A9D0FB0A2FF0006A4DE /* icon.icns in Resources */ = {isa = PBXBuildFile; fileRef = D5617A080FAEAF8300928B3A /* icon.icns */; };
 		EE1D7C9216E01E7000B000EB /* NSView+FirstResponder.m in Sources */ = {isa = PBXBuildFile; fileRef = EE1D7C9116E01E7000B000EB /* NSView+FirstResponder.m */; };
@@ -78,11 +78,11 @@
 		D594BE850FAE6219007A85F2 /* NJDevice.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NJDevice.m; sourceTree = "<group>"; };
 		D594BE880FAE64AD007A85F2 /* NJInput.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NJInput.h; sourceTree = "<group>"; };
 		D594BE890FAE64AD007A85F2 /* NJInput.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NJInput.m; sourceTree = "<group>"; };
-		D594BEF70FAE6FF2007A85F2 /* NJInputController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NJInputController.h; sourceTree = "<group>"; };
-		D594BEF80FAE6FF2007A85F2 /* NJInputController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NJInputController.m; sourceTree = "<group>"; };
+		D594BEF70FAE6FF2007A85F2 /* NJDeviceController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NJDeviceController.h; sourceTree = "<group>"; };
+		D594BEF80FAE6FF2007A85F2 /* NJDeviceController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NJDeviceController.m; sourceTree = "<group>"; };
 		D594BEFF0FAE7397007A85F2 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = /System/Library/Frameworks/IOKit.framework; sourceTree = "<absolute>"; };
-		D594BF810FAE9661007A85F2 /* ApplicationController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ApplicationController.h; sourceTree = "<group>"; };
-		D594BF820FAE9661007A85F2 /* ApplicationController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ApplicationController.m; sourceTree = "<group>"; };
+		D594BF810FAE9661007A85F2 /* EnjoyableApplicationDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EnjoyableApplicationDelegate.h; sourceTree = "<group>"; };
+		D594BF820FAE9661007A85F2 /* EnjoyableApplicationDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EnjoyableApplicationDelegate.m; sourceTree = "<group>"; };
 		D5F8096F0FB093400006A4DE /* NJOutputMapping.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NJOutputMapping.h; sourceTree = "<group>"; };
 		D5F809700FB093400006A4DE /* NJOutputMapping.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NJOutputMapping.m; sourceTree = "<group>"; };
 		EE1D7C9016E01E7000B000EB /* NSView+FirstResponder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSView+FirstResponder.h"; sourceTree = "<group>"; };
@@ -109,44 +109,43 @@
 		080E96DDFE201D6D7F000001 /* Classes */ = {
 			isa = PBXGroup;
 			children = (
-				D5617D290FAF579A00928B3A /* NJInputAnalog.h */,
-				D5617D2A0FAF579A00928B3A /* NJInputAnalog.m */,
+				D594BF810FAE9661007A85F2 /* EnjoyableApplicationDelegate.h */,
+				D594BF820FAE9661007A85F2 /* EnjoyableApplicationDelegate.m */,
+				D594BEF70FAE6FF2007A85F2 /* NJDeviceController.h */,
+				D594BEF80FAE6FF2007A85F2 /* NJDeviceController.m */,
+				D5617A340FAEB74000928B3A /* NJMappingsController.h */,
+				D5617A350FAEB74000928B3A /* NJMappingsController.m */,
+				D5617FE20FAFD7B000928B3A /* NJOutputController.h */,
+				D5617FE30FAFD7B000928B3A /* NJOutputController.m */,
+				D5617FE50FAFDB5800928B3A /* NJKeyInputField.h */,
+				D5617FE60FAFDB5800928B3A /* NJKeyInputField.m */,
+				D5617A370FAEBA1800928B3A /* NJMapping.h */,
+				D5617A380FAEBA1800928B3A /* NJMapping.m */,
 				D594BE840FAE6219007A85F2 /* NJDevice.h */,
 				D594BE850FAE6219007A85F2 /* NJDevice.m */,
+				EEF86B7316E2241000674B87 /* NJInputPathElement.h */,
 				D594BE880FAE64AD007A85F2 /* NJInput.h */,
 				D594BE890FAE64AD007A85F2 /* NJInput.m */,
-				D5617D240FAF579300928B3A /* NJInputHat.h */,
-				D5617D250FAF579300928B3A /* NJInputHat.m */,
+				D5617D290FAF579A00928B3A /* NJInputAnalog.h */,
+				D5617D2A0FAF579A00928B3A /* NJInputAnalog.m */,
 				D5617D180FAF568100928B3A /* NJInputButton.h */,
 				D5617D190FAF568100928B3A /* NJInputButton.m */,
-				D594BEF70FAE6FF2007A85F2 /* NJInputController.h */,
-				D594BEF80FAE6FF2007A85F2 /* NJInputController.m */,
-				D594BF810FAE9661007A85F2 /* ApplicationController.h */,
-				D594BF820FAE9661007A85F2 /* ApplicationController.m */,
-				D5617A340FAEB74000928B3A /* NJMappingsController.h */,
-				D5617A350FAEB74000928B3A /* NJMappingsController.m */,
-				D5617A370FAEBA1800928B3A /* NJMapping.h */,
-				D5617A380FAEBA1800928B3A /* NJMapping.m */,
-				D5F8096F0FB093400006A4DE /* NJOutputMapping.h */,
-				D5F809700FB093400006A4DE /* NJOutputMapping.m */,
+				D5617D240FAF579300928B3A /* NJInputHat.h */,
+				D5617D250FAF579300928B3A /* NJInputHat.m */,
 				D5617FD40FAFD06000928B3A /* NJOutput.h */,
 				D5617FD50FAFD06000928B3A /* NJOutput.m */,
 				D5617FD70FAFD1E600928B3A /* NJOutputKeyPress.h */,
 				D5617FD80FAFD1E600928B3A /* NJOutputKeyPress.m */,
-				D5617FE20FAFD7B000928B3A /* NJOutputController.h */,
-				D5617FE30FAFD7B000928B3A /* NJOutputController.m */,
-				D5617FE50FAFDB5800928B3A /* NJKeyInputField.h */,
-				D5617FE60FAFDB5800928B3A /* NJKeyInputField.m */,
-				8BD9B54115C230FE00929C5D /* NJOutputMouseMove.h */,
-				8BD9B54215C230FE00929C5D /* NJOutputMouseMove.m */,
+				D5F8096F0FB093400006A4DE /* NJOutputMapping.h */,
+				D5F809700FB093400006A4DE /* NJOutputMapping.m */,
 				8B7E476A15C314A200C588FA /* NJOutputMouseButton.h */,
 				8B7E476B15C314A200C588FA /* NJOutputMouseButton.m */,
+				8BD9B54115C230FE00929C5D /* NJOutputMouseMove.h */,
+				8BD9B54215C230FE00929C5D /* NJOutputMouseMove.m */,
 				8BEFAD9A15C46BFF00823AEC /* NJOutputMouseScroll.h */,
 				8BEFAD9B15C46BFF00823AEC /* NJOutputMouseScroll.m */,
 				8BEFAD9E15C476DC00823AEC /* NJOutputSwitchMouseMode.h */,
 				8BEFAD9F15C476DC00823AEC /* NJOutputSwitchMouseMode.m */,
-				EEF86B7316E2241000674B87 /* NJInputPathElement.h */,
-				EEF86B7416E298CD00674B87 /* NJEvents.h */,
 			);
 			name = Classes;
 			sourceTree = "<group>";
@@ -181,6 +180,7 @@
 			isa = PBXGroup;
 			children = (
 				080E96DDFE201D6D7F000001 /* Classes */,
+				EE1D5F8B16E403D600749C36 /* Categories */,
 				29B97315FDCFA39411CA2CEA /* Other Sources */,
 				29B97317FDCFA39411CA2CEA /* Resources */,
 				29B97323FDCFA39411CA2CEA /* Frameworks */,
@@ -192,12 +192,9 @@
 		29B97315FDCFA39411CA2CEA /* Other Sources */ = {
 			isa = PBXGroup;
 			children = (
-				32CA4F630368D1EE00C91783 /* Enjoyable_Prefix.pch */,
 				29B97316FDCFA39411CA2CEA /* main.m */,
-				EE1D7C9416E0ECCF00B000EB /* NSError+Description.h */,
-				EE1D7C9516E0ECCF00B000EB /* NSError+Description.m */,
-				EE1D7C9016E01E7000B000EB /* NSView+FirstResponder.h */,
-				EE1D7C9116E01E7000B000EB /* NSView+FirstResponder.m */,
+				EEF86B7416E298CD00674B87 /* NJEvents.h */,
+				32CA4F630368D1EE00C91783 /* Enjoyable_Prefix.pch */,
 			);
 			name = "Other Sources";
 			sourceTree = "<group>";
@@ -223,6 +220,17 @@
 			name = Frameworks;
 			sourceTree = "<group>";
 		};
+		EE1D5F8B16E403D600749C36 /* Categories */ = {
+			isa = PBXGroup;
+			children = (
+				EE1D7C9416E0ECCF00B000EB /* NSError+Description.h */,
+				EE1D7C9516E0ECCF00B000EB /* NSError+Description.m */,
+				EE1D7C9016E01E7000B000EB /* NSView+FirstResponder.h */,
+				EE1D7C9116E01E7000B000EB /* NSView+FirstResponder.m */,
+			);
+			name = Categories;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -293,8 +301,8 @@
 				8D11072D0486CEB800E47090 /* main.m in Sources */,
 				D594BE860FAE6219007A85F2 /* NJDevice.m in Sources */,
 				D594BE8A0FAE64AD007A85F2 /* NJInput.m in Sources */,
-				D594BEF90FAE6FF2007A85F2 /* NJInputController.m in Sources */,
-				D594BF830FAE9661007A85F2 /* ApplicationController.m in Sources */,
+				D594BEF90FAE6FF2007A85F2 /* NJDeviceController.m in Sources */,
+				D594BF830FAE9661007A85F2 /* EnjoyableApplicationDelegate.m in Sources */,
 				D5617A360FAEB74000928B3A /* NJMappingsController.m in Sources */,
 				D5617A390FAEBA1800928B3A /* NJMapping.m in Sources */,
 				D5617D1A0FAF568100928B3A /* NJInputButton.m in Sources */,