diff options
| author |   satok <satok@google.com> | 2011-06-24 18:38:41 +0900 |
|---|---|---|
| committer | satok <satok@google.com> | 2011-06-24 18:38:41 +0900 |
| commit | 80a9ce76d85ff521aeb5a51d759f5ba367ffc627 (patch) | |
| tree | 239ff93af9a2b5bb0271968467a212c150608e03 /native/src/proximity_info.cpp | |
| parent | dfd66f19edf1e1d97a0bf83dd20b99ee8bfae35e (diff) | |
| parent | 52344a0788db20d12960b2481e99e990c3de1ea4 (diff) | |
| download | latinime-80a9ce76d85ff521aeb5a51d759f5ba367ffc627.tar.gz latinime-80a9ce76d85ff521aeb5a51d759f5ba367ffc627.tar.xz latinime-80a9ce76d85ff521aeb5a51d759f5ba367ffc627.zip | |
Merge remote-tracking branch 'goog/master' into merge
Conflicts:
java/res/xml/method.xml
Change-Id: I7b5f2232753d7159b520e5e57a0e06c51935edbd
Diffstat (limited to 'native/src/proximity_info.cpp')
| -rw-r--r-- | native/src/proximity_info.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/native/src/proximity_info.cpp b/native/src/proximity_info.cpp index 102123c3c..209c31e6e 100644 --- a/native/src/proximity_info.cpp +++ b/native/src/proximity_info.cpp @@ -22,6 +22,7 @@ #include "proximity_info.h" namespace latinime { + ProximityInfo::ProximityInfo(const int maxProximityCharsSize, const int keyboardWidth, const int keyboardHeight, const int gridWidth, const int gridHeight, const uint32_t *proximityCharsArray) @@ -61,4 +62,5 @@ bool ProximityInfo::hasSpaceProximity(const int x, const int y) const { } return false; } -} // namespace latinime + +} // namespace latinime |