summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <montel@kde.org>2016-09-06 04:54:49 (GMT)
committerMontel Laurent <montel@kde.org>2016-09-06 04:54:49 (GMT)
commit88246c7f6416861ead323f63826f6c02eb40dd34 (patch)
tree645e574fe85f0329da7caac8762f1ab961c58849
parent6fece88c8a7ce0fb6ed27a67561c6837be97fff5 (diff)
Port to qregularexpression
-rw-r--r--src/addressline/addresslineedit/addresseelineeditutil.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/addressline/addresslineedit/addresseelineeditutil.cpp b/src/addressline/addresslineedit/addresseelineeditutil.cpp
index c2137f3..cbc85ca 100644
--- a/src/addressline/addresslineedit/addresseelineeditutil.cpp
+++ b/src/addressline/addresslineedit/addresseelineeditutil.cpp
@@ -19,7 +19,6 @@
#include "addresseelineeditutil.h"
-#include <QRegExp>
#include <QRegularExpression>
#include <QUrl>
@@ -28,11 +27,11 @@ QString KPIM::AddresseeLineEditUtil::adaptPasteMails(QString str)
{
QString newText = str;
// remove newlines in the to-be-pasted string
- QStringList lines = newText.split(QRegExp(QLatin1String("\r?\n")), QString::SkipEmptyParts);
+ QStringList lines = newText.split(QRegularExpression(QLatin1String("\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(QRegExp(QLatin1String(",?\\s*$")));
+ (*it).remove(QRegularExpression(QLatin1String(",?\\s*$")));
}
newText = lines.join(QStringLiteral(", "));