Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
PIM
Akonadi Calendar
Commits
165184ca
Commit
165184ca
authored
Aug 01, 2020
by
Ahmad Samir
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Port QRegExp to QRegularExpression
parent
f65b672b
Pipeline
#29253
passed with stage
in 11 minutes and 45 seconds
Changes
1
Pipelines
3
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
6 deletions
+6
-6
src/freebusymanager.cpp
src/freebusymanager.cpp
+6
-6
No files found.
src/freebusymanager.cpp
View file @
165184ca
...
...
@@ -31,7 +31,7 @@
#include <QDir>
#include <QFile>
#include <QReg
Exp
>
#include <QReg
ularExpression
>
#include <QTextStream>
#include <QTimer>
#include <QTimerEvent>
...
...
@@ -56,9 +56,9 @@ QUrl replaceVariablesUrl(const QUrl &url, const QString &email)
}
QString
saveStr
=
url
.
path
();
saveStr
.
replace
(
QReg
Exp
(
QStringLiteral
(
"%
[Ee][Mm][Aa][Ii][Ll]%"
)
),
email
);
saveStr
.
replace
(
QReg
Exp
(
QStringLiteral
(
"%
[Nn][Aa][Mm][Ee]%"
)
),
emailName
);
saveStr
.
replace
(
QReg
Exp
(
QStringLiteral
(
"%
[Ss][Ee][Rr][Vv][Ee][Rr]%"
)
),
emailHost
);
saveStr
.
replace
(
QReg
ularExpression
(
QStringLiteral
(
"%
email%"
),
QRegularExpression
::
CaseInsensitiveOption
),
email
);
saveStr
.
replace
(
QReg
ularExpression
(
QStringLiteral
(
"%
name%"
),
QRegularExpression
::
CaseInsensitiveOption
),
emailName
);
saveStr
.
replace
(
QReg
ularExpression
(
QStringLiteral
(
"%
server%"
),
QRegularExpression
::
CaseInsensitiveOption
),
emailHost
);
QUrl
retUrl
(
url
);
retUrl
.
setPath
(
saveStr
);
...
...
@@ -272,7 +272,7 @@ void FreeBusyManagerPrivate::contactSearchJobFinished(KJob *_job)
}
}
if
(
CalendarSettings
::
self
()
->
freeBusyRetrieveUrl
().
contains
(
QReg
Exp
(
QStringLiteral
(
"
\\
.[xiv]fb$"
))))
{
if
(
CalendarSettings
::
self
()
->
freeBusyRetrieveUrl
().
contains
(
QReg
ularExpression
(
QStringLiteral
(
"
\\
.[xiv]fb$"
))))
{
// user specified a fullpath
// do variable string replacements to the URL (MS Outlook style)
const
QUrl
sourceUrl
(
CalendarSettings
::
self
()
->
freeBusyRetrieveUrl
());
...
...
@@ -805,7 +805,7 @@ void FreeBusyManager::publishFreeBusy(QWidget *parentWidget)
// We need to massage the list a bit so that Outlook understands
// it.
messageText
.
replace
(
QReg
Exp
(
QStringLiteral
(
"ORGANIZER
\\
s*:MAILTO:"
)),
messageText
.
replace
(
QReg
ularExpression
(
QStringLiteral
(
"ORGANIZER
\\
s*:MAILTO:"
)),
QStringLiteral
(
"ORGANIZER:"
));
// Create a local temp file and save the message to it
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment