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 /platform/server/os_server.h | |
parent | 415a901b685997c8949b9705ef5b8fe6eaeda613 (diff) | |
parent | 3dea5fd631c9513ed09b876f25e8bf6deff49683 (diff) | |
download | redot-engine-09e5877ff5cd72b684bceddab8c203cc897dbb6c.tar.gz |
Merge pull request #36212 from akien-mga/remove-battery-power-api
Remove incomplete battery status/power API
Diffstat (limited to 'platform/server/os_server.h')
-rw-r--r-- | platform/server/os_server.h | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/platform/server/os_server.h b/platform/server/os_server.h index 46ca9cb6d1..7584293722 100644 --- a/platform/server/os_server.h +++ b/platform/server/os_server.h @@ -36,11 +36,9 @@ #include "main/input_default.h" #ifdef __APPLE__ #include "platform/osx/crash_handler_osx.h" -#include "platform/osx/power_osx.h" #include "platform/osx/semaphore_osx.h" #else #include "platform/x11/crash_handler_x11.h" -#include "platform/x11/power_x11.h" #endif #include "servers/audio_server.h" #include "servers/visual/rasterizer.h" @@ -63,12 +61,6 @@ class OS_Server : public OS_Unix { InputDefault *input; -#ifdef __APPLE__ - PowerOSX *power_manager; -#else - PowerX11 *power_manager; -#endif - CrashHandler crash_handler; int video_driver_index; @@ -112,9 +104,6 @@ public: void run(); - virtual OS::PowerState get_power_state(); - virtual int get_power_seconds_left(); - virtual int get_power_percent_left(); virtual bool _check_internal_feature_support(const String &p_feature); virtual String get_config_path() const; |