Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2014-10-23 12:24:36 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2014-10-23 12:24:36 (GMT) |
| commit | fa67c2b239d9c7fc508205ea17724322011194f4 (patch) | |
| tree | 33c09d0a38bbf2a61b9f0dbadc048d7665542972 /Sluift/ElementConvertors/StatusShowConvertor.cpp | |
| parent | 052190912463d8ea36979fd5a5e9a298588dce4f (diff) | |
| download | swift-contrib-fa67c2b239d9c7fc508205ea17724322011194f4.zip swift-contrib-fa67c2b239d9c7fc508205ea17724322011194f4.tar.bz2 | |
Fix code in response to clang warnings.
Removes some unused private members and restructure switch statement to handle
all cases.
Test-Information:
Fixed code does not emit the clang warnings anymore.
Change-Id: I06a9036b307014e2f882e3cee45a6881b24c3f70
Diffstat (limited to 'Sluift/ElementConvertors/StatusShowConvertor.cpp')
| -rw-r--r-- | Sluift/ElementConvertors/StatusShowConvertor.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Sluift/ElementConvertors/StatusShowConvertor.cpp b/Sluift/ElementConvertors/StatusShowConvertor.cpp index d8e24ab..27876ff 100644 --- a/Sluift/ElementConvertors/StatusShowConvertor.cpp +++ b/Sluift/ElementConvertors/StatusShowConvertor.cpp @@ -1,74 +1,74 @@ /* * Copyright (c) 2014 Remko Tronçon * Licensed under the GNU General Public License. * See the COPYING file for more information. */ #include <Sluift/ElementConvertors/StatusShowConvertor.h> #include <lua.hpp> #include <boost/smart_ptr/make_shared.hpp> #include <boost/numeric/conversion/cast.hpp> #include <Sluift/Lua/Check.h> #include <Sluift/Lua/Exception.h> using namespace Swift; StatusShowConvertor::StatusShowConvertor() : GenericLuaElementConvertor<StatusShow>("show") { } StatusShowConvertor::~StatusShowConvertor() { } boost::shared_ptr<StatusShow> StatusShowConvertor::doConvertFromLua(lua_State* L) { boost::shared_ptr<StatusShow> result = boost::make_shared<StatusShow>(); lua_getfield(L, -1, "type"); if (lua_isstring(L, -1)) { result->setType(convertStatusShowTypeFromString(lua_tostring(L, -1))); } lua_pop(L, 1); return result; } void StatusShowConvertor::doConvertToLua(lua_State* L, boost::shared_ptr<StatusShow> payload) { lua_createtable(L, 0, 0); - const std::string show = convertStatusShowTypeToString(payload->getType()); + const std::string show = convertStatusShowTypeToString(payload->getType()); if (!show.empty()) { lua_pushstring(L, show.c_str()); lua_setfield(L, -2, "type"); } } std::string StatusShowConvertor::convertStatusShowTypeToString(const StatusShow::Type &show) { switch (show) { - case StatusShow::Online: return "online"; break; - case StatusShow::FFC: return "ffc"; break; - case StatusShow::Away: return "away"; break; - case StatusShow::XA: return "xa"; break; - case StatusShow::DND: return "dnd"; break; - case StatusShow::None: return ""; break; + case StatusShow::Online: return "online"; + case StatusShow::FFC: return "ffc"; + case StatusShow::Away: return "away"; + case StatusShow::XA: return "xa"; + case StatusShow::DND: return "dnd"; + case StatusShow::None: return ""; } assert(false); return ""; } StatusShow::Type StatusShowConvertor::convertStatusShowTypeFromString(const std::string& show) { if (show == "online") { return StatusShow::Online; } else if (show == "ffc") { return StatusShow::FFC; } else if (show == "away") { return StatusShow::Away; } else if (show == "xa") { return StatusShow::XA; } else if (show == "dnd") { return StatusShow::DND; } else { throw Lua::Exception("Illegal status show: '" + show + "'"); } } |