mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 16:31:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

cc_frm.cpp: use 'vector::at' function for more safety

Browse Source
This commit is contained in:
Thilo Graf
2019-10-27 16:24:47 +01:00
parent 535b1004aa
commit 7783b755d0
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/gui/components/cc_frm.cpp
View File

@@ -253,8 +253,8 @@ CComponentsItem* CComponentsForm::getCCItem(const uint& cc_item_id)
return NULL; return NULL;
} }
if (v_cc_items[cc_item_id]) if (v_cc_items.at(cc_item_id))
return v_cc_items[cc_item_id]; return v_cc_items.at(cc_item_id);
return NULL; return NULL;
} }
@@ -271,14 +271,14 @@ CComponentsItem* CComponentsForm::getNextCCItem(CComponentsItem* current_cc_item
void CComponentsForm::replaceCCItem(const uint& cc_item_id, CComponentsItem* new_cc_Item) void CComponentsForm::replaceCCItem(const uint& cc_item_id, CComponentsItem* new_cc_Item)
{ {
if (!v_cc_items.empty()){ if (!v_cc_items.empty()){
CComponentsItem* old_Item = v_cc_items[cc_item_id]; CComponentsItem* old_Item = v_cc_items.at(cc_item_id);
if (old_Item){ if (old_Item){
CComponentsForm * old_parent = old_Item->getParent(); CComponentsForm * old_parent = old_Item->getParent();
new_cc_Item->setParent(old_parent); new_cc_Item->setParent(old_parent);
new_cc_Item->setIndex(old_parent->getIndex()); new_cc_Item->setIndex(old_parent->getIndex());
delete old_Item; delete old_Item;
old_Item = NULL; old_Item = NULL;
v_cc_items[cc_item_id] = new_cc_Item; v_cc_items.at(cc_item_id) = new_cc_Item;
} }
} }
else else
@@ -313,9 +313,9 @@ void CComponentsForm::insertCCItem(const uint& cc_item_id, CComponentsItem* cc_I
void CComponentsForm::removeCCItem(const uint& cc_item_id) void CComponentsForm::removeCCItem(const uint& cc_item_id)
{ {
if (!v_cc_items.empty()){ if (!v_cc_items.empty()){
if (v_cc_items[cc_item_id]) { if (v_cc_items.at(cc_item_id)) {
delete v_cc_items[cc_item_id]; delete v_cc_items.at(cc_item_id);
v_cc_items[cc_item_id] = NULL; v_cc_items.at(cc_item_id) = NULL;
v_cc_items.erase(v_cc_items.begin()+cc_item_id); v_cc_items.erase(v_cc_items.begin()+cc_item_id);
dprintf(DEBUG_DEBUG, "[CComponentsForm] %s removing cc_Item [id=%u]...\n", __func__, cc_item_id); dprintf(DEBUG_DEBUG, "[CComponentsForm] %s removing cc_Item [id=%u]...\n", __func__, cc_item_id);
} }
@@ -333,7 +333,7 @@ void CComponentsForm::removeCCItem(CComponentsItem* cc_Item)
void CComponentsForm::exchangeCCItem(const uint& cc_item_id_a, const uint& cc_item_id_b) void CComponentsForm::exchangeCCItem(const uint& cc_item_id_a, const uint& cc_item_id_b)
{ {
if (!v_cc_items.empty()) if (!v_cc_items.empty())
swap(v_cc_items[cc_item_id_a], v_cc_items[cc_item_id_b]); swap(v_cc_items.at(cc_item_id_a), v_cc_items.at(cc_item_id_b));
} }
void CComponentsForm::exchangeCCItem(CComponentsItem* item_a, CComponentsItem* item_b) void CComponentsForm::exchangeCCItem(CComponentsItem* item_a, CComponentsItem* item_b)