X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fandroid%2Fmainthread.h;h=ab587ff0e879f8cc3cee12309c000255d2b8a7eb;hb=HEAD;hp=99a641b6e71084828d0c0b88364ff0425f697751;hpb=122846f0881673770d88eff7d925ecf25c01b62e;p=libs%2Fcore.git diff --git a/source/core/android/mainthread.h b/source/core/android/mainthread.h index 99a641b..ab587ff 100644 --- a/source/core/android/mainthread.h +++ b/source/core/android/mainthread.h @@ -20,8 +20,8 @@ public: sigc::signal signal_input_queue_destroyed; private: - ANativeActivity *activity = 0; - AAssetManager *asset_manager = 0; + ANativeActivity *activity = nullptr; + AAssetManager *asset_manager = nullptr; FS::Path int_data_path; bool starting_up = true; Mutex startup_mutex; @@ -41,7 +41,7 @@ public: void set_window_flags(unsigned, unsigned); private: - virtual void main(); + void main() override; static void app_created(void *); static void activity_destroyed(ANativeActivity *);