Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2016-03-31 14:57:35 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2016-03-31 14:57:35 (GMT) |
| commit | cfbdb43d2cadd40aa87338d41548e4bf89e146e6 (patch) | |
| tree | 18d94153a302445196fc0c18586abf44a1ce4a38 /Sluift/ElementConvertors/StatusShowConvertor.cpp | |
| parent | 1d545a4a7fb877f021508094b88c1f17b30d8b4e (diff) | |
| download | swift-cfbdb43d2cadd40aa87338d41548e4bf89e146e6.zip swift-cfbdb43d2cadd40aa87338d41548e4bf89e146e6.tar.bz2 | |
Convert tabs to 4 spaces for all source files
Removed trailing spaces and whitespace on empty lines
in the process.
Changed CheckTabs.py tool to disallow hard tabs in source
files.
Test-Information:
Manually checked 30 random files that the conversion worked
as expected.
Change-Id: I874f99d617bd3d2bb55f02d58f22f58f9b094480
Diffstat (limited to 'Sluift/ElementConvertors/StatusShowConvertor.cpp')
| -rw-r--r-- | Sluift/ElementConvertors/StatusShowConvertor.cpp | 82 |
1 files changed, 41 insertions, 41 deletions
diff --git a/Sluift/ElementConvertors/StatusShowConvertor.cpp b/Sluift/ElementConvertors/StatusShowConvertor.cpp index faae289..d1c1e85 100644 --- a/Sluift/ElementConvertors/StatusShowConvertor.cpp +++ b/Sluift/ElementConvertors/StatusShowConvertor.cpp @@ -23,54 +23,54 @@ 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; + 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()); - if (!show.empty()) { - lua_pushstring(L, show.c_str()); - lua_setfield(L, -2, "type"); - } + lua_createtable(L, 0, 0); + 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"; - 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 ""; + switch (show) { + 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 + "'"); - } + 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 + "'"); + } } |