summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <[email protected]>2017-06-08 08:51:51 +0200
committerMontel Laurent <[email protected]>2017-06-08 08:51:51 +0200
commit70a3930197e44c2a1d68fc9b047bced9e3e1bff3 (patch)
tree9330c0ae75418169640d7e068b9d0574968c0e29
parent36a9c0c84154487487dae601b0458ecac7a1b568 (diff)
Move other method
-rw-r--r--CMakeLists.txt2
-rw-r--r--messagecomposer/src/utils/util.cpp7
-rw-r--r--messagecomposer/src/utils/util.h9
-rw-r--r--messagecore/src/helpers/messagehelpers.cpp6
-rw-r--r--messagecore/src/helpers/messagehelpers.h8
5 files changed, 17 insertions, 15 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 36cafbf..d6e9770 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.0)
-set(PIM_VERSION "5.5.46")
+set(PIM_VERSION "5.5.47")
if (POLICY CMP0053)
cmake_policy(SET CMP0053 NEW)
diff --git a/messagecomposer/src/utils/util.cpp b/messagecomposer/src/utils/util.cpp
index fb5b589..c19e946 100644
--- a/messagecomposer/src/utils/util.cpp
+++ b/messagecomposer/src/utils/util.cpp
@@ -406,3 +406,10 @@ bool MessageComposer::Util::getLinkInformation(const KMime::Message::Ptr &msg, Q
}
return true;
}
+
+bool MessageComposer::Util::isStandaloneMessage(const Akonadi::Item &item)
+{
+ // standalone message have a valid payload, but are not, themselves valid items
+ return item.hasPayload<KMime::Message::Ptr>() && !item.isValid();
+}
+
diff --git a/messagecomposer/src/utils/util.h b/messagecomposer/src/utils/util.h
index b54ab64..f654534 100644
--- a/messagecomposer/src/utils/util.h
+++ b/messagecomposer/src/utils/util.h
@@ -76,6 +76,15 @@ MESSAGECOMPOSER_EXPORT void addLinkInformation(const KMime::Message::Ptr &messag
*/
MESSAGECOMPOSER_EXPORT bool getLinkInformation(const KMime::Message::Ptr &msg, QList<Akonadi::Item::Id> &id, QList<Akonadi::MessageStatus> &status);
+/**
+ * Returns whether the item represents a valid KMime::Message that is not
+ * in the Akonadi store (yet). This happens when operating on messages
+ * attached to other mails, for example. Such items are not "valid", in
+ * the akonadi sense, since jobs cannot sensibly use them, but they do
+ * contain a valid message pointer.
+ */
+MESSAGECOMPOSER_EXPORT bool isStandaloneMessage(const Akonadi::Item &item);
+
}
}
diff --git a/messagecore/src/helpers/messagehelpers.cpp b/messagecore/src/helpers/messagehelpers.cpp
index c0f9f16..52e8012 100644
--- a/messagecore/src/helpers/messagehelpers.cpp
+++ b/messagecore/src/helpers/messagehelpers.cpp
@@ -32,9 +32,3 @@ KMime::Message::Ptr MessageCore::Util::message(const Akonadi::Item &item)
return item.payload<KMime::Message::Ptr>();
}
-bool MessageCore::Util::isStandaloneMessage(const Akonadi::Item &item)
-{
- // standalone message have a valid payload, but are not, themselves valid items
- return item.hasPayload<KMime::Message::Ptr>() && !item.isValid();
-}
-
diff --git a/messagecore/src/helpers/messagehelpers.h b/messagecore/src/helpers/messagehelpers.h
index e0f0a8b..d600774 100644
--- a/messagecore/src/helpers/messagehelpers.h
+++ b/messagecore/src/helpers/messagehelpers.h
@@ -38,14 +38,6 @@ namespace Util
*/
MESSAGECORE_EXPORT KMime::Message::Ptr message(const Akonadi::Item &item);
-/**
- * Returns whether the item represents a valid KMime::Message that is not
- * in the Akonadi store (yet). This happens when operating on messages
- * attached to other mails, for example. Such items are not "valid", in
- * the akonadi sense, since jobs cannot sensibly use them, but they do
- * contain a valid message pointer.
- */
-MESSAGECORE_EXPORT bool isStandaloneMessage(const Akonadi::Item &item);
}