CComponents: replace __FUNCTION__ with __func__

__func__ is more suitable for portability
This commit is contained in:
2013-12-15 16:57:11 +01:00
parent 1583f98f7c
commit 8442b39c28
8 changed files with 32 additions and 32 deletions

View File

@@ -130,7 +130,7 @@ void CComponentsHeader::initVarHeader()
CComponentsHeader::~CComponentsHeader()
{
#ifdef DEBUG_CC
printf("[~CComponentsHeader] [%s - %d] delete...\n", __FUNCTION__, __LINE__);
printf("[~CComponentsHeader] [%s - %d] delete...\n", __func__, __LINE__);
#endif
v_cch_btn.clear();
}
@@ -172,7 +172,7 @@ void CComponentsHeader::initIcon()
//create instance for cch_icon_obj
if (cch_icon_obj == NULL){
#ifdef DEBUG_CC
printf(" [CComponentsHeader]\n [%s - %d] init header icon: %s\n", __FUNCTION__, __LINE__, cch_icon_name);
printf(" [CComponentsHeader]\n [%s - %d] init header icon: %s\n", __func__, __LINE__, cch_icon_name);
#endif
cch_icon_obj = new CComponentsPicture(cch_icon_x, cch_items_y, 0, 0, cch_icon_name);
}
@@ -235,7 +235,7 @@ void CComponentsHeader::initDefaultButtons()
if (cch_buttons & CC_BTN_MENU)
v_cch_btn.push_back(NEUTRINO_ICON_BUTTON_MENU);
#ifdef DEBUG_CC
printf("[CComponentsHeader] %s added %d default buttons...\n", __FUNCTION__, v_cch_btn.size());
printf("[CComponentsHeader] %s added %d default buttons...\n", __func__, v_cch_btn.size());
#endif
}
@@ -279,7 +279,7 @@ void CComponentsHeader::initButtons()
if (cch_btn_obj == NULL){
cch_btn_obj = new CComponentsIconForm();
#ifdef DEBUG_CC
printf(" [CComponentsHeader]\n [%s - %d] init header buttons...\n", __FUNCTION__, __LINE__);
printf(" [CComponentsHeader]\n [%s - %d] init header buttons...\n", __func__, __LINE__);
#endif
}
@@ -332,7 +332,7 @@ void CComponentsHeader::initCaption()
//create cch_text_obj and add to collection
if (cch_text_obj == NULL){
#ifdef DEBUG_CC
printf(" [CComponentsHeader]\n [%s - %d] init header text: %s [ x %d w %d ]\n", __FUNCTION__, __LINE__, cch_text.c_str(), cch_text_x, cc_text_w);
printf(" [CComponentsHeader]\n [%s - %d] init header text: %s [ x %d w %d ]\n", __func__, __LINE__, cch_text.c_str(), cch_text_x, cc_text_w);
#endif
cch_text_obj = new CComponentsText();
}