Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
PIM
Akonadi Contacts
Commits
dce31b90
Commit
dce31b90
authored
Mar 08, 2022
by
Laurent Montel
😁
Browse files
Fix compile without depercated method
parent
438c5676
Pipeline
#146696
passed with stage
in 2 minutes and 37 seconds
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
dce31b90
...
...
@@ -85,7 +85,7 @@ endif()
########### Targets ###########
ecm_set_disabled_deprecation_versions
(
QT 5.14.0 KF 5.9
1
.0
)
ecm_set_disabled_deprecation_versions
(
QT 5.14.0 KF 5.9
2
.0
)
if
(
BUILD_TESTING
)
...
...
src/akonadi-contacts/contactstreemodel.cpp
View file @
dce31b90
...
...
@@ -99,14 +99,14 @@ QVariant ContactsTreeModel::entityData(const Item &item, int column, int role) c
case
HomeAddress
:
{
const
KContacts
::
Address
address
=
contact
.
address
(
KContacts
::
Address
::
Home
);
if
(
!
address
.
isEmpty
())
{
return
address
.
formatted
Address
(
);
return
address
.
formatted
(
KContacts
::
AddressFormatStyle
::
Postal
);
}
break
;
}
case
BusinessAddress
:
{
const
KContacts
::
Address
address
=
contact
.
address
(
KContacts
::
Address
::
Work
);
if
(
!
address
.
isEmpty
())
{
return
address
.
formatted
Address
(
);
return
address
.
formatted
(
KContacts
::
AddressFormatStyle
::
Postal
);
}
break
;
}
...
...
src/akonadi-contacts/standardcontactformatter.cpp
View file @
dce31b90
...
...
@@ -146,7 +146,7 @@ QString StandardContactFormatter::toHtml(HtmlForm form) const
QString
formattedAddress
;
if
(
address
.
label
().
isEmpty
())
{
formattedAddress
=
address
.
formatted
Address
(
).
trimmed
().
toHtmlEscaped
();
formattedAddress
=
address
.
formatted
(
KContacts
::
AddressFormatStyle
::
Postal
).
trimmed
().
toHtmlEscaped
();
}
else
{
formattedAddress
=
address
.
label
().
toHtmlEscaped
();
}
...
...
src/contact-editor/editor/addresseditor/addressmodel.cpp
View file @
dce31b90
...
...
@@ -80,7 +80,7 @@ QVariant AddressModel::data(const QModelIndex &index, int role) const
if
(
!
addr
.
label
().
isEmpty
())
{
str
+=
addr
.
label
().
toHtmlEscaped
().
replace
(
QLatin1Char
(
'\n'
),
QLatin1String
(
"<br/>"
));
}
else
{
str
+=
addr
.
formatted
Address
(
).
trimmed
().
toHtmlEscaped
().
replace
(
QLatin1Char
(
'\n'
),
QLatin1String
(
"<br/>"
));
str
+=
addr
.
formatted
(
KContacts
::
AddressFormatStyle
::
Postal
).
trimmed
().
toHtmlEscaped
().
replace
(
QLatin1Char
(
'\n'
),
QLatin1String
(
"<br/>"
));
}
return
str
;
}
...
...
Volker Krause
@vkrause
mentioned in commit
562a0482
·
Mar 13, 2022
mentioned in commit
562a0482
mentioned in commit 562a04826e6ca8a1de759eb3da554b34c4822146
Toggle commit list
Volker Krause
@vkrause
mentioned in merge request
!21 (merged)
·
Mar 13, 2022
mentioned in merge request
!21 (merged)
mentioned in merge request !21
Toggle commit list
Write
Preview
Supports
Markdown
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