Commit 511ff539 authored by Masahiro Yamada's avatar Masahiro Yamada
Browse files

kconfig: qconf: remove ConfigItem::visible member 



The " (NEW)" string should be displayed regardless of the visibility
of the associated menu.

The ConfigItem::visible member is not used for any other purpose.

Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
parent 76567f93

scripts/kconfig/qconf.cc

+11 −17
Original line number Diff line number Diff line
@@ -175,17 +175,16 @@ void ConfigItem::updateMenu(void) 
		setText(dataColIdx, sym_get_string_value(sym));

		break;

	}

	if (!sym_has_value(sym) && visible)

	if (!sym_has_value(sym))

		prompt += " (NEW)";

set_prompt:

	setText(promptColIdx, prompt);

}



void ConfigItem::testUpdateMenu(bool v)

void ConfigItem::testUpdateMenu(void)

{

	ConfigItem* i;



	visible = v;

	if (!menu)

		return;
@@ -429,7 +428,7 @@ void ConfigList::updateList() 
			item = (ConfigItem*)(*it);

			if (!item->menu)

				continue;

			item->testUpdateMenu(menu_is_visible(item->menu));

			item->testUpdateMenu();



			++it;

		}
@@ -439,16 +438,16 @@ void ConfigList::updateList() 
	if (rootEntry != &rootmenu && mode == singleMode) {

		item = (ConfigItem *)topLevelItem(0);

		if (!item)

			item = new ConfigItem(this, 0, true);

			item = new ConfigItem(this, 0);

		last = item;

	}

	if ((mode == singleMode || (mode == symbolMode && !(rootEntry->flags & MENU_ROOT))) &&

	    rootEntry->sym && rootEntry->prompt) {

		item = last ? last->nextSibling() : nullptr;

		if (!item)

			item = new ConfigItem(this, last, rootEntry, true);

			item = new ConfigItem(this, last, rootEntry);

		else

			item->testUpdateMenu(true);

			item->testUpdateMenu();



		updateMenuList(item, rootEntry);

		update();
@@ -597,7 +596,6 @@ void ConfigList::updateMenuList(ConfigItem *parent, struct menu* menu) 
	struct menu* child;

	ConfigItem* item;

	ConfigItem* last;

	bool visible;

	enum prop_type type;



	if (!menu) {
@@ -629,14 +627,13 @@ void ConfigList::updateMenuList(ConfigItem *parent, struct menu* menu) 
			break;

		}



		visible = menu_is_visible(child);

		if (!menuSkip(child)) {

			if (!child->sym && !child->list && !child->prompt)

				continue;

			if (!item || item->menu != child)

				item = new ConfigItem(parent, last, child, visible);

				item = new ConfigItem(parent, last, child);

			else

				item->testUpdateMenu(visible);

				item->testUpdateMenu();



			if (mode == fullMode || mode == menuMode || type != P_MENU)

				updateMenuList(item, child);
@@ -662,7 +659,6 @@ void ConfigList::updateMenuList(struct menu *menu) 
	struct menu* child;

	ConfigItem* item;

	ConfigItem* last;

	bool visible;

	enum prop_type type;



	if (!menu) {
@@ -694,14 +690,13 @@ void ConfigList::updateMenuList(struct menu *menu) 
			break;

		}



		visible = menu_is_visible(child);

		if (!menuSkip(child)) {

			if (!child->sym && !child->list && !child->prompt)

				continue;

			if (!item || item->menu != child)

				item = new ConfigItem(this, last, child, visible);

				item = new ConfigItem(this, last, child);

			else

				item->testUpdateMenu(visible);

				item->testUpdateMenu();



			if (mode == fullMode || mode == menuMode || type != P_MENU)

				updateMenuList(item, child);
@@ -1274,8 +1269,7 @@ void ConfigSearchWindow::search(void) 
		return;

	for (p = result; *p; p++) {

		for_all_prompts((*p), prop)

			lastItem = new ConfigItem(list, lastItem, prop->menu,

						  menu_is_visible(prop->menu));

			lastItem = new ConfigItem(list, lastItem, prop->menu);

	}

}

scripts/kconfig/qconf.h

+7 −8
Original line number Diff line number Diff line
@@ -114,25 +114,25 @@ public slots: 
class ConfigItem : public QTreeWidgetItem {

	typedef class QTreeWidgetItem Parent;

public:

	ConfigItem(ConfigList *parent, ConfigItem *after, struct menu *m, bool v)

	: Parent(parent, after), nextItem(0), menu(m), visible(v), goParent(false)

	ConfigItem(ConfigList *parent, ConfigItem *after, struct menu *m)

	: Parent(parent, after), nextItem(0), menu(m), goParent(false)

	{

		init();

	}

	ConfigItem(ConfigItem *parent, ConfigItem *after, struct menu *m, bool v)

	: Parent(parent, after), nextItem(0), menu(m), visible(v), goParent(false)

	ConfigItem(ConfigItem *parent, ConfigItem *after, struct menu *m)

	: Parent(parent, after), nextItem(0), menu(m), goParent(false)

	{

		init();

	}

	ConfigItem(ConfigList *parent, ConfigItem *after, bool v)

	: Parent(parent, after), nextItem(0), menu(0), visible(v), goParent(true)

	ConfigItem(ConfigList *parent, ConfigItem *after)

	: Parent(parent, after), nextItem(0), menu(0), goParent(true)

	{

		init();

	}

	~ConfigItem(void);

	void init(void);

	void updateMenu(void);

	void testUpdateMenu(bool v);

	void testUpdateMenu(void);

	ConfigList* listView() const

	{

		return (ConfigList*)Parent::treeWidget();
@@ -159,7 +159,6 @@ class ConfigItem : public QTreeWidgetItem { 


	ConfigItem* nextItem;

	struct menu *menu;

	bool visible;

	bool goParent;



	static QIcon symbolYesIcon, symbolModIcon, symbolNoIcon;