Skip to content

Commit

Permalink
kconfig: qconf: remove 'parent' from ConfigList::updateMenuList()
Browse files Browse the repository at this point in the history
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 <[email protected]>
  • Loading branch information
masahir0y committed Aug 14, 2020
1 parent 1031685 commit 5b75a6c
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
18 changes: 9 additions & 9 deletions scripts/kconfig/qconf.cc
Original file line number Diff line number Diff line change
Expand Up @@ -446,7 +446,7 @@ void ConfigList::updateList()
return;
}
update:
updateMenuList(this, rootEntry);
updateMenuList(rootEntry);
update();
resizeColumnToContents(0);
}
Expand Down Expand Up @@ -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()) {
Expand Down Expand Up @@ -628,7 +628,7 @@ void ConfigList::updateMenuList(ConfigItem *parent, struct menu* menu)
}
}

void ConfigList::updateMenuList(ConfigList *parent, struct menu* menu)
void ConfigList::updateMenuList(struct menu *menu)
{
struct menu* child;
ConfigItem* item;
Expand All @@ -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) {
Expand All @@ -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);

Expand All @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion scripts/kconfig/qconf.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down

0 comments on commit 5b75a6c

Please sign in to comment.