Git commit 028f07319deaf3025124c00c150a5233313dea87 by David Jarvie.
Committed on 30/09/2014 at 22:42.
Pushed by djarvie into branch 'master'.

Formatting

M  +6    -3    kalarm/akonadiresourcecreator.cpp
M  +4    -2    kalarm/recurrenceedit.cpp
M  +2    -1    kalarm/reminder.cpp
M  +2    -1    kalarm/resourceselector.cpp

http://commits.kde.org/kdepim/028f07319deaf3025124c00c150a5233313dea87

diff --git a/kalarm/akonadiresourcecreator.cpp b/kalarm/akonadiresourcecrea=
tor.cpp
index 77c6493..b34a060 100644
--- a/kalarm/akonadiresourcecreator.cpp
+++ b/kalarm/akonadiresourcecreator.cpp
@@ -92,7 +92,8 @@ void AkonadiResourceCreator::getAgentType()
         return;
     }
     AgentInstanceCreateJob* job =3D new AgentInstanceCreateJob(mAgentType,=
 mParent);
-    connect(job, &AgentInstanceCreateJob::result, this, &AkonadiResourceCr=
eator::agentInstanceCreated);
+    connect(job, &AgentInstanceCreateJob::result,
+            this, &AkonadiResourceCreator::agentInstanceCreated);
     job->start();
 }
 =

@@ -132,8 +133,10 @@ void AkonadiResourceCreator::agentInstanceCreated(KJob=
* j)
         }
         else
         {
-            connect(agentControlIface, &org::freedesktop::Akonadi::Agent::=
Control::configurationDialogAccepted, this, &AkonadiResourceCreator::config=
urationDialogAccepted);
-            connect(agentControlIface, &org::freedesktop::Akonadi::Agent::=
Control::configurationDialogRejected, this, &AkonadiResourceCreator::exitWi=
thError);
+            connect(agentControlIface, &org::freedesktop::Akonadi::Agent::=
Control::configurationDialogAccepted,
+                    this, &AkonadiResourceCreator::configurationDialogAcce=
pted);
+            connect(agentControlIface, &org::freedesktop::Akonadi::Agent::=
Control::configurationDialogRejected,
+                    this, &AkonadiResourceCreator::exitWithError);
         }
         mAgentInstance.configure(mParent);
 =

diff --git a/kalarm/recurrenceedit.cpp b/kalarm/recurrenceedit.cpp
index 412cfe9..60c577b 100644
--- a/kalarm/recurrenceedit.cpp
+++ b/kalarm/recurrenceedit.cpp
@@ -256,8 +256,10 @@ RecurrenceEdit::RecurrenceEdit(bool readOnly, QWidget*=
 parent)
     mRepeatCountEntry->setSelectOnStep(false);
     mRepeatCountEntry->setReadOnly(mReadOnly);
     mRepeatCountEntry->setWhatsThis(i18nc("@info:whatsthis", "Enter the to=
tal number of times to trigger the alarm"));
-    connect(mRepeatCountEntry, static_cast<void (SpinBox::*)(int)>(&SpinBo=
x::valueChanged), this, &RecurrenceEdit::repeatCountChanged);
-    connect(mRepeatCountEntry, static_cast<void (SpinBox::*)(int)>(&SpinBo=
x::valueChanged), this, &RecurrenceEdit::contentsChanged);
+    connect(mRepeatCountEntry, static_cast<void (SpinBox::*)(int)>(&SpinBo=
x::valueChanged),
+            this, &RecurrenceEdit::repeatCountChanged);
+    connect(mRepeatCountEntry, static_cast<void (SpinBox::*)(int)>(&SpinBo=
x::valueChanged),
+            this, &RecurrenceEdit::contentsChanged);
     mRepeatCountButton->setFocusWidget(mRepeatCountEntry);
     mRepeatCountLabel =3D new QLabel(i18nc("@label", "occurrence(s)"), mRa=
ngeButtonBox);
     mRepeatCountLabel->setFixedSize(mRepeatCountLabel->sizeHint());
diff --git a/kalarm/reminder.cpp b/kalarm/reminder.cpp
index 9c43577..e6e4881 100644
--- a/kalarm/reminder.cpp
+++ b/kalarm/reminder.cpp
@@ -66,7 +66,8 @@ Reminder::Reminder(const QString& reminderWhatsThis, cons=
t QString& valueWhatsTh
     mTime->setFixedSize(mTime->sizeHint());
     connect(mTime, &TimeSelector::toggled, this, &Reminder::slotReminderTo=
ggled);
     connect(mTime, &TimeSelector::valueChanged, this, &Reminder::changed);
-    connect(mTimeSignCombo, static_cast<void (ComboBox::*)(int)>(&ComboBox=
::currentIndexChanged), this, &Reminder::changed);
+    connect(mTimeSignCombo, static_cast<void (ComboBox::*)(int)>(&ComboBox=
::currentIndexChanged),
+            this, &Reminder::changed);
     topLayout->addWidget(mTime, 0, Qt::AlignLeft);
 =

     if (showOnceOnly)
diff --git a/kalarm/resourceselector.cpp b/kalarm/resourceselector.cpp
index 5de28b6..a2cb731 100644
--- a/kalarm/resourceselector.cpp
+++ b/kalarm/resourceselector.cpp
@@ -126,7 +126,8 @@ ResourceSelector::ResourceSelector(QWidget* parent)
     connect(AkonadiModel::instance(), SIGNAL(collectionAdded(Akonadi::Coll=
ection)),
                                       SLOT(slotCollectionAdded(Akonadi::Co=
llection)));
 =

-    connect(mAlarmType, static_cast<void (KComboBox::*)(int)>(&KComboBox::=
activated), this, &ResourceSelector::alarmTypeSelected);
+    connect(mAlarmType, static_cast<void (KComboBox::*)(int)>(&KComboBox::=
activated),
+            this, &ResourceSelector::alarmTypeSelected);
     QTimer::singleShot(0, this, SLOT(alarmTypeSelected()));
 =

     Preferences::connect(SIGNAL(archivedKeepDaysChanged(int)), this, SLOT(=
archiveDaysChanged(int)));