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

Showing the changes to scripts (1 of 1 file). Show all

Unified · Split

scripts/kconfig/qconf.cc+3−8
@@ -31,11 +31,6 @@ static ConfigSettings *configSettings; · 30 unmodified lines
31 31
32QAction *ConfigMainWindow::saveAction;32QAction *ConfigMainWindow::saveAction;
33 33
34static inline QString qgettext(const char* str)
35{
36 return QString::fromLocal8Bit(str);
37}
38
39ConfigSettings::ConfigSettings()34ConfigSettings::ConfigSettings()
40 : QSettings("kernel.org", "qconf")35 : QSettings("kernel.org", "qconf")
41{36{
@@ -109,7 +104,7 @@ void ConfigItem::updateMenu(void) · 67 unmodified lines
109 104
110 sym = menu->sym;105 sym = menu->sym;
111 prop = menu->prompt;106 prop = menu->prompt;
112 prompt = qgettext(menu_get_prompt(menu));107 prompt = menu_get_prompt(menu);
113 108
114 if (prop) switch (prop->type) {109 if (prop) switch (prop->type) {
115 case P_MENU:110 case P_MENU:
@@ -135,7 +130,7 @@ void ConfigItem::updateMenu(void) · 19 unmodified lines
135 if (!sym)130 if (!sym)
136 goto set_prompt;131 goto set_prompt;
137 132
138 setText(nameColIdx, QString::fromLocal8Bit(sym->name));133 setText(nameColIdx, sym->name);
139 134
140 type = sym_get_type(sym);135 type = sym_get_type(sym);
141 switch (type) {136 switch (type) {
@@ -265,7 +260,7 @@ void ConfigLineEdit::show(ConfigItem* i) · 123 unmodified lines
265{260{
266 item = i;261 item = i;
267 if (sym_get_string_value(item->menu->sym))262 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));
269 else264 else
270 setText(QString());265 setText(QString());
271 Parent::show();266 Parent::show();