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
KDE PIM Runtime
Commits
5c7278c9
Commit
5c7278c9
authored
Jan 18, 2021
by
Laurent Montel
😁
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
It's already in qt5.14
parent
73671a0d
Pipeline
#48051
failed with stage
in 26 minutes and 24 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
18 deletions
+0
-18
resources/ews/test/statemonitor.h
resources/ews/test/statemonitor.h
+0
-6
resources/openxchange/openxchangeresource.cpp
resources/openxchange/openxchangeresource.cpp
+0
-12
No files found.
resources/ews/test/statemonitor.h
View file @
5c7278c9
...
...
@@ -57,13 +57,7 @@ template<typename T>
CollectionStateMonitor
<
T
>::
CollectionStateMonitor
(
QObject
*
parent
,
const
QHash
<
QString
,
T
>
&
stateHash
,
const
QString
&
inboxId
,
const
StateComparisonFunc
&
comparisonFunc
,
int
recheckInterval
)
:
StateMonitorBase
(
parent
)
,
mMonitor
(
this
)
#if QT_VERSION < QT_VERSION_CHECK(5 \
, 14 \
, 0)
,
mPending
(
stateHash
.
keys
().
toSet
())
#else
,
mPending
(
stateHash
.
keyBegin
(),
stateHash
.
keyEnd
())
#endif
,
mStateHash
(
stateHash
)
,
mComparisonFunc
(
comparisonFunc
)
,
mInboxId
(
inboxId
)
...
...
resources/openxchange/openxchangeresource.cpp
View file @
5c7278c9
...
...
@@ -96,11 +96,7 @@ private:
template
<
typename
T
>
static
inline
RemoteInformation
loadImpl
(
const
T
&
entity
)
{
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
const
QStringList
parts
=
entity
.
remoteRevision
().
split
(
QLatin1Char
(
':'
),
QString
::
KeepEmptyParts
);
#else
const
QStringList
parts
=
entity
.
remoteRevision
().
split
(
QLatin1Char
(
':'
),
Qt
::
KeepEmptyParts
);
#endif
OXA
::
Folder
::
Module
module
=
OXA
::
Folder
::
Unbound
;
...
...
@@ -161,17 +157,9 @@ public:
ObjectsLastSync
()
{
if
(
!
Settings
::
self
()
->
objectsLastSync
().
isEmpty
())
{
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
const
QStringList
pairs
=
Settings
::
self
()
->
objectsLastSync
().
split
(
QLatin1Char
(
':'
),
QString
::
KeepEmptyParts
);
#else
const
QStringList
pairs
=
Settings
::
self
()
->
objectsLastSync
().
split
(
QLatin1Char
(
':'
),
Qt
::
KeepEmptyParts
);
#endif
for
(
const
QString
&
pair
:
pairs
)
{
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
const
QStringList
entry
=
pair
.
split
(
QLatin1Char
(
'='
),
QString
::
KeepEmptyParts
);
#else
const
QStringList
entry
=
pair
.
split
(
QLatin1Char
(
'='
),
Qt
::
KeepEmptyParts
);
#endif
mObjectsMap
.
insert
(
entry
.
at
(
0
).
toLongLong
(),
entry
.
at
(
1
).
toULongLong
());
}
}
...
...
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