test/testwm2.c
changeset 6785 c094c438c0a6
parent 6677 c3202c29e352
child 6786 7174fb08017a
     1.1 --- a/test/testwm2.c	Mon Dec 31 10:14:38 2012 -0800
     1.2 +++ b/test/testwm2.c	Mon Dec 31 10:26:38 2012 -0800
     1.3 @@ -13,15 +13,15 @@
     1.4  #include <stdlib.h>
     1.5  #include <stdio.h>
     1.6  
     1.7 -#include "common.h"
     1.8 +#include "SDL_test_common.h"
     1.9  
    1.10 -static CommonState *state;
    1.11 +static SDLTest_CommonState *state;
    1.12  
    1.13  /* Call this instead of exit(), so we can clean up SDL: atexit() is evil. */
    1.14  static void
    1.15  quit(int rc)
    1.16  {
    1.17 -    CommonQuit(state);
    1.18 +    SDLTest_CommonQuit(state);
    1.19      exit(rc);
    1.20  }
    1.21  
    1.22 @@ -50,7 +50,7 @@
    1.23      SDL_Cursor *cursor = NULL;
    1.24  
    1.25      /* Initialize test framework */
    1.26 -    state = CommonCreateState(argv, SDL_INIT_VIDEO);
    1.27 +    state = SDLTest_CommonCreateState(argv, SDL_INIT_VIDEO);
    1.28      if (!state) {
    1.29          return 1;
    1.30      }
    1.31 @@ -58,17 +58,17 @@
    1.32      for (i = 1; i < argc;) {
    1.33          int consumed;
    1.34  
    1.35 -        consumed = CommonArg(state, i);
    1.36 +        consumed = SDLTest_CommonArg(state, i);
    1.37          if (consumed == 0) {
    1.38              consumed = -1;
    1.39          }
    1.40          if (consumed < 0) {
    1.41 -            fprintf(stderr, "Usage: %s %s\n", argv[0], CommonUsage(state));
    1.42 +            fprintf(stderr, "Usage: %s %s\n", argv[0], SDLTest_CommonUsage(state));
    1.43              quit(1);
    1.44          }
    1.45          i += consumed;
    1.46      }
    1.47 -    if (!CommonInit(state)) {
    1.48 +    if (!SDLTest_CommonInit(state)) {
    1.49          quit(2);
    1.50      }
    1.51  
    1.52 @@ -77,7 +77,7 @@
    1.53      while (!done) {
    1.54          /* Check for events */
    1.55          while (SDL_PollEvent(&event)) {
    1.56 -            CommonEvent(state, &event, &done);
    1.57 +            SDLTest_CommonEvent(state, &event, &done);
    1.58  
    1.59              if (event.type == SDL_WINDOWEVENT) {
    1.60                  if (event.window.event == SDL_WINDOWEVENT_MOVED) {