diff --git a/src/kompareprocess.cpp b/src/kompareprocess.cpp
index c025233..9b838ea 100644
--- a/src/kompareprocess.cpp
+++ b/src/kompareprocess.cpp
@@ -1,301 +1,300 @@
 /*
 SPDX-FileCopyrightText: 2001-2005,2009 Otto Bruggeman <bruggie@gmail.com>
 SPDX-FileCopyrightText: 2001-2003 John Firebaugh <jfirebaugh@kde.org>
 SPDX-FileCopyrightText: 2007-2008 Kevin Kofler <kevin.kofler@chello.at>
 
 SPDX-License-Identifier: GPL-2.0-or-later
 */
 
 #include "kompareprocess.h"
 
 #include <QDir>
 #include <QStringList>
 #include <QTextCodec>
 
 #include <KCharsets>
 #include <KIO/Global>
 
 #include <komparediffdebug.h>
 #include "diffsettings.h"
 
 namespace {
 /// TODO: This should be replaced to QDir::relativeFilePath
 static QString constructRelativePath(const QString& from, const QString& to)
 {
     QUrl fromURL(from);
     QUrl toURL(to);
     QUrl root;
     int upLevels = 0;
 
     // Find a common root.
     root = fromURL;
     while (root.isValid() && !root.isParentOf(toURL)) {
         root = KIO::upUrl(root);
         ++upLevels;
     }
 
     if (!root.isValid()) return to;
 
     QString relative;
     for (; upLevels > 0; --upLevels) {
         relative += QStringLiteral("../");
     }
 
     relative += QString(to).remove(0, root.path().length());
     return relative;
 }
 }
 
 KompareProcess::KompareProcess(DiffSettings* diffSettings, Kompare::DiffMode diffMode, const QString& source, const QString& destination, const QString& dir, Kompare::Mode mode)
     : KProcess(),
       m_diffSettings(diffSettings),
       m_mode(diffMode),
       m_customString(nullptr),
       m_textDecoder(nullptr)
 {
     // connect the signal that indicates that the process has exited
-    typedef void(QProcess::*void_QProcess_argIntExitStatus)(int, QProcess::ExitStatus);
-    connect(this, static_cast<void_QProcess_argIntExitStatus>(&QProcess::finished),
+    connect(this, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished),
             this, &KompareProcess::slotFinished);
 
     setEnv(QStringLiteral("LANG"), QStringLiteral("C"));
 
     // Write command and options
     if (m_mode == Kompare::Default)
     {
         writeDefaultCommandLine();
     }
     else
     {
         writeCommandLine();
     }
 
     if (!dir.isEmpty()) {
         setWorkingDirectory(dir);
     }
 
     // Write file names
     *this << QStringLiteral("--");
 
     //Add the option for diff to read from stdin(QIODevice::write), and save a pointer to the string
     if (mode == Kompare::ComparingStringFile)
     {
         *this << QStringLiteral("-");
         m_customString = &source;
     }
     else
     {
         *this << constructRelativePath(dir, source);
     }
 
     if (mode == Kompare::ComparingFileString)
     {
         *this << QStringLiteral("-");
         m_customString = &destination;
     }
     else
     {
         *this << constructRelativePath(dir, destination);
     }
 }
 
 void KompareProcess::writeDefaultCommandLine()
 {
     if (!m_diffSettings || m_diffSettings->m_diffProgram.isEmpty())
     {
         *this << QStringLiteral("diff") << QStringLiteral("-dr");
     }
     else
     {
         *this << m_diffSettings->m_diffProgram << QStringLiteral("-dr");
     }
 
     *this << QStringLiteral("-U") << QString::number(m_diffSettings->m_linesOfContext);
 }
 
 void KompareProcess::writeCommandLine()
 {
     // load the executable into the KProcess
     if (m_diffSettings->m_diffProgram.isEmpty())
     {
         qCDebug(LIBKOMPAREDIFF2) << "Using the first diff in the path...";
         *this << QStringLiteral("diff");
     }
     else
     {
         qCDebug(LIBKOMPAREDIFF2) << "Using a user specified diff, namely: " << m_diffSettings->m_diffProgram;
         *this << m_diffSettings->m_diffProgram;
     }
 
     switch (m_diffSettings->m_format) {
     case Kompare::Unified :
         *this << QStringLiteral("-U") << QString::number(m_diffSettings->m_linesOfContext);
         break;
     case Kompare::Context :
         *this << QStringLiteral("-C") << QString::number(m_diffSettings->m_linesOfContext);
         break;
     case Kompare::RCS :
         *this << QStringLiteral("-n");
         break;
     case Kompare::Ed :
         *this << QStringLiteral("-e");
         break;
     case Kompare::SideBySide:
         *this << QStringLiteral("-y");
         break;
     case Kompare::Normal :
     case Kompare::UnknownFormat :
     default:
         break;
     }
 
     if (m_diffSettings->m_largeFiles
 // default diff does not have -H on OpenBSD
 // so don't pass this option unless the user overrode the default program
 #if defined(__OpenBSD__)
             && !m_diffSettings->m_diffProgram.isEmpty()
 #endif
        )
     {
         *this << QStringLiteral("-H");
     }
 
     if (m_diffSettings->m_ignoreWhiteSpace)
     {
         *this << QStringLiteral("-b");
     }
 
     if (m_diffSettings->m_ignoreAllWhiteSpace)
     {
         *this << QStringLiteral("-w");
     }
 
     if (m_diffSettings->m_ignoreEmptyLines)
     {
         *this << QStringLiteral("-B");
     }
 
     if (m_diffSettings->m_ignoreChangesDueToTabExpansion)
     {
         *this << QStringLiteral("-E");
     }
 
     if (m_diffSettings->m_createSmallerDiff)
     {
         *this << QStringLiteral("-d");
     }
 
     if (m_diffSettings->m_ignoreChangesInCase)
     {
         *this << QStringLiteral("-i");
     }
 
     if (m_diffSettings->m_ignoreRegExp && !m_diffSettings->m_ignoreRegExpText.isEmpty())
     {
         *this << QStringLiteral("-I") << m_diffSettings->m_ignoreRegExpText;
     }
 
     if (m_diffSettings->m_showCFunctionChange)
     {
         *this << QStringLiteral("-p");
     }
 
     if (m_diffSettings->m_convertTabsToSpaces)
     {
         *this << QStringLiteral("-t");
     }
 
     if (m_diffSettings->m_recursive)
     {
         *this << QStringLiteral("-r");
     }
 
     if (m_diffSettings->m_newFiles)
     {
         *this << QStringLiteral("-N");
     }
 
 // This option is more trouble than it is worth... please do not ever enable it unless you want really weird crashes
 //  if ( m_diffSettings->m_allText )
 //  {
 //      *this << QStringLiteral("-a");
 //  }
 
     if (m_diffSettings->m_excludeFilePattern)
     {
         for (const QString& it : qAsConst(m_diffSettings->m_excludeFilePatternList)) {
             *this << QStringLiteral("-x") << it;
         }
     }
 
     if (m_diffSettings->m_excludeFilesFile && !m_diffSettings->m_excludeFilesFileURL.isEmpty())
     {
         *this << QStringLiteral("-X") << m_diffSettings->m_excludeFilesFileURL;
     }
 }
 
 KompareProcess::~KompareProcess()
 {
     delete m_textDecoder;
 }
 
 void KompareProcess::setEncoding(const QString& encoding)
 {
     if (!encoding.compare(QLatin1String("default"), Qt::CaseInsensitive))
     {
         m_textDecoder = QTextCodec::codecForLocale()->makeDecoder();
     }
     else
     {
         m_codec = KCharsets::charsets()->codecForName(encoding);
         if (m_codec)
             m_textDecoder = m_codec->makeDecoder();
         else
         {
             qCDebug(LIBKOMPAREDIFF2) << "Using locale codec as backup...";
             m_codec = QTextCodec::codecForLocale();
             m_textDecoder = m_codec->makeDecoder();
         }
     }
 }
 
 void KompareProcess::start()
 {
 #ifndef NDEBUG
     QString cmdLine;
     QStringList program = KProcess::program();
     QStringList::ConstIterator it = program.constBegin();
     QStringList::ConstIterator end = program.constEnd();
     for (; it != end; ++it)
         cmdLine += QLatin1Char('\"') + (*it) + QLatin1String("\" ");
     qCDebug(LIBKOMPAREDIFF2) << cmdLine;
 #endif
     setOutputChannelMode(SeparateChannels);
     setNextOpenMode(QIODevice::ReadWrite);
     KProcess::start();
 
     //If we have a string to compare against input it now
     if (m_customString)
         write(m_codec->fromUnicode(*m_customString));
     closeWriteChannel();
 }
 
 void KompareProcess::slotFinished(int exitCode, QProcess::ExitStatus exitStatus)
 {
     // add all output to m_stdout/m_stderr
     if (m_textDecoder)
     {
         m_stdout = m_textDecoder->toUnicode(readAllStandardOutput());
         m_stderr = m_textDecoder->toUnicode(readAllStandardError());
     }
     else
         qCDebug(LIBKOMPAREDIFF2) << "KompareProcess::slotFinished : No decoder !!!";
 
     // exit code of 0: no differences
     //              1: some differences
     //              2: error but there may be differences !
     qCDebug(LIBKOMPAREDIFF2) << "Exited with exit code : " << exitCode;
     Q_EMIT diffHasFinished(exitStatus == NormalExit && exitCode != 0);
 }