diff --git a/src/alttransview.cpp b/src/alttransview.cpp
--- a/src/alttransview.cpp
+++ b/src/alttransview.cpp
@@ -38,7 +38,6 @@
 #include <QStringBuilder>
 #include <QDragEnterEvent>
 #include <QMimeData>
-#include <QSignalMapper>
 #include <QFileInfo>
 #include <QDir>
 #include <QToolTip>
@@ -75,13 +74,10 @@
     m_everShown = group.readEntry("EverShown", false);
 
 
-    QSignalMapper* signalMapper = new QSignalMapper(this);
     int i = m_actions.size();
     while (--i >= 0) {
-        connect(m_actions.at(i), &QAction::triggered, signalMapper, QOverload<>::of(&QSignalMapper::map));
-        signalMapper->setMapping(m_actions.at(i), i);
+        connect(m_actions.at(i), &QAction::triggered, this, [this, i] { slotUseSuggestion(i); });
     }
-    connect(signalMapper, QOverload<int>::of(&QSignalMapper::mapped), this, &AltTransView::slotUseSuggestion);
 
     connect(m_browser, &TM::TextBrowser::textInsertRequested, this, &AltTransView::textInsertRequested);
     //connect(m_browser, &TM::TextBrowser::customContextMenuRequested, this, &AltTransView::contextMenu);
diff --git a/src/catalog/catalogstring.cpp b/src/catalog/catalogstring.cpp
--- a/src/catalog/catalogstring.cpp
+++ b/src/catalog/catalogstring.cpp
@@ -281,7 +281,7 @@
     QList<InlineTag> oldTags = target.tags;
     target.tags.clear();
     //we actually walking from beginning to end:
-    qSort(oldTags.begin(), oldTags.end(), qGreater<InlineTag>());
+    std::sort(oldTags.begin(), oldTags.end(), qGreater<InlineTag>());
     i = oldTags.size();
     while (--i >= 0) {
         const InlineTag& targetTag = oldTags.at(i);
@@ -304,7 +304,7 @@
             QList<InlineTag> possibleRefMatches;
             foreach (int i, tagType2tagIndex.values(targetTag.type))
                 possibleRefMatches << ref.tags.at(i);
-            qSort(possibleRefMatches);
+            std::sort(possibleRefMatches.begin(), possibleRefMatches.end());
             qCWarning(LOKALIZE_LOG) << "setting id:" << targetTag.id << possibleRefMatches.first().id;
             targetTag.id = possibleRefMatches.first().id;
 
diff --git a/src/catalog/phase.cpp b/src/catalog/phase.cpp
--- a/src/catalog/phase.cpp
+++ b/src/catalog/phase.cpp
@@ -70,7 +70,7 @@
 
     QSet<QString> names;
     QList<Phase> phases = catalog->allPhases();
-    qSort(phases.begin(), phases.end(), qGreater<Phase>());
+    std::sort(phases.begin(), phases.end(), qGreater<Phase>());
     foreach (const Phase& p, phases) {
         if (!(options & ForceAdd) && p.contact == phase.contact && p.process == phase.process) {
             phase = p;
diff --git a/src/catalog/xliff/xliffstorage.cpp b/src/catalog/xliff/xliffstorage.cpp
--- a/src/catalog/xliff/xliffstorage.cpp
+++ b/src/catalog/xliff/xliffstorage.cpp
@@ -781,7 +781,7 @@
         result.append(note);
         elem = elem.nextSiblingElement(NOTE);
     }
-    qSort(result);
+    std::sort(result.begin(), result.end());
     return result.toVector();
 }
 
diff --git a/src/glossary/glossary.cpp b/src/glossary/glossary.cpp
--- a/src/glossary/glossary.cpp
+++ b/src/glossary/glossary.cpp
@@ -308,7 +308,7 @@
     }
 
     if (!busyIdNumbers.isEmpty()) {
-        qSort(busyIdNumbers);
+        std::sort(busyIdNumbers.begin(), busyIdNumbers.end());
         while (busyIdNumbers.contains(idNumber))
             ++idNumber;
     }
