use empty to check string

Origin commit data
------------------
Branch: ni/coolstream
Commit: 2b5e7b5ba3
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-01-09 (Fri, 09 Jan 2015)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Jacek Jendrzej
2015-01-09 17:15:11 +01:00
parent 91859dcb45
commit 5afc24dc67
34 changed files with 170 additions and 170 deletions

View File

@@ -1243,7 +1243,7 @@ int CLuaInstance::MenuAddKey(lua_State *L)
std::string action; tableLookup(L, "action", action);
std::string id; tableLookup(L, "id", id);
lua_Unsigned directkey = CRCInput::RC_nokey; tableLookup(L, "directkey", directkey);
if ((action != "") && (directkey != CRCInput::RC_nokey)) {
if ((!action.empty()) && (directkey != CRCInput::RC_nokey)) {
CLuaMenuForwarder *forwarder = new CLuaMenuForwarder(L, action, id);
m->m->addKey(directkey, forwarder, action);
m->targets.push_back(forwarder);
@@ -1772,22 +1772,22 @@ int CLuaInstance::CWindowNew(lua_State *L)
CComponentsFooter* footer = (*udata)->w->getFooterObject();
if (footer) {
int btnCount = 0;
if (btnRed != "") btnCount++;
if (btnGreen != "") btnCount++;
if (btnYellow != "") btnCount++;
if (btnBlue != "") btnCount++;
if (!btnRed.empty()) btnCount++;
if (!btnGreen.empty()) btnCount++;
if (!btnYellow.empty()) btnCount++;
if (!btnBlue.empty()) btnCount++;
if (btnCount) {
fb_pixel_t col = footer->getColorBody();
int btnw = (dx-20) / btnCount;
int btnh = footer->getHeight();
int start = 10;
if (btnRed != "")
if (!btnRed.empty())
footer->addCCItem(new CComponentsButtonRed(start, CC_CENTERED, btnw, btnh, btnRed, 0, false , true, false, col, col));
if (btnGreen != "")
if (!btnGreen.empty())
footer->addCCItem(new CComponentsButtonGreen(start+=btnw, CC_CENTERED, btnw, btnh, btnGreen, 0, false , true, false, col, col));
if (btnYellow != "")
if (!btnYellow.empty())
footer->addCCItem(new CComponentsButtonYellow(start+=btnw, CC_CENTERED, btnw, btnh, btnYellow, 0, false , true, false, col, col));
if (btnBlue != "")
if (!btnBlue.empty())
footer->addCCItem(new CComponentsButtonBlue(start+=btnw, CC_CENTERED, btnw, btnh, btnBlue, 0, false , true, false, col, col));
}
}