aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <montel@kde.org>2017-01-17 07:06:16 (GMT)
committerMontel Laurent <montel@kde.org>2017-01-17 07:06:16 (GMT)
commit334f7b979f5106867b2d41a9addd7844d192e41a (patch)
treefac57a3d99c2fc10bacf24a2077295b3050bfa6f
parent25c01655660d13d72277d9e51372b1aa907b6736 (diff)
Remove deprecated method
-rw-r--r--CMakeLists.txt2
-rw-r--r--src/kmime_types.cpp5
-rw-r--r--src/kmime_types.h12
3 files changed, 2 insertions, 17 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a1bca0d..c779ac5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.0)
-set(PIM_VERSION "5.4.40")
+set(PIM_VERSION "5.4.41")
project(KMime VERSION ${PIM_VERSION})
diff --git a/src/kmime_types.cpp b/src/kmime_types.cpp
index a4e66f5..fd63c6e 100644
--- a/src/kmime_types.cpp
+++ b/src/kmime_types.cpp
@@ -164,11 +164,6 @@ bool Mailbox::hasName() const
return !mDisplayName.isEmpty();
}
-QString Mailbox::prettyAddress() const
-{
- return prettyAddress(QuoteNever);
-}
-
QString Mailbox::prettyAddress(Quoting quoting) const
{
if (!hasName()) {
diff --git a/src/kmime_types.h b/src/kmime_types.h
index 06febb5..e25cf70 100644
--- a/src/kmime_types.h
+++ b/src/kmime_types.h
@@ -98,13 +98,6 @@ public:
bool hasName() const;
/**
- Returns a assembled display name / address string of the following form:
- "Display Name &lt;address&gt;". These are unicode strings without any
- transport encoding, ie. they are only suitable for displaying.
- */
- QString prettyAddress() const;
-
- /**
* Describes how display names should be quoted
* @since 4.5
*/
@@ -123,10 +116,7 @@ public:
* @param quoting describes how the display name should be quoted
* @since 4.5
*/
- // TODO: KDE5: BIC: remove other prettyAddress() overload, and make it None the default
- // parameter here
- //AK_REVIEW: replace by 'QString quotedAddress() const'
- QString prettyAddress(Quoting quoting) const;
+ QString prettyAddress(Quoting quoting = QuoteNever) const;
/**
Parses the given unicode string.