diff --git a/src/glossary/glossarywindow.cpp b/src/glossary/glossarywindow.cpp
--- a/src/glossary/glossarywindow.cpp
+++ b/src/glossary/glossarywindow.cpp
@@ -308,7 +308,7 @@
     //m_subjectField->addItems(Project::instance()->glossary()->subjectFields());
     //m_subjectField->setModel(new SubjectFieldModel(this));
     QStringList subjectFields = Project::instance()->glossary()->subjectFields();
-    qSort(subjectFields);
+    std::sort(subjectFields.begin(), subjectFields.end());
     QStringListModel* subjectFieldsModel = new QStringListModel(this);
     subjectFieldsModel->setStringList(subjectFields);
     m_subjectField->setModel(subjectFieldsModel);
diff --git a/src/mergemode/mergecatalog.cpp b/src/mergemode/mergecatalog.cpp
--- a/src/mergemode/mergecatalog.cpp
+++ b/src/mergemode/mergecatalog.cpp
@@ -194,7 +194,7 @@
             while (--k >= 0)
                 scores << calcMatchItem(i, DocPosition(entries.at(k)));
 
-            qSort(scores.begin(), scores.end(), qGreater<MatchItem>());
+            std::sort(scores.begin(), scores.end(), qGreater<MatchItem>());
 
             m_map[i.entry] = scores.first().mergeEntry;
             backMap.insert(scores.first().mergeEntry, i.entry);
@@ -219,7 +219,7 @@
         foreach (int value, basePositions)
             scores << calcMatchItem(DocPosition(value), mergePosition);
 
-        qSort(scores.begin(), scores.end(), qGreater<MatchItem>());
+        std::sort(scores.begin(), scores.end(), qGreater<MatchItem>());
         int i = scores.size();
         while (--i > 0) {
             //qCDebug(LOKALIZE_LOG)<<"erasing"<<scores.at(i).baseEntry<<m_map[scores.at(i).baseEntry]<<",m_map["<<scores.at(i).baseEntry<<"]=-1";
diff --git a/src/msgctxtview.cpp b/src/msgctxtview.cpp
--- a/src/msgctxtview.cpp
+++ b/src/msgctxtview.cpp
@@ -179,7 +179,7 @@
                 this, &MsgCtxtView::pologyReceivedStandardOutput);
         connect(m_pologyProcess, &KProcess::readyReadStandardError,
                 this, &MsgCtxtView::pologyReceivedStandardError);
