Renamed SDL_Del* to SDL_Remove*

test/testautomation_clipboard.c

@@ -389,7 +389,7 @@ static int clipboard_testClipboardDataFunctions(void *arg)
         !boolResult,
         "Verify has test text data, expected SDL_FALSE, got SDL_TRUE");
 
-    SDL_DelEventWatch(ClipboardEventWatch, NULL);
+    SDL_RemoveEventWatch(ClipboardEventWatch, NULL);
 
     return TEST_COMPLETED;
 }
@@ -473,7 +473,7 @@ static int clipboard_testClipboardTextFunctions(void *arg)
     SDL_free(textRef);
     SDL_free(text);
 
-    SDL_DelEventWatch(ClipboardEventWatch, NULL);
+    SDL_RemoveEventWatch(ClipboardEventWatch, NULL);
 
     return TEST_COMPLETED;
 }
@@ -556,7 +556,7 @@ static int clipboard_testPrimarySelectionTextFunctions(void *arg)
     SDL_free(textRef);
     SDL_free(text);
 
-    SDL_DelEventWatch(ClipboardEventWatch, NULL);
+    SDL_RemoveEventWatch(ClipboardEventWatch, NULL);
 
     return TEST_COMPLETED;
 }

test/testautomation_events.c

@@ -106,7 +106,7 @@ static int events_pushPumpAndPollUserevent(void *arg)
  * Adds and deletes an event watch function with NULL userdata
  *
  * \sa SDL_AddEventWatch
- * \sa SDL_DelEventWatch
+ * \sa SDL_RemoveEventWatch
  *
  */
 static int events_addDelEventWatch(void *arg)
@@ -138,8 +138,8 @@ static int events_addDelEventWatch(void *arg)
     SDLTest_AssertCheck(g_eventFilterCalled == 1, "Check that event filter was called");
 
     /* Delete watch */
-    SDL_DelEventWatch(events_sampleNullEventFilter, NULL);
-    SDLTest_AssertPass("Call to SDL_DelEventWatch()");
+    SDL_RemoveEventWatch(events_sampleNullEventFilter, NULL);
+    SDLTest_AssertPass("Call to SDL_RemoveEventWatch()");
 
     /* Push a user event onto the queue and force queue update */
     g_eventFilterCalled = 0;
@@ -156,7 +156,7 @@ static int events_addDelEventWatch(void *arg)
  * Adds and deletes an event watch function with userdata
  *
  * \sa SDL_AddEventWatch
- * \sa SDL_DelEventWatch
+ * \sa SDL_RemoveEventWatch
  *
  */
 static int events_addDelEventWatchWithUserdata(void *arg)
@@ -189,8 +189,8 @@ static int events_addDelEventWatchWithUserdata(void *arg)
     SDLTest_AssertCheck(g_eventFilterCalled == 1, "Check that event filter was called");
 
     /* Delete watch */
-    SDL_DelEventWatch(events_sampleNullEventFilter, (void *)&g_userdataValue);
-    SDLTest_AssertPass("Call to SDL_DelEventWatch()");
+    SDL_RemoveEventWatch(events_sampleNullEventFilter, (void *)&g_userdataValue);
+    SDLTest_AssertPass("Call to SDL_RemoveEventWatch()");
 
     /* Push a user event onto the queue and force queue update */
     g_eventFilterCalled = 0;

test/testautomation_hints.c

@@ -215,7 +215,7 @@ static int hints_setHint(void *arg)
 
     SDLTest_AssertPass("Call to SDL_ResetHint(), after clearing callback");
     callbackValue = NULL;
-    SDL_DelHintCallback(testHint, hints_testHintChanged, &callbackValue);
+    SDL_RemoveHintCallback(testHint, hints_testHintChanged, &callbackValue);
     SDL_ResetHint(testHint);
     SDLTest_AssertCheck(
         callbackValue == NULL,