openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

kconfig: qconf: remove 'parent' from ConfigList::updateMenuList() 

All the call-sites of this function pass 'this' to the first argument.

So, 'parent' is always the 'this' pointer.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
This commit is contained in:
Masahiro Yamada 2020-08-07 18:19:01 +09:00
parent 1031685c5e
commit 5b75a6c896
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
scripts/kconfig/qconf.cc
View File

@ -446,7 +446,7 @@ void ConfigList::updateList()
return;
}
update:
updateMenuList(this, rootEntry);
updateMenuList(rootEntry);
update();
resizeColumnToContents(0);
}
@ -524,7 +524,7 @@ void ConfigList::setRootMenu(struct menu *menu)
type = menu && menu->prompt ? menu->prompt->type : P_UNKNOWN;
if (type != P_MENU)
return;
updateMenuList(this, 0);
updateMenuList(0);
rootEntry = menu;
updateListAll();
if (currentItem()) {
@ -628,7 +628,7 @@ hide:
}
}
void ConfigList::updateMenuList(ConfigList *parent, struct menu* menu)
void ConfigList::updateMenuList(struct menu *menu)
{
struct menu* child;
ConfigItem* item;
@ -637,19 +637,19 @@ void ConfigList::updateMenuList(ConfigList *parent, struct menu* menu)
enum prop_type type;
if (!menu) {
while (parent->topLevelItemCount() > 0)
while (topLevelItemCount() > 0)
{
delete parent->takeTopLevelItem(0);
delete takeTopLevelItem(0);
}
return;
}
last = (ConfigItem*)parent->topLevelItem(0);
last = (ConfigItem *)topLevelItem(0);
if (last && !last->goParent)
last = 0;
for (child = menu->list; child; child = child->next) {
item = last ? last->nextSibling() : (ConfigItem*)parent->topLevelItem(0);
item = last ? last->nextSibling() : (ConfigItem *)topLevelItem(0);
type = child->prompt ? child->prompt->type : P_UNKNOWN;
switch (mode) {
@ -670,7 +670,7 @@ void ConfigList::updateMenuList(ConfigList *parent, struct menu* menu)
if (!child->sym && !child->list && !child->prompt)
continue;
if (!item || item->menu != child)
item = new ConfigItem(parent, last, child, visible);
item = new ConfigItem(this, last, child, visible);
else
item->testUpdateMenu(visible);
@ -683,7 +683,7 @@ void ConfigList::updateMenuList(ConfigList *parent, struct menu* menu)
}
hide:
if (item && item->menu == child) {
last = (ConfigItem*)parent->topLevelItem(0);
last = (ConfigItem *)topLevelItem(0);
if (last == item)
last = 0;
else while (last->nextSibling() != item)

2
scripts/kconfig/qconf.h
View File

@ -102,7 +102,7 @@ public slots:
bool menuSkip(struct menu *);
void updateMenuList(ConfigItem *parent, struct menu*);
void updateMenuList(ConfigList *parent, struct menu*);
void updateMenuList(struct menu *menu);
bool updateAll;