-        connect(m_pologyProcess, QOverload<int>::of(&KProcess::finished),
+        connect(m_pologyProcess, QOverload<int, QProcess::ExitStatus>::of(&KProcess::finished),
                 this, &MsgCtxtView::pologyHasFinished);
         m_pologyData = QStringLiteral("[pology] ");
         m_pologyProcessInProgress = m_entry.entry + 1;
diff --git a/src/project/projectmodel.cpp b/src/project/projectmodel.cpp
--- a/src/project/projectmodel.cpp
+++ b/src/project/projectmodel.cpp
@@ -399,7 +399,7 @@
     endRemoveRows(); //< fires removed event - the list has to be consistent now
 
     //add back rows that have POT files and fix row order
-    qSort(potRowsToInsert.begin(), potRowsToInsert.end());
+    std::sort(potRowsToInsert.begin(), potRowsToInsert.end());
 
     int insertionPoint = node->poCount;
 
diff --git a/src/project/projectwidget.cpp b/src/project/projectwidget.cpp
--- a/src/project/projectwidget.cpp
+++ b/src/project/projectwidget.cpp
@@ -395,10 +395,10 @@
     if (item.isDir()) {
         int j = model.rowCount(idx);
         while (--j >= 0) {
-            const KFileItem& childItem(model.itemForIndex(idx.child(j, 0)));
+            const KFileItem& childItem(model.itemForIndex(model.index(j, 0, idx)));
 
             if (childItem.isDir())
-                recursiveAdd(list, idx.child(j, 0));
+                recursiveAdd(list, model.index(j, 0, idx));
             else if (m_proxyModel->filterAcceptsRow(j, idx))
                 list.prepend(childItem.localPath());
         }
diff --git a/src/tm/jobs.cpp b/src/tm/jobs.cpp
--- a/src/tm/jobs.cpp
+++ b/src/tm/jobs.cpp
@@ -1467,15 +1467,15 @@
         emit done(this);
         return;
     }
-    qSort(words);//to speed up if some words occur multiple times
+    std::sort(words.begin(), words.end());//to speed up if some words occur multiple times
 
     bool isShort = words.size() < 20;
 
     if (!doSelect(db, words, isShort))
         doSelect(db, words, !isShort);
 
     //qCWarning(LOKALIZE_LOG) <<"SelectJob: done "<<a.elapsed()<<m_entries.size();
-    qSort(m_entries.begin(), m_entries.end(), qGreater<TMEntry>());
+    std::sort(m_entries.begin(), m_entries.end(), qGreater<TMEntry>());
     const int limit = qMin(Settings::suggCount(), m_entries.size());
     const int minScore = Settings::suggScore() * 100;
     int i = m_entries.size() - 1;
diff --git a/src/tm/tmview.cpp b/src/tm/tmview.cpp
--- a/src/tm/tmview.cpp
+++ b/src/tm/tmview.cpp
@@ -46,7 +46,6 @@
 #include <QFileInfo>
 #include <QFile>
 #include <QDir>
-#include <QSignalMapper>
 #include <QTimer>
 #include <QToolTip>
 #include <QMenu>
@@ -169,21 +168,15 @@
 {
     setAcceptDrops(true);
 
-    QSignalMapper* signalMapper_insert = new QSignalMapper(this);
-    QSignalMapper* signalMapper_remove = new QSignalMapper(this);
     int i = m_actions_insert.size();
     while (--i >= 0) {
-        connect(m_actions_insert.at(i), &QAction::triggered, signalMapper_insert, QOverload<>::of(&QSignalMapper::map));
-        signalMapper_insert->setMapping(m_actions_insert.at(i), i);
+        connect(m_actions_insert.at(i), &QAction::triggered, this, [this, i] { slotUseSuggestion(i); });
     }
 
     i = m_actions_remove.size();
     while (--i >= 0) {
-        connect(m_actions_remove.at(i), &QAction::triggered, signalMapper_remove, QOverload<>::of(&QSignalMapper::map));
-        signalMapper_remove->setMapping(m_actions_remove.at(i), i);
+        connect(m_actions_remove.at(i), &QAction::triggered, this, [this, i] { slotRemoveSuggestion(i); });
     }
-    connect(signalMapper_insert, QOverload<int>::of(&QSignalMapper::mapped), this, &TMView::slotUseSuggestion);
-    connect(signalMapper_remove, QOverload<int>::of(&QSignalMapper::mapped), this, &TMView::slotRemoveSuggestion);
 
     setToolTip(i18nc("@info:tooltip", "Double-click any word to insert it into translation"));
 
@@ -409,7 +402,7 @@
     //check if this is an additional query, from secondary DBs
     if (job.m_dbName != projectID) {
         job.m_entries += m_entries;
-        qSort(job.m_entries.begin(), job.m_entries.end(), qGreater<TMEntry>());
+        std::sort(job.m_entries.begin(), job.m_entries.end(), qGreater<TMEntry>());
         const int limit = qMin(Settings::suggCount(), job.m_entries.size());
         const int minScore = Settings::suggScore() * 100;
         int i = job.m_entries.size() - 1;
diff --git a/src/webquery/webqueryview.cpp b/src/webquery/webqueryview.cpp
--- a/src/webquery/webqueryview.cpp
+++ b/src/webquery/webqueryview.cpp
@@ -53,7 +53,6 @@
 #include <QTime>
 #include <QSplitter>
 #include <QTextBrowser>
-#include <QSignalMapper>
 #include <QTimer>
 
 // #include <QShortcutEvent>
@@ -107,13 +106,10 @@
     m_browser->setToolTip(i18nc("@info:tooltip", "Double-click any word to insert it into translation"));
 
 
-    QSignalMapper* signalMapper = new QSignalMapper(this);
     int i = m_actions.size();
     while (--i >= 0) {
-        connect(m_actions.at(i), &QAction::triggered, signalMapper, QOverload<>::of(&QSignalMapper::map));
-        signalMapper->setMapping(m_actions.at(i), i);
+        connect(m_actions.at(i), &QAction::triggered, this, [this, i] { slotUseSuggestion(i); });
     }
-    connect(signalMapper, QOverload<int>::of(&QSignalMapper::mapped), this, &WebQueryView::slotUseSuggestion);
     connect(m_browser, &QTextBrowser::selectionChanged, this, &WebQueryView::slotSelectionChanged);
 
 }