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

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

Location:
trunk/src/platform
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/platform/android/androidapp.cpp

    r2297 r2506  
    7070{
    7171    int argc = 1;
    72     char *argv[] = { "", NULL };
    73     char *env[] = { NULL };
     72    char *argv[] = { "", nullptr };
     73    char *env[] = { nullptr };
    7474
    7575    /* Call the user's main() function. One of these will work. */
     
    7878    lol_android_main(argc, argv, env);
    7979
    80     return NULL;
     80    return nullptr;
    8181}
    8282
     
    108108    /* Initialise app thread and wait for it to be ready, ie. set
    109109     * the FPS value at least. */
    110     g_main_thread = new Thread(lol::AndroidApp::MainRun, NULL);;
     110    g_main_thread = new Thread(lol::AndroidApp::MainRun, nullptr);
    111111    g_main_queue.Pop();
    112112
  • trunk/src/platform/nacl/nacl-instance.cpp

    r1440 r2506  
    9292    /* Ensure only one NaClInstance does Init() at the same time. */
    9393    main_mutex.Lock();
    94     char *env[] = { NULL };
     94    char *env[] = { nullptr };
    9595    Args arglist(argc, const_cast<char **>(argv), const_cast<char **>(env));
    9696    main_queue.Push(&arglist);
    97     m_main_thread = new Thread(MainRun, NULL);
     97    m_main_thread = new Thread(MainRun, nullptr);
    9898    /* Push so that only MainSignal() can unblock us */
    99     main_queue.Push(NULL);
    100     main_queue.Push(NULL);
     99    main_queue.Push(nullptr);
     100    main_queue.Push(nullptr);
    101101    main_mutex.Unlock();
    102102
     
    121121    lol_nacl_main(arglist->m_argc, arglist->m_argv, arglist->m_env);
    122122
    123     return NULL;
     123    return nullptr;
    124124}
    125125
     
    146146    m_size = ivec2(position.size().width(), position.size().height());
    147147
    148     if (m_opengl_ctx == NULL)
     148    if (m_opengl_ctx == nullptr)
    149149        m_opengl_ctx.reset(new OpenGLContext(this));
    150150    m_opengl_ctx->InvalidateContext(this);
     
    178178void NaClInstance::DrawSelf()
    179179{
    180     if (m_opengl_ctx == NULL)
     180    if (m_opengl_ctx == nullptr)
    181181        return;
    182182
  • trunk/src/platform/nacl/opengl_context.cpp

    r1084 r2506  
    3939}
    4040
    41 bool OpenGLContext::MakeContextCurrent(pp::Instance* instance) {
    42   if (instance == NULL) {
     41bool OpenGLContext::MakeContextCurrent(pp::Instance* instance)
     42{
     43  if (instance == nullptr)
     44  {
    4345    glSetCurrentContextPPAPI(0);
    4446    return false;
  • trunk/src/platform/ps3/ps3app.cpp

    r2316 r2506  
    6464    cellSysmoduleLoadModule(CELL_SYSMODULE_IO);
    6565
    66     cellSysutilRegisterCallback(0, Ps3AppData::SysCallBack, NULL);
     66    cellSysutilRegisterCallback(0, Ps3AppData::SysCallBack, nullptr);
    6767
    6868    PSGLinitOptions psglio;
  • trunk/src/platform/ps3/threadbase.h

    r2183 r2506  
    137137    virtual ~ThreadBase()
    138138    {
    139         sys_ppu_thread_join(m_thread, NULL);
     139        sys_ppu_thread_join(m_thread, nullptr);
    140140    }
    141141
  • trunk/src/platform/sdl/sdlapp.cpp

    r2301 r2506  
    3434
    3535#if defined USE_SDL && defined USE_D3D9
    36 HWND g_hwnd = NULL;
     36HWND g_hwnd = nullptr;
    3737extern IDirect3DDevice9 *g_d3ddevice;
    3838#endif
     
    8888    }
    8989
    90     SDL_WM_SetCaption(title, NULL);
     90    SDL_WM_SetCaption(title, nullptr);
    9191
    9292    /* Initialise everything */
     
    127127    if (FAILED(hr))
    128128        Abort();
    129     hr = g_d3ddevice->Present(NULL, NULL, NULL, NULL);
     129    hr = g_d3ddevice->Present(nullptr, nullptr, nullptr, nullptr);
    130130    if (FAILED(hr))
    131131        Abort();
  • trunk/src/platform/sdl/sdlinput.cpp

    r2216 r2506  
    197197    /* Send the whole keyboard state to the input system */
    198198#if 0
    199     Uint8 *keystate = SDL_GetKeyState(NULL);
     199    Uint8 *keystate = SDL_GetKeyState(nullptr);
    200200    for (int i = 0; i < 256; i++)
    201201        if (keystate[i])
  • trunk/src/platform/xbox/xboxapp.cpp

    r2222 r2506  
    6868
    6969#if defined _XBOX
    70     g_d3ddevice->Present(NULL, NULL, NULL, NULL);
     70    g_d3ddevice->Present(nullptr, nullptr, nullptr, nullptr);
    7171#endif
    7272}
Note: See TracChangeset for help on using the changeset viewer.