Fix includes

alarmcalendar.cpp

@@ -32,14 +32,13 @@
 #include <KCalCore/MemoryCalendar>
 #include <KCalCore/ICalFormat>
 
+#include <KTimeZone>
 #include <kglobal.h>
 #include <KLocalizedString>
 #include <kstandarddirs.h>
-#include <K4AboutData>
 #include <kio/netaccess.h>
 #include <kfileitem.h>
 #include <QTemporaryFile>
-#include <KTimeZone>
 #include <KSharedConfig>
 #include <QStandardPaths>
 #include <qdebug.h>

autostart/autostart.cpp

@@ -30,7 +30,6 @@
 #include <QTimer>
 #include <QtDBus/QtDBus>
 #include <QStandardPaths>
-#include <QDebug>
 
 // Number of seconds to wait before autostarting KAlarm.
 // Allow plenty of time for session restoration to happen first.

birthdaymodel.cpp

@@ -31,7 +31,6 @@
 #include <kabc/addressee.h>
 
 #include <kglobal.h>
-#include <KLocalizedString>
 #include <QLocale>
 
 using namespace KAlarmCal;

kamail.cpp

@@ -39,14 +39,12 @@
 #include <kmime/kmime_headers.h>
 #include <kmime/kmime_message.h>
 
+#include <K4AboutData>
 #include <KLocale>
-#include <KTimeZone>
 #include <KUrl>
 #include <KLocalizedString>
-#include <K4AboutData>
 #include <kfileitem.h>
 #include <kio/netaccess.h>
-#include <QTemporaryFile>
 #include <kemailsettings.h>
 #include <kcodecs.h>
 #include <kcharsets.h>

lib/synchtimer.cpp

@@ -23,7 +23,8 @@
 
 #include <QTimer>
 #include <qdebug.h>
-
+#include <QDateTime>
+#include <QTime>
 
 /*=============================================================================
 =  Class: SynchTimer

lib/timeedit.h

@@ -22,7 +22,7 @@
 #define TIMEEDIT_H
 
 #include <khbox.h>
-
+#include <QTime>
 class ComboBox;
 class TimeSpinBox;
 

lib/timespinbox.h

@@ -22,8 +22,7 @@
 #define TIMESPINBOX_H
 
 #include "spinbox2.h"
-#include <QDateTime>
-
+#include <QTime>
 
 /**
  *  @short Hours/minutes time entry widget.

mainwindow.cpp

@@ -51,7 +51,8 @@
 #include <AkonadiCore/control.h>
 using namespace KCalCore;
 using namespace KCalUtils;
-
+#include <KLocale>
+#include <K4AboutData>
 #include <ktoolbar.h>
 #include <kactioncollection.h>
 #include <ksystemtrayicon.h>
@@ -64,12 +65,10 @@ using namespace KCalUtils;
 #include <kshortcutsdialog.h>
 #include <kedittoolbar.h>
 #include <kxmlguifactory.h>
-#include <K4AboutData>
 #include <ktoggleaction.h>
 #include <ktoolbarpopupaction.h>
-#include <KTimeZone>
-#include <KGlobal>
 #include <KShortcut>
+#include <KTimeZone>
 
 #include <QAction>
 #include <QSplitter>
@@ -79,7 +78,6 @@ using namespace KCalUtils;
 #include <QResizeEvent>
 #include <QCloseEvent>
 #include <QDesktopWidget>
-#include <QMenuBar>
 #include <QMenu>
 #include <qinputdialog.h>
 #include <qdebug.h>

messagewin.cpp

@@ -39,10 +39,9 @@
 #include "synchtimer.h"
 
 //QT5 #include "kspeechinterface.h"
-
-
-#include <kstandardguiitem.h>
 #include <K4AboutData>
+#include <KLocale>
+#include <kstandardguiitem.h>
 #include <KLocalizedString>
 #include <kconfig.h>
 #include <kiconloader.h>
@@ -62,9 +61,7 @@
 #include <netwm.h>
 #include <qx11info_x11.h>
 #endif
-#include <KGlobal>
 
-#include <QAction>
 #include <qtextbrowser.h>
 #include <QPushButton>
 #include <QScrollBar>

timeselector.cpp

@@ -24,7 +24,6 @@
 #include "combobox.h"
 #include "timeselector.h"
 
-#include <KLocalizedString>
 #include <kdialog.h>
 #include <QHBoxLayout>
 #include <qdebug.h>

traywindow.cpp

@@ -39,18 +39,18 @@
 #include <ktoggleaction.h>
 #include <kapplication.h>
 #include <KLocalizedString>
-#include <K4AboutData>
 #include <kmessagebox.h>
 #include <kstandardaction.h>
 #include <kstandardguiitem.h>
 #include <kiconeffect.h>
 #include <kconfig.h>
-#include <KGlobal>
 #include <KIconLoader>
+#include <KLocale>
+#include <K4AboutData>
 
+#include <QMenu>
 #include <QList>
 #include <QTimer>
-#include <QMenu>
 #include <qdebug.h>
 
 #include <stdlib.h>