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

List:       kde-commits
Subject:    [kdepim] kalarm: Formatting
From:       David Jarvie <djarvie () kde ! org>
Date:       2014-09-30 22:39:43
Message-ID: E1XZ659-0006Lb-49 () scm ! kde ! org
[Download RAW message or body]

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/akonadiresourcecreator.cpp
index 77c6493..b34a060 100644
--- a/kalarm/akonadiresourcecreator.cpp
+++ b/kalarm/akonadiresourcecreator.cpp
@@ -92,7 +92,8 @@ void AkonadiResourceCreator::getAgentType()
         return;
     }
     AgentInstanceCreateJob* job = new AgentInstanceCreateJob(mAgentType, mParent);
-    connect(job, &AgentInstanceCreateJob::result, this, \
&AkonadiResourceCreator::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::configurationDialogAccepted);
-            connect(agentControlIface, \
&org::freedesktop::Akonadi::Agent::Control::configurationDialogRejected, this, \
&AkonadiResourceCreator::exitWithError); +            connect(agentControlIface, \
&org::freedesktop::Akonadi::Agent::Control::configurationDialogAccepted, +            \
this, &AkonadiResourceCreator::configurationDialogAccepted); +            \
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 total number \
                of times to trigger the alarm"));
-    connect(mRepeatCountEntry, static_cast<void \
(SpinBox::*)(int)>(&SpinBox::valueChanged), this, \
                &RecurrenceEdit::repeatCountChanged);
-    connect(mRepeatCountEntry, static_cast<void \
(SpinBox::*)(int)>(&SpinBox::valueChanged), this, &RecurrenceEdit::contentsChanged); \
+    connect(mRepeatCountEntry, static_cast<void \
(SpinBox::*)(int)>(&SpinBox::valueChanged), +            this, \
&RecurrenceEdit::repeatCountChanged); +    connect(mRepeatCountEntry, \
static_cast<void (SpinBox::*)(int)>(&SpinBox::valueChanged), +            this, \
&RecurrenceEdit::contentsChanged);  \
                mRepeatCountButton->setFocusWidget(mRepeatCountEntry);
     mRepeatCountLabel = new QLabel(i18nc("@label", "occurrence(s)"), \
mRangeButtonBox);  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, const QString& \
valueWhatsTh  mTime->setFixedSize(mTime->sizeHint());
     connect(mTime, &TimeSelector::toggled, this, &Reminder::slotReminderToggled);
     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::Collection)),
                                       \
SLOT(slotCollectionAdded(Akonadi::Collection)));  
-    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)));


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