[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kio] src/core: Cut the dependency between country files and KIO
From:       Aleix Pol <aleixpol () kde ! org>
Date:       2014-04-07 16:28:40
Message-ID: E1WXCPY-00080n-Kh () scm ! kde ! org
[Download RAW message or body]

Git commit 69a5c5f7c5e9f80684820fc631d13b8768cad930 by Aleix Pol.
Committed on 07/04/2014 at 16:28.
Pushed by apol into branch 'master'.

Cut the dependency between country files and KIO

Remove unused configuration option, where we would let the country
information to specify the BinaryUnitDialect, even though none of them did.

REVIEW: 117122

M  +1    -5    src/core/global.cpp

http://commits.kde.org/kio/69a5c5f7c5e9f80684820fc631d13b8768cad930

diff --git a/src/core/global.cpp b/src/core/global.cpp
index d95568c..b6f523d 100644
--- a/src/core/global.cpp
+++ b/src/core/global.cpp
@@ -49,11 +49,7 @@ BinaryUnitDialect _k_loadBinaryDialect()
 {
     KConfigGroup mainGroup(KSharedConfig::openConfig(), "Locale");
 
-    KConfig entryFile(QStandardPaths::locate(QStandardPaths::GenericDataLocation, \
QLatin1String("locale/") + \
QString::fromLatin1("l10n/%1/kf5_entry.desktop").arg(QLocale::countryToString(QLocale().country()))));
                
-    entryFile.setLocale(QLocale::languageToString(QLocale().language()));
-    KConfigGroup entryGroup(&entryFile, "KCM Locale");
-
-    BinaryUnitDialect dialect = (BinaryUnitDialect) \
entryGroup.readEntry("BinaryUnitDialect", int(IECBinaryDialect)); +    \
BinaryUnitDialect dialect(BinaryUnitDialect(mainGroup.readEntry("BinaryUnitDialect", \
                int(DefaultBinaryDialect))));
     dialect = (BinaryUnitDialect) mainGroup.readEntry("BinaryUnitDialect", \
int(dialect));  
     // Error checking


[prev in list] [next in list] [prev in thread] [next in thread]