]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
Revert "kconfig: qconf: Change title for the item window"
authorMasahiro Yamada <masahiroy@kernel.org>
Wed, 29 Jul 2020 17:46:17 +0000 (02:46 +0900)
committerMasahiro Yamada <masahiroy@kernel.org>
Sat, 1 Aug 2020 11:54:39 +0000 (20:54 +0900)
This reverts commit 5752ff07fd90d764d96e3c586cc95c09598abfdd.

It added dead code to ConfigList:ConfigList().

The constructor of ConfigList has the initializer, mode(singleMode).

    if (mode == symbolMode)
           setHeaderLabels(QStringList() << "Item" << "Name" << "N" << "M" << "Y" << "Value");
    else
           setHeaderLabels(QStringList() << "Option" << "Name" << "N" << "M" << "Y" << "Value");

... always takes the else part.

The change to ConfigList::updateSelection() is strange too.
When you click the split view icon for the first time, the titles in
both windows show "Option". After you click something in the right
window, the title suddenly changes to "Item".

ConfigList::updateSelection() is not the right place to do this,
at least. It was not a good idea, I think.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
scripts/kconfig/qconf.cc

index fa51e65d56d0e4fb2707092152060f17599d2877..86bc8ded8de8ce9f14dc4724ae55bce208f62bb3 100644 (file)
@@ -307,10 +307,7 @@ ConfigList::ConfigList(ConfigView* p, const char *name)
        setVerticalScrollMode(ScrollPerPixel);
        setHorizontalScrollMode(ScrollPerPixel);
 
-       if (mode == symbolMode)
-               setHeaderLabels(QStringList() << "Item" << "Name" << "N" << "M" << "Y" << "Value");
-       else
-               setHeaderLabels(QStringList() << "Option" << "Name" << "N" << "M" << "Y" << "Value");
+       setHeaderLabels(QStringList() << "Option" << "Name" << "N" << "M" << "Y" << "Value");
 
        connect(this, SIGNAL(itemSelectionChanged(void)),
                SLOT(updateSelection(void)));
@@ -391,11 +388,6 @@ void ConfigList::updateSelection(void)
        struct menu *menu;
        enum prop_type type;
 
-       if (mode == symbolMode)
-               setHeaderLabels(QStringList() << "Item" << "Name" << "N" << "M" << "Y" << "Value");
-       else
-               setHeaderLabels(QStringList() << "Option" << "Name" << "N" << "M" << "Y" << "Value");
-
        if (selectedItems().count() == 0)
                return;