Index: tools/viewer/sk_app/Window.h |
diff --git a/tools/viewer/sk_app/Window.h b/tools/viewer/sk_app/Window.h |
index 56444a67b76639577e9b0e24a7b506c6bce1a54a..48fd4ecdb860a275e356f9fa1e07a110a966c4ef 100644 |
--- a/tools/viewer/sk_app/Window.h |
+++ b/tools/viewer/sk_app/Window.h |
@@ -41,7 +41,7 @@ public: |
void detach(); |
// input handling |
- enum Key { |
+ enum class Key { |
bsalomon
2016/05/09 20:25:53
When we use enum class we drop the _<Type> suffix
|
kNONE_Key, //corresponds to android's UNKNOWN |
kLeftSoftKey_Key, |
@@ -79,7 +79,7 @@ public: |
kLast_Key = kCamera_Key |
}; |
- static const int kKeyCount = kLast_Key + 1; |
+ static const int kKeyCount = static_cast<int>(Key::kLast_Key) + 1; |
enum ModifierKeys { |
kShift_ModifierKey = 1 << 0, |