Ignore:
Timestamp:
Feb 26, 2013, 2:43:45 PM (7 years ago)
Author:
sam
Message:

base: start removing occurrences of NULL on our long journey to nullptr.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/input/input.cpp

    r2300 r2506  
    3232 */
    3333
    34 InputTracker* Input::m_input_tracker = NULL;
     34InputTracker* Input::m_input_tracker = nullptr;
    3535
    3636static class InputData
     
    117117#if defined USE_SDL
    118118#   if SDL_VERSION_ATLEAST(1,3,0)
    119     Uint8 *keystate = SDL_GetKeyboardState(NULL);
     119    Uint8 *keystate = SDL_GetKeyboardState(nullptr);
    120120#   else
    121     Uint8 *keystate = SDL_GetKeyState(NULL);
     121    Uint8 *keystate = SDL_GetKeyState(nullptr);
    122122#   endif
    123123    //SOOOoooo ugly.
     
    271271    /* Simulate a joystick using the keyboard. This SDL call is free. */
    272272#   if SDL_VERSION_ATLEAST(1,3,0)
    273     Uint8 *keystate = SDL_GetKeyboardState(NULL);
     273    Uint8 *keystate = SDL_GetKeyboardState(nullptr);
    274274#   else
    275     Uint8 *keystate = SDL_GetKeyState(NULL);
     275    Uint8 *keystate = SDL_GetKeyState(nullptr);
    276276#   endif
    277277    int left = keystate[SDLK_d] - (keystate[SDLK_a] | keystate[SDLK_q]);
     
    304304#if defined USE_SDL
    305305#   if SDL_VERSION_ATLEAST(1,3,0)
    306     Uint8 *keystate = SDL_GetKeyboardState(NULL);
     306    Uint8 *keystate = SDL_GetKeyboardState(nullptr);
    307307#   else
    308     Uint8 *keystate = SDL_GetKeyState(NULL);
     308    Uint8 *keystate = SDL_GetKeyState(nullptr);
    309309#   endif
    310310    return keystate[button];
     
    402402    data->mouse = coord;
    403403
    404     WorldEntity *top = NULL;
     404    WorldEntity *top = nullptr;
    405405
    406406    /* Find the top “widget” amongst all entities that match the
     
    487487    /* FIXME: add the possibility to choose amongst sticks */
    488488    if (desired >= data->m_sticks.Count())
    489         return NULL;
     489        return nullptr;
    490490    Ticker::Ref(data->m_sticks[desired]);
    491491    return data->m_sticks[desired];
Note: See TracChangeset for help on using the changeset viewer.