History

kconfig: qconf: drop more localization code

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").

Masahiro Yamada committed 6 years ago

Commit 3c73ff01 parent 5b75a6c1 file · +3 −8Browse files

Unified · Split

scripts/kconfig/qconf.cc+3−8
@@ -31,11 +31,6 @@ static ConfigSettings *configSettings; · 30 unmodified lines
3131
3232 QAction *ConfigMainWindow::saveAction;
3333
34−static inline QString qgettext(const char* str)
35−{
36− return QString::fromLocal8Bit(str);
37−}
38−
3934 ConfigSettings::ConfigSettings()
4035 : QSettings("kernel.org", "qconf")
4136 {
@@ -109,7 +104,7 @@ void ConfigItem::updateMenu(void) · 67 unmodified lines
109104
110105 sym = menu->sym;
111106 prop = menu->prompt;
112− prompt = qgettext(menu_get_prompt(menu));
107+ prompt = menu_get_prompt(menu);
113108
114109 if (prop) switch (prop->type) {
115110 case P_MENU:
@@ -135,7 +130,7 @@ void ConfigItem::updateMenu(void) · 19 unmodified lines
135130 if (!sym)
136131 goto set_prompt;
137132
138− setText(nameColIdx, QString::fromLocal8Bit(sym->name));
133+ setText(nameColIdx, sym->name);
139134
140135 type = sym_get_type(sym);
141136 switch (type) {
@@ -265,7 +260,7 @@ void ConfigLineEdit::show(ConfigItem* i) · 123 unmodified lines
265260 {
266261 item = i;
267262 if (sym_get_string_value(item->menu->sym))
268− setText(QString::fromLocal8Bit(sym_get_string_value(item->menu->sym)));
263+ setText(sym_get_string_value(item->menu->sym));
269264 else
270265 setText(QString());
271266 Parent::show();