Skip to content

L
linux
Commit 32b2ee5c authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

Merge tag 'kconfig-v5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild 

Pull Kconfig updates from Masahiro Yamada:

 - remove '---help---' keyword support

 - fix mouse events for 'menuconfig' symbols in search view of qconf

 - code cleanups of qconf

* tag 'kconfig-v5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild: (24 commits)
  kconfig: qconf: move setOptionMode() to ConfigList from ConfigView
  kconfig: qconf: do not limit the pop-up menu to the first row
  kconfig: qconf: refactor icon setups
  kconfig: qconf: remove unused voidPix, menuInvPix
  kconfig: qconf: remove ConfigItem::text/setText
  kconfig: qconf: remove ConfigList::addColumn/removeColumn
  kconfig: qconf: remove ConfigItem::pixmap/setPixmap
  kconfig: qconf: drop more localization code
  kconfig: qconf: remove 'parent' from ConfigList::updateMenuList()
  kconfig: qconf: remove unused argument from ConfigView::updateList()
  kconfig: qconf: remove unused argument from ConfigList::updateList()
  kconfig: qconf: omit parent to QHBoxLayout()
  kconfig: qconf: remove name from ConfigSearchWindow constructor
  kconfig: qconf: remove unused ConfigList::listView()
  kconfig: qconf: overload addToolBar() to create and insert toolbar
  kconfig: qconf: remove toolBar from ConfigMainWindow members
  kconfig: qconf: use 'menu' variable for (QMenu *)
  kconfig: qconf: do not use 'menu' variable for (QMenuBar *)
  kconfig: qconf: remove ->addSeparator() to menuBar
  kconfig: add 'static' to some file-local data
  ...
