commit fd606bc303bdf1fafefc4a6b79d050faa26d0800
author Jeff Brown <jeffbrown@google.com> Tue Jul 13 16:14:54 2010 -0700
committer Jeff Brown <jeffbrown@google.com> Tue Jul 13 16:47:02 2010 -0700
tree 72397fd006d566a4116adff3c69d2877f603140b
parent 5ef6b2f2568944e9dedf31c83716b8dd94dd506a

Migrate to new keycode constants in keycodes.h.

Change-Id: I775efb0f73b418db5bf65c218949b164f8e65647

simulator/app/PhoneButton.cpp

diff --git a/simulator/app/PhoneButton.cpp b/simulator/app/PhoneButton.cpp
index eca7ddc..15c5109 100644
--- a/simulator/app/PhoneButton.cpp
+++ b/simulator/app/PhoneButton.cpp
@@ -27,7 +27,7 @@
     assert(!mHasImage);     // quick check for re-use
 
     mKeyCode = LookupKeyCode(label);
-    if (mKeyCode == kKeyCodeUnknown) {
+    if (mKeyCode == AKEYCODE_UNKNOWN) {
         fprintf(stderr, "WARNING: key code '%s' not recognized\n", label);
         // keep going
     }
@@ -129,9 +129,9 @@
 /*
  * Look up a key code based on a string.
  *
- * Returns kKeyCodeUnknown if the label doesn't match anything.
+ * Returns AKEYCODE_UNKNOWN if the label doesn't match anything.
  */
-KeyCode PhoneButton::LookupKeyCode(const char* label) const
+int32_t PhoneButton::LookupKeyCode(const char* label) const
 {
     static const struct {
         const char* label;
@@ -172,9 +172,9 @@
 
     for (int i = 0; i < numCodes; i++) {
         if (strcmp(label, codeList[i].label) == 0)
-            return (KeyCode) codeList[i].keyCode;
+            return codeList[i].keyCode;
     }
 
-    return kKeyCodeUnknown;
+    return AKEYCODE_UNKNOWN;
 };