Commit 7fa25f7e authored by David Jarvie's avatar David Jarvie
Browse files

Reinstate original include order

This partially reverts commit 7107c53e.
parent 7107c53e
Pipeline #238088 passed with stage
in 1 minute and 40 seconds
......@@ -8,18 +8,18 @@
#include "birthdaydlg.h"
#include "akonadiplugin/akonadiplugin.h"
#include "editdlgtypes.h"
#include "fontcolourbutton.h"
#include "latecancel.h"
#include "lib/checkbox.h"
#include "lib/shellprocess.h"
#include "preferences.h"
#include "reminder.h"
#include "repetitionbutton.h"
#include "resourcescalendar.h"
#include "soundpicker.h"
#include "specialactions.h"
#include "lib/checkbox.h"
#include "lib/shellprocess.h"
#include "akonadiplugin/akonadiplugin.h"
#include <KLocalizedString>
#include <KConfigGroup>
......@@ -37,6 +37,7 @@
#include <QDialogButtonBox>
#include <QSortFilterProxyModel>
BirthdayDlg::BirthdayDlg(QWidget* parent)
: QDialog(parent)
{
......
......@@ -9,10 +9,10 @@
#include "commandoptions.h"
#include "functions.h"
#include "kalarm_debug.h"
#include "kalarmcalendar/identities.h"
#include "kamail.h"
#include "preferences.h"
#include "kalarmcalendar/identities.h"
#include "kalarm_debug.h"
#include <kpimtextedit/kpimtextedit-texttospeech.h>
#include <KLocalizedString>
......
......@@ -9,13 +9,13 @@
#include "dbushandler.h"
#include "functions.h"
#include "kalarm_debug.h"
#include "kalarmapp.h"
#include "kalarmcalendar/identities.h"
#include "kalarmcalendar/karecurrence.h"
#include "kamail.h"
#include "resources/resources.h"
#include <kalarmadaptor.h>
#include "kalarmcalendar/identities.h"
#include "kalarmcalendar/karecurrence.h"
#include "kalarm_debug.h"
using namespace KCalendarCore;
......
......@@ -9,9 +9,9 @@
#include "deferdlg.h"
#include "alarmtimewidget.h"
#include "kalarmcalendar/kaevent.h"
#include "lib/messagebox.h"
#include "resources/resources.h"
#include "lib/messagebox.h"
#include "kalarmcalendar/kaevent.h"
#include <KLocalizedString>
......
......@@ -10,10 +10,10 @@
#include "alarmlistview.h"
#include "eventlistview.h"
#include "kalarmcalendar/kaevent.h"
#include "lib/messagebox.h"
#include "preferences.h"
#include "resources/eventmodel.h"
#include "lib/messagebox.h"
#include "kalarmcalendar/kaevent.h"
#include <KFindDialog>
#include <KFind>
......
......@@ -15,10 +15,11 @@
#include <QEvent>
#include <QGroupBox>
#include <QHBoxLayout>
#include <QLabel>
#include <QHBoxLayout>
#include <QVBoxLayout>
FontColourChooser::FontColourChooser(QWidget* parent, const QStringList& fontList,
const QString& frameLabel, bool fg, bool defaultFont, int visibleListSize)
: QWidget(parent)
......
......@@ -9,24 +9,24 @@
#include "functions.h"
#include "functions_p.h"
#include "akonadiplugin/akonadiplugin.h"
#include "displaycalendar.h"
#include "kalarm_debug.h"
#include "kalarmapp.h"
#include "kalarmcalendar/identities.h"
#include "kamail.h"
#include "lib/autoqpointer.h"
#include "lib/dragdrop.h"
#include "lib/filedialog.h"
#include "lib/messagebox.h"
#include "lib/shellprocess.h"
#include "mainwindow.h"
#include "preferences.h"
#include "resourcescalendar.h"
#include "resources/calendarfunctions.h"
#include "resources/datamodel.h"
#include "resources/eventmodel.h"
#include "resources/resources.h"
#include "resourcescalendar.h"
#include "lib/autoqpointer.h"
#include "lib/dragdrop.h"
#include "lib/filedialog.h"
#include "lib/messagebox.h"
#include "lib/shellprocess.h"
#include "kalarmcalendar/identities.h"
#include "akonadiplugin/akonadiplugin.h"
#include "kalarm_debug.h"
#include <KCalendarCore/Event>
#include <KCalendarCore/ICalFormat>
......
......@@ -8,26 +8,26 @@
#include "kalarmapp.h"
#include "kalarm.h"
#include "commandoptions.h"
#include "dbushandler.h"
#include "dbusproperties.h" // DBUS-generated
#include "displaycalendar.h"
#include "editdlgtypes.h"
#include "functions.h"
#include "kalarm.h"
#include "kamail.h"
#include "lib/desktop.h"
#include "lib/messagebox.h"
#include "mainwindow.h"
#include "messagenotification.h"
#include "messagewindow.h"
#include "notifications_interface.h" // DBUS-generated
#include "pluginmanager.h"
#include "resources/datamodel.h"
#include "resources/resources.h"
#include "resourcescalendar.h"
#include "startdaytimer.h"
#include "traywindow.h"
#include "resources/datamodel.h"
#include "resources/resources.h"
#include "lib/desktop.h"
#include "lib/messagebox.h"
#include "notifications_interface.h" // DBUS-generated
#include "dbusproperties.h" // DBUS-generated
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
#include "migratekde4files.h"
#endif
......
......@@ -8,14 +8,14 @@
#include "kamail.h"
#include "akonadiplugin/akonadiplugin.h"
#include "kalarm.h"
#include "kalarm_debug.h"
#include "kalarmapp.h"
#include "kalarmcalendar/identities.h"
#include "lib/messagebox.h"
#include "mainwindow.h"
#include "preferences.h"
#include "lib/messagebox.h"
#include "kalarmcalendar/identities.h"
#include "akonadiplugin/akonadiplugin.h"
#include "kalarm_debug.h"
#include "kmailinterface.h"
......
......@@ -11,27 +11,27 @@
#include "alarmlistdelegate.h"
#include "alarmlistview.h"
#include "birthdaydlg.h"
#include "config-kalarm.h"
#include "datepicker.h"
#include "deferdlg.h"
#include "functions.h"
#include "kalarm_debug.h"
#include "kalarmapp.h"
#include "kalarmcalendar/alarmtext.h"
#include "lib/autoqpointer.h"
#include "lib/dragdrop.h"
#include "lib/messagebox.h"
#include "newalarmaction.h"
#include "prefdlg.h"
#include "preferences.h"
#include "resources/datamodel.h"
#include "resources/eventmodel.h"
#include "resources/resources.h"
#include "resourcescalendar.h"
#include "resourceselector.h"
#include "templatedlg.h"
#include "traywindow.h"
#include "wakedlg.h"
#include "resources/datamodel.h"
#include "resources/eventmodel.h"
#include "resources/resources.h"
#include "lib/autoqpointer.h"
#include "lib/dragdrop.h"
#include "lib/messagebox.h"
#include "kalarmcalendar/alarmtext.h"
#include "config-kalarm.h"
#include "kalarm_debug.h"
#include <KCalUtils/ICalDrag>
#include <KCalendarCore/MemoryCalendar>
......
......@@ -9,10 +9,10 @@
#include "messagenotification.h"
#include "messagedisplayhelper.h"
#include "kalarm_debug.h"
#include "lib/file.h"
#include "mainwindow.h"
#include "resourcescalendar.h"
#include "lib/file.h"
#include "kalarm_debug.h"
#include <KAboutData>
#include <KLocalizedString>
......
......@@ -8,11 +8,11 @@
#include "newalarmaction.h"
#include "lib/shellprocess.h"
#include "templatemenuaction.h"
#include "resources/datamodel.h"
#include "resources/eventmodel.h"
#include "resources/resources.h"
#include "templatemenuaction.h"
#include "resources/eventmodel.h"
#include "lib/shellprocess.h"
#include <KActionCollection>
#include <KGlobalAccel>
......
......@@ -12,9 +12,8 @@
#include "recurrenceedit.h"
#include "recurrenceedit_p.h"
#include "kalarm_debug.h"
#include "kalarmcalendar/kaevent.h"
#include "kalarmcalendar/karecurrence.h"
#include "preferences.h"
#include "repetitionbutton.h"
#include "lib/buttongroup.h"
#include "lib/checkbox.h"
#include "lib/combobox.h"
......@@ -23,8 +22,9 @@
#include "lib/spinbox.h"
#include "lib/timeedit.h"
#include "lib/timespinbox.h"
#include "preferences.h"
#include "repetitionbutton.h"
#include "kalarmcalendar/kaevent.h"
#include "kalarmcalendar/karecurrence.h"
#include "kalarm_debug.h"
#include <KCalendarCore/Event>
......
......@@ -8,11 +8,11 @@
#include "reminder.h"
#include "kalarmcalendar/kadatetime.h"
#include "lib/checkbox.h"
#include "lib/combobox.h"
#include "preferences.h"
#include "timeselector.h"
#include "lib/checkbox.h"
#include "lib/combobox.h"
#include "kalarmcalendar/kadatetime.h"
#include <KCalendarCore/Duration>
......
......@@ -8,9 +8,10 @@
#include "eventmodel.h"
#include "preferences.h"
#include "resourcedatamodelbase.h"
#include "resources.h"
#include "preferences.h"
/*============================================================================*/
......
......@@ -8,10 +8,10 @@
#include "fileresourceconfigmanager.h"
#include "fileresourcecalendarupdater.h"
#include "kalarm_debug.h"
#include "resources.h"
#include "singlefileresource.h"
#include "fileresourcecalendarupdater.h"
#include "kalarm_debug.h"
#include <KConfig>
#include <KConfigGroup>
......
......@@ -8,10 +8,10 @@
#include "resourcemodel.h"
#include "kalarm_debug.h"
#include "lib/messagebox.h"
#include "resourcedatamodelbase.h"
#include "resources.h"
#include "lib/messagebox.h"
#include "kalarm_debug.h"
#include <KLocalizedString>
......
......@@ -11,8 +11,8 @@
#include "resourcedatamodelbase.h"
#include "resourceselectdialog.h"
#include "kalarm_debug.h"
#include "lib/autoqpointer.h"
#include "kalarm_debug.h"
#include <KLocalizedString>
......
......@@ -13,18 +13,18 @@
#include "resourceselector.h"
#include "functions.h"
#include "kalarm_debug.h"
#include "kalarmapp.h"
#include "lib/messagebox.h"
#include "lib/packedlayout.h"
#include "mainwindow.h"
#include "preferences.h"
#include "resourcescalendar.h"
#include "resources/datamodel.h"
#include "resources/resourcecreator.h"
#include "resources/resourcedatamodelbase.h"
#include "resources/resourcemodel.h"
#include "resources/resources.h"
#include "resourcescalendar.h"
#include "lib/messagebox.h"
#include "lib/packedlayout.h"
#include "kalarm_debug.h"
#include <KLocalizedString>
#include <KActionCollection>
......
......@@ -8,6 +8,8 @@
#include "sounddlg.h"
#include "mainwindow.h"
#include "soundpicker.h"
#include "lib/checkbox.h"
#include "lib/config.h"
#include "lib/file.h"
......@@ -16,8 +18,6 @@
#include "lib/pushbutton.h"
#include "lib/slider.h"
#include "lib/spinbox.h"
#include "mainwindow.h"
#include "soundpicker.h"
#include <KLocalizedString>
#include <phonon/MediaObject>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment