Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
PIM
KIdentityManagement
Commits
cbbea8a0
Commit
cbbea8a0
authored
Dec 28, 2021
by
Laurent Montel
Browse files
Help to make it compile against qt6
parent
82b35671
Pipeline
#115246
passed with stage
in 1 minute and 29 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/identity.cpp
View file @
cbbea8a0
...
...
@@ -24,8 +24,9 @@ Q_DECLARE_METATYPE(KIdentityManagement::Signature)
Identity
::
Identity
(
const
QString
&
id
,
const
QString
&
fullName
,
const
QString
&
emailAddr
,
const
QString
&
organization
,
const
QString
&
replyToAddr
)
{
qRegisterMetaType
<
Signature
>
();
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
qRegisterMetaTypeStreamOperators
<
Signature
>
();
#endif
setProperty
(
QLatin1String
(
s_uoid
),
0
);
setProperty
(
QLatin1String
(
s_identity
),
id
);
setProperty
(
QLatin1String
(
s_name
),
fullName
);
...
...
src/identitymanager.cpp
View file @
cbbea8a0
...
...
@@ -18,8 +18,7 @@ static const char configKeyDefaultIdentity[] = "Default Identity";
#include
<KEMailSettings>
// for IdentityEntry::fromControlCenter()
#include
<KLocalizedString>
#include
<KSharedConfig>
#include
<kcoreaddons_version.h>
#if KCOREADDONS_VERSION < QT_VERSION_CHECK(6, 0, 0)
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
#include
<Kdelibs4ConfigMigrator>
#endif
#include
<kuser.h>
...
...
@@ -277,7 +276,7 @@ IdentityManager::IdentityManager(bool readonly, QObject *parent, const char *nam
:
QObject
(
parent
)
,
d
(
new
IdentityManagerPrivate
(
this
))
{
#if
KCOREADDONS
_VERSION < QT_VERSION_CHECK(6, 0, 0)
#if
QT
_VERSION < QT_VERSION_CHECK(6, 0, 0)
static
bool
triedMigration
=
false
;
if
(
!
triedMigration
)
{
triedMigration
=
true
;
...
...
src/signature.h
View file @
cbbea8a0
...
...
@@ -13,6 +13,7 @@
#include
<QHash>
#include
<QImage>
#include
<QSharedPointer>
#include
<QString>
#include
<memory>
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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