Fix various uses of nil as an integer constant

livecodefraser · livecodefraser · commit f6bde59f44cf · 2016-09-01T10:56:35.000+01:00
diff --git a/engine/src/desktop-dc.cpp b/engine/src/desktop-dc.cpp
@@ -912,7 +912,7 @@ void MCScreenDC::flushevents(uint2 e)
 	else if (e == FE_KEYUP)
 		t_mask = kMCPlatformEventKeyUp;
 	
-	if (t_mask != nil)
+	if (t_mask != 0)
 		MCPlatformFlushEvents(t_mask);
 }
 
diff --git a/engine/src/mac-qt-player.mm b/engine/src/mac-qt-player.mm
@@ -264,8 +264,8 @@ inline NSComparisonResult do_QTTimeCompare (QTTime time, QTTime otherTime)
 	
     // MW-2014-07-16: [[ Bug 12506 ]] Make sure we unhook the callbacks before releasing (it
     //   seems it takes a while for QTKit to actually release the objects!).
-    MCSetActionFilterWithRefCon([m_movie quickTimeMovieController], nil, nil);
-    SetMovieDrawingCompleteProc([m_movie quickTimeMovie], movieDrawingCallAlways, nil, nil);
+    MCSetActionFilterWithRefCon([m_movie quickTimeMovieController], nil, 0);
+    SetMovieDrawingCompleteProc([m_movie quickTimeMovie], movieDrawingCallAlways, nil, 0);
     
     [[NSNotificationCenter defaultCenter] removeObserver: m_observer];
     [m_observer release];
@@ -401,7 +401,7 @@ inline NSComparisonResult do_QTTimeCompare (QTTime time, QTTime otherTime)
 			t_player -> m_current_frame = nil;
 		}
 
-		SetMovieDrawingCompleteProc([t_player -> m_movie quickTimeMovie], movieDrawingCallAlways, nil, nil);
+		SetMovieDrawingCompleteProc([t_player -> m_movie quickTimeMovie], movieDrawingCallAlways, nil, 0);
         
 		// Switching to non-offscreen
 		t_player -> m_offscreen = t_player -> m_pending_offscreen;
@@ -527,8 +527,8 @@ inline NSComparisonResult do_QTTimeCompare (QTTime time, QTTime otherTime)
     m_has_invalid_filename = false;
 	
     // MW-2014-07-18: [[ Bug ]] Clean up callbacks before we release.
-    MCSetActionFilterWithRefCon([m_movie quickTimeMovieController], nil, nil);
-    SetMovieDrawingCompleteProc([m_movie quickTimeMovie], movieDrawingCallAlways, nil, nil);
+    MCSetActionFilterWithRefCon([m_movie quickTimeMovieController], nil, 0);
+    SetMovieDrawingCompleteProc([m_movie quickTimeMovie], movieDrawingCallAlways, nil, 0);
 	[m_movie release];
     
     // PM-2014-09-02: [[ Bug 13306 ]] Make sure we reset the previous value of loadedtime when loading a new movie
diff --git a/engine/src/quicktime.cpp b/engine/src/quicktime.cpp
@@ -720,7 +720,7 @@ Boolean MCQTEffectsDialog(MCStringRef &r_data)
 			case codecParameterDialogConfirm:
 			case userCanceledErr:
 				QTDismissStandardParameterDialog(createdDialogID);
-				createdDialogID =nil;
+				createdDialogID = 0;
 				break;
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -912,7 +912,7 @@ void MCScreenDC::flushevents(uint2 e)`
`912`	`912`	`else if (e == FE_KEYUP)`
`913`	`913`	`t_mask = kMCPlatformEventKeyUp;`
`914`	`914`
`915`		`- if (t_mask != nil)`
	`915`	`+ if (t_mask != 0)`
`916`	`916`	`MCPlatformFlushEvents(t_mask);`
`917`	`917`	`}`
`918`	`918`
Original file line number	Diff line number	Diff line change
`@@ -720,7 +720,7 @@ Boolean MCQTEffectsDialog(MCStringRef &r_data)`
`720`	`720`	`case codecParameterDialogConfirm:`
`721`	`721`	`case userCanceledErr:`
`722`	`722`	`QTDismissStandardParameterDialog(createdDialogID);`
`723`		`- createdDialogID =nil;`
	`723`	`+ createdDialogID = 0;`
`724`	`724`	`break;`
`725`	`725`	`}`
`726`	`726`	`}`