Hello community,
here is the log from the commit of package kidentitymanagement for
openSUSE:Factory checked in at 2018-08-22 14:13:14
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kidentitymanagement (Old)
and /work/SRC/openSUSE:Factory/.kidentitymanagement.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kidentitymanagement"
Wed Aug 22 14:13:14 2018 rev:35 rq:630137 version:18.08.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/kidentitymanagement/kidentitymanagement.changes
2018-07-18 22:42:14.525287722 +0200
+++
/work/SRC/openSUSE:Factory/.kidentitymanagement.new/kidentitymanagement.changes
2018-08-22 14:13:15.757343643 +0200
@@ -1,0 +2,21 @@
+Thu Aug 16 22:04:23 UTC 2018 - [email protected]
+
+- Update to 18.08.0
+ * New feature release
+ * For more details please see:
+ * https://www.kde.org/announcements/announce-applications-18.08.0.php
+- Changes since 18.07.80:
+ * None
+
+-------------------------------------------------------------------
+Thu Jul 26 13:00:43 UTC 2018 - [email protected]
+
+- Update to 18.07.80
+ * New feature release
+ * For more details please see:
+ * https://www.kde.org/announcements/announce-applications-18.07.80.php
+- Changes since 18.04.3:
+ * USe Q_REQUIRED_RESULT
+ * Don't use deprecated api
+
+-------------------------------------------------------------------
Old:
----
kidentitymanagement-18.04.3.tar.xz
New:
----
kidentitymanagement-18.08.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kidentitymanagement.spec ++++++
--- /var/tmp/diff_new_pack.DOPNd2/_old 2018-08-22 14:13:16.213344724 +0200
+++ /var/tmp/diff_new_pack.DOPNd2/_new 2018-08-22 14:13:16.217344733 +0200
@@ -19,11 +19,11 @@
%bcond_without lang
Name: kidentitymanagement
-Version: 18.04.3
+Version: 18.08.0
Release: 0
%define kf5_version 5.26.0
# Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA)
-%{!?_kapp_version: %global _kapp_version %(echo %{version}| awk -F. '{print
$1"."$2}')}
+%{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print
$1"."$2}')}
Summary: KDE PIM Libraries: Identity Management
License: LGPL-2.1-or-later
Group: System/GUI/KDE
@@ -60,7 +60,6 @@
This package provides the core library to handle multiple email identities and
associated settings.
-
%package devel
Summary: KDE PIM Libraries: Identity Management - development files
Group: Development/Libraries/KDE
@@ -72,9 +71,7 @@
This package contains necessary include files and libraries needed
to develop applications that make use of multiple email identities.
-%if %{with lang}
%lang_package
-%endif
%prep
%setup -q -n kidentitymanagement-%{version}
++++++ kidentitymanagement-18.04.3.tar.xz -> kidentitymanagement-18.08.0.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kidentitymanagement-18.04.3/CMakeLists.txt
new/kidentitymanagement-18.08.0/CMakeLists.txt
--- old/kidentitymanagement-18.04.3/CMakeLists.txt 2018-07-10
02:13:42.000000000 +0200
+++ new/kidentitymanagement-18.08.0/CMakeLists.txt 2018-08-10
02:13:12.000000000 +0200
@@ -1,10 +1,10 @@
cmake_minimum_required(VERSION 3.0)
-set(PIM_VERSION "5.8.3")
+set(PIM_VERSION "5.9.0")
project(KIdentityManagement VERSION ${PIM_VERSION})
# ECM setup
-set(KF5_VERSION "5.44.0")
+set(KF5_VERSION "5.47.0")
find_package(ECM ${KF5_VERSION} CONFIG REQUIRED)
set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
@@ -24,7 +24,7 @@
set(KIDENTITYMANAGEMENT_LIB_VERSION ${PIM_VERSION})
-set(PIMTEXTEDIT_LIB_VERSION "5.8.3")
+set(PIMTEXTEDIT_LIB_VERSION "5.9.0")
ecm_setup_version(PROJECT VARIABLE_PREFIX KIDENTITYMANAGEMENT
VERSION_HEADER
"${CMAKE_CURRENT_BINARY_DIR}/kidentitymanagement_version.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kidentitymanagement-18.04.3/autotests/CMakeLists.txt
new/kidentitymanagement-18.08.0/autotests/CMakeLists.txt
--- old/kidentitymanagement-18.04.3/autotests/CMakeLists.txt 2018-06-29
07:04:47.000000000 +0200
+++ new/kidentitymanagement-18.08.0/autotests/CMakeLists.txt 2018-08-06
07:14:43.000000000 +0200
@@ -1,5 +1,5 @@
include(ECMAddTests)
-set(QT_REQUIRED_VERSION "5.8.0")
+set(QT_REQUIRED_VERSION "5.9.0")
find_package(Qt5Test ${QT_REQUIRED_VERSION} CONFIG REQUIRED)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kidentitymanagement-18.04.3/autotests/identitytest.cpp
new/kidentitymanagement-18.08.0/autotests/identitytest.cpp
--- old/kidentitymanagement-18.04.3/autotests/identitytest.cpp 2018-06-29
07:04:47.000000000 +0200
+++ new/kidentitymanagement-18.08.0/autotests/identitytest.cpp 2018-08-06
07:14:43.000000000 +0200
@@ -194,7 +194,7 @@
// It is picking up identities from older tests somethimes, so cleanup
while (manager.identities().size() > 1) {
- manager.removeIdentity(manager.identities().at(0));
+ QVERIFY(manager.removeIdentity(manager.identities().at(0)));
manager.commit();
}
@@ -219,7 +219,7 @@
manager.commit();
// Remove the first identity, which we couldn't remove above
- manager.removeIdentity(manager.identities().at(0));
+ QVERIFY(manager.removeIdentity(manager.identities().at(0)));
manager.commit();
QCOMPARE(manager.allEmails().size(), 4);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kidentitymanagement-18.04.3/po/zh_CN/libkpimidentities5.po
new/kidentitymanagement-18.08.0/po/zh_CN/libkpimidentities5.po
--- old/kidentitymanagement-18.04.3/po/zh_CN/libkpimidentities5.po
2018-07-10 02:13:42.000000000 +0200
+++ new/kidentitymanagement-18.08.0/po/zh_CN/libkpimidentities5.po
2018-08-10 02:13:12.000000000 +0200
@@ -7,7 +7,7 @@
"Project-Id-Version: kdeorg\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n";
"POT-Creation-Date: 2017-10-25 05:47+0200\n"
-"PO-Revision-Date: 2018-07-03 17:40\n"
+"PO-Revision-Date: 2018-07-24 08:46\n"
"Last-Translator: guoyunhebrave <[email protected]>\n"
"Language-Team: Chinese Simplified\n"
"Language: zh_CN\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kidentitymanagement-18.04.3/po/zh_TW/libkpimidentities5.po
new/kidentitymanagement-18.08.0/po/zh_TW/libkpimidentities5.po
--- old/kidentitymanagement-18.04.3/po/zh_TW/libkpimidentities5.po
2018-07-10 02:13:42.000000000 +0200
+++ new/kidentitymanagement-18.08.0/po/zh_TW/libkpimidentities5.po
2018-08-10 02:13:12.000000000 +0200
@@ -144,15 +144,3 @@
#, kde-format
msgid "&Use HTML (disabling removes formatting)"
msgstr "使用 HTML（關閉的話會移除格式）(&U)"
-
-#~ msgctxt "NAME OF TRANSLATORS"
-#~ msgid "Your names"
-#~ msgstr "Frank Weng (a.k.a. Franklin)"
-
-#~ msgctxt "EMAIL OF TRANSLATORS"
-#~ msgid "Your emails"
-#~ msgstr "[email protected]"
-
-#~ msgctxt "show default identity"
-#~ msgid "Default"
-#~ msgstr "預設"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kidentitymanagement-18.04.3/src/identity.h
new/kidentitymanagement-18.08.0/src/identity.h
--- old/kidentitymanagement-18.04.3/src/identity.h 2018-06-29
07:04:47.000000000 +0200
+++ new/kidentitymanagement-18.08.0/src/identity.h 2018-08-06
07:14:43.000000000 +0200
@@ -110,45 +110,45 @@
bool operator>=(const Identity &other) const;
/** Tests if there are enough values set to allow mailing */
- bool mailingAllowed() const;
+ Q_REQUIRED_RESULT bool mailingAllowed() const;
/** Identity/nickname for this collection */
- QString identityName() const;
+ Q_REQUIRED_RESULT QString identityName() const;
/** Identity/nickname for this collection */
void setIdentityName(const QString &name);
/** @return whether this identity is the default identity */
- bool isDefault() const;
+ Q_REQUIRED_RESULT bool isDefault() const;
/** Unique Object Identifier for this identity */
- uint uoid() const;
+ Q_REQUIRED_RESULT uint uoid() const;
/** Full name of the user */
- QString fullName() const;
+ Q_REQUIRED_RESULT QString fullName() const;
void setFullName(const QString &);
/** The user's organization (optional) */
- QString organization() const;
+ Q_REQUIRED_RESULT QString organization() const;
void setOrganization(const QString &);
/** The user's OpenPGP encryption key */
- QByteArray pgpEncryptionKey() const;
+ Q_REQUIRED_RESULT QByteArray pgpEncryptionKey() const;
void setPGPEncryptionKey(const QByteArray &key);
/** The user's OpenPGP signing key */
- QByteArray pgpSigningKey() const;
+ Q_REQUIRED_RESULT QByteArray pgpSigningKey() const;
void setPGPSigningKey(const QByteArray &key);
/** The user's S/MIME encryption key */
- QByteArray smimeEncryptionKey() const;
+ Q_REQUIRED_RESULT QByteArray smimeEncryptionKey() const;
void setSMIMEEncryptionKey(const QByteArray &key);
/** The user's S/MIME signing key */
- QByteArray smimeSigningKey() const;
+ Q_REQUIRED_RESULT QByteArray smimeSigningKey() const;
void setSMIMESigningKey(const QByteArray &key);
- QString preferredCryptoMessageFormat() const;
+ Q_REQUIRED_RESULT QString preferredCryptoMessageFormat() const;
void setPreferredCryptoMessageFormat(const QString &);
/**
@@ -157,7 +157,7 @@
*
* @since 4.6
*/
- QString primaryEmailAddress() const;
+ Q_REQUIRED_RESULT QString primaryEmailAddress() const;
void setPrimaryEmailAddress(const QString &email);
/**
@@ -165,7 +165,7 @@
*
* @since 4.6
*/
- const QStringList emailAliases() const;
+ Q_REQUIRED_RESULT const QStringList emailAliases() const;
void setEmailAliases(const QStringList &aliases);
/**
@@ -175,35 +175,35 @@
*
* @since 4.6
*/
- bool matchesEmailAddress(const QString &addr) const;
+ Q_REQUIRED_RESULT bool matchesEmailAddress(const QString &addr) const;
/** vCard to attach to outgoing emails */
- QString vCardFile() const;
+ Q_REQUIRED_RESULT QString vCardFile() const;
void setVCardFile(const QString &);
/** email address in the format "username <name@host>" suitable
for the "From:" field of email messages. */
- QString fullEmailAddr() const;
+ Q_REQUIRED_RESULT QString fullEmailAddr() const;
/** email address for the ReplyTo: field */
- QString replyToAddr() const;
+ Q_REQUIRED_RESULT QString replyToAddr() const;
void setReplyToAddr(const QString &);
/** email addresses for the BCC: field */
- QString bcc() const;
+ Q_REQUIRED_RESULT QString bcc() const;
void setBcc(const QString &);
/** email addresses for the CC: field
* @since 4.9
*/
- QString cc() const;
+ Q_REQUIRED_RESULT QString cc() const;
void setCc(const QString &);
/**
*
* @since 4.10
*/
- bool attachVcard() const;
+ Q_REQUIRED_RESULT bool attachVcard() const;
void setAttachVcard(bool attach);
/**
@@ -215,29 +215,29 @@
/**
* @since 4.11
*/
- bool disabledFcc() const;
+ Q_REQUIRED_RESULT bool disabledFcc() const;
void setDisabledFcc(bool);
/**
* @since 4.12
*/
- bool pgpAutoSign() const;
+ Q_REQUIRED_RESULT bool pgpAutoSign() const;
void setPgpAutoSign(bool);
/**
* @since 5.4
*/
- bool pgpAutoEncrypt() const;
+ Q_REQUIRED_RESULT bool pgpAutoEncrypt() const;
void setPgpAutoEncrypt(bool);
/**
* @since 4.14
*/
- QString defaultDomainName() const;
+ Q_REQUIRED_RESULT QString defaultDomainName() const;
void setDefaultDomainName(const QString &domainName);
void setSignature(const Signature &sig);
- Signature &signature(); /* _not_ const! */
+ Q_REQUIRED_RESULT Signature &signature(); /* _not_ const! */
/**
@return the signature with '-- \n' prepended to it if it is not
@@ -246,34 +246,34 @@
@param ok if a valid bool pointer, it is set to @c true or @c false
depending
on whether the signature could successfully be obtained.
*/
- QString signatureText(bool *ok = nullptr) const;
+ Q_REQUIRED_RESULT QString signatureText(bool *ok = nullptr) const;
/**
* @since 4.1
* @return true if the inlined signature is html formatted
*/
- bool signatureIsInlinedHtml() const;
+ Q_REQUIRED_RESULT bool signatureIsInlinedHtml() const;
/** The transport that is set for this identity. Used to link a
transport with an identity. */
- QString transport() const;
+ Q_REQUIRED_RESULT QString transport() const;
void setTransport(const QString &);
/** The folder where sent messages from this identity will be
stored by default. */
- QString fcc() const;
+ Q_REQUIRED_RESULT QString fcc() const;
void setFcc(const QString &);
/** The folder where draft messages from this identity will be
stored by default.
*/
- QString drafts() const;
+ Q_REQUIRED_RESULT QString drafts() const;
void setDrafts(const QString &);
/** The folder where template messages from this identity will be
stored by default.
*/
- QString templates() const;
+ Q_REQUIRED_RESULT QString templates() const;
void setTemplates(const QString &);
/**
@@ -282,19 +282,19 @@
* Note that this is the localized language name (e.g. "British English"),
* _not_ the language code or dictionary name!
*/
- QString dictionary() const;
+ Q_REQUIRED_RESULT QString dictionary() const;
void setDictionary(const QString &);
/** a X-Face header for this identity */
- QString xface() const;
+ Q_REQUIRED_RESULT QString xface() const;
void setXFace(const QString &);
- bool isXFaceEnabled() const;
+ Q_REQUIRED_RESULT bool isXFaceEnabled() const;
void setXFaceEnabled(const bool);
/** Get random properties
* @param key the key of the property to get
*/
- QVariant property(const QString &key) const;
+ Q_REQUIRED_RESULT QVariant property(const QString &key) const;
/** Set random properties, when @p value is empty (for QStrings) or null,
the property is deleted. */
void setProperty(const QString &key, const QVariant &value);
@@ -302,10 +302,10 @@
static const Identity &null();
/** Returns true when the identity contains no values, all null values or
only empty values */
- bool isNull() const;
+ Q_REQUIRED_RESULT bool isNull() const;
- static QString mimeDataType();
- static bool canDecode(const QMimeData *);
+ Q_REQUIRED_RESULT static QString mimeDataType();
+ Q_REQUIRED_RESULT static bool canDecode(const QMimeData *);
void populateMimeData(QMimeData *) const;
static Identity fromMimeData(const QMimeData *);
@@ -334,26 +334,26 @@
protected:
/** during migration when it failed it can be a string => not a qlonglong
akonadi::id => fix it*/
- QString verifyAkonadiId(const QString &str) const;
+ Q_REQUIRED_RESULT QString verifyAkonadiId(const QString &str) const;
/** @return true if the signature is read from the output of a command */
- bool signatureIsCommand() const;
+ Q_REQUIRED_RESULT bool signatureIsCommand() const;
/** @return true if the signature is read from a text file */
- bool signatureIsPlainFile() const;
+ Q_REQUIRED_RESULT bool signatureIsPlainFile() const;
/** @return true if the signature was specified directly */
- bool signatureIsInline() const;
+ Q_REQUIRED_RESULT bool signatureIsInline() const;
/** name of the signature file (with path) */
- QString signatureFile() const;
+ Q_REQUIRED_RESULT QString signatureFile() const;
void setSignatureFile(const QString &);
/** inline signature */
- QString signatureInlineText() const;
+ Q_REQUIRED_RESULT QString signatureInlineText() const;
void setSignatureInlineText(const QString &);
/** Inline or signature from a file */
- bool useSignatureFile() const;
+ Q_REQUIRED_RESULT bool useSignatureFile() const;
Signature mSignature;
bool mIsDefault;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kidentitymanagement-18.04.3/src/identitycombo.h
new/kidentitymanagement-18.08.0/src/identitycombo.h
--- old/kidentitymanagement-18.04.3/src/identitycombo.h 2018-06-29
07:04:47.000000000 +0200
+++ new/kidentitymanagement-18.08.0/src/identitycombo.h 2018-08-06
07:14:43.000000000 +0200
@@ -45,7 +45,7 @@
explicit IdentityCombo(IdentityManager *manager, QWidget *parent =
nullptr);
~IdentityCombo();
- QString currentIdentityName() const;
+ Q_REQUIRED_RESULT QString currentIdentityName() const;
uint currentIdentity() const;
void setCurrentIdentity(const QString &identityName);
void setCurrentIdentity(const Identity &identity);
@@ -54,7 +54,7 @@
Returns the IdentityManager used in this combo box.
@since 4.5
*/
- IdentityManager *identityManager() const;
+ Q_REQUIRED_RESULT IdentityManager *identityManager() const;
Q_SIGNALS:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kidentitymanagement-18.04.3/src/identitymanager.h
new/kidentitymanagement-18.08.0/src/identitymanager.h
--- old/kidentitymanagement-18.04.3/src/identitymanager.h 2018-06-29
07:04:47.000000000 +0200
+++ new/kidentitymanagement-18.08.0/src/identitymanager.h 2018-08-06
07:14:43.000000000 +0200
@@ -73,12 +73,12 @@
/** @return a unique name for a new identity based on @p name
* @param name the name of the base identity
*/
- QString makeUnique(const QString &name) const;
+ Q_REQUIRED_RESULT QString makeUnique(const QString &name) const;
/** @return whether the @p name is unique
* @param name the name to be examined
*/
- bool isUnique(const QString &name) const;
+ Q_REQUIRED_RESULT bool isUnique(const QString &name) const;
/** Commit changes to disk and emit changed() if necessary. */
void commit();
@@ -87,17 +87,17 @@
void rollback();
/** Check whether there are any unsaved changes. */
- bool hasPendingChanges() const;
+ Q_REQUIRED_RESULT bool hasPendingChanges() const;
/** @return the list of identities */
- QStringList identities() const;
+ Q_REQUIRED_RESULT QStringList identities() const;
/** Convenience method.
@return the list of (shadow) identities, ie. the ones currently
under configuration.
*/
- QStringList shadowIdentities() const;
+ Q_REQUIRED_RESULT QStringList shadowIdentities() const;
/** Sort the identities by name (the default is always first). This
operates on the @em shadow list, so you need to @ref commit for
@@ -116,7 +116,7 @@
@param addressList the addressList to examine
@see #identityForAddress
**/
- bool thatIsMe(const QString &addressList) const;
+ Q_REQUIRED_RESULT bool thatIsMe(const QString &addressList) const;
/** @return the identity with Unique Object Identifier (UOID) @p
uoid or @ref Identity::null if not found.
@@ -142,7 +142,7 @@
@param uoid the default identity to set
@return false if an identity with UOID @p uoid was not found
**/
- bool setAsDefault(uint uoid);
+ Q_REQUIRED_RESULT bool setAsDefault(uint uoid);
/** @return the identity named @p identityName. This method returns a
reference to the identity that can be modified. To let others
@@ -162,7 +162,7 @@
or when one tries to remove the last identity.
@param identityName the identity to remove
**/
- bool removeIdentity(const QString &identityName);
+ Q_REQUIRED_RESULT bool removeIdentity(const QString &identityName);
/**
* Removes the identity with name @p identityName
@@ -173,7 +173,7 @@
*
* @since 4.6
*/
- bool removeIdentityForced(const QString &identityName);
+ Q_REQUIRED_RESULT bool removeIdentityForced(const QString &identityName);
ConstIterator begin() const;
ConstIterator end() const;
@@ -188,7 +188,7 @@
/** Returns the list of all email addresses (only name@host) from all
identities */
- QStringList allEmails() const;
+ Q_REQUIRED_RESULT QStringList allEmails() const;
Q_SIGNALS:
/** Emitted whenever a commit changes any configure option */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kidentitymanagement-18.04.3/src/signature.h
new/kidentitymanagement-18.08.0/src/signature.h
--- old/kidentitymanagement-18.04.3/src/signature.h 2018-06-29
07:04:47.000000000 +0200
+++ new/kidentitymanagement-18.08.0/src/signature.h 2018-08-06
07:14:43.000000000 +0200
@@ -128,33 +128,33 @@
/** @return the raw signature text as entered resp. read from file.
@param ok set to @c true if reading succeeded
*/
- QString rawText(bool *ok = nullptr) const;
+ Q_REQUIRED_RESULT QString rawText(bool *ok = nullptr) const;
/** @return the signature text with a "-- \n" separator added, if
necessary. A newline will not be appended or prepended.
@param ok set to @c true if reading succeeded
*/
- QString withSeparator(bool *ok = nullptr) const;
+ Q_REQUIRED_RESULT QString withSeparator(bool *ok = nullptr) const;
/** Set the signature text and mark this signature as being of
"inline text" type. */
void setText(const QString &text);
- QString text() const;
+ Q_REQUIRED_RESULT QString text() const;
/**
* Returns the text of the signature. If the signature is HTML, the HTML
* tags will be stripped.
* @since 4.4
*/
- QString toPlainText() const;
+ Q_REQUIRED_RESULT QString toPlainText() const;
/** Set the signature URL and mark this signature as being of
"from file" resp. "from output of command" type. */
void setPath(const QString &path, bool isExecutable = false);
- QString path() const;
+ Q_REQUIRED_RESULT QString path() const;
/// @return the type of signature (ie. way to obtain the signature text)
- Type type() const;
+ Q_REQUIRED_RESULT Type type() const;
void setType(Type type);
/**
@@ -168,7 +168,7 @@
* @return boolean whether the inlined signature is html
* @since 4.1
*/
- bool isInlinedHtml() const;
+ Q_REQUIRED_RESULT bool isInlinedHtml() const;
/**
* Sets the location where the copies of the signature images will be
stored.
@@ -186,7 +186,7 @@
* @since 4.4
*/
void setImageLocation(const QString &path);
- QString imageLocation() const;
+ Q_REQUIRED_RESULT QString imageLocation() const;
/**
* Adds the given image to the signature.
@@ -207,7 +207,7 @@
* @since 4.9
*/
void setEnabledSignature(bool enabled);
- bool isEnabledSignature() const;
+ Q_REQUIRED_RESULT bool isEnabledSignature() const;
enum AddedTextFlag {
AddNothing = 0, ///< Don't add any text to the signature
@@ -242,7 +242,7 @@
// with the deprecated method
void insertIntoTextEdit(Placement placement, AddedText addedText,
KPIMTextEdit::RichTextComposer *textEdit, bool forceDisplay = false) const;
- QList<Signature::EmbeddedImagePtr> embeddedImages() const;
+ Q_REQUIRED_RESULT QList<Signature::EmbeddedImagePtr> embeddedImages()
const;
void setEmbeddedImages(const QList<Signature::EmbeddedImagePtr> &embedded);
protected:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kidentitymanagement-18.04.3/src/signatureconfigurator.cpp
new/kidentitymanagement-18.08.0/src/signatureconfigurator.cpp
--- old/kidentitymanagement-18.04.3/src/signatureconfigurator.cpp
2018-06-29 07:04:47.000000000 +0200
+++ new/kidentitymanagement-18.08.0/src/signatureconfigurator.cpp
2018-08-06 07:14:43.000000000 +0200
@@ -255,7 +255,7 @@
hlay = new QHBoxLayout(); // inherits spacing
page_vlay->addLayout(hlay);
mCommandEdit = new KLineEdit(page);
- mCommandEdit->setClearButtonShown(true);
+ mCommandEdit->setClearButtonEnabled(true);
mCommandEdit->setCompletionObject(new KShellCompletion());
mCommandEdit->setAutoDeleteCompletionObject(true);
mCommandEdit->setWhatsThis(
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kidentitymanagement-18.04.3/src/signatureconfigurator.h
new/kidentitymanagement-18.08.0/src/signatureconfigurator.h
--- old/kidentitymanagement-18.04.3/src/signatureconfigurator.h 2018-06-29
07:04:47.000000000 +0200
+++ new/kidentitymanagement-18.08.0/src/signatureconfigurator.h 2018-08-06
07:14:43.000000000 +0200
@@ -57,7 +57,7 @@
/**
* Indicated if the user wants a signature
*/
- bool isSignatureEnabled() const;
+ Q_REQUIRED_RESULT bool isSignatureEnabled() const;
/**
* Use this to activate the signature.
@@ -68,7 +68,7 @@
* This returns the type of the signature,
* so that can be Disabled, Inline, fromFile, etc.
*/
- Signature::Type signatureType() const;
+ Q_REQUIRED_RESULT Signature::Type signatureType() const;
/**
* Set the signature type to @p type.
@@ -79,7 +79,7 @@
* Returns the inline text, only useful
* when this is the appropriate Signature::Type
*/
- QString inlineText() const;
+ Q_REQUIRED_RESULT QString inlineText() const;
/**
* Make @p text the text for the signature.
@@ -90,7 +90,7 @@
* Returns the file url which the user wants
* to use as a signature.
*/
- QString filePath() const;
+ Q_REQUIRED_RESULT QString filePath() const;
/**
* Set @p url for the file url part of the
@@ -102,7 +102,7 @@
* Returns the url of the command which the
* users wants to use as signature.
*/
- QString commandPath() const;
+ Q_REQUIRED_RESULT QString commandPath() const;
/**
* Sets @p url as the command to execute.
@@ -113,7 +113,7 @@
Conveniece method.
@return a Signature object representing the state of the widgets.
**/
- Signature signature() const;
+ Q_REQUIRED_RESULT Signature signature() const;
/**
Convenience method. Sets the widgets according to @p sig
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kidentitymanagement-18.04.3/src/utils.h
new/kidentitymanagement-18.08.0/src/utils.h
--- old/kidentitymanagement-18.04.3/src/utils.h 2018-06-29 07:04:47.000000000
+0200
+++ new/kidentitymanagement-18.08.0/src/utils.h 2018-08-06 07:14:43.000000000
+0200
@@ -31,14 +31,14 @@
* - make sure that only an email address is used as parameter and NO name
<email>
* - emails are tested with email.toLower(), so no need to lower them before.
*/
-KIDENTITYMANAGEMENT_EXPORT bool thatIsMe(const QString &email);
+Q_REQUIRED_RESULT KIDENTITYMANAGEMENT_EXPORT bool thatIsMe(const QString
&email);
/*
* Very fast version of IdentityManager::allEmails , that is using an internal
cache.
* The cache is updated with IdentityManager::changed signal.
* All email addresses + alias of the identities. The email addresses are all
lowered.
*/
-KIDENTITYMANAGEMENT_EXPORT const QSet<QString> &allEmails();
+Q_REQUIRED_RESULT KIDENTITYMANAGEMENT_EXPORT const QSet<QString> &allEmails();
}
#endif
