]> git.tdb.fi Git - libs/core.git/blobdiff - source/core/android/mainthread.cpp
Use nullptr instead of 0 for pointers
[libs/core.git] / source / core / android / mainthread.cpp
index 8ce484a0dee75e4a014a7440d2775c891fbe18a3..6441c2059b8179066fc61336801940320dedad9a 100644 (file)
@@ -15,8 +15,7 @@ namespace Android {
 
 MainThread::MainThread(ANativeActivity *a):
        asset_manager(a->assetManager),
-       int_data_path(a->internalDataPath),
-       starting_up(true)
+       int_data_path(a->internalDataPath)
 {
        attach_to_activity(a);
        startup_mutex.lock();
@@ -54,7 +53,7 @@ void MainThread::resume_startup()
 JavaVM *MainThread::get_java_vm() const
 {
        if(!activity)
-               return 0;
+               return nullptr;
 
        return activity->vm;
 }
@@ -69,7 +68,7 @@ void MainThread::main()
        /* I have no idea how dependable this is, but it seems to be the only way
        to get the package name aside from making a Java call through JNI */
        char *appname = strdup(int_data_path[-2].c_str());
-       char *argv[] = { appname, 0 };
+       char *argv[] = { appname, nullptr };
        Msp::Android::ErrorLogger err_logger;
        FS::chdir(FS::dirname(int_data_path));
        Msp::Application::run(1, argv, this, &app_created);