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.cpp | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

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

diff --git a/framework/domain/composercontroller.cpp b/framework/domain/composercontroller.cpp
index 75396735..7122f201 100644
--- a/framework/domain/composercontroller.cpp
+++ b/framework/domain/composercontroller.cpp
@@ -82,12 +82,11 @@ public:
 
 ComposerController::ComposerController()
     : Kube::Controller(),
-    mSendAction{new Kube::ControllerAction},
-    mSaveAsDraftAction{new Kube::ControllerAction},
+    action_send{new Kube::ControllerAction{this, &ComposerController::send}},
+    action_saveAsDraft{new Kube::ControllerAction{this, &ComposerController::saveAsDraft}},
     mRecipientCompleter{new RecipientCompleter},
     mIdentitySelector{new IdentitySelector{*this}}
 {
-    QObject::connect(mSaveAsDraftAction.data(), &Kube::ControllerAction::triggered, this, &ComposerController::saveAsDraft);
     updateSaveAsDraftAction();
     // mSendAction->monitorProperty<To>();
     // mSendAction->monitorProperty<Send>([] (const QString &) -> bool{
@@ -96,7 +95,6 @@ ComposerController::ComposerController()
     // registerAction<ControllerAction>(&ComposerController::send);
     // actionDepends<ControllerAction, To, Subject>();
     // TODO do in constructor
-    QObject::connect(mSendAction.data(), &Kube::ControllerAction::triggered, this, &ComposerController::send);
 
     QObject::connect(this, &ComposerController::toChanged, &ComposerController::updateSendAction);
     QObject::connect(this, &ComposerController::subjectChanged, &ComposerController::updateSendAction);
@@ -166,16 +164,6 @@ void applyAddresses(const QString &list, std::function<void(const QByteArray &,
     }
 }
 
-Kube::ControllerAction* ComposerController::saveAsDraftAction()
-{
-    return mSaveAsDraftAction.data();
-}
-
-Kube::ControllerAction* ComposerController::sendAction()
-{
-    return mSendAction.data();
-}
-
 KMime::Message::Ptr ComposerController::assembleMessage()
 {
     auto mail = mExistingMessage;
@@ -206,7 +194,7 @@ KMime::Message::Ptr ComposerController::assembleMessage()
 void ComposerController::updateSendAction()
 {
     auto enabled = !getTo().isEmpty() && !getSubject().isEmpty();
-    mSendAction->setEnabled(enabled);
+    sendAction()->setEnabled(enabled);
 }
 
 void ComposerController::send()
@@ -242,7 +230,7 @@ void ComposerController::send()
 
 void ComposerController::updateSaveAsDraftAction()
 {
-    mSendAction->setEnabled(true);
+    sendAction()->setEnabled(true);
 }
 
 void ComposerController::saveAsDraft()
-- 
cgit v1.2.3