kconfig: qconf: do not use 'menu' variable for (QMenuBar *)
I think it is a bit confusing to use 'menu' to hold a QMenuBar pointer. I want to use 'menu' for a QMenu pointer. You do not need to use a local variable here. Use menuBar() directly. Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
This commit is contained in:
Родитель
614bf0a89a
Коммит
d4b1cea7de
|
@ -1382,7 +1382,6 @@ void ConfigSearchWindow::search(void)
|
|||
ConfigMainWindow::ConfigMainWindow(void)
|
||||
: searchWindow(0)
|
||||
{
|
||||
QMenuBar* menu;
|
||||
bool ok = true;
|
||||
QVariant x, y;
|
||||
int width, height;
|
||||
|
@ -1433,7 +1432,6 @@ ConfigMainWindow::ConfigMainWindow(void)
|
|||
setTabOrder(configList, helpText);
|
||||
configList->setFocus();
|
||||
|
||||
menu = menuBar();
|
||||
toolBar = new QToolBar("Tools", this);
|
||||
addToolBar(toolBar);
|
||||
|
||||
|
@ -1519,7 +1517,7 @@ ConfigMainWindow::ConfigMainWindow(void)
|
|||
toolBar->addAction(fullViewAction);
|
||||
|
||||
// create config menu
|
||||
QMenu* config = menu->addMenu("&File");
|
||||
QMenu* config = menuBar()->addMenu("&File");
|
||||
config->addAction(loadAction);
|
||||
config->addAction(saveAction);
|
||||
config->addAction(saveAsAction);
|
||||
|
@ -1527,12 +1525,13 @@ ConfigMainWindow::ConfigMainWindow(void)
|
|||
config->addAction(quitAction);
|
||||
|
||||
// create edit menu
|
||||
QMenu* editMenu = menu->addMenu("&Edit");
|
||||
QMenu* editMenu = menuBar()->addMenu("&Edit");
|
||||
editMenu->addAction(searchAction);
|
||||
|
||||
// create options menu
|
||||
QMenu* optionMenu = menu->addMenu("&Option");
|
||||
QMenu* optionMenu = menuBar()->addMenu("&Option");
|
||||
optionMenu->addAction(showNameAction);
|
||||
|
||||
optionMenu->addAction(showRangeAction);
|
||||
optionMenu->addAction(showDataAction);
|
||||
optionMenu->addSeparator();
|
||||
|
@ -1541,7 +1540,7 @@ ConfigMainWindow::ConfigMainWindow(void)
|
|||
optionMenu->addAction(showDebugAction);
|
||||
|
||||
// create help menu
|
||||
QMenu* helpMenu = menu->addMenu("&Help");
|
||||
QMenu* helpMenu = menuBar()->addMenu("&Help");
|
||||
helpMenu->addAction(showIntroAction);
|
||||
helpMenu->addAction(showAboutAction);
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче