From c18ec356e84f55f728efa9fb93b0984ab04e5659 Mon Sep 17 00:00:00 2001
From: Michael Zanetti <michael_zanetti@gmx.net>
Date: Mon, 18 Mar 2019 23:34:58 +0100
Subject: [PATCH] Make it build with Qt 5.7, drop commented code

---
 libnymea/translator.cpp | 10 +++++-----
 libnymea/translator.h   |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/libnymea/translator.cpp b/libnymea/translator.cpp
index a6639dab..306936a9 100644
--- a/libnymea/translator.cpp
+++ b/libnymea/translator.cpp
@@ -115,11 +115,11 @@ QString Translator::translate(const PluginId &pluginId, const QString &string, c
 {
     DevicePlugin *plugin = m_deviceManager->plugin(pluginId);
 
-    if (!m_translatorContexts.contains(plugin->pluginId()) || !m_translatorContexts.value(plugin->pluginId()).translators.contains(locale)) {
+    if (!m_translatorContexts.contains(plugin->pluginId()) || !m_translatorContexts.value(plugin->pluginId()).translators.contains(locale.name())) {
         loadTranslator(plugin, locale);
     }
 
-    QTranslator* translator = m_translatorContexts.value(plugin->pluginId()).translators.value(locale);
+    QTranslator* translator = m_translatorContexts.value(plugin->pluginId()).translators.value(locale.name());
     QString translatedString = translator->translate(plugin->pluginName().toUtf8(), string.toUtf8());
     return translatedString.isEmpty() ? string : translatedString;
 }
@@ -130,7 +130,7 @@ void Translator::loadTranslator(DevicePlugin *plugin, const QLocale &locale)
         // Create default translator for this plugin
         TranslatorContext defaultCtx;
         defaultCtx.pluginId = plugin->pluginId();
-        defaultCtx.translators.insert(QLocale("en_US"), new QTranslator());
+        defaultCtx.translators.insert("en_US", new QTranslator());
         m_translatorContexts.insert(plugin->pluginId(), defaultCtx);
         if (locale == QLocale("en_US")) {
             return;
@@ -189,7 +189,7 @@ void Translator::loadTranslator(DevicePlugin *plugin, const QLocale &locale)
 
 
     if (!loaded) {
-        translator = m_translatorContexts.value(plugin->pluginId()).translators.value(QLocale("en_US"));
+        translator = m_translatorContexts.value(plugin->pluginId()).translators.value("en_US");
     }
 
     if (!m_translatorContexts.contains(plugin->pluginId())) {
@@ -197,6 +197,6 @@ void Translator::loadTranslator(DevicePlugin *plugin, const QLocale &locale)
         ctx.pluginId = plugin->pluginId();
         m_translatorContexts.insert(plugin->pluginId(), ctx);
     }
-    m_translatorContexts[plugin->pluginId()].translators.insert(locale, translator);
+    m_translatorContexts[plugin->pluginId()].translators.insert(locale.name(), translator);
 
 }
diff --git a/libnymea/translator.h b/libnymea/translator.h
index aab18e5b..6540856c 100644
--- a/libnymea/translator.h
+++ b/libnymea/translator.h
@@ -25,7 +25,7 @@ private:
 
     struct TranslatorContext {
         PluginId pluginId;
-        QHash<QLocale, QTranslator*> translators;
+        QHash<QString, QTranslator*> translators;
     };
     QHash<PluginId, TranslatorContext> m_translatorContexts;
 };