From kde-commits  Tue Sep 30 22:24:32 2014
From: David Jarvie <djarvie () kde ! org>
Date: Tue, 30 Sep 2014 22:24:32 +0000
To: kde-commits
Subject: [kdepim] kalarm: Fix spacings, tidy
Message-Id: <E1XZ5qS-00023I-5g () scm ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=141211588013099

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

Fix spacings, tidy

M  +6    -6    kalarm/lib/timeedit.cpp
M  +3    -4    kalarm/lib/timeperiod.cpp
M  +1    -1    kalarm/recurrenceedit.cpp

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

diff --git a/kalarm/lib/timeedit.cpp b/kalarm/lib/timeedit.cpp
index abf79df..94aeeec 100644
--- a/kalarm/lib/timeedit.cpp
+++ b/kalarm/lib/timeedit.cpp
@@ -37,22 +37,22 @@ TimeEdit::TimeEdit(QWidget* parent)
       mPmIndex(-1),
       mReadOnly(false)
 {
-    QHBoxLayout *hbox =3D new QHBoxLayout;
-    hbox->setMargin(0);
-    setLayout(hbox);
+    QHBoxLayout* layout =3D new QHBoxLayout;
+    layout->setMargin(0);
+    layout->setSpacing(0);
+    setLayout(layout);
     bool use12hour =3D KLocale::global()->use12Clock();
     mSpinBox =3D new TimeSpinBox(!use12hour, this);
-    hbox->addWidget(mSpinBox);
-
     mSpinBox->setFixedSize(mSpinBox->sizeHint());
     connect(mSpinBox, SIGNAL(valueChanged(int)), SLOT(slotValueChanged(int=
)));
+    layout->addWidget(mSpinBox);
     if (use12hour)
     {
         mAmPm =3D new ComboBox(this);
         setAmPmCombo(1, 1);     // add "am" and "pm" options to the combo =
box
         mAmPm->setFixedSize(mAmPm->sizeHint());
-        hbox->addWidget(mAmPm);
         connect(mAmPm, SIGNAL(highlighted(int)), SLOT(slotAmPmChanged(int)=
));
+        layout->addWidget(mAmPm);
     }
 }
 =

diff --git a/kalarm/lib/timeperiod.cpp b/kalarm/lib/timeperiod.cpp
index 0812330..22c2194 100644
--- a/kalarm/lib/timeperiod.cpp
+++ b/kalarm/lib/timeperiod.cpp
@@ -52,13 +52,11 @@ TimePeriod::TimePeriod(bool allowHourMinute, QWidget* p=
arent)
       mNoHourMinute(!allowHourMinute),
       mReadOnly(false)
 {
-    QHBoxLayout *layout =3D new QHBoxLayout;
+    QHBoxLayout* layout =3D new QHBoxLayout;
     setLayout(layout);
-    layout->setSpacing(KDialog::spacingHint());
     layout->setMargin(0);
 =

     mSpinStack =3D new QStackedWidget(this);
-    layout->addWidget(mSpinStack);
     mSpinBox =3D new SpinBox(mSpinStack);
     mSpinBox->setSingleStep(1);
     mSpinBox->setSingleShiftStep(10);
@@ -74,9 +72,9 @@ TimePeriod::TimePeriod(bool allowHourMinute, QWidget* par=
ent)
     mSpinStack->setFixedSize(mSpinBox->sizeHint().expandedTo(mTimeSpinBox-=
>sizeHint()));
     mHourMinuteRaised =3D mNoHourMinute;
     showHourMin(!mNoHourMinute);
+    layout->addWidget(mSpinStack);
 =

     mUnitsCombo =3D new ComboBox(this);
-    layout->addWidget(mUnitsCombo);
     mUnitsCombo->setEditable(false);
     if (mNoHourMinute)
         mDateOnlyOffset =3D 2;
@@ -91,6 +89,7 @@ TimePeriod::TimePeriod(bool allowHourMinute, QWidget* par=
ent)
     mMaxUnitShown =3D Weeks;
     mUnitsCombo->setFixedSize(mUnitsCombo->sizeHint());
     connect(mUnitsCombo, SIGNAL(activated(int)), SLOT(slotUnitsSelected(in=
t)));
+    layout->addWidget(mUnitsCombo);
 =

     setFocusProxy(mUnitsCombo);
     setTabOrder(mUnitsCombo, mSpinStack);
diff --git a/kalarm/recurrenceedit.cpp b/kalarm/recurrenceedit.cpp
index 99110af..412cfe9 100644
--- a/kalarm/recurrenceedit.cpp
+++ b/kalarm/recurrenceedit.cpp
@@ -38,7 +38,6 @@
 #include "timespinbox.h"
 #include "buttongroup.h"
 =

-#include <KHBox>
 #include <kalarmcal/kaevent.h>
 #include <kalarmcal/karecurrence.h>
 =

@@ -52,6 +51,7 @@ using namespace KCalCore;
 #include <kdialog.h>
 #include <kmessagebox.h>
 #include <kdatecombobox.h>
+#include <KHBox>
 =

 #include <QPushButton>
 #include <QLabel>