diff --git a/src/libkdepim/addressline/addresslineedit/addresseelineeditutil.cpp b/src/libkdepim/addressline/addresslineedit/addresseelineeditutil.cpp
index 7651bcc..7b526a4 100644
--- a/src/libkdepim/addressline/addresslineedit/addresseelineeditutil.cpp
+++ b/src/libkdepim/addressline/addresslineedit/addresseelineeditutil.cpp
@@ -1,47 +1,47 @@
 /*
    Copyright (C) 2016-2019 Laurent Montel <montel@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 "addresseelineeditutil.h"
 #include <QRegularExpression>
 #include <QUrl>
 
-QString KPIM::AddresseeLineEditUtil::adaptPasteMails(QString str)
+QString KPIM::AddresseeLineEditUtil::adaptPasteMails(const QString &str)
 {
     QString newText = str;
     // remove newlines in the to-be-pasted string
     QStringList lines = newText.split(QRegularExpression(QStringLiteral("\r?\n")), QString::SkipEmptyParts);
     QStringList::iterator end(lines.end());
     for (QStringList::iterator it = lines.begin(); it != end; ++it) {
         // remove trailing commas and whitespace
         (*it).remove(QRegularExpression(QStringLiteral(",?\\s*$")));
     }
     newText = lines.join(QStringLiteral(", "));
 
     if (newText.startsWith(QLatin1String("mailto:"))) {
         const QUrl url(newText);
         newText = url.path();
     } else if (newText.contains(QLatin1String(" at "))) {
         // Anti-spam stuff
         newText.replace(QStringLiteral(" at "), QStringLiteral("@"));
         newText.replace(QStringLiteral(" dot "), QStringLiteral("."));
     } else if (newText.contains(QLatin1String("(at)"))) {
         newText.replace(QRegularExpression(QStringLiteral("\\s*\\(at\\)\\s*")), QStringLiteral("@"));
     }
     return newText;
 }
diff --git a/src/libkdepim/addressline/addresslineedit/addresseelineeditutil.h b/src/libkdepim/addressline/addresslineedit/addresseelineeditutil.h
index 9033714..da1f5a0 100644
--- a/src/libkdepim/addressline/addresslineedit/addresseelineeditutil.h
+++ b/src/libkdepim/addressline/addresslineedit/addresseelineeditutil.h
@@ -1,34 +1,34 @@
 /*
    Copyright (C) 2016-2019 Laurent Montel <montel@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.
 */
 
 #ifndef ADDRESSEELINEEDITUTIL_H
 #define ADDRESSEELINEEDITUTIL_H
 
 #include <QString>
 #include "kdepim_export.h"
 
 namespace KPIM {
 class KDEPIM_EXPORT AddresseeLineEditUtil
 {
 public:
-    static QString adaptPasteMails(QString str);
+    static QString adaptPasteMails(const QString &str);
 };
 }
 
 #endif // ADDRESSEELINEEDITUTIL_H
diff --git a/src/libkdepimakonadi/addressline/blacklistbaloocompletion/autotests/blacklistbalooemailwarningtest.cpp b/src/libkdepimakonadi/addressline/blacklistbaloocompletion/autotests/blacklistbalooemailwarningtest.cpp
index 9d11366..98b9df3 100644
--- a/src/libkdepimakonadi/addressline/blacklistbaloocompletion/autotests/blacklistbalooemailwarningtest.cpp
+++ b/src/libkdepimakonadi/addressline/blacklistbaloocompletion/autotests/blacklistbalooemailwarningtest.cpp
@@ -1,70 +1,70 @@
 /*
   Copyright (c) 2015-2019 Montel Laurent <montel@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 "blacklistbalooemailwarningtest.h"
 #include "../blacklistbalooemailwarning.h"
 #include <QTest>
 #include <QSignalSpy>
 #include <QAction>
 
 BlackListBalooEmailWarningTest::BlackListBalooEmailWarningTest(QObject *parent)
     : QObject(parent)
 {
 }
 
 BlackListBalooEmailWarningTest::~BlackListBalooEmailWarningTest()
 {
 }
 
 void BlackListBalooEmailWarningTest::shouldHaveDefaultValue()
 {
     KPIM::BlackListBalooEmailWarning warning;
     QVERIFY(!warning.isVisible());
     QVERIFY(!warning.isCloseButtonVisible());
     QVERIFY(warning.wordWrap());
 
     QAction *save = warning.findChild<QAction *>(QStringLiteral("saveblacklist"));
     QVERIFY(save);
 
     QAction *search = warning.findChild<QAction *>(QStringLiteral("search"));
     QVERIFY(search);
 }
 
 void BlackListBalooEmailWarningTest::shouldEmitSaveChanges()
 {
     KPIM::BlackListBalooEmailWarning warning;
-    QSignalSpy spy1(&warning, SIGNAL(saveChanges()));
+    QSignalSpy spy1(&warning, &KPIM::BlackListBalooEmailWarning::saveChanges);
 
     QAction *save = warning.findChild<QAction *>(QStringLiteral("saveblacklist"));
     save->trigger();
     QCOMPARE(spy1.count(), 1);
 }
 
 void BlackListBalooEmailWarningTest::shouldEmitNewSearch()
 {
     KPIM::BlackListBalooEmailWarning warning;
-    QSignalSpy spy1(&warning, SIGNAL(newSearch()));
+    QSignalSpy spy1(&warning, &KPIM::BlackListBalooEmailWarning::newSearch);
 
     QAction *search = warning.findChild<QAction *>(QStringLiteral("search"));
     search->trigger();
     QCOMPARE(spy1.count(), 1);
 }
 
 QTEST_MAIN(BlackListBalooEmailWarningTest)