swg-source-1.2/src-1.2
1
0
Fork 0
mirror of https://bitbucket.org/theswgsource/src-1.2.git synced 2026-08-03 04:19:20 -04:00
Code Issues Projects Releases Wiki Activity

newer standards prefer nullptr over NULL - this is most of them but there are others too

Browse Source
This commit is contained in:
DarthArgus
2016-02-15 00:07:31 -06:00
parent 6bb5137dc4
commit 03dc62efba
937 changed files with 14983 additions and 14983 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engine/server/library/serverScript/src/shared/ScriptMethodsServerUI.cpp
+9 -9
View File
@@ -83,14 +83,14 @@ jint JNICALL ScriptMethodsServerUINamespace::createSuiPage(JNIEnv *env, jobject
JavaStringParam localPageName(pageName);
jint failureCode = -1;
ServerObject* owner = NULL;
ServerObject* owner = nullptr;
if(!JavaLibrary::getObject(ownerobject, owner))
{
WARNING(true, ("SUI: couldn't get owner ServerObject*, can't create a page"));
return failureCode;
}
ServerObject* so = NULL;
ServerObject* so = nullptr;
if(!JavaLibrary::getObject(client, so))
return failureCode;
@@ -296,7 +296,7 @@ jboolean JNICALL ScriptMethodsServerUINamespace::subscribeToSuiEvent(JNIEnv
}
std::string ewn;
if (eventWidgetName != NULL)
if (eventWidgetName != nullptr)
{
JavaStringParam localEventWidgetName(eventWidgetName);
JavaLibrary::convert(localEventWidgetName, ewn);
@@ -323,7 +323,7 @@ jboolean JNICALL ScriptMethodsServerUINamespace::subscribeToSuiPropertyForEv
}
std::string ewn;
if (eventWidgetName != NULL)
if (eventWidgetName != nullptr)
{
JavaStringParam localEventWidgetName(eventWidgetName);
JavaLibrary::convert(localEventWidgetName, ewn);
@@ -411,7 +411,7 @@ jboolean JNICALL ScriptMethodsServerUINamespace::setSuiAssociatedLocation(JN
return JNI_FALSE;
}
ServerObject* associatedObject = NULL;
ServerObject* associatedObject = nullptr;
if(!JavaLibrary::getObject(j_associatedObjectId, associatedObject))
{
DEBUG_WARNING(true, ("could not find object for associatedObjectid"));
@@ -441,12 +441,12 @@ jboolean JNICALL ScriptMethodsServerUINamespace::setSuiMaxRangeToObject(JNIE
jboolean JNICALL ScriptMethodsServerUINamespace::clientMinigameOpen(JNIEnv *env, jobject self, jlong player, jobject data)
{
ServerObject* playerServerObject = NULL;
ServerObject* playerServerObject = nullptr;
if(!JavaLibrary::getObject(player, playerServerObject))
return JNI_FALSE;
CreatureObject * creatureObject = playerServerObject->asCreatureObject();
if(creatureObject != NULL)
if(creatureObject != nullptr)
{
ValueDictionary gameData;
JavaLibrary::convert(data, gameData);
@@ -462,12 +462,12 @@ jboolean JNICALL ScriptMethodsServerUINamespace::clientMinigameOpen(JNIEnv *env,
jboolean JNICALL ScriptMethodsServerUINamespace::clientMinigameClose(JNIEnv *env, jobject self, jlong player, jobject data)
{
ServerObject* playerServerObject = NULL;
ServerObject* playerServerObject = nullptr;
if(!JavaLibrary::getObject(player, playerServerObject))
return JNI_FALSE;
CreatureObject * creatureObject = playerServerObject->asCreatureObject();
if(creatureObject != NULL)
if(creatureObject != nullptr)
{
ValueDictionary gameData;
JavaLibrary::convert(data, gameData);