From: Sam Ravnborg <sam@ravnborg.org>
To: linux-kbuild <linux-kbuild@vger.kernel.org>,
LKML <linux-kernel@vger.kernel.org>
Cc: Markus Heidelberg <markus.heidelberg@web.de>,
Sam Ravnborg <sam@ravnborg.org>
Subject: [PATCH 29/39] kconfig qconf: add namespace for use of Key_ enum values
Date: Sat, 6 Jun 2009 01:42:47 +0200 [thread overview]
Message-ID: <1244245377-17441-29-git-send-email-sam@ravnborg.org> (raw)
In-Reply-To: <20090605233720.GA13588@uranus.ravnborg.org>
From: Markus Heidelberg <markus.heidelberg@web.de>
They are defined in the 'Qt' namespace.
Fixes the following compiler errors after a quick conversion with 'qt3to4',
which occured with g++ 3.4.6 and 4.1.2, but not anymore with 4.3.2.
scripts/kconfig/qconf.cc: In member function 'virtual void ConfigLineEdit::keyPressEvent(QKeyEvent*)':
scripts/kconfig/qconf.cc:311: error: 'Key_Escape' was not declared in this scope
scripts/kconfig/qconf.cc:313: error: 'Key_Return' was not declared in this scope
scripts/kconfig/qconf.cc:314: error: 'Key_Enter' was not declared in this scope
scripts/kconfig/qconf.cc: In member function 'virtual void ConfigList::keyPressEvent(QKeyEvent*)':
scripts/kconfig/qconf.cc:653: error: 'Key_Escape' was not declared in this scope
scripts/kconfig/qconf.cc:666: error: 'Key_Return' was not declared in this scope
scripts/kconfig/qconf.cc:667: error: 'Key_Enter' was not declared in this scope
scripts/kconfig/qconf.cc:681: error: 'Key_Space' was not declared in this scope
scripts/kconfig/qconf.cc:684: error: 'Key_N' was not declared in this scope
scripts/kconfig/qconf.cc:687: error: 'Key_M' was not declared in this scope
scripts/kconfig/qconf.cc:690: error: 'Key_Y' was not declared in this scope
scripts/kconfig/qconf.cc: In constructor 'ConfigMainWindow::ConfigMainWindow()':
scripts/kconfig/qconf.cc:1329: error: 'CTRL' was not declared in this scope
scripts/kconfig/qconf.cc:1329: error: 'Key_Q' was not declared in this scope
scripts/kconfig/qconf.cc:1331: error: 'Key_L' was not declared in this scope
scripts/kconfig/qconf.cc:1333: error: 'Key_S' was not declared in this scope
scripts/kconfig/qconf.cc:1340: error: 'Key_F' was not declared in this scope
Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
---
scripts/kconfig/qconf.cc | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/scripts/kconfig/qconf.cc b/scripts/kconfig/qconf.cc
index 7433dac..afae613 100644
--- a/scripts/kconfig/qconf.cc
+++ b/scripts/kconfig/qconf.cc
@@ -297,10 +297,10 @@ void ConfigLineEdit::show(ConfigItem* i)
void ConfigLineEdit::keyPressEvent(QKeyEvent* e)
{
switch (e->key()) {
- case Key_Escape:
+ case Qt::Key_Escape:
break;
- case Key_Return:
- case Key_Enter:
+ case Qt::Key_Return:
+ case Qt::Key_Enter:
sym_set_string_value(item->menu->sym, text().latin1());
parent()->updateList(item);
break;
@@ -639,7 +639,7 @@ void ConfigList::keyPressEvent(QKeyEvent* ev)
struct menu *menu;
enum prop_type type;
- if (ev->key() == Key_Escape && mode != fullMode && mode != listMode) {
+ if (ev->key() == Qt::Key_Escape && mode != fullMode && mode != listMode) {
emit parentSelected();
ev->accept();
return;
@@ -652,8 +652,8 @@ void ConfigList::keyPressEvent(QKeyEvent* ev)
item = (ConfigItem*)i;
switch (ev->key()) {
- case Key_Return:
- case Key_Enter:
+ case Qt::Key_Return:
+ case Qt::Key_Enter:
if (item->goParent) {
emit parentSelected();
break;
@@ -667,16 +667,16 @@ void ConfigList::keyPressEvent(QKeyEvent* ev)
emit menuSelected(menu);
break;
}
- case Key_Space:
+ case Qt::Key_Space:
changeValue(item);
break;
- case Key_N:
+ case Qt::Key_N:
setValue(item, no);
break;
- case Key_M:
+ case Qt::Key_M:
setValue(item, mod);
break;
- case Key_Y:
+ case Qt::Key_Y:
setValue(item, yes);
break;
default:
@@ -1315,18 +1315,18 @@ ConfigMainWindow::ConfigMainWindow(void)
backAction = new QAction("Back", QPixmap(xpm_back), _("Back"), 0, this);
connect(backAction, SIGNAL(activated()), SLOT(goBack()));
backAction->setEnabled(FALSE);
- QAction *quitAction = new QAction("Quit", _("&Quit"), CTRL+Key_Q, this);
+ QAction *quitAction = new QAction("Quit", _("&Quit"), Qt::CTRL + Qt::Key_Q, this);
connect(quitAction, SIGNAL(activated()), SLOT(close()));
- QAction *loadAction = new QAction("Load", QPixmap(xpm_load), _("&Load"), CTRL+Key_L, this);
+ QAction *loadAction = new QAction("Load", QPixmap(xpm_load), _("&Load"), Qt::CTRL + Qt::Key_L, this);
connect(loadAction, SIGNAL(activated()), SLOT(loadConfig()));
- saveAction = new QAction("Save", QPixmap(xpm_save), _("&Save"), CTRL+Key_S, this);
+ saveAction = new QAction("Save", QPixmap(xpm_save), _("&Save"), Qt::CTRL + Qt::Key_S, this);
connect(saveAction, SIGNAL(activated()), SLOT(saveConfig()));
conf_set_changed_callback(conf_changed);
// Set saveAction's initial state
conf_changed();
QAction *saveAsAction = new QAction("Save As...", _("Save &As..."), 0, this);
connect(saveAsAction, SIGNAL(activated()), SLOT(saveConfigAs()));
- QAction *searchAction = new QAction("Find", _("&Find"), CTRL+Key_F, this);
+ QAction *searchAction = new QAction("Find", _("&Find"), Qt::CTRL + Qt::Key_F, this);
connect(searchAction, SIGNAL(activated()), SLOT(searchConfig()));
QAction *singleViewAction = new QAction("Single View", QPixmap(xpm_single_view), _("Single View"), 0, this);
connect(singleViewAction, SIGNAL(activated()), SLOT(showSingleView()));
--
1.6.3.rc3.40.g75b44
next prev parent reply other threads:[~2009-06-05 23:41 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-06-05 23:37 kbuild-next content Sam Ravnborg
2009-06-05 23:42 ` [PATCH 01/39] kconfig: handle comment entries within choice/endchoice Sam Ravnborg
2009-06-05 23:42 ` [PATCH 02/39] kbuild, deb-pkg: minor general improvements in builddeb script Sam Ravnborg
2009-06-05 23:42 ` [PATCH 03/39] kbuild, deb-pkg: refactor code to reduce duplication Sam Ravnborg
2009-06-05 23:42 ` [PATCH 04/39] kbuild, deb-pkg: fix 'file not found' error when building .deb package for arm Sam Ravnborg
2009-06-05 23:42 ` [PATCH 05/39] kbuild, deb-pkg: pass Debian maintainer script parameters to packaging hook scripts Sam Ravnborg
2009-06-05 23:42 ` [PATCH 06/39] kbuild, deb-pkg: allow to specify a custom revision for .deb packages Sam Ravnborg
2009-06-05 23:42 ` [PATCH 07/39] kbuild, deb-pkg: allow alternative hook scripts directory in " Sam Ravnborg
2009-06-05 23:42 ` [PATCH 08/39] kbuild, deb-pkg: improve changelog entry and package descriptions Sam Ravnborg
2009-06-05 23:42 ` [PATCH 09/39] kbuild, deb-pkg: generate debian/copyright file Sam Ravnborg
2009-06-05 23:42 ` [PATCH 10/39] kbuild, deb-pkg: improve maintainer identification Sam Ravnborg
2009-06-05 23:42 ` [PATCH 11/39] kbuild, deb-pkg: improve Source field Sam Ravnborg
2009-06-05 23:42 ` [PATCH 12/39] kbuild, deb-pkg: fix generated package name Sam Ravnborg
2009-06-05 23:42 ` [PATCH 13/39] kbuild, deb-pkg: fix Provides field Sam Ravnborg
2009-06-05 23:42 ` [PATCH 14/39] kbuild, deb-pkg: fix Section field Sam Ravnborg
2009-06-05 23:42 ` [PATCH 15/39] kbuild, deb-pkg: bump standards version Sam Ravnborg
2009-06-05 23:42 ` [PATCH 16/39] initconst adjustments Sam Ravnborg
2009-06-05 23:42 ` [PATCH 17/39] kbuild: fix header export when __ASSEMBLY__ is used Sam Ravnborg
2009-06-06 0:41 ` Arnd Bergmann
2009-06-06 5:45 ` Jaswinder Singh Rajput
2009-06-06 6:05 ` Sam Ravnborg
2009-06-06 8:14 ` Russell King
2009-06-05 23:42 ` [PATCH 18/39] kbuild/headers_check: refine extern check Sam Ravnborg
2009-06-06 0:46 ` Arnd Bergmann
2009-06-06 8:38 ` Sam Ravnborg
2009-06-06 15:25 ` Arnd Bergmann
2009-06-08 1:31 ` Amerigo Wang
2009-06-05 23:42 ` [PATCH 19/39] kbuild: clean up scripts/headers.sh Sam Ravnborg
2009-06-05 23:42 ` [PATCH 20/39] kbuild: allow docproc invocation from external Sam Ravnborg
2009-06-05 23:42 ` [PATCH 21/39] kbuild/Documentation: Incorrect makefile syntax in example Sam Ravnborg
2009-06-05 23:42 ` [PATCH 22/39] kbuild: remove extra ifdef/endif of top Makefile Sam Ravnborg
2009-06-05 23:42 ` [PATCH 23/39] kconfig: fix typo "mconfig" to "menuconfig" in a comment Sam Ravnborg
2009-06-05 23:42 ` [PATCH 24/39] kconfig: add a note about the deps to the 'silentoldconfig' help Sam Ravnborg
2009-06-05 23:42 ` [PATCH 25/39] kconfig: resort the documentation of the environment variables Sam Ravnborg
2009-06-05 23:42 ` [PATCH 26/39] gitignore: ignore Kconfig i18n files Sam Ravnborg
2009-06-05 23:42 ` [PATCH 27/39] kconfig qconf: fix -Wall compiler warnings Sam Ravnborg
2009-06-05 23:42 ` [PATCH 28/39] kconfig qconf: fix namespace for Horizontal and Vertical enum values Sam Ravnborg
2009-06-05 23:42 ` Sam Ravnborg [this message]
2009-06-05 23:42 ` [PATCH 30/39] kconfig qconf: fix the type of the desktop widget Sam Ravnborg
2009-06-05 23:42 ` [PATCH 31/39] kconfig: do not hardcode ".config" filename Sam Ravnborg
2009-06-05 23:42 ` [PATCH 32/39] kconfig: do not hardcode "include/config/auto.conf" filename Sam Ravnborg
2009-06-05 23:42 ` [PATCH 33/39] kernel/kallsyms.c: replace deprecated __initcall with device_initcall and fix whitespace Sam Ravnborg
2009-06-05 23:42 ` [PATCH 34/39] scripts/headers_check.pl: correct RE in header CONFIG leak check Sam Ravnborg
2009-06-05 23:42 ` [PATCH 35/39] kbuild: add hint about __refdata to modpost Sam Ravnborg
2009-06-05 23:42 ` [PATCH 36/39] menu: fix embedded menu presentation Sam Ravnborg
2009-06-05 23:42 ` [PATCH 37/39] Remove bashisms from scripts Sam Ravnborg
2009-06-05 23:42 ` [PATCH 38/39] ignore *.patch files Sam Ravnborg
2009-06-05 23:42 ` [PATCH 39/39] kbuild: fix "Argument list too long" error for "make headers_check", Sam Ravnborg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1244245377-17441-29-git-send-email-sam@ravnborg.org \
--to=sam@ravnborg.org \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=markus.heidelberg@web.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox