kconfig: qconf: do not show checkbox icon for choice

When you select "Show All Options" or "Show Prompt Options", choice
entries display a check box icon, but this has no point because
choice is always y since commit fde192511bdb ("kconfig: remove tristate
choice support").

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Acked-by: Randy Dunlap <rdunlap@infradead.org>
Tested-by: Randy Dunlap <rdunlap@infradead.org>

diff --git a/scripts/kconfig/qconf.cc b/scripts/kconfig/qconf.cc
index eaa465b0ccf9c480544ddd7609c3fc4de3a72e13..546738a5c3b1527c979ae74a76a73f071e5ec162 100644 (file)
--- a/scripts/kconfig/qconf.cc
+++ b/scripts/kconfig/qconf.cc
@@ -92,7 +92,6 @@ void ConfigItem::updateMenu(void)
 {
        ConfigList* list;
        struct symbol* sym;
-       struct property *prop;
        QString prompt;
        int type;
        tristate expr;
@@ -105,11 +104,10 @@ void ConfigItem::updateMenu(void)
        }
 
        sym = menu->sym;
-       prop = menu->prompt;
        prompt = menu_get_prompt(menu);
 
-       if (prop) switch (prop->type) {
-       case P_MENU:
+       switch (menu->type) {
+       case M_MENU:
                if (list->mode == singleMode) {
                        /* a menuconfig entry is displayed differently
                         * depending whether it's at the view root or a child.
@@ -123,10 +121,13 @@ void ConfigItem::updateMenu(void)
                        setIcon(promptColIdx, QIcon());
                }
                goto set_prompt;
-       case P_COMMENT:
+       case M_COMMENT:
                setIcon(promptColIdx, QIcon());
                prompt = "*** " + prompt + " ***";
                goto set_prompt;
+       case M_CHOICE:
+               setIcon(promptColIdx, QIcon());
+               goto set_prompt;
        default:
                ;
        }