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
Utilities
KGpg
Commits
df3312f4
Commit
df3312f4
authored
Aug 31, 2020
by
Laurent Montel
😁
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Using no deprecated enum Qt::MiddleButton"
This reverts commit
eb3e2e88
.
parent
eb3e2e88
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
7 additions
and
7 deletions
+7
-7
core/KGpgSignNode.cpp
core/KGpgSignNode.cpp
+2
-2
core/KGpgUatNode.cpp
core/KGpgUatNode.cpp
+1
-1
core/convert.cpp
core/convert.cpp
+1
-1
model/kgpgsearchresultmodel.cpp
model/kgpgsearchresultmodel.cpp
+1
-1
transactions/kgpgdelsign.cpp
transactions/kgpgdelsign.cpp
+2
-2
No files found.
core/KGpgSignNode.cpp
View file @
df3312f4
...
...
@@ -39,11 +39,11 @@ KGpgSignNodePrivate::KGpgSignNodePrivate(const QStringList &sl)
m_revocation
=
(
sl
.
at
(
0
)
==
QLatin1String
(
"rev"
));
if
(
sl
.
count
()
<
6
)
return
;
m_creation
=
QDateTime
::
from
SecsSinceEpoch
(
sl
.
at
(
5
).
toUInt
());
m_creation
=
QDateTime
::
from
Time_t
(
sl
.
at
(
5
).
toUInt
());
if
(
sl
.
count
()
<
7
)
return
;
if
(
!
sl
.
at
(
6
).
isEmpty
())
m_expiration
=
QDateTime
::
from
SecsSinceEpoch
(
sl
.
at
(
6
).
toUInt
());
m_expiration
=
QDateTime
::
from
Time_t
(
sl
.
at
(
6
).
toUInt
());
if
(
sl
.
count
()
<
11
)
return
;
m_local
=
sl
.
at
(
10
).
endsWith
(
QLatin1Char
(
'l'
));
...
...
core/KGpgUatNode.cpp
View file @
df3312f4
...
...
@@ -47,7 +47,7 @@ KGpgUatNodePrivate::KGpgUatNodePrivate(const KGpgKeyNode *parent, const unsigned
{
if
(
sl
.
count
()
<
6
)
return
;
m_creation
=
QDateTime
::
from
SecsSinceEpoch
(
sl
.
at
(
5
).
toUInt
());
m_creation
=
QDateTime
::
from
Time_t
(
sl
.
at
(
5
).
toUInt
());
}
QPixmap
...
...
core/convert.cpp
View file @
df3312f4
...
...
@@ -275,7 +275,7 @@ QDateTime toDateTime(const QString &s)
if
(
s
.
contains
(
QLatin1Char
(
'T'
)))
ret
=
QDateTime
::
fromString
(
s
,
QLatin1String
(
"yyyyMMddTHHmmss"
));
else
ret
=
QDateTime
::
from
SecsSinceEpoch
(
s
.
toUInt
());
ret
=
QDateTime
::
from
Time_t
(
s
.
toUInt
());
return
ret
;
}
...
...
model/kgpgsearchresultmodel.cpp
View file @
df3312f4
...
...
@@ -88,7 +88,7 @@ SearchResult::SearchResult(const QString &line)
m_bits
=
parts
.
at
(
3
).
toUInt
();
m_creation
.
setTime_t
(
parts
.
at
(
4
).
toULongLong
());
m_expired
=
!
parts
.
at
(
5
).
isEmpty
()
&&
QDateTime
::
from
SecsSinceEpoch
(
parts
.
at
(
5
).
toULongLong
())
<=
QDateTime
::
currentDateTimeUtc
();
QDateTime
::
from
Time_t
(
parts
.
at
(
5
).
toULongLong
())
<=
QDateTime
::
currentDateTimeUtc
();
m_revoked
=
(
parts
.
at
(
6
)
==
QLatin1String
(
"r"
));
m_validPub
=
true
;
...
...
transactions/kgpgdelsign.cpp
View file @
df3312f4
...
...
@@ -120,13 +120,13 @@ KGpgDelSign::boolQuestion(const QString &line)
if
(
signode
==
nullptr
)
return
KGpgTransaction
::
BA_NO
;
const
QDateTime
creation
=
QDateTime
::
from
SecsSinceEpoch
(
parts
[
5
].
toUInt
());
const
QDateTime
creation
=
QDateTime
::
from
Time_t
(
parts
[
5
].
toUInt
());
if
(
creation
!=
signode
->
getCreation
())
return
KGpgTransaction
::
BA_NO
;
QDateTime
sigexp
;
if
(
!
parts
[
6
].
isEmpty
()
&&
(
parts
[
6
]
!=
QLatin1String
(
"0"
)))
sigexp
=
QDateTime
::
from
SecsSinceEpoch
(
parts
[
6
].
toUInt
());
sigexp
=
QDateTime
::
from
Time_t
(
parts
[
6
].
toUInt
());
if
(
sigexp
!=
signode
->
getExpiration
())
return
KGpgTransaction
::
BA_NO
;
...
...
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