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: Masahiro Yamada <masahiroy@kernel.org>

diff --git a/scripts/kconfig/qconf.cc b/scripts/kconfig/qconf.cc
index 7c844c4a119ecbced0b7f2bfc6dc77754c0f9232..5b1237bf085a5f908ae50e659fc7968b00e0e9ec 100644 (file)
--- a/scripts/kconfig/qconf.cc
+++ b/scripts/kconfig/qconf.cc
@@ -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);
        }
 }
 

diff --git a/scripts/kconfig/qconf.h b/scripts/kconfig/qconf.h
index 0b62fb26821afbf216823e492f11f544a25b3471..62ab3286d04f753b93a086a74e98eb2d3af88884 100644 (file)
--- a/scripts/kconfig/qconf.h
+++ b/scripts/kconfig/qconf.h
@@ -114,25 +114,25 @@ public:
 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 @@ public:
 
        ConfigItem* nextItem;
        struct menu *menu;
-       bool visible;
        bool goParent;
 
        static QIcon symbolYesIcon, symbolModIcon, symbolNoIcon;