summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBoris Barbulovski <bbarbulovski@gmail.com>2015-09-22 11:36:07 -0700
committerMichal Marek <mmarek@suse.com>2015-10-14 14:59:01 +0200
commit76bede87084ac891f8ddc727178efa49dc49a0d5 (patch)
tree9650396464c786f2cc6cb4d7770fbb8bfb302bae
parent924bbb53d512688bf9caae10a0d2d8b081aea535 (diff)
downloadlinux-76bede87084ac891f8ddc727178efa49dc49a0d5.tar.bz2
Port xconfig to Qt5 - Use QMenu
Signed-off-by: Boris Barbulovski <bbarbulovski@gmail.com> Signed-off-by: Thiago Macieira <thiago.macieira@intel.com> Signed-off-by: Michal Marek <mmarek@suse.com>
-rw-r--r--scripts/kconfig/qconf.cc20
-rw-r--r--scripts/kconfig/qconf.h2
2 files changed, 11 insertions, 11 deletions
diff --git a/scripts/kconfig/qconf.cc b/scripts/kconfig/qconf.cc
index f4231d406a66..334000aa77ff 100644
--- a/scripts/kconfig/qconf.cc
+++ b/scripts/kconfig/qconf.cc
@@ -13,7 +13,7 @@
#include <q3header.h>
#include <QFileDialog>
#include <q3dragobject.h>
-#include <q3popupmenu.h>
+#include <QMenu>
#include <qapplication.h>
#include <qdesktopwidget.h>
@@ -817,7 +817,7 @@ void ConfigList::contextMenuEvent(QContextMenuEvent *e)
if (!headerPopup) {
QAction *action;
- headerPopup = new Q3PopupMenu(this);
+ headerPopup = new QMenu(this);
action = new QAction(_("Show Name"), this);
action->setToggleAction(TRUE);
connect(action, SIGNAL(toggled(bool)),
@@ -1387,32 +1387,32 @@ ConfigMainWindow::ConfigMainWindow(void)
fullViewAction->addTo(toolBar);
// create config menu
- Q3PopupMenu* config = new Q3PopupMenu(this);
+ QMenu* config = new QMenu(this);
menu->insertItem(_("&File"), config);
loadAction->addTo(config);
saveAction->addTo(config);
saveAsAction->addTo(config);
- config->insertSeparator();
+ config->addSeparator();
quitAction->addTo(config);
// create edit menu
- Q3PopupMenu* editMenu = new Q3PopupMenu(this);
+ QMenu* editMenu = new QMenu(this);
menu->insertItem(_("&Edit"), editMenu);
searchAction->addTo(editMenu);
// create options menu
- Q3PopupMenu* optionMenu = new Q3PopupMenu(this);
+ QMenu* optionMenu = new QMenu(this);
menu->insertItem(_("&Option"), optionMenu);
showNameAction->addTo(optionMenu);
showRangeAction->addTo(optionMenu);
showDataAction->addTo(optionMenu);
- optionMenu->insertSeparator();
+ optionMenu->addSeparator();
optGroup->addTo(optionMenu);
- optionMenu->insertSeparator();
+ optionMenu->addSeparator();
// create help menu
- Q3PopupMenu* helpMenu = new Q3PopupMenu(this);
- menu->insertSeparator();
+ QMenu* helpMenu = new QMenu(this);
+ menu->addSeparator();
menu->insertItem(_("&Help"), helpMenu);
showIntroAction->addTo(helpMenu);
showAboutAction->addTo(helpMenu);
diff --git a/scripts/kconfig/qconf.h b/scripts/kconfig/qconf.h
index 84b62f5804cc..94e57bd8fffe 100644
--- a/scripts/kconfig/qconf.h
+++ b/scripts/kconfig/qconf.h
@@ -117,7 +117,7 @@ public:
struct menu *rootEntry;
QColorGroup disabledColorGroup;
QColorGroup inactivedColorGroup;
- Q3PopupMenu* headerPopup;
+ QMenu* headerPopup;
private:
int colMap[colNr];