diff options
| author | Thomas Herzog | 2017-09-15 08:43:35 +0200 |
|---|---|---|
| committer | GitHub | 2017-09-15 08:43:35 +0200 |
| commit | 7dffed485bb6e824335de96bffc79ea58a2de576 (patch) | |
| tree | c694cc3f02b6aba2651f6cd60af2851e328895cb /platform/android/power_android.cpp | |
| parent | d3c1f2a7f69a54652a2a07eaca402db2ee489132 (diff) | |
| parent | 0fffa45158bebeb4aaba1df1d271c000fffbe7f7 (diff) | |
| download | godot-7dffed485bb6e824335de96bffc79ea58a2de576.tar.gz godot-7dffed485bb6e824335de96bffc79ea58a2de576.tar.zst godot-7dffed485bb6e824335de96bffc79ea58a2de576.zip | |
Merge pull request #11230 from maxim-sheronov/fix_enum_bindings
Fix enums bindings
Diffstat (limited to '')
| -rw-r--r-- | platform/android/power_android.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/platform/android/power_android.cpp b/platform/android/power_android.cpp index 98d4d810b..48c9377a5 100644 --- a/platform/android/power_android.cpp +++ b/platform/android/power_android.cpp @@ -198,19 +198,19 @@ bool power_android::GetPowerInfo_Android() { if (Android_JNI_GetPowerInfo(&plugged, &charged, &battery, &this->nsecs_left, &this->percent_left) != -1) { if (plugged) { if (charged) { - this->power_state = POWERSTATE_CHARGED; + this->power_state = OS::POWERSTATE_CHARGED; } else if (battery) { - this->power_state = POWERSTATE_CHARGING; + this->power_state = OS::POWERSTATE_CHARGING; } else { - this->power_state = POWERSTATE_NO_BATTERY; + this->power_state = OS::POWERSTATE_NO_BATTERY; this->nsecs_left = -1; this->percent_left = -1; } } else { - this->power_state = POWERSTATE_ON_BATTERY; + this->power_state = OS::POWERSTATE_ON_BATTERY; } } else { - this->power_state = POWERSTATE_UNKNOWN; + this->power_state = OS::POWERSTATE_UNKNOWN; this->nsecs_left = -1; this->percent_left = -1; } @@ -218,12 +218,12 @@ bool power_android::GetPowerInfo_Android() { return true; } -PowerState power_android::get_power_state() { +OS::PowerState power_android::get_power_state() { if (GetPowerInfo_Android()) { 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; } } @@ -246,7 +246,7 @@ int power_android::get_power_percent_left() { } power_android::power_android() - : nsecs_left(-1), percent_left(-1), power_state(POWERSTATE_UNKNOWN) { + : nsecs_left(-1), percent_left(-1), power_state(OS::POWERSTATE_UNKNOWN) { } power_android::~power_android() { |