Fix a number of compile errors caused by enabling OSX warnings

livecodefraser · livecodefraser · commit 5c89cebd570e · 2015-06-23T10:31:24.000+01:00
diff --git a/engine/src/mac-menu.mm b/engine/src/mac-menu.mm
@@ -424,7 +424,7 @@ - (BOOL)performKeyEquivalent: (NSEvent *)event
     // SN-2014-12-05: [[ Bug 14019 ]] Forbid any Cmd-key reaction when the target is the colour picker
     // (that colour picker is modal after all)
     if ([[[event window] delegate] isKindOfClass: [MCColorPanelDelegate class]])
-        return;
+        return NO;
 
 	// If the event is not targetted at one of our windows, we just let things
 	// flow as normal.
diff --git a/engine/src/player-platform.cpp b/engine/src/player-platform.cpp
@@ -2750,7 +2750,7 @@ void MCPlayer::SynchronizeUserCallbacks(void)
 	delete cblist;
     
     if (!hasfilename())
-        return True;
+        return;
     
     // Now set the markers in the player so that we get notified.
     array_t<uint32_t> t_markers;
@@ -2761,7 +2761,7 @@ void MCPlayer::SynchronizeUserCallbacks(void)
     MCPlatformSetPlayerProperty(m_platform_player, kMCPlatformPlayerPropertyMarkers, kMCPlatformPropertyTypeUInt32Array, &t_markers);
     MCMemoryDeleteArray(t_markers . ptr);
     
-	return True;
+	return;
 }
 
 Boolean MCPlayer::isbuffering(void)
diff --git a/revbrowser/src/cefbrowser_osx.mm b/revbrowser/src/cefbrowser_osx.mm
@@ -240,7 +240,7 @@ bool MCCefPlatformCreateBrowser(int p_window_id, MCCefBrowserBase *&r_browser)
     
 	NSView *t_handle;
 	if (!GetWindowHandle(t_handle))
-		return false;
+		return;
     
     t_handle = t_handle;
 }
diff --git a/revvideograbber/src/rrecapture.m b/revvideograbber/src/rrecapture.m
@@ -784,7 +784,7 @@ - (BOOL)startRecording: (BOOL *)r_success
 - (BOOL)stopRecording: (BOOL *)r_success
 {
 	if (m_record_state == kCaptureSessionStateStopped)
-		return;
+		return NO;
 	
 	[m_record_output recordToOutputFileURL: nil];
 	
@@ -1178,7 +1178,7 @@ void rreCaptureResumePreviewing(void)
 NSString *rreCapturePreviewState(void)
 {
 	if (!CaptureSessionExists())
-		return;
+		return nil;
 	
 	return [g_session previewState];
 }
@@ -1259,7 +1259,7 @@ void rreCaptureSetRecordOutput(NSString *p_image_id)
 NSString *rreCaptureStartRecording(void)
 {
 	if (!CaptureSessionExists())
-		return;
+		return nil;
 	
 	BOOL t_success;
 	if (![g_session startRecording: &t_success])
@@ -1274,7 +1274,7 @@ void rreCaptureSetRecordOutput(NSString *p_image_id)
 NSString *rreCaptureStopRecording(void)
 {
 	if (!CaptureSessionExists())
-		return;
+		return nil;
 	
 	BOOL t_success;
 	[g_session stopRecording: &t_success];
@@ -1309,7 +1309,7 @@ void rreCaptureResumeRecording(void)
 int32_t rreCaptureGetRecordFrameRate(void)
 {
 	if (!CaptureSessionExists())
-		return;
+		return nil;
 	
 	return [g_session maxFrameRate];
 }
@@ -1325,7 +1325,7 @@ void rreCaptureSetRecordFrameRate(int32_t p_rate)
 NSString *rreCaptureGetRecordFrameSize(void)
 {
 	if (!CaptureSessionExists())
-		return;
+		return nil;
 	
 	NSSize t_size;
 	t_size = [g_session maxFrameSize];
@@ -1345,7 +1345,7 @@ void rreCaptureSetRecordFrameSize(int32_t p_width, int32_t p_height)
 NSString *rreCaptureRecordState(void)
 {
 	if (!CaptureSessionExists())
-		return;
+        return nil;
 	
 	return [g_session recordState];
 }

Original file line number	Diff line number	Diff line change
`@@ -240,7 +240,7 @@ bool MCCefPlatformCreateBrowser(int p_window_id, MCCefBrowserBase *&r_browser)`
`240`	`240`
`241`	`241`	`NSView *t_handle;`
`242`	`242`	`if (!GetWindowHandle(t_handle))`
`243`		`- return false;`
	`243`	`+ return;`
`244`	`244`
`245`	`245`	`t_handle = t_handle;`
`246`	`246`	`}`
Original file line number	Diff line number	Diff line change
`@@ -784,7 +784,7 @@ - (BOOL)startRecording: (BOOL *)r_success`
`784`	`784`	`- (BOOL)stopRecording: (BOOL *)r_success`
`785`	`785`	`{`
`786`	`786`	`if (m_record_state == kCaptureSessionStateStopped)`
`787`		`- return;`
	`787`	`+ return NO;`
`788`	`788`
`789`	`789`	`[m_record_output recordToOutputFileURL: nil];`
`790`	`790`
`@@ -1178,7 +1178,7 @@ void rreCaptureResumePreviewing(void)`
`1178`	`1178`	`NSString *rreCapturePreviewState(void)`
`1179`	`1179`	`{`
`1180`	`1180`	`if (!CaptureSessionExists())`
`1181`		`- return;`
	`1181`	`+ return nil;`
`1182`	`1182`
`1183`	`1183`	`return [g_session previewState];`
`1184`	`1184`	`}`
`@@ -1259,7 +1259,7 @@ void rreCaptureSetRecordOutput(NSString *p_image_id)`
`1259`	`1259`	`NSString *rreCaptureStartRecording(void)`
`1260`	`1260`	`{`
`1261`	`1261`	`if (!CaptureSessionExists())`
`1262`		`- return;`
	`1262`	`+ return nil;`
`1263`	`1263`
`1264`	`1264`	`BOOL t_success;`
`1265`	`1265`	`if (![g_session startRecording: &t_success])`
`@@ -1274,7 +1274,7 @@ void rreCaptureSetRecordOutput(NSString *p_image_id)`
`1274`	`1274`	`NSString *rreCaptureStopRecording(void)`
`1275`	`1275`	`{`
`1276`	`1276`	`if (!CaptureSessionExists())`
`1277`		`- return;`
	`1277`	`+ return nil;`
`1278`	`1278`
`1279`	`1279`	`BOOL t_success;`
`1280`	`1280`	`[g_session stopRecording: &t_success];`
`@@ -1309,7 +1309,7 @@ void rreCaptureResumeRecording(void)`
`1309`	`1309`	`int32_t rreCaptureGetRecordFrameRate(void)`
`1310`	`1310`	`{`
`1311`	`1311`	`if (!CaptureSessionExists())`
`1312`		`- return;`
	`1312`	`+ return nil;`
`1313`	`1313`
`1314`	`1314`	`return [g_session maxFrameRate];`
`1315`	`1315`	`}`
`@@ -1325,7 +1325,7 @@ void rreCaptureSetRecordFrameRate(int32_t p_rate)`
`1325`	`1325`	`NSString *rreCaptureGetRecordFrameSize(void)`
`1326`	`1326`	`{`
`1327`	`1327`	`if (!CaptureSessionExists())`
`1328`		`- return;`
	`1328`	`+ return nil;`
`1329`	`1329`
`1330`	`1330`	`NSSize t_size;`
`1331`	`1331`	`t_size = [g_session maxFrameSize];`
`@@ -1345,7 +1345,7 @@ void rreCaptureSetRecordFrameSize(int32_t p_width, int32_t p_height)`
`1345`	`1345`	`NSString *rreCaptureRecordState(void)`
`1346`	`1346`	`{`
`1347`	`1347`	`if (!CaptureSessionExists())`
`1348`		`- return;`
	`1348`	`+ return nil;`
`1349`	`1349`
`1350`	`1350`	`return [g_session recordState];`
`1351`	`1351`	`}`