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

List:       kde-commits
Subject:    [kdepim] kalarm: Tidy
From:       David Jarvie <djarvie () kde ! org>
Date:       2014-08-31 23:07:56
Message-ID: E1XOEE0-0003Cn-Jg () scm ! kde ! org
[Download RAW message or body]

Git commit 87e54008cd913d6ae59ea59636339da88cb37763 by David Jarvie.
Committed on 31/08/2014 at 23:10.
Pushed by djarvie into branch 'master'.

Tidy

M  +3    -5    kalarm/templatepickdlg.cpp
M  +1    -1    kalarm/templatepickdlg.h

http://commits.kde.org/kdepim/87e54008cd913d6ae59ea59636339da88cb37763

diff --git a/kalarm/templatepickdlg.cpp b/kalarm/templatepickdlg.cpp
index ff7e693..a247a18 100644
--- a/kalarm/templatepickdlg.cpp
+++ b/kalarm/templatepickdlg.cpp
@@ -26,13 +26,13 @@
 #include "templatelistview.h"
 
 #include <KLocalizedString>
+#include <KConfigGroup>
 
 #include <QVBoxLayout>
 #include <QResizeEvent>
-#include <qdebug.h>
-#include <KConfigGroup>
 #include <QDialogButtonBox>
 #include <QPushButton>
+#include <qdebug.h>
 
 static const char TMPL_PICK_DIALOG_NAME[] = "TemplatePickDialog";
 
@@ -46,16 +46,14 @@ TemplatePickDlg::TemplatePickDlg(KAEvent::Actions type, QWidget* parent)
     mainLayout->addWidget(topWidget);
     setWindowTitle(i18nc("@title:window", "Choose Alarm Template"));
     QDialogButtonBox* buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok|QDialogButtonBox::Cancel);
+    mainLayout->addWidget(buttonBox);
     mOkButton = buttonBox->button(QDialogButtonBox::Ok);
     mOkButton->setDefault(true);
     mOkButton->setShortcut(Qt::CTRL | Qt::Key_Return);
     connect(buttonBox, SIGNAL(accepted()), this, SLOT(accept()));
     connect(buttonBox, SIGNAL(rejected()), this, SLOT(reject()));
-    mainLayout->addWidget(buttonBox);
-    mOkButton->setDefault(true);
     QVBoxLayout* topLayout = new QVBoxLayout(topWidget);
     topLayout->setMargin(0);
-    //QT5 topLayout->setSpacing(spacingHint());
 
     // Display the list of templates, but exclude command alarms if in kiosk mode.
     KAEvent::Actions shown = KAEvent::ACT_ALL;
diff --git a/kalarm/templatepickdlg.h b/kalarm/templatepickdlg.h
index e9e17e0..8b65468 100644
--- a/kalarm/templatepickdlg.h
+++ b/kalarm/templatepickdlg.h
@@ -44,7 +44,7 @@ class TemplatePickDlg : public QDialog
     private:
         TemplateListModel* mListFilterModel;
         TemplateListView*  mListView;
-        QPushButton* mOkButton;
+        QPushButton*       mOkButton;
 };
 
 #endif // TEMPLATEPICKDLG_H
[prev in list] [next in list] [prev in thread] [next in thread]