From c9e0e7e51df1401f852a210718b165fd7531a0f5 Mon Sep 17 00:00:00 2001 From: Steve Checkoway Date: Wed, 20 Sep 2006 00:04:19 +0000 Subject: [PATCH] Don't return NULL. --- stepmania/src/ProfileManager.cpp | 2 +- stepmania/src/ScreenOptionsManageProfiles.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/stepmania/src/ProfileManager.cpp b/stepmania/src/ProfileManager.cpp index ea4f44ae46..a0462c6f1c 100644 --- a/stepmania/src/ProfileManager.cpp +++ b/stepmania/src/ProfileManager.cpp @@ -572,7 +572,7 @@ RString ProfileManager::GetProfileDirImportedFrom( ProfileSlot slot ) const case ProfileSlot_Player2: return m_sProfileDirImportedFrom[slot]; case ProfileSlot_Machine: - return NULL; + return RString(); default: ASSERT(0); } diff --git a/stepmania/src/ScreenOptionsManageProfiles.cpp b/stepmania/src/ScreenOptionsManageProfiles.cpp index 0c45bc692e..9478012ea1 100644 --- a/stepmania/src/ScreenOptionsManageProfiles.cpp +++ b/stepmania/src/ScreenOptionsManageProfiles.cpp @@ -416,7 +416,7 @@ RString ScreenOptionsManageProfiles::GetLocalProfileIDWithFocus() const { int iIndex = GetLocalProfileIndexWithFocus(); if( iIndex == -1 ) - return NULL; + return RString(); return m_vsLocalProfileID[iIndex]; }