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

List:       kde-commits
Subject:    [kdepim] agents/followupreminderagent: Merge remote-tracking branch 'origin/KDE/4.14'
From:       Montel Laurent <montel () kde ! org>
Date:       2014-10-30 8:45:52
Message-ID: E1XjlMe-00028k-7F () scm ! kde ! org
[Download RAW message or body]

Git commit dce96b1739bea38956460946b315de3ac232cb97 by Montel Laurent.
Committed on 30/10/2014 at 08:45.
Pushed by mlaurent into branch 'master'.

Merge remote-tracking branch 'origin/KDE/4.14'

Conflicts:
	agents/followupreminderagent/jobs/followupremindershowmessagejob.cpp
	agents/followupreminderagent/jobs/followupremindershowmessagejob.h

M  +5    -5    agents/followupreminderagent/followupreminderinfowidget.cpp
M  +6    -7    agents/followupreminderagent/jobs/followupremindershowmessagejob.cpp
M  +2    -2    agents/followupreminderagent/jobs/followupremindershowmessagejob.h

http://commits.kde.org/kdepim/dce96b1739bea38956460946b315de3ac232cb97

diff --cc agents/followupreminderagent/followupreminderinfowidget.cpp
index 3d62871,9ff61e4..a670a21
--- a/agents/followupreminderagent/followupreminderinfowidget.cpp
+++ b/agents/followupreminderagent/followupreminderinfowidget.cpp
@@@ -129,12 -128,12 +129,12 @@@ void FollowUpReminderInfoWidget::create
      item->setInfo(info);
      item->setText(To, info->to());
      item->setText(Subject, info->subject());
 -    const QString date = KGlobal::locale()->formatDate( \
info->followUpReminderDate(), KLocale::LongDate );  +    const QString date = \
KLocale::global()->formatDate(info->followUpReminderDate(), KLocale::LongDate);  \
                item->setText(DeadLine, date);
-     item->setText(AnswerWasReceived, info->answerWasReceived() ? i18n("Received") : \
                i18n("On hold"));
- 
-     item->setData(0, AnswerItemFound, info->answerWasReceived());
-     if (info->answerWasReceived()) {
+     const bool answerWasReceived = info->answerWasReceived();
+     item->setText(AnswerWasReceived, answerWasReceived ? i18n("Received") : \
i18n("On hold")); +     item->setData(0, AnswerItemFound, answerWasReceived);
+     if (answerWasReceived) {
          item->setBackgroundColor(DeadLine, Qt::green);
      } else {
          if (info->followUpReminderDate() < QDate::currentDate()) {
diff --cc agents/followupreminderagent/jobs/followupremindershowmessagejob.cpp
index 23fa8bc,88c6f45..07b3ecb
--- a/agents/followupreminderagent/jobs/followupremindershowmessagejob.cpp
+++ b/agents/followupreminderagent/jobs/followupremindershowmessagejob.cpp
@@@ -45,9 -45,8 +45,8 @@@ void FollowUpReminderShowMessageJob::st
          // Program is not already running, so start it
          QString errmsg;
          if (KToolInvocation::startServiceByDesktopName(QLatin1String("kmail2"), \
                QString(), &errmsg)) {
 -            qDebug()<<" Can not start kmail"<<errmsg;
 +            qDebug() << " Can not start kmail" << errmsg;
-             setError(UserDefinedError);
-             Q_EMIT emitResult();
+             deleteLater();
              return;
          }
      }
diff --cc agents/followupreminderagent/jobs/followupremindershowmessagejob.h
index 53eb5e9,09dc93a..643b4c5
--- a/agents/followupreminderagent/jobs/followupremindershowmessagejob.h
+++ b/agents/followupreminderagent/jobs/followupremindershowmessagejob.h
@@@ -18,10 -18,10 +18,10 @@@
  #ifndef FOLLOWUPREMINDERSHOWMESSAGEJOB_H
  #define FOLLOWUPREMINDERSHOWMESSAGEJOB_H
  
- #include <KJob>
 +#include <AkonadiCore/Item>
+ #include <QObject>
 -#include <Akonadi/Item>
  
- class FollowUpReminderShowMessageJob : public KJob
+ class FollowUpReminderShowMessageJob : public QObject
  {
      Q_OBJECT
  public:


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