From ccb647b4d0f7627bddf5df8b488ebcac2f463829 Mon Sep 17 00:00:00 2001
From: Christian Mollekopf <chrigi_1@fastmail.fm>
Date: Mon, 2 Jan 2017 13:57:44 +0100
Subject: Less boilerplate

---
 framework/domain/composercontroller.h | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

(limited to 'framework/domain/composercontroller.h')

diff --git a/framework/domain/composercontroller.h b/framework/domain/composercontroller.h
index 2e74954e..161bcebc 100644
--- a/framework/domain/composercontroller.h
+++ b/framework/domain/composercontroller.h
@@ -65,8 +65,8 @@ class ComposerController : public Kube::Controller
     Q_PROPERTY (Selector* identitySelector READ identitySelector CONSTANT)
     //Q_PROPERTY (QValidator* subjectValidator READ subjectValidator CONSTANT)
 
-    Q_PROPERTY (Kube::ControllerAction* sendAction READ sendAction CONSTANT)
-    Q_PROPERTY (Kube::ControllerAction* saveAsDraftAction READ saveAsDraftAction CONSTANT)
+    KUBE_CONTROLLER_ACTION(send)
+    KUBE_CONTROLLER_ACTION(saveAsDraft)
 
 public:
     explicit ComposerController();
@@ -76,22 +76,15 @@ public:
 
     Q_INVOKABLE void loadMessage(const QVariant &draft, bool loadAsDraft);
 
-    Kube::ControllerAction* sendAction();
-    Kube::ControllerAction* saveAsDraftAction();
-
 private slots:
     void updateSendAction();
-    void send();
     void updateSaveAsDraftAction();
-    void saveAsDraft();
 
 private:
     void recordForAutocompletion(const QByteArray &addrSpec, const QByteArray &displayName);
     void setMessage(const QSharedPointer<KMime::Message> &msg);
     KMime::Message::Ptr assembleMessage();
 
-    QScopedPointer<Kube::ControllerAction> mSendAction;
-    QScopedPointer<Kube::ControllerAction> mSaveAsDraftAction;
     QScopedPointer<Completer> mRecipientCompleter;
     QScopedPointer<Selector> mIdentitySelector;
 };
-- 
cgit v1.2.3