fixed some catch.hpp includes in the tests, fixed a deprecated event …

…cast in appleevents.mm
octareenroon91 · Dec 22, 2015 · a44b298 · a44b298
1 parent df54ee1
commit a44b298
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/src/pcedit/pc.appleevents.mm b/src/pcedit/pc.appleevents.mm
@@ -54,7 +54,7 @@ -(BOOL)application:(NSApplication*) app openFile:(NSString*) file {
 -(NSApplicationTerminateReply)applicationShouldTerminate: (NSApplication*)sender {
 	(void) sender; // Suppress "unused parameter" warning
 	All_Done = verify_restore_quit("save-quit");
-	return All_Done;
+	return All_Done ? NSTerminateNow : NSTerminateCancel;
 }
 @end
 
diff --git a/test/init.cpp b/test/init.cpp
@@ -6,7 +6,7 @@
 //
 //
 
-#include <catch.hpp>
+#include "catch.hpp"
 #include "scenario.hpp"
 #include "creature.hpp"
 #include "creatlist.hpp"

diff --git a/test/item_legacy.cpp b/test/item_legacy.cpp
@@ -6,7 +6,7 @@
 //
 //
 
-#include <catch.hpp>
+#include "catch.hpp"
 #include "item.hpp"
 #include "oldstructs.hpp"
 #include "spell.hpp"

diff --git a/test/monst_legacy.cpp b/test/monst_legacy.cpp
@@ -6,7 +6,7 @@
 //
 //
 
-#include <catch.hpp>
+#include "catch.hpp"
 #include "creature.hpp"
 #include "oldstructs.hpp"
 

diff --git a/test/ter_legacy.cpp b/test/ter_legacy.cpp
@@ -6,7 +6,7 @@
 //
 //
 
-#include <catch.hpp>
+#include "catch.hpp"
 #include "terrain.hpp"
 #include "oldstructs.hpp"