[PATCH v2 12/19] kconfig: qconf: drop more localization code

From: Masahiro Yamada
Date: Fri Aug 07 2020 - 05:20:59 EST


This is a remnant of commit 694c49a7c01c ("kconfig: drop localization
support").

Get it back to the code prior to commit 3b9fa0931dd8 ("[PATCH] Kconfig
i18n support").

Signed-off-by: Masahiro Yamada <masahiroy@xxxxxxxxxx>
---

(no changes since v1)

scripts/kconfig/qconf.cc | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/scripts/kconfig/qconf.cc b/scripts/kconfig/qconf.cc
index 604f7855b070..230ce621d85b 100644
--- a/scripts/kconfig/qconf.cc
+++ b/scripts/kconfig/qconf.cc
@@ -31,11 +31,6 @@ static ConfigSettings *configSettings;

QAction *ConfigMainWindow::saveAction;

-static inline QString qgettext(const char* str)
-{
- return QString::fromLocal8Bit(str);
-}
-
ConfigSettings::ConfigSettings()
: QSettings("kernel.org", "qconf")
{
@@ -109,7 +104,7 @@ void ConfigItem::updateMenu(void)

sym = menu->sym;
prop = menu->prompt;
- prompt = qgettext(menu_get_prompt(menu));
+ prompt = menu_get_prompt(menu);

if (prop) switch (prop->type) {
case P_MENU:
@@ -135,7 +130,7 @@ void ConfigItem::updateMenu(void)
if (!sym)
goto set_prompt;

- setText(nameColIdx, QString::fromLocal8Bit(sym->name));
+ setText(nameColIdx, sym->name);

type = sym_get_type(sym);
switch (type) {
@@ -265,7 +260,7 @@ void ConfigLineEdit::show(ConfigItem* i)
{
item = i;
if (sym_get_string_value(item->menu->sym))
- setText(QString::fromLocal8Bit(sym_get_string_value(item->menu->sym)));
+ setText(sym_get_string_value(item->menu->sym));
else
setText(QString());
Parent::show();
--
2.25.1