diff --git a/src/translator.cpp b/src/translator.cpp
index 8d1e2d593..29b0c259a 100644
--- a/src/translator.cpp
+++ b/src/translator.cpp
@@ -7,9 +7,10 @@
 #include <QLibraryInfo>
 #include <QDebug>
 #include <QMutexLocker>
+#include <algorithm>
 
 QTranslator* Translator::translator{nullptr};
-QVector<QPair<void*, std::function<void()>>> Translator::callbacks;
+QVector<Translator::Callback> Translator::callbacks;
 QMutex Translator::lock;
 
 void Translator::translate()
@@ -64,12 +65,6 @@ void Translator::registerHandler(std::function<void()> f, void *owner)
 void Translator::unregister(void *owner)
 {
     QMutexLocker locker{&lock};
-    for (int i=0; i<callbacks.size(); i++)
-    {
-        if (callbacks[i].first == owner)
-        {
-            callbacks.removeAt(i);
-            i--;
-        }
-    }
+    callbacks.erase(std::remove_if(begin(callbacks), end(callbacks),
+                    [=](const Callback& c){return c.first==owner;}), end(callbacks));
 }
diff --git a/src/translator.h b/src/translator.h
index 35359035c..2fff880fc 100644
--- a/src/translator.h
+++ b/src/translator.h
@@ -19,9 +19,10 @@ public:
     static void unregister(void* owner);
 
 private:
-    static QTranslator* translator;
-    static QVector<QPair<void*, std::function<void()>>> callbacks;
+    using Callback = QPair<void*, std::function<void()>>;
+    static QVector<Callback> callbacks;
     static QMutex lock;
+    static QTranslator* translator;
 };
 
 #endif // TRANSLATOR_H