diff --git a/libs/widgets/KoGlobal.cpp b/libs/widgets/KoGlobal.cpp
index 1295a6587f..3b936e6c48 100644
--- a/libs/widgets/KoGlobal.cpp
+++ b/libs/widgets/KoGlobal.cpp
@@ -1,158 +1,158 @@
 /* This file is part of the KDE project
    Copyright (C) 2001 David Faure <faure@kde.org>
    Copyright 2003 Nicolas GOUTTE <goutte@kde.org>
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
    License as published by the Free Software Foundation; either
    version 2 of the License, or (at your option) any later version.
 
    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Library General Public License for more details.
 
    You should have received a copy of the GNU Library General Public License
    along with this library; see the file COPYING.LIB.  If not, write to
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
 */
 
 #include "KoGlobal.h"
 
 #include <KoConfig.h>
 #include <KoResourcePaths.h>
 
 #include <QPaintDevice>
 #include <QFont>
 #include <QFontInfo>
 #include <QFontDatabase>
 #include <QGlobalStatic>
 
 #include <WidgetsDebug.h>
 #include <kconfiggroup.h>
 #include <klocalizedstring.h>
 #include <ksharedconfig.h>
 #include <kconfig.h>
 
 Q_GLOBAL_STATIC(KoGlobal, s_instance)
 
 KoGlobal* KoGlobal::self()
 {
     return s_instance;
 }
 
 KoGlobal::KoGlobal()
     : m_pointSize(-1)
     , m_calligraConfig(0)
 {
     // Fixes a bug where values from some config files are not picked up
     // due to  KSharedConfig::openConfig() being initialized before paths have been set up above.
     // NOTE: Values set without a sync() call before KoGlobal has been initialized will not stick
      KSharedConfig::openConfig()->reparseConfiguration();
 }
 
 KoGlobal::~KoGlobal()
 {
     delete m_calligraConfig;
 }
 
 QStringList KoGlobal::_listOfLanguageTags()
 {
     if (m_langMap.isEmpty())
         createListOfLanguages();
     return m_langMap.values();
 }
 
 QStringList KoGlobal::_listOfLanguages()
 {
     if (m_langMap.empty())
         createListOfLanguages();
     return m_langMap.keys();
 }
 
 void KoGlobal::createListOfLanguages()
 {
     KConfig config("all_languages", KConfig::NoGlobals);
     // Note that we could also use KLocale::allLanguagesTwoAlpha
 
     QMap<QString, bool> seenLanguages;
     const QStringList langlist = config.groupList();
     for (QStringList::ConstIterator itall = langlist.begin();
             itall != langlist.end(); ++itall) {
         const QString tag = *itall;
         const QString name = config.group(tag).readEntry("Name", tag);
         // e.g. name is "French" and tag is "fr"
 
         // The QMap does the sorting on the display-name, so that
         // comboboxes are sorted.
         m_langMap.insert(name, tag);
 
         seenLanguages.insert(tag, true);
     }
 
     // Also take a look at the installed translations.
     // Many of them are already in all_languages but all_languages doesn't
     // currently have en_GB or en_US etc.
 
     QStringList translationList = KoResourcePaths::findAllResources("locale",
                                         QString::fromLatin1("*/entry.desktop"))
             + KoResourcePaths::findAllResources("locale",
                                                 QString::fromLatin1("*/kf5_entry.desktop"));;
     translationList.removeDuplicates();
-    for (QStringList::ConstIterator it = translationList.begin();
+    for (QStringList::Iterator it = translationList.begin();
             it != translationList.end(); ++it) {
         // Extract the language tag from the directory name
         QString tag = *it;
         int index = tag.lastIndexOf('/');
         tag = tag.left(index);
         index = tag.lastIndexOf('/');
         tag = tag.mid(index + 1);
 
         if (seenLanguages.find(tag) == seenLanguages.end()) {
             KConfig entry(*it, KConfig::SimpleConfig);
 
             const QString name = entry.group("KCM Locale").readEntry("Name", tag);
             // e.g. name is "US English" and tag is "en_US"
             m_langMap.insert(name, tag);
 
             // enable this if writing a third way of finding languages below
             //seenLanguages.insert( tag, true );
         }
 
     }
 
     // #### We also might not have an entry for a language where spellchecking is supported,
     //      but no KDE translation is available, like fr_CA.
     // How to add them?
 }
 
 QString KoGlobal::tagOfLanguage(const QString & _lang)
 {
     const LanguageMap& map = self()->m_langMap;
     QMap<QString, QString>::ConstIterator it = map.find(_lang);
     if (it != map.end())
         return *it;
     return QString();
 }
 
 QString KoGlobal::languageFromTag(const QString &langTag)
 {
     const LanguageMap& map = self()->m_langMap;
     QMap<QString, QString>::ConstIterator it = map.begin();
     const QMap<QString, QString>::ConstIterator end = map.end();
     for (; it != end; ++it)
         if (it.value() == langTag)
             return it.key();
 
     // Language code not found. Better return the code (tag) than nothing.
     return langTag;
 }
 
 KConfig* KoGlobal::_calligraConfig()
 {
     if (!m_calligraConfig) {
         m_calligraConfig = new KConfig("kritarc");
     }
     return m_calligraConfig;
 }