fix: correct spelling of convertLayoutToISO in X11LayoutsParser
This commit is contained in:
parent
c234f2fc66
commit
801ada88b7
4 changed files with 6 additions and 6 deletions
|
|
@ -134,7 +134,7 @@ std::string AppUtilUnix::getCurrentLanguageCode()
|
||||||
XFree(kbdDescr);
|
XFree(kbdDescr);
|
||||||
XCloseDisplay(display);
|
XCloseDisplay(display);
|
||||||
|
|
||||||
result = X11LayoutsParser::convertLayotToISO(m_evdev, result);
|
result = X11LayoutsParser::convertLayoutToISO(m_evdev, result);
|
||||||
|
|
||||||
#elif WINAPI_CARBON
|
#elif WINAPI_CARBON
|
||||||
auto layoutLanguages =
|
auto layoutLanguages =
|
||||||
|
|
|
||||||
|
|
@ -170,7 +170,7 @@ std::vector<std::string> X11LayoutsParser::getX11LanguageList(const std::string
|
||||||
return convertISO639_2ToISO639_1(iso639_2Codes);
|
return convertISO639_2ToISO639_1(iso639_2Codes);
|
||||||
}
|
}
|
||||||
|
|
||||||
std::string X11LayoutsParser::convertLayotToISO(
|
std::string X11LayoutsParser::convertLayoutToISO(
|
||||||
const std::string &pathToEvdevFile, const std::string &layoutLangCode, bool needToReloadFiles
|
const std::string &pathToEvdevFile, const std::string &layoutLangCode, bool needToReloadFiles
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -17,7 +17,7 @@ class X11LayoutsParser
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
static std::vector<std::string> getX11LanguageList(const std::string &pathToEvdevFile);
|
static std::vector<std::string> getX11LanguageList(const std::string &pathToEvdevFile);
|
||||||
static std::string convertLayotToISO(
|
static std::string convertLayoutToISO(
|
||||||
const std::string &pathToEvdevFile, const std::string &layoutLangCode, bool needToReloadFiles = false
|
const std::string &pathToEvdevFile, const std::string &layoutLangCode, bool needToReloadFiles = false
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -77,9 +77,9 @@ void X11LayoutParserTests::xmlParse()
|
||||||
|
|
||||||
void X11LayoutParserTests::convertLayouts()
|
void X11LayoutParserTests::convertLayouts()
|
||||||
{
|
{
|
||||||
QCOMPARE(X11LayoutsParser::convertLayotToISO(kTestCorrectFile.toStdString(), "us", true), "en");
|
QCOMPARE(X11LayoutsParser::convertLayoutToISO(kTestCorrectFile.toStdString(), "us", true), "en");
|
||||||
QCOMPARE(X11LayoutsParser::convertLayotToISO(kTestBadFile1.toStdString(), "us", true), "");
|
QCOMPARE(X11LayoutsParser::convertLayoutToISO(kTestBadFile1.toStdString(), "us", true), "");
|
||||||
QCOMPARE(X11LayoutsParser::convertLayotToISO(kTestFutureFile.toStdString(), "us", true), "");
|
QCOMPARE(X11LayoutsParser::convertLayoutToISO(kTestFutureFile.toStdString(), "us", true), "");
|
||||||
}
|
}
|
||||||
|
|
||||||
QTEST_MAIN(X11LayoutParserTests)
|
QTEST_MAIN(X11LayoutParserTests)
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue