The big NULL replacement party part 5.
Right. ' = NULL' would get a lot of these.
This commit is contained in:
@@ -19,7 +19,7 @@ LoadingWindow *LoadingWindow::Create()
|
||||
ASSERT( DriversToTry.size() != 0 );
|
||||
|
||||
RString Driver;
|
||||
LoadingWindow *ret = NULL;
|
||||
LoadingWindow *ret = nullptr;
|
||||
|
||||
for( unsigned i = 0; ret == nullptr && i < DriversToTry.size(); ++i )
|
||||
{
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
|
||||
#include <dlfcn.h>
|
||||
|
||||
static void *Handle = NULL;
|
||||
static void *Handle = nullptr;
|
||||
static INIT Module_Init;
|
||||
static SHUTDOWN Module_Shutdown;
|
||||
static SETTEXT Module_SetText;
|
||||
@@ -71,11 +71,11 @@ LoadingWindow_Gtk::~LoadingWindow_Gtk()
|
||||
{
|
||||
if( Module_Shutdown != nullptr )
|
||||
Module_Shutdown();
|
||||
Module_Shutdown = NULL;
|
||||
Module_Shutdown = nullptr;
|
||||
|
||||
if( Handle )
|
||||
dlclose( Handle );
|
||||
Handle = NULL;
|
||||
Handle = nullptr;
|
||||
}
|
||||
|
||||
void LoadingWindow_Gtk::SetText( RString s )
|
||||
|
||||
@@ -33,7 +33,7 @@ extern "C" const char *Init( int *argc, char ***argv )
|
||||
|
||||
splash = gtk_image_new_from_file(splash_image_path);
|
||||
|
||||
label = gtk_label_new(NULL);
|
||||
label = gtk_label_new(nullptr);
|
||||
gtk_label_set_justify(GTK_LABEL(label),GTK_JUSTIFY_CENTER);
|
||||
gtk_label_set_ellipsize(GTK_LABEL(label),PANGO_ELLIPSIZE_END);
|
||||
gtk_label_set_line_wrap(GTK_LABEL(label),FALSE);
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
#include "LocalizedString.h"
|
||||
|
||||
#include "RageSurfaceUtils_Zoom.h"
|
||||
static HBITMAP g_hBitmap = NULL;
|
||||
static HBITMAP g_hBitmap = nullptr;
|
||||
|
||||
/* Load a RageSurface into a GDI surface. */
|
||||
static HBITMAP LoadWin32Surface( const RageSurface *pSplash, HWND hWnd )
|
||||
@@ -39,7 +39,7 @@ static HBITMAP LoadWin32Surface( const RageSurface *pSplash, HWND hWnd )
|
||||
RageSurfaceUtils::Zoom( s, iWidth, iHeight );
|
||||
}
|
||||
|
||||
HDC hScreen = GetDC(NULL);
|
||||
HDC hScreen = GetDC(nullptr);
|
||||
ASSERT_M( hScreen != nullptr, werr_ssprintf(GetLastError(), "hScreen") );
|
||||
|
||||
HBITMAP bitmap = CreateCompatibleBitmap( hScreen, s->w, s->h );
|
||||
@@ -104,7 +104,7 @@ BOOL CALLBACK LoadingWindow_Win32::WndProc( HWND hWnd, UINT msg, WPARAM wParam,
|
||||
|
||||
case WM_DESTROY:
|
||||
DeleteObject( g_hBitmap );
|
||||
g_hBitmap = NULL;
|
||||
g_hBitmap = nullptr;
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -126,7 +126,7 @@ void LoadingWindow_Win32::SetSplash( const RageSurface *pSplash )
|
||||
if( g_hBitmap != nullptr )
|
||||
{
|
||||
DeleteObject( g_hBitmap );
|
||||
g_hBitmap = NULL;
|
||||
g_hBitmap = nullptr;
|
||||
}
|
||||
|
||||
g_hBitmap = LoadWin32Surface( pSplash, hwnd );
|
||||
@@ -143,7 +143,7 @@ void LoadingWindow_Win32::SetSplash( const RageSurface *pSplash )
|
||||
|
||||
LoadingWindow_Win32::LoadingWindow_Win32()
|
||||
{
|
||||
m_hIcon = NULL;
|
||||
m_hIcon = nullptr;
|
||||
hwnd = CreateDialog( handle.Get(), MAKEINTRESOURCE(IDD_LOADING_DIALOG), NULL, WndProc );
|
||||
for( unsigned i = 0; i < 3; ++i )
|
||||
text[i] = "ABC"; /* always set on first call */
|
||||
|
||||
Reference in New Issue
Block a user