[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 18:27:47
Message-ID: E1XO9qt-0007L2-1K () scm ! kde ! org
[Download RAW message or body]

Git commit 96e68f51b156c7d62a1fd8bf948f426b8617337f by David Jarvie.
Committed on 31/08/2014 at 18:30.
Pushed by djarvie into branch 'master'.

Tidy

M  +1    -1    kalarm/alarmcalendar.cpp
M  +1    -1    kalarm/lib/synchtimer.cpp
M  +0    -1    kalarm/lib/timezonecombo.h
M  +1    -1    kalarm/main.cpp
M  +2    -2    kalarm/templatepickdlg.cpp

http://commits.kde.org/kdepim/96e68f51b156c7d62a1fd8bf948f426b8617337f

diff --git a/kalarm/alarmcalendar.cpp b/kalarm/alarmcalendar.cpp
index 5970ed6..1354b09 100644
--- a/kalarm/alarmcalendar.cpp
+++ b/kalarm/alarmcalendar.cpp
@@ -38,8 +38,8 @@
 #include <kstandarddirs.h>
 #include <kio/netaccess.h>
 #include <kfileitem.h>
-#include <QTemporaryFile>
 #include <KSharedConfig>
+#include <QTemporaryFile>
 #include <QStandardPaths>
 #include <qdebug.h>
 
diff --git a/kalarm/lib/synchtimer.cpp b/kalarm/lib/synchtimer.cpp
index 9c8cb85..f954b6d 100644
--- a/kalarm/lib/synchtimer.cpp
+++ b/kalarm/lib/synchtimer.cpp
@@ -22,9 +22,9 @@
 #include "synchtimer.h"
 
 #include <QTimer>
-#include <qdebug.h>
 #include <QDateTime>
 #include <QTime>
+#include <qdebug.h>
 
 /*=============================================================================
 =  Class: SynchTimer
diff --git a/kalarm/lib/timezonecombo.h b/kalarm/lib/timezonecombo.h
index 4f20c43..615dd59 100644
--- a/kalarm/lib/timezonecombo.h
+++ b/kalarm/lib/timezonecombo.h
@@ -48,7 +48,6 @@ class TimeZoneCombo : public ComboBox
         void setTimeZone(const KTimeZone& tz);
 
     private:
-        static bool mCatalogLoaded;
         QStringList mZoneNames;
 };
 
diff --git a/kalarm/main.cpp b/kalarm/main.cpp
index d37413a..116a0e0 100644
--- a/kalarm/main.cpp
+++ b/kalarm/main.cpp
@@ -35,7 +35,7 @@
 #define PROGRAM_NAME "kalarm"
 
 
-int main(int argc, char *argv[])
+int main(int argc, char* argv[])
 {
     Kdelibs4ConfigMigrator migrate(QLatin1String("kalarm"));
     migrate.setConfigFiles(QStringList() << QLatin1String("kalarmrc"));
diff --git a/kalarm/templatepickdlg.cpp b/kalarm/templatepickdlg.cpp
index 080459c..ff7e693 100644
--- a/kalarm/templatepickdlg.cpp
+++ b/kalarm/templatepickdlg.cpp
@@ -41,11 +41,11 @@ TemplatePickDlg::TemplatePickDlg(KAEvent::Actions type, QWidget* parent)
     : QDialog(parent)
 {
     QWidget* topWidget = new QWidget(this);
-    QVBoxLayout *mainLayout = new QVBoxLayout;
+    QVBoxLayout* mainLayout = new QVBoxLayout;
     setLayout(mainLayout);
     mainLayout->addWidget(topWidget);
     setWindowTitle(i18nc("@title:window", "Choose Alarm Template"));
-    QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok|QDialogButtonBox::Cancel);
+    QDialogButtonBox* buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok|QDialogButtonBox::Cancel);
     mOkButton = buttonBox->button(QDialogButtonBox::Ok);
     mOkButton->setDefault(true);
     mOkButton->setShortcut(Qt::CTRL | Qt::Key_Return);
[prev in list] [next in list] [prev in thread] [next in thread]