swg-source-1.2/src-1.2
1
0
Fork 0
mirror of https://bitbucket.org/theswgsource/src-1.2.git synced 2026-09-29 14:12:54 -04:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
This reverts commit 3e4cc36e7e.
This commit is contained in:
DarthArgus
2016-02-11 19:44:31 -06:00
parent 3e4cc36e7e
commit 8e2160f33e
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/ScriptMethodsSystem.cpp
+5 -5
View File
@@ -61,7 +61,7 @@ jboolean JNICALL ScriptMethodsSystemNamespace::sendConsoleCommand(JNIEnv * env,
{
JavaStringParam localCommand(command);
ServerObject* object = nullptr;
ServerObject* object = NULL;
if (!JavaLibrary::getObject(target, object))
return JNI_FALSE;
@@ -86,7 +86,7 @@ jboolean JNICALL ScriptMethodsSystemNamespace::sendConsoleCommand(JNIEnv * env,
* @param section the config file section
* @param key the config file key
*
* @return the key value, or nullptr if the key doesn't exist
* @return the key value, or null if the key doesn't exist
*/
jstring JNICALL ScriptMethodsSystemNamespace::getConfigSetting(JNIEnv * env, jobject self,
jstring section, jstring key)
@@ -108,12 +108,12 @@ jstring JNICALL ScriptMethodsSystemNamespace::getConfigSetting(JNIEnv * env, job
return 0;
const ConfigFile::Section * sec = ConfigFile::getSection(sectionName.c_str());
if (sec == nullptr)
if (sec == NULL)
return 0;
const ConfigFile::Key * ky = sec->findKey(keyName.c_str());
if (ky == nullptr)
return nullptr;
if (ky == NULL)
return NULL;
JavaString jvalue(ky->getAsString(ky->getCount()-1, ""));
return jvalue.getReturnValue();