From 64afe09e883f09a320f789db415524bd5325a242 Mon Sep 17 00:00:00 2001 From: Alex Richardson Date: Mon, 25 May 2015 16:27:45 +0100 Subject: [PATCH] Port away from KLocale --- core/script/kjs_app.cpp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/core/script/kjs_app.cpp b/core/script/kjs_app.cpp index ab55fa4dd..a7bba0ca3 100644 --- a/core/script/kjs_app.cpp +++ b/core/script/kjs_app.cpp @@ -16,8 +16,9 @@ #include -#include -#include +#include + +#include #include "../document_p.h" #include "kjs_fullscreen_p.h" @@ -53,11 +54,9 @@ static KJSObject appGetFormsVersion( KJSContext *, void * ) static KJSObject appGetLanguage( KJSContext *, void * ) { - QString lang; - QString country; - QString dummy; - KLocale::splitLocale( KLocale::global()->language(), - lang, country, dummy, dummy ); + QLocale locale; + QString lang = QLocale::languageToString(locale.language()); + QString country = QLocale::countryToString(locale.country()); QString acroLang = QString::fromLatin1( "ENU" ); if ( lang == QLatin1String( "da" ) ) acroLang = QString::fromLatin1( "DAN" ); // Danish