parents a1d21081 d4bbe8a1
Expand all Show whitespace changes
Inline Side-by-side
Showing with 218 additions and 243 deletions
scripts/checkkconfigsymbols.py
View file @ 32b2ee5c
...@@ -34,7 +34,7 @@ REGEX_SOURCE_SYMBOL = re.compile(SOURCE_SYMBOL) ...@@ -34,7 +34,7 @@ REGEX_SOURCE_SYMBOL = re.compile(SOURCE_SYMBOL)
REGEX_KCONFIG_DEF = re.compile(DEF) REGEX_KCONFIG_DEF = re.compile(DEF)
REGEX_KCONFIG_EXPR = re.compile(EXPR) REGEX_KCONFIG_EXPR = re.compile(EXPR)
REGEX_KCONFIG_STMT = re.compile(STMT) REGEX_KCONFIG_STMT = re.compile(STMT)
REGEX_KCONFIG_HELP = re.compile(r"^\s+(help|---help---)\s*$") REGEX_KCONFIG_HELP = re.compile(r"^\s+help\s*$")
REGEX_FILTER_SYMBOLS = re.compile(r"[A-Za-z0-9]$") REGEX_FILTER_SYMBOLS = re.compile(r"[A-Za-z0-9]$")
REGEX_NUMERIC = re.compile(r"0[xX][0-9a-fA-F]+|[0-9]+") REGEX_NUMERIC = re.compile(r"0[xX][0-9a-fA-F]+|[0-9]+")
REGEX_QUOTES = re.compile("(\"(.*?)\")") REGEX_QUOTES = re.compile("(\"(.*?)\")")
......
scripts/checkpatch.pl
View file @ 32b2ee5c
...@@ -3045,11 +3045,7 @@ sub process { ...@@ -3045,11 +3045,7 @@ sub process {
if ($lines[$ln - 1] =~ /^\+\s*(?:bool|tristate|prompt)\s*["']/) { if ($lines[$ln - 1] =~ /^\+\s*(?:bool|tristate|prompt)\s*["']/) {
$is_start = 1; $is_start = 1;
} elsif ($lines[$ln - 1] =~ /^\+\s*(?:help|---help---)\s*$/) { } elsif ($lines[$ln - 1] =~ /^\+\s*(?:---)?help(?:---)?$/) {
if ($lines[$ln - 1] =~ "---help---") {
WARN("CONFIG_DESCRIPTION",
"prefer 'help' over '---help---' for new help texts\n" . $herecurr);
}
$length = -1; $length = -1;
} }
......
scripts/kconfig/images.c
View file @ 32b2ee5c
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#include "images.h" #include "images.h"
const char *xpm_load[] = { const char * const xpm_load[] = {
"22 22 5 1", "22 22 5 1",
". c None", ". c None",
"# c #000000", "# c #000000",
...@@ -35,7 +35,7 @@ const char *xpm_load[] = { ...@@ -35,7 +35,7 @@ const char *xpm_load[] = {
"###############.......", "###############.......",
"......................"}; "......................"};
const char *xpm_save[] = { const char * const xpm_save[] = {
"22 22 5 1", "22 22 5 1",
". c None", ". c None",
"# c #000000", "# c #000000",
...@@ -65,7 +65,7 @@ const char *xpm_save[] = { ...@@ -65,7 +65,7 @@ const char *xpm_save[] = {
"..##################..", "..##################..",
"......................"}; "......................"};
const char *xpm_back[] = { const char * const xpm_back[] = {
"22 22 3 1", "22 22 3 1",
". c None", ". c None",
"# c #000083", "# c #000083",
...@@ -93,7 +93,7 @@ const char *xpm_back[] = { ...@@ -93,7 +93,7 @@ const char *xpm_back[] = {
"......................", "......................",
"......................"}; "......................"};
const char *xpm_tree_view[] = { const char * const xpm_tree_view[] = {
"22 22 2 1", "22 22 2 1",
". c None", ". c None",
"# c #000000", "# c #000000",
...@@ -120,7 +120,7 @@ const char *xpm_tree_view[] = { ...@@ -120,7 +120,7 @@ const char *xpm_tree_view[] = {
"......................", "......................",
"......................"}; "......................"};
const char *xpm_single_view[] = { const char * const xpm_single_view[] = {
"22 22 2 1", "22 22 2 1",
". c None", ". c None",
"# c #000000", "# c #000000",
...@@ -147,7 +147,7 @@ const char *xpm_single_view[] = { ...@@ -147,7 +147,7 @@ const char *xpm_single_view[] = {
"......................", "......................",
"......................"}; "......................"};
const char *xpm_split_view[] = { const char * const xpm_split_view[] = {
"22 22 2 1", "22 22 2 1",
". c None", ". c None",
"# c #000000", "# c #000000",
...@@ -174,7 +174,7 @@ const char *xpm_split_view[] = { ...@@ -174,7 +174,7 @@ const char *xpm_split_view[] = {
"......................", "......................",
"......................"}; "......................"};
const char *xpm_symbol_no[] = { const char * const xpm_symbol_no[] = {
"12 12 2 1", "12 12 2 1",
" c white", " c white",
". c black", ". c black",
...@@ -191,7 +191,7 @@ const char *xpm_symbol_no[] = { ...@@ -191,7 +191,7 @@ const char *xpm_symbol_no[] = {
" .......... ", " .......... ",
" "}; " "};
const char *xpm_symbol_mod[] = { const char * const xpm_symbol_mod[] = {
"12 12 2 1", "12 12 2 1",
" c white", " c white",
". c black", ". c black",
...@@ -208,7 +208,7 @@ const char *xpm_symbol_mod[] = { ...@@ -208,7 +208,7 @@ const char *xpm_symbol_mod[] = {
" .......... ", " .......... ",
" "}; " "};
const char *xpm_symbol_yes[] = { const char * const xpm_symbol_yes[] = {
"12 12 2 1", "12 12 2 1",
" c white", " c white",
". c black", ". c black",
...@@ -225,7 +225,7 @@ const char *xpm_symbol_yes[] = { ...@@ -225,7 +225,7 @@ const char *xpm_symbol_yes[] = {
" .......... ", " .......... ",
" "}; " "};
const char *xpm_choice_no[] = { const char * const xpm_choice_no[] = {
"12 12 2 1", "12 12 2 1",
" c white", " c white",
". c black", ". c black",
...@@ -242,7 +242,7 @@ const char *xpm_choice_no[] = { ...@@ -242,7 +242,7 @@ const char *xpm_choice_no[] = {
" .... ", " .... ",
" "}; " "};
const char *xpm_choice_yes[] = { const char * const xpm_choice_yes[] = {
"12 12 2 1", "12 12 2 1",
" c white", " c white",
". c black", ". c black",
...@@ -259,7 +259,7 @@ const char *xpm_choice_yes[] = { ...@@ -259,7 +259,7 @@ const char *xpm_choice_yes[] = {
" .... ", " .... ",
" "}; " "};
const char *xpm_menu[] = { const char * const xpm_menu[] = {
"12 12 2 1", "12 12 2 1",
" c white", " c white",
". c black", ". c black",
...@@ -276,7 +276,7 @@ const char *xpm_menu[] = { ...@@ -276,7 +276,7 @@ const char *xpm_menu[] = {
" .......... ", " .......... ",
" "}; " "};
const char *xpm_menu_inv[] = { const char * const xpm_menu_inv[] = {
"12 12 2 1", "12 12 2 1",
" c white", " c white",
". c black", ". c black",
...@@ -293,7 +293,7 @@ const char *xpm_menu_inv[] = { ...@@ -293,7 +293,7 @@ const char *xpm_menu_inv[] = {
" .......... ", " .......... ",
" "}; " "};
const char *xpm_menuback[] = { const char * const xpm_menuback[] = {
"12 12 2 1", "12 12 2 1",
" c white", " c white",
". c black", ". c black",
...@@ -310,7 +310,7 @@ const char *xpm_menuback[] = { ...@@ -310,7 +310,7 @@ const char *xpm_menuback[] = {
" .......... ", " .......... ",
" "}; " "};
const char *xpm_void[] = { const char * const xpm_void[] = {
"12 12 2 1", "12 12 2 1",
" c white", " c white",
". c black", ". c black",
......
scripts/kconfig/images.h
View file @ 32b2ee5c
...@@ -10,21 +10,21 @@ ...@@ -10,21 +10,21 @@
extern "C" { extern "C" {
#endif #endif
extern const char *xpm_load[]; extern const char * const xpm_load[];
extern const char *xpm_save[]; extern const char * const xpm_save[];
extern const char *xpm_back[]; extern const char * const xpm_back[];
extern const char *xpm_tree_view[]; extern const char * const xpm_tree_view[];
extern const char *xpm_single_view[]; extern const char * const xpm_single_view[];
extern const char *xpm_split_view[]; extern const char * const xpm_split_view[];
extern const char *xpm_symbol_no[]; extern const char * const xpm_symbol_no[];
extern const char *xpm_symbol_mod[]; extern const char * const xpm_symbol_mod[];
extern const char *xpm_symbol_yes[]; extern const char * const xpm_symbol_yes[];
extern const char *xpm_choice_no[]; extern const char * const xpm_choice_no[];
extern const char *xpm_choice_yes[]; extern const char * const xpm_choice_yes[];
extern const char *xpm_menu[]; extern const char * const xpm_menu[];
extern const char *xpm_menu_inv[]; extern const char * const xpm_menu_inv[];
extern const char *xpm_menuback[]; extern const char * const xpm_menuback[];
extern const char *xpm_void[]; extern const char * const xpm_void[];
#ifdef __cplusplus #ifdef __cplusplus
} }
......
scripts/kconfig/lexer.l
View file @ 32b2ee5c
...@@ -36,7 +36,7 @@ struct buffer { ...@@ -36,7 +36,7 @@ struct buffer {
YY_BUFFER_STATE state; YY_BUFFER_STATE state;
}; };
struct buffer *current_buf; static struct buffer *current_buf;
static int last_ts, first_ts; static int last_ts, first_ts;
...@@ -105,7 +105,7 @@ n [A-Za-z0-9_-] ...@@ -105,7 +105,7 @@ n [A-Za-z0-9_-]
"endchoice" return T_ENDCHOICE; "endchoice" return T_ENDCHOICE;
"endif" return T_ENDIF; "endif" return T_ENDIF;
"endmenu" return T_ENDMENU; "endmenu" return T_ENDMENU;
"help"|"---help---" return T_HELP; "help" return T_HELP;
"hex" return T_HEX; "hex" return T_HEX;
"if" return T_IF; "if" return T_IF;
"imply" return T_IMPLY; "imply" return T_IMPLY;
......
scripts/kconfig/qconf.cc
View file @ 32b2ee5c
This diff is collapsed.
scripts/kconfig/qconf.h
View file @ 32b2ee5c
...@@ -69,11 +69,13 @@ class ConfigList : public QTreeWidget { ...@@ -69,11 +69,13 @@ class ConfigList : public QTreeWidget {
public slots: public slots:
void setRootMenu(struct menu *menu); void setRootMenu(struct menu *menu);
void updateList(ConfigItem *item); void updateList();
void setValue(ConfigItem* item, tristate val); void setValue(ConfigItem* item, tristate val);
void changeValue(ConfigItem* item); void changeValue(ConfigItem* item);
void updateSelection(void); void updateSelection(void);
void saveSettings(void); void saveSettings(void);
void setOptionMode(QAction *action);
signals: signals:
void menuChanged(struct menu *menu); void menuChanged(struct menu *menu);
void menuSelected(struct menu *menu); void menuSelected(struct menu *menu);
...@@ -85,35 +87,19 @@ public slots: ...@@ -85,35 +87,19 @@ public slots:
void updateListAll(void) void updateListAll(void)
{ {
updateAll = true; updateAll = true;
updateList(NULL); updateList();
updateAll = false; updateAll = false;
} }
ConfigList* listView()
{
return this;
}
void addColumn(colIdx idx)
{
showColumn(idx);
}
void removeColumn(colIdx idx)
{
hideColumn(idx);
}
void setAllOpen(bool open); void setAllOpen(bool open);
void setParentMenu(void); void setParentMenu(void);
bool menuSkip(struct menu *); bool menuSkip(struct menu *);
void updateMenuList(ConfigItem *parent, struct menu*); void updateMenuList(ConfigItem *parent, struct menu*);
void updateMenuList(ConfigList *parent, struct menu*); void updateMenuList(struct menu *menu);
bool updateAll; bool updateAll;
QPixmap symbolYesPix, symbolModPix, symbolNoPix;
QPixmap choiceYesPix, choiceNoPix;
QPixmap menuPix, menuInvPix, menuBackPix, voidPix;
bool showName, showRange, showData; bool showName, showRange, showData;
enum listMode mode; enum listMode mode;
enum optionMode optMode; enum optionMode optMode;
...@@ -121,6 +107,8 @@ public slots: ...@@ -121,6 +107,8 @@ public slots:
QPalette disabledColorGroup; QPalette disabledColorGroup;
QPalette inactivedColorGroup; QPalette inactivedColorGroup;
QMenu* headerPopup; QMenu* headerPopup;
static QAction *showNormalAction, *showAllAction, *showPromptAction;
}; };
class ConfigItem : public QTreeWidgetItem { class ConfigItem : public QTreeWidgetItem {
...@@ -168,28 +156,16 @@ class ConfigItem : public QTreeWidgetItem { ...@@ -168,28 +156,16 @@ class ConfigItem : public QTreeWidgetItem {
return ret; return ret;
} }
void setText(colIdx idx, const QString& text)
{
Parent::setText(idx, text);
}
QString text(colIdx idx) const
{
return Parent::text(idx);
}
void setPixmap(colIdx idx, const QIcon &icon)
{
Parent::setIcon(idx, icon);
}
const QIcon pixmap(colIdx idx) const
{
return icon(idx);
}
// TODO: Implement paintCell // TODO: Implement paintCell
ConfigItem* nextItem; ConfigItem* nextItem;
struct menu *menu; struct menu *menu;
bool visible; bool visible;
bool goParent; bool goParent;
static QIcon symbolYesIcon, symbolModIcon, symbolNoIcon;
static QIcon choiceYesIcon, choiceNoIcon;
static QIcon menuIcon, menubackIcon;
}; };
class ConfigLineEdit : public QLineEdit { class ConfigLineEdit : public QLineEdit {
...@@ -214,7 +190,7 @@ class ConfigView : public QWidget { ...@@ -214,7 +190,7 @@ class ConfigView : public QWidget {
public: public:
ConfigView(QWidget* parent, const char *name = 0); ConfigView(QWidget* parent, const char *name = 0);
~ConfigView(void); ~ConfigView(void);
static void updateList(ConfigItem* item); static void updateList();
static void updateListAll(void); static void updateListAll(void);
bool showName(void) const { return list->showName; } bool showName(void) const { return list->showName; }
...@@ -224,7 +200,6 @@ public slots: ...@@ -224,7 +200,6 @@ public slots:
void setShowName(bool); void setShowName(bool);
void setShowRange(bool); void setShowRange(bool);
void setShowData(bool); void setShowData(bool);
void setOptionMode(QAction *);
signals: signals:
void showNameChanged(bool); void showNameChanged(bool);
void showRangeChanged(bool); void showRangeChanged(bool);
...@@ -235,10 +210,6 @@ public slots: ...@@ -235,10 +210,6 @@ public slots:
static ConfigView* viewList; static ConfigView* viewList;
ConfigView* nextView; ConfigView* nextView;
static QAction *showNormalAction;
static QAction *showAllAction;
static QAction *showPromptAction;
}; };
class ConfigInfoView : public QTextBrowser { class ConfigInfoView : public QTextBrowser {
...@@ -276,7 +247,7 @@ class ConfigSearchWindow : public QDialog { ...@@ -276,7 +247,7 @@ class ConfigSearchWindow : public QDialog {
Q_OBJECT Q_OBJECT
typedef class QDialog Parent; typedef class QDialog Parent;
public: public:
ConfigSearchWindow(ConfigMainWindow* parent, const char *name = 0); ConfigSearchWindow(ConfigMainWindow *parent);
public slots: public slots:
void saveSettings(void); void saveSettings(void);
...@@ -326,7 +297,6 @@ public slots: ...@@ -326,7 +297,6 @@ public slots:
ConfigView *configView; ConfigView *configView;
ConfigList *configList; ConfigList *configList;
ConfigInfoView *helpText; ConfigInfoView *helpText;
QToolBar *toolBar;
QAction *backAction; QAction *backAction;
QAction *singleViewAction; QAction *singleViewAction;
QAction *splitViewAction; QAction *splitViewAction;
......
scripts/kconfig/symbol.c
View file @ 32b2ee5c
...@@ -15,15 +15,21 @@ struct symbol symbol_yes = { ...@@ -15,15 +15,21 @@ struct symbol symbol_yes = {
.name = "y", .name = "y",
.curr = { "y", yes }, .curr = { "y", yes },
.flags = SYMBOL_CONST|SYMBOL_VALID, .flags = SYMBOL_CONST|SYMBOL_VALID,
}, symbol_mod = { };
struct symbol symbol_mod = {
.name = "m", .name = "m",
.curr = { "m", mod }, .curr = { "m", mod },
.flags = SYMBOL_CONST|SYMBOL_VALID, .flags = SYMBOL_CONST|SYMBOL_VALID,
}, symbol_no = { };
struct symbol symbol_no = {
.name = "n", .name = "n",
.curr = { "n", no }, .curr = { "n", no },
.flags = SYMBOL_CONST|SYMBOL_VALID, .flags = SYMBOL_CONST|SYMBOL_VALID,
}, symbol_empty = { };
static struct symbol symbol_empty = {
.name = "", .name = "",
.curr = { "", no }, .curr = { "", no },
.flags = SYMBOL_VALID, .flags = SYMBOL_VALID,
...@@ -31,7 +37,7 @@ struct symbol symbol_yes = { ...@@ -31,7 +37,7 @@ struct symbol symbol_yes = {
struct symbol *sym_defconfig_list; struct symbol *sym_defconfig_list;
struct symbol *modules_sym; struct symbol *modules_sym;
tristate modules_val; static tristate modules_val;
enum symbol_type sym_get_type(struct symbol *sym) enum symbol_type sym_get_type(struct symbol *sym)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7