[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdepim-addons/Applications/17.08] plugins/messageviewerplugins/createeventplugin: Reduce duplicate 
From:       Montel Laurent <null () kde ! org>
Date:       2017-08-18 5:57:34
Message-ID: E1diaHm-0003JB-JC () code ! kde ! org
[Download RAW message or body]

Git commit 53a7ad8b5a3ed056d82e3b3cf0cd409d109b7496 by Montel Laurent.
Committed on 18/08/2017 at 05:57.
Pushed by mlaurent into branch 'Applications/17.08'.

Reduce duplicate code

M  +8    -5    plugins/messageviewerplugins/createeventplugin/eventedit.cpp
M  +1    -0    plugins/messageviewerplugins/createeventplugin/eventedit.h

https://commits.kde.org/kdepim-addons/53a7ad8b5a3ed056d82e3b3cf0cd409d109b7496

diff --git a/plugins/messageviewerplugins/createeventplugin/eventedit.cpp \
b/plugins/messageviewerplugins/createeventplugin/eventedit.cpp index \
                50be17c0..a1fdfb73 100644
--- a/plugins/messageviewerplugins/createeventplugin/eventedit.cpp
+++ b/plugins/messageviewerplugins/createeventplugin/eventedit.cpp
@@ -274,10 +274,7 @@ void EventEdit::slotReturnPressed()
     }
 
     if (!mEventEdit->text().trimmed().isEmpty()) {
-        KCalCore::Event::Ptr event(new KCalCore::Event);
-        event->setDtStart(KDateTime(dtstart));
-        event->setDtEnd(KDateTime(dtend));
-        event->setSummary(mEventEdit->text());
+        KCalCore::Event::Ptr event = createEventItem();
         Q_EMIT createEvent(event, collection);
         mEventEdit->clear();
         hide();
@@ -339,7 +336,7 @@ void EventEdit::slotStartDateTimeChanged(const QDateTime \
&newDateTime)  mEndDateTimeEdit->setMinimumDateTime(newDateTime);
 }
 
-void EventEdit::slotOpenEditor()
+KCalCore::Event::Ptr EventEdit::createEventItem()
 {
     KCalCore::Attachment::Ptr attachment(new \
KCalCore::Attachment(mMessage->encodedContent().toBase64(), \
                KMime::Message::mimeType()));
     const KMime::Headers::Subject *const subject = mMessage->subject(false);
@@ -351,6 +348,12 @@ void EventEdit::slotOpenEditor()
     event->setDtStart(KDateTime(mStartDateTimeEdit->dateTime()));
     event->setDtEnd(KDateTime(mEndDateTimeEdit->dateTime()));
     event->addAttachment(attachment);
+    return event;
+}
+
+void EventEdit::slotOpenEditor()
+{
+    KCalCore::Event::Ptr event = createEventItem();
 
     Akonadi::Item item;
     item.setPayload<KCalCore::Event::Ptr>(event);
diff --git a/plugins/messageviewerplugins/createeventplugin/eventedit.h \
b/plugins/messageviewerplugins/createeventplugin/eventedit.h index d30efa5c..f868c8ea \
                100644
--- a/plugins/messageviewerplugins/createeventplugin/eventedit.h
+++ b/plugins/messageviewerplugins/createeventplugin/eventedit.h
@@ -69,6 +69,7 @@ Q_SIGNALS:
 protected:
     bool eventFilter(QObject *object, QEvent *e) override;
 private:
+    KCalCore::Event::Ptr createEventItem();
     void readConfig();
     void comboboxRowInserted();
     Akonadi::Collection mCollection;


[prev in list] [next in list] [prev in thread] [next in thread]