From ab6de4ee33736c66c79b7cd65f550d2ca3fb8fe6 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Tue, 18 Feb 2020 11:12:44 +0100 Subject: [PATCH] Clean up interface --- src/editor/composer.h | 2 +- src/editor/kmcomposerwin.h | 13 ++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/editor/composer.h b/src/editor/composer.h index c988ad5cb..63bd91717 100644 --- a/src/editor/composer.h +++ b/src/editor/composer.h @@ -70,7 +70,7 @@ public: // mailserviceimpl virtual void addAttachment(const QList &url, bool showWarning) = 0; virtual void addAttachment(const QString &name, KMime::Headers::contentEncoding cte, const QString &charset, const QByteArray &data, const QByteArray &mimeType) = 0; public: // kmcommand - virtual QString dbusObjectPath() const = 0; + virtual Q_REQUIRED_RESULT QString dbusObjectPath() const = 0; public: // kmkernel, kmcommands, callback /** * Set the message the composer shall work with. This discards diff --git a/src/editor/kmcomposerwin.h b/src/editor/kmcomposerwin.h index f82626182..4fa3bc312 100644 --- a/src/editor/kmcomposerwin.h +++ b/src/editor/kmcomposerwin.h @@ -135,20 +135,19 @@ public: * Start of D-Bus callable stuff. The D-Bus methods need to be public slots, * otherwise they can't be accessed. */ - // TODO clean-up dbus stuff; make the adaptor a friend; etc. public Q_SLOTS: Q_SCRIPTABLE void send(int how) override; + /** + * End of D-Bus callable stuff + */ - Q_SCRIPTABLE void addAttachmentsAndSend(const QList &urls, const QString &comment, int how) override; + void addAttachmentsAndSend(const QList &urls, const QString &comment, int how) override; - Q_SCRIPTABLE void addAttachment(const QList &infos, bool showWarning) override; + void addAttachment(const QList &infos, bool showWarning) override; - Q_SCRIPTABLE void addAttachment(const QString &name, KMime::Headers::contentEncoding cte, const QString &charset, const QByteArray &data, const QByteArray &mimeType) override; + void addAttachment(const QString &name, KMime::Headers::contentEncoding cte, const QString &charset, const QByteArray &data, const QByteArray &mimeType) override; - /** - * End of D-Bus callable stuff - */ Q_SIGNALS: void identityChanged(const KIdentityManagement::Identity &identity);