diff options
Diffstat (limited to 'platform/javascript')
| -rw-r--r-- | platform/javascript/os_javascript.cpp | 2 | ||||
| -rw-r--r-- | platform/javascript/os_javascript.h | 2 | ||||
| -rw-r--r-- | platform/javascript/power_javascript.cpp | 6 | ||||
| -rw-r--r-- | platform/javascript/power_javascript.h | 6 | 
4 files changed, 8 insertions, 8 deletions
| diff --git a/platform/javascript/os_javascript.cpp b/platform/javascript/os_javascript.cpp index ac8d367366..543d028576 100644 --- a/platform/javascript/os_javascript.cpp +++ b/platform/javascript/os_javascript.cpp @@ -976,7 +976,7 @@ String OS_JavaScript::get_joy_guid(int p_device) const {  	return input->get_joy_guid_remapped(p_device);  } -PowerState OS_JavaScript::get_power_state() { +OS::PowerState OS_JavaScript::get_power_state() {  	return power_manager->get_power_state();  } diff --git a/platform/javascript/os_javascript.h b/platform/javascript/os_javascript.h index f78a3f2768..4c6469cb58 100644 --- a/platform/javascript/os_javascript.h +++ b/platform/javascript/os_javascript.h @@ -165,7 +165,7 @@ public:  	virtual String get_joy_guid(int p_device) const;  	bool joy_connection_changed(int p_type, const EmscriptenGamepadEvent *p_event); -	virtual PowerState get_power_state(); +	virtual OS::PowerState get_power_state();  	virtual int get_power_seconds_left();  	virtual int get_power_percent_left(); diff --git a/platform/javascript/power_javascript.cpp b/platform/javascript/power_javascript.cpp index 3d54146595..10964502d4 100644 --- a/platform/javascript/power_javascript.cpp +++ b/platform/javascript/power_javascript.cpp @@ -36,12 +36,12 @@ bool PowerJavascript::UpdatePowerInfo() {  	return false;  } -PowerState PowerJavascript::get_power_state() { +OS::PowerState PowerJavascript::get_power_state() {  	if (UpdatePowerInfo()) {  		return power_state;  	} else {  		WARN_PRINT("Power management is not implemented on this platform, defaulting to POWERSTATE_UNKNOWN"); -		return POWERSTATE_UNKNOWN; +		return OS::POWERSTATE_UNKNOWN;  	}  } @@ -64,7 +64,7 @@ int PowerJavascript::get_power_percent_left() {  }  PowerJavascript::PowerJavascript() -	: nsecs_left(-1), percent_left(-1), power_state(POWERSTATE_UNKNOWN) { +	: nsecs_left(-1), percent_left(-1), power_state(OS::POWERSTATE_UNKNOWN) {  }  PowerJavascript::~PowerJavascript() { diff --git a/platform/javascript/power_javascript.h b/platform/javascript/power_javascript.h index 834d765557..8454c5d728 100644 --- a/platform/javascript/power_javascript.h +++ b/platform/javascript/power_javascript.h @@ -31,13 +31,13 @@  #ifndef PLATFORM_JAVASCRIPT_POWER_JAVASCRIPT_H_  #define PLATFORM_JAVASCRIPT_POWER_JAVASCRIPT_H_ -#include "os/power.h" +#include "os/os.h"  class PowerJavascript {  private:  	int nsecs_left;  	int percent_left; -	PowerState power_state; +	OS::PowerState power_state;  	bool UpdatePowerInfo(); @@ -45,7 +45,7 @@ public:  	PowerJavascript();  	virtual ~PowerJavascript(); -	PowerState get_power_state(); +	OS::PowerState get_power_state();  	int get_power_seconds_left();  	int get_power_percent_left();  }; |