From 3ac071054453741fb0baf0c792b732cdf873de0d Mon Sep 17 00:00:00 2001 From: Alex Szpakowski Date: Fri, 30 Aug 2013 23:50:29 -0300 Subject: [PATCH] Renamed Joystick:getProductGUID back to Joystick:getGUID --- src/modules/joystick/Joystick.h | 2 +- src/modules/joystick/sdl/Joystick.cpp | 2 +- src/modules/joystick/sdl/Joystick.h | 2 +- src/modules/joystick/sdl/JoystickModule.cpp | 10 +++++----- src/modules/joystick/sdl/JoystickModule.h | 2 +- src/modules/joystick/sdl/wrap_Joystick.cpp | 6 +++--- src/modules/joystick/sdl/wrap_Joystick.h | 2 +- src/modules/joystick/sdl/wrap_JoystickModule.cpp | 2 +- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/modules/joystick/Joystick.h b/src/modules/joystick/Joystick.h index 17c16b440..58fec07ce 100644 --- a/src/modules/joystick/Joystick.h +++ b/src/modules/joystick/Joystick.h @@ -152,7 +152,7 @@ public: virtual void *getHandle() const = 0; - virtual std::string getProductGUID() const = 0; + virtual std::string getGUID() const = 0; virtual int getInstanceID() const = 0; virtual int getID() const = 0; diff --git a/src/modules/joystick/sdl/Joystick.cpp b/src/modules/joystick/sdl/Joystick.cpp index f18243e9d..b45b19713 100644 --- a/src/modules/joystick/sdl/Joystick.cpp +++ b/src/modules/joystick/sdl/Joystick.cpp @@ -239,7 +239,7 @@ void *Joystick::getHandle() const return joyhandle; } -std::string Joystick::getProductGUID() const +std::string Joystick::getGUID() const { // SDL2's GUIDs identify *classes* of devices, instead of unique devices. return pguid; diff --git a/src/modules/joystick/sdl/Joystick.h b/src/modules/joystick/sdl/Joystick.h index fc43b5258..a63a8595a 100644 --- a/src/modules/joystick/sdl/Joystick.h +++ b/src/modules/joystick/sdl/Joystick.h @@ -70,7 +70,7 @@ public: void *getHandle() const; - std::string getProductGUID() const; + std::string getGUID() const; int getInstanceID() const; int getID() const; diff --git a/src/modules/joystick/sdl/JoystickModule.cpp b/src/modules/joystick/sdl/JoystickModule.cpp index 40be91f56..878406a61 100644 --- a/src/modules/joystick/sdl/JoystickModule.cpp +++ b/src/modules/joystick/sdl/JoystickModule.cpp @@ -109,14 +109,14 @@ love::joystick::Joystick *JoystickModule::addJoystick(int deviceindex) if (deviceindex < 0 || deviceindex >= SDL_NumJoysticks()) return 0; - std::string guidstr = getDeviceProductGUID(deviceindex); + std::string guidstr = getDeviceGUID(deviceindex); joystick::Joystick *joystick = 0; for (size_t i = 0; i < joysticks.size(); i++) { // Try to re-use a disconnected Joystick with the same GUID. - if (!joysticks[i]->isConnected() && joysticks[i]->getProductGUID() == guidstr) + if (!joysticks[i]->isConnected() && joysticks[i]->getGUID() == guidstr) { joystick = joysticks[i]; joystick->open(deviceindex); @@ -398,13 +398,13 @@ void JoystickModule::checkGamepads(const std::string &guid) const if (!SDL_IsGameController(d_index)) continue; - if (guid.compare(getDeviceProductGUID(d_index)) != 0) + if (guid.compare(getDeviceGUID(d_index)) != 0) continue; std::vector::const_iterator it; for (it = activeSticks.begin(); it != activeSticks.end(); ++it) { - if ((*it)->isGamepad() || guid.compare((*it)->getProductGUID()) != 0) + if ((*it)->isGamepad() || guid.compare((*it)->getGUID()) != 0) continue; // Big hack time: open the index as a game controller and compare @@ -422,7 +422,7 @@ void JoystickModule::checkGamepads(const std::string &guid) const } } -std::string JoystickModule::getDeviceProductGUID(int deviceindex) const +std::string JoystickModule::getDeviceGUID(int deviceindex) const { if (deviceindex < 0 || deviceindex >= SDL_NumJoysticks()) return std::string(""); diff --git a/src/modules/joystick/sdl/JoystickModule.h b/src/modules/joystick/sdl/JoystickModule.h index a22245e8e..55f224ffe 100644 --- a/src/modules/joystick/sdl/JoystickModule.h +++ b/src/modules/joystick/sdl/JoystickModule.h @@ -63,7 +63,7 @@ private: void checkGamepads(const std::string &guid) const; // SDL2's GUIDs identify *classes* of devices, instead of unique devices. - std::string getDeviceProductGUID(int deviceindex) const; + std::string getDeviceGUID(int deviceindex) const; // Lists of currently connected Joysticks. std::vector activeSticks; diff --git a/src/modules/joystick/sdl/wrap_Joystick.cpp b/src/modules/joystick/sdl/wrap_Joystick.cpp index 37d07088f..c851008d6 100644 --- a/src/modules/joystick/sdl/wrap_Joystick.cpp +++ b/src/modules/joystick/sdl/wrap_Joystick.cpp @@ -66,10 +66,10 @@ int w_Joystick_getID(lua_State *L) return 2; } -int w_Joystick_getProductGUID(lua_State *L) +int w_Joystick_getGUID(lua_State *L) { Joystick *j = luax_checkjoystick(L, 1); - luax_pushstring(L, j->getProductGUID()); + luax_pushstring(L, j->getGUID()); return 1; } @@ -192,7 +192,7 @@ static const luaL_Reg functions[] = { "isConnected", w_Joystick_isConnected }, { "getName", w_Joystick_getName }, { "getID", w_Joystick_getID }, - { "getProductGUID", w_Joystick_getProductGUID }, + { "getGUID", w_Joystick_getGUID }, { "getAxisCount", w_Joystick_getAxisCount }, { "getButtonCount", w_Joystick_getButtonCount }, { "getHatCount", w_Joystick_getHatCount }, diff --git a/src/modules/joystick/sdl/wrap_Joystick.h b/src/modules/joystick/sdl/wrap_Joystick.h index 74cd006f8..86f8c70b0 100644 --- a/src/modules/joystick/sdl/wrap_Joystick.h +++ b/src/modules/joystick/sdl/wrap_Joystick.h @@ -37,7 +37,7 @@ Joystick *luax_checkjoystick(lua_State *L, int idx); int w_Joystick_isConnected(lua_State *L); int w_Joystick_getName(lua_State *L); int w_Joystick_getID(lua_State *L); -int w_Joystick_getProductGUID(lua_State *L); +int w_Joystick_getGUID(lua_State *L); int w_Joystick_getAxisCount(lua_State *L); int w_Joystick_getButtonCount(lua_State *L); int w_Joystick_getHatCount(lua_State *L); diff --git a/src/modules/joystick/sdl/wrap_JoystickModule.cpp b/src/modules/joystick/sdl/wrap_JoystickModule.cpp index 295170789..c01a38a2d 100644 --- a/src/modules/joystick/sdl/wrap_JoystickModule.cpp +++ b/src/modules/joystick/sdl/wrap_JoystickModule.cpp @@ -130,7 +130,7 @@ int w_getGamepadMapping(lua_State *L) else { love::joystick::Joystick *stick = luax_checkjoystick(L, 1); - guid = stick->getProductGUID(); + guid = stick->getGUID(); } const char *gpbindstr = luaL_checkstring(L, 2);