From a8276105c7f8b809bb1065bce2a97273727cf8be Mon Sep 17 00:00:00 2001 From: Alex Szpakowski Date: Sun, 1 Mar 2015 02:46:00 -0400 Subject: [PATCH] Renamed love.touch.getTouchIDs to love.touch.getIDs. --HG-- branch : minor --- src/modules/touch/Touch.h | 2 +- src/modules/touch/sdl/Touch.cpp | 2 +- src/modules/touch/sdl/Touch.h | 2 +- src/modules/touch/wrap_Touch.cpp | 6 +++--- src/modules/touch/wrap_Touch.h | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/modules/touch/Touch.h b/src/modules/touch/Touch.h index 21cbd2e4e..c735e505e 100644 --- a/src/modules/touch/Touch.h +++ b/src/modules/touch/Touch.h @@ -56,7 +56,7 @@ public: /** * Gets a list of the IDs of all currently active touches. **/ - virtual std::vector getTouchIDs() const = 0; + virtual std::vector getIDs() const = 0; /** * Gets the position in pixels of a specific touch, using its ID. diff --git a/src/modules/touch/sdl/Touch.cpp b/src/modules/touch/sdl/Touch.cpp index b9fb13c7d..0185c3225 100644 --- a/src/modules/touch/sdl/Touch.cpp +++ b/src/modules/touch/sdl/Touch.cpp @@ -30,7 +30,7 @@ namespace touch namespace sdl { -std::vector Touch::getTouchIDs() const +std::vector Touch::getIDs() const { std::vector ids; ids.reserve(touches.size()); diff --git a/src/modules/touch/sdl/Touch.h b/src/modules/touch/sdl/Touch.h index bfe263146..c7caca03e 100644 --- a/src/modules/touch/sdl/Touch.h +++ b/src/modules/touch/sdl/Touch.h @@ -43,7 +43,7 @@ public: virtual ~Touch() {} - virtual std::vector getTouchIDs() const; + virtual std::vector getIDs() const; virtual void getPosition(int64 id, double &x, double &y) const; // Implements Module. diff --git a/src/modules/touch/wrap_Touch.cpp b/src/modules/touch/wrap_Touch.cpp index 213eca1d3..ba4f761ad 100644 --- a/src/modules/touch/wrap_Touch.cpp +++ b/src/modules/touch/wrap_Touch.cpp @@ -33,9 +33,9 @@ namespace touch #define instance() (Module::getInstance(Module::M_TOUCH)) -int w_getTouchIDs(lua_State *L) +int w_getIDs(lua_State *L) { - std::vector ids = instance()->getTouchIDs(); + std::vector ids = instance()->getIDs(); lua_createtable(L, (int) ids.size(), 0); @@ -72,7 +72,7 @@ int w_getPosition(lua_State *L) static const luaL_Reg functions[] = { - { "getTouchIDs", w_getTouchIDs }, + { "getIDs", w_getIDs }, { "getPosition", w_getPosition }, { 0, 0 } }; diff --git a/src/modules/touch/wrap_Touch.h b/src/modules/touch/wrap_Touch.h index 1d8942460..7d3b4f32c 100644 --- a/src/modules/touch/wrap_Touch.h +++ b/src/modules/touch/wrap_Touch.h @@ -30,7 +30,7 @@ namespace love namespace touch { -int w_getTouchIDs(lua_State *L); +int w_getIDs(lua_State *L); int w_getPosition(lua_State *L); extern "C" LOVE_EXPORT int luaopen_love_touch(lua_State *L);