diff options
Diffstat (limited to 'include/input/VirtualKeyMap.h')
-rw-r--r-- | include/input/VirtualKeyMap.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/input/VirtualKeyMap.h b/include/input/VirtualKeyMap.h index e245ead682..6e8e2c9cf4 100644 --- a/include/input/VirtualKeyMap.h +++ b/include/input/VirtualKeyMap.h @@ -23,8 +23,8 @@ #include <utils/Errors.h> #include <utils/KeyedVector.h> #include <utils/Tokenizer.h> -#include <utils/String8.h> #include <utils/Unicode.h> +#include <vector> namespace android { @@ -50,9 +50,9 @@ class VirtualKeyMap { public: ~VirtualKeyMap(); - static status_t load(const String8& filename, VirtualKeyMap** outMap); + static std::unique_ptr<VirtualKeyMap> load(const std::string& filename); - inline const Vector<VirtualKeyDefinition>& getVirtualKeys() const { + inline const std::vector<VirtualKeyDefinition>& getVirtualKeys() const { return mVirtualKeys; } @@ -71,7 +71,7 @@ private: bool parseNextIntField(int32_t* outValue); }; - Vector<VirtualKeyDefinition> mVirtualKeys; + std::vector<VirtualKeyDefinition> mVirtualKeys; VirtualKeyMap(); }; |