diff options
author | RĂ©mi Verschelde <rverschelde@gmail.com> | 2020-02-14 15:01:22 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-02-14 15:01:22 +0100 |
commit | 09e5877ff5cd72b684bceddab8c203cc897dbb6c (patch) | |
tree | d613d6898a36bc3688ce23d58f5dace262b39a84 /core/os | |
parent | 415a901b685997c8949b9705ef5b8fe6eaeda613 (diff) | |
parent | 3dea5fd631c9513ed09b876f25e8bf6deff49683 (diff) |
Merge pull request #36212 from akien-mga/remove-battery-power-api
Remove incomplete battery status/power API
Diffstat (limited to 'core/os')
-rw-r--r-- | core/os/os.cpp | 10 | ||||
-rw-r--r-- | core/os/os.h | 14 |
2 files changed, 0 insertions, 24 deletions
diff --git a/core/os/os.cpp b/core/os/os.cpp index 13be4a5c37..d1b6ccab54 100644 --- a/core/os/os.cpp +++ b/core/os/os.cpp @@ -586,16 +586,6 @@ bool OS::is_vsync_via_compositor_enabled() const { return _vsync_via_compositor; } -OS::PowerState OS::get_power_state() { - return POWERSTATE_UNKNOWN; -} -int OS::get_power_seconds_left() { - return -1; -} -int OS::get_power_percent_left() { - return -1; -} - void OS::set_has_server_feature_callback(HasServerFeatureCallback p_callback) { has_server_feature_callback = p_callback; diff --git a/core/os/os.h b/core/os/os.h index 1bb910cb0d..e4661e4583 100644 --- a/core/os/os.h +++ b/core/os/os.h @@ -78,14 +78,6 @@ public: typedef void (*ImeCallback)(void *p_inp, String p_text, Point2 p_selection); typedef bool (*HasServerFeatureCallback)(const String &p_feature); - enum PowerState { - POWERSTATE_UNKNOWN, /**< cannot determine power status */ - POWERSTATE_ON_BATTERY, /**< Not plugged in, running on the battery */ - POWERSTATE_NO_BATTERY, /**< Plugged in, no battery available */ - POWERSTATE_CHARGING, /**< Plugged in, charging battery */ - POWERSTATE_CHARGED /**< Plugged in, battery charged */ - }; - enum RenderThreadMode { RENDER_THREAD_UNSAFE, @@ -517,10 +509,6 @@ public: void set_vsync_via_compositor(bool p_enable); bool is_vsync_via_compositor_enabled() const; - virtual OS::PowerState get_power_state(); - virtual int get_power_seconds_left(); - virtual int get_power_percent_left(); - virtual void force_process_input(){}; bool has_feature(const String &p_feature); @@ -542,6 +530,4 @@ public: virtual ~OS(); }; -VARIANT_ENUM_CAST(OS::PowerState); - #endif |