[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kdepim/frameworks] /: Fix includes
From: Christophe Giboudeaux <cgiboudeaux () gmx ! com>
Date: 2014-04-30 19:27:32
Message-ID: E1WfaAG-00020k-CT () scm ! kde ! org
[Download RAW message or body]
Git commit d038d839285d25df49cffee80be141264d289213 by Christophe Giboudeaux.
Committed on 30/04/2014 at 19:29.
Pushed by cgiboudeaux into branch 'frameworks'.
Fix includes
M +2 -2 akonadiconsole/akonadibrowsermodel.cpp
M +1 -1 akonadiconsole/browserwidget.cpp
M +1 -1 examples/coisceim/foldercontentswidget.cpp
M +1 -1 examples/coisceim/trip.cpp
M +2 -2 kalarm/alarmcalendar.cpp
M +2 -2 kalarm/alarmcalendar.h
M +1 -1 kalarm/dbushandler.cpp
M +1 -1 kalarm/dbushandler.h
M +1 -1 kalarm/editdlgtypes.cpp
M +4 -4 kalarm/functions.cpp
M +1 -1 kalarm/kamail.cpp
M +1 -1 kalarm/kamail.h
M +1 -1 kalarm/latecancel.cpp
M +1 -1 kalarm/lib/timeperiod.h
M +1 -1 kalarm/mainwindow.cpp
M +1 -1 kalarm/mainwindow.h
M +1 -1 kalarm/recurrenceedit.cpp
M +1 -1 kalarm/reminder.cpp
M +2 -2 kontact/plugins/korganizer/tests/summaryeventtest.cpp
M +1 -1 messageviewer/tests/eventedittest.cpp
M +1 -1 messageviewer/tests/todoedittest.cpp
M +4 -4 mobile/calendar/eventsexporthandler.cpp
M +4 -4 mobile/calendar/eventsimporthandler.cpp
M +2 -2 mobile/calendar/mainview.cpp
M +2 -2 mobile/calendar/searchwidget.cpp
M +1 -1 mobile/lib/calendar/incidenceview.h
M +1 -1 mobile/tasks/mainview.cpp
M +1 -1 mobile/tasks/searchwidget.cpp
M +4 -4 mobile/tasks/tasksexporthandler.cpp
M +4 -4 mobile/tasks/tasksimporthandler.cpp
M +1 -1 mobile/tasks/taskthreadgroupercomparator.cpp
http://commits.kde.org/kdepim/d038d839285d25df49cffee80be141264d289213
diff --git a/akonadiconsole/akonadibrowsermodel.cpp \
b/akonadiconsole/akonadibrowsermodel.cpp index e10284b..ad6ece4 100644
--- a/akonadiconsole/akonadibrowsermodel.cpp
+++ b/akonadiconsole/akonadibrowsermodel.cpp
@@ -25,8 +25,8 @@
#include <KABC/addressee.h>
#include <KABC/contactgroup.h>
-#include <KCalCore/incidence.h>
-#include <KCalCore/event.h>
+#include <KCalCore/Incidence>
+#include <KCalCore/Event>
#include <boost/shared_ptr.hpp>
diff --git a/akonadiconsole/browserwidget.cpp b/akonadiconsole/browserwidget.cpp
index d420634..78d193b 100644
--- a/akonadiconsole/browserwidget.cpp
+++ b/akonadiconsole/browserwidget.cpp
@@ -50,7 +50,7 @@
#include <KABC/addressee.h>
#include <KABC/contactgroup.h>
-#include <KCalCore/incidence.h>
+#include <KCalCore/Incidence>
#include <kdebug.h>
#include <kconfig.h>
diff --git a/examples/coisceim/foldercontentswidget.cpp \
b/examples/coisceim/foldercontentswidget.cpp index bc2f074..b3b84c3 100644
--- a/examples/coisceim/foldercontentswidget.cpp
+++ b/examples/coisceim/foldercontentswidget.cpp
@@ -34,7 +34,7 @@
#include <KMime/kmime_message.h>
-#include <KCalCore/todo.h>
+#include <KCalCore/Todo>
#include "trip.h"
#include "note.h"
diff --git a/examples/coisceim/trip.cpp b/examples/coisceim/trip.cpp
index c9749e9..fa10500 100644
--- a/examples/coisceim/trip.cpp
+++ b/examples/coisceim/trip.cpp
@@ -25,7 +25,7 @@
#include <AkonadiCore/ChangeRecorder>
-#include <KCalCore/incidence.h>
+#include <KCalCore/Incidence>
#include "tripcomponentfactory.h"
#include "tripmodel.h"
diff --git a/kalarm/alarmcalendar.cpp b/kalarm/alarmcalendar.cpp
index fccae5b..7bc5522 100644
--- a/kalarm/alarmcalendar.cpp
+++ b/kalarm/alarmcalendar.cpp
@@ -36,8 +36,8 @@
#include "preferences.h"
#ifdef USE_AKONADI
-#include <KCalCore/memorycalendar.h>
-#include <KCalCore/icalformat.h>
+#include <KCalCore/MemoryCalendar>
+#include <KCalCore/IcalFormat>
#else
#include <kcal/calendarlocal.h>
#include <kcal/icalformat.h>
diff --git a/kalarm/alarmcalendar.h b/kalarm/alarmcalendar.h
index 948af1b..5318fe5 100644
--- a/kalarm/alarmcalendar.h
+++ b/kalarm/alarmcalendar.h
@@ -32,8 +32,8 @@
#ifdef USE_AKONADI
#include <AkonadiCore/collection.h>
-#include <KCalCore/filestorage.h>
-#include <KCalCore/event.h>
+#include <KCalCore/FileStorage>
+#include <KCalCore/Event>
#include <QHash>
#endif
#include <kurl.h>
diff --git a/kalarm/dbushandler.cpp b/kalarm/dbushandler.cpp
index fab51ab..2a98e08 100644
--- a/kalarm/dbushandler.cpp
+++ b/kalarm/dbushandler.cpp
@@ -34,7 +34,7 @@
#include <KAlarmCal/karecurrence.h>
#ifdef USE_AKONADI
-#include <KCalCore/duration.h>
+#include <KCalCore/Duration>
using namespace KCalCore;
#else
#include <kcal/duration.h>
diff --git a/kalarm/dbushandler.h b/kalarm/dbushandler.h
index 10d3237..3ac97d5 100644
--- a/kalarm/dbushandler.h
+++ b/kalarm/dbushandler.h
@@ -26,7 +26,7 @@
#include <KAlarmCal/kaevent.h>
#ifdef USE_AKONADI
-#include <KCalCore/duration.h>
+#include <KCalCore/Duration>
#else
#include <kcal/duration.h>
#endif
diff --git a/kalarm/editdlgtypes.cpp b/kalarm/editdlgtypes.cpp
index 4eb7eb0..1aa5dee 100644
--- a/kalarm/editdlgtypes.cpp
+++ b/kalarm/editdlgtypes.cpp
@@ -51,7 +51,7 @@
#include <Akonadi/Contact/emailaddressselectiondialog.h>
#ifdef USE_AKONADI
-#include <KCalCore/person.h>
+#include <KCalCore/Person>
#include <KCalUtils/icaldrag.h>
using namespace KCalCore;
#else
diff --git a/kalarm/functions.cpp b/kalarm/functions.cpp
index ceafb98..ba3777d 100644
--- a/kalarm/functions.cpp
+++ b/kalarm/functions.cpp
@@ -48,10 +48,10 @@
#include <KAlarmCal/kaevent.h>
#ifdef USE_AKONADI
-#include <KCalCore/event.h>
-#include <KCalCore/icalformat.h>
-#include <KCalCore/person.h>
-#include <KCalCore/duration.h>
+#include <KCalCore/Event>
+#include <KCalCore/IcalFormat>
+#include <KCalCore/Person>
+#include <KCalCore/Duration>
using namespace KCalCore;
#else
#include <kcal/event.h>
diff --git a/kalarm/kamail.cpp b/kalarm/kamail.cpp
index 2f707ba..54d8c6a 100644
--- a/kalarm/kamail.cpp
+++ b/kalarm/kamail.cpp
@@ -36,7 +36,7 @@
#include <MailTransport/transport.h>
#include <MailTransport/messagequeuejob.h>
#ifdef USE_AKONADI
-#include <KCalCore/person.h>
+#include <KCalCore/Person>
#else
#include <kcal/person.h>
#endif
diff --git a/kalarm/kamail.h b/kalarm/kamail.h
index 63b2225..8745d71 100644
--- a/kalarm/kamail.h
+++ b/kalarm/kamail.h
@@ -24,7 +24,7 @@
#include <KAlarmCal/kaevent.h>
#ifdef USE_AKONADI
-#include <KCalCore/person.h>
+#include <KCalCore/Person>
#else
#include <kcal/person.h>
#endif
diff --git a/kalarm/latecancel.cpp b/kalarm/latecancel.cpp
index 1b655e2..6416f79 100644
--- a/kalarm/latecancel.cpp
+++ b/kalarm/latecancel.cpp
@@ -24,7 +24,7 @@
#include "checkbox.h"
#ifdef USE_AKONADI
-#include <KCalCore/duration.h>
+#include <KCalCore/Duration>
using namespace KCalCore;
#else
#include <kcal/duration.h>
diff --git a/kalarm/lib/timeperiod.h b/kalarm/lib/timeperiod.h
index 16da74b..cdd927b 100644
--- a/kalarm/lib/timeperiod.h
+++ b/kalarm/lib/timeperiod.h
@@ -22,7 +22,7 @@
#define TIMEPERIOD_H
#ifdef USE_AKONADI
-#include <KCalCore/duration.h>
+#include <KCalCore/Duration>
#else
#include <kcal/duration.h>
#endif
diff --git a/kalarm/mainwindow.cpp b/kalarm/mainwindow.cpp
index 9a5b849..ed88df9 100644
--- a/kalarm/mainwindow.cpp
+++ b/kalarm/mainwindow.cpp
@@ -52,7 +52,7 @@
#include <libkdepim/misc/maillistdrag.h>
#include <KMime/kmime_content.h>
#ifdef USE_AKONADI
-#include <KCalCore/memorycalendar.h>
+#include <KCalCore/MemoryCalendar>
#include <KCalUtils/icaldrag.h>
#include <AkonadiCore/control.h>
using namespace KCalCore;
diff --git a/kalarm/mainwindow.h b/kalarm/mainwindow.h
index 14188ab..fbf1cb0 100644
--- a/kalarm/mainwindow.h
+++ b/kalarm/mainwindow.h
@@ -34,7 +34,7 @@
#ifdef USE_AKONADI
#include <AkonadiCore/item.h>
-#include <KCalCore/calendar.h>
+#include <KCalCore/Calendar>
#else
#include <kcal/calendar.h>
#endif
diff --git a/kalarm/recurrenceedit.cpp b/kalarm/recurrenceedit.cpp
index 58a7f65..f6b9937 100644
--- a/kalarm/recurrenceedit.cpp
+++ b/kalarm/recurrenceedit.cpp
@@ -42,7 +42,7 @@
#include <KAlarmCal/karecurrence.h>
#ifdef USE_AKONADI
-#include <KCalCore/event.h>
+#include <KCalCore/Event>
using namespace KCalCore;
#else
#include <kcal/event.h>
diff --git a/kalarm/reminder.cpp b/kalarm/reminder.cpp
index 77afaa1..34b248f 100644
--- a/kalarm/reminder.cpp
+++ b/kalarm/reminder.cpp
@@ -27,7 +27,7 @@
#include "reminder.h"
#ifdef USE_AKONADI
-#include <KCalCore/duration.h>
+#include <KCalCore/Duration>
using namespace KCalCore;
#else
#include <kcal/duration.h>
diff --git a/kontact/plugins/korganizer/tests/summaryeventtest.cpp \
b/kontact/plugins/korganizer/tests/summaryeventtest.cpp index b5941cf..7b25d65 100644
--- a/kontact/plugins/korganizer/tests/summaryeventtest.cpp
+++ b/kontact/plugins/korganizer/tests/summaryeventtest.cpp
@@ -22,8 +22,8 @@
#include "summaryeventtest.h"
#include "../summaryeventinfo.h"
-#include <KCalCore/event.h>
-#include <KCalCore/memorycalendar.h>
+#include <KCalCore/Event>
+#include <KCalCore/MemoryCalendar>
QTEST_KDEMAIN_CORE( SummaryEventTester )
diff --git a/messageviewer/tests/eventedittest.cpp \
b/messageviewer/tests/eventedittest.cpp index 59b1071..c8a2aa6 100644
--- a/messageviewer/tests/eventedittest.cpp
+++ b/messageviewer/tests/eventedittest.cpp
@@ -24,7 +24,7 @@
#include <AkonadiWidgets/CollectionComboBox>
#include <AkonadiCore/EntityTreeModel>
#include <QStandardItemModel>
-#include <KCalCore/event.h>
+#include <KCalCore/Event>
#include <KDateTimeEdit>
#include <qtest_kde.h>
diff --git a/messageviewer/tests/todoedittest.cpp \
b/messageviewer/tests/todoedittest.cpp index 3d19108..31b9e94 100644
--- a/messageviewer/tests/todoedittest.cpp
+++ b/messageviewer/tests/todoedittest.cpp
@@ -22,7 +22,7 @@
#include <AkonadiWidgets/CollectionComboBox>
#include <AkonadiCore/EntityTreeModel>
#include <QStandardItemModel>
-#include <KCalCore/todo.h>
+#include <KCalCore/Todo>
#include <qtest_kde.h>
#include <qtestkeyboard.h>
#include <qtestmouse.h>
diff --git a/mobile/calendar/eventsexporthandler.cpp \
b/mobile/calendar/eventsexporthandler.cpp index 47fe9d6..a8152ab 100644
--- a/mobile/calendar/eventsexporthandler.cpp
+++ b/mobile/calendar/eventsexporthandler.cpp
@@ -19,10 +19,10 @@
#include "eventsexporthandler.h"
-#include <KCalCore/event.h>
-#include <KCalCore/filestorage.h>
-#include <KCalCore/icalformat.h>
-#include <KCalCore/memorycalendar.h>
+#include <KCalCore/Event>
+#include <KCalCore/FileStorage>
+#include <KCalCore/IcalFormat>
+#include <KCalCore/MemoryCalendar>
#include <kfiledialog.h>
#include <klocale.h>
diff --git a/mobile/calendar/eventsimporthandler.cpp \
b/mobile/calendar/eventsimporthandler.cpp index 59e550c..2db20fd 100644
--- a/mobile/calendar/eventsimporthandler.cpp
+++ b/mobile/calendar/eventsimporthandler.cpp
@@ -19,10 +19,10 @@
#include "eventsimporthandler.h"
-#include <KCalCore/event.h>
-#include <KCalCore/filestorage.h>
-#include <KCalCore/icalformat.h>
-#include <KCalCore/memorycalendar.h>
+#include <KCalCore/Event>
+#include <KCalCore/FileStorage>
+#include <KCalCore/IcalFormat>
+#include <KCalCore/MemoryCalendar>
#include <klocale.h>
#include <kmessagebox.h>
diff --git a/mobile/calendar/mainview.cpp b/mobile/calendar/mainview.cpp
index 3eb8806..7fe099d 100644
--- a/mobile/calendar/mainview.cpp
+++ b/mobile/calendar/mainview.cpp
@@ -65,8 +65,8 @@
#include <calendarviews/month/monthview.h>
#include <kaction.h>
#include <kactioncollection.h>
-#include <KCalCore/event.h>
-#include <KCalCore/todo.h>
+#include <KCalCore/Event>
+#include <KCalCore/Todo>
#include <kcolorcombo.h>
#include <kcolordialog.h>
#include <kmessagebox.h>
diff --git a/mobile/calendar/searchwidget.cpp b/mobile/calendar/searchwidget.cpp
index e0677e7..250448b 100644
--- a/mobile/calendar/searchwidget.cpp
+++ b/mobile/calendar/searchwidget.cpp
@@ -21,8 +21,8 @@
#include "stylesheetloader.h"
-#include <KCalCore/event.h>
-#include <KCalCore/todo.h>
+#include <KCalCore/Event>
+#include <KCalCore/Todo>
#include <QtCore/QDate>
#include <qplatformdefs.h>
diff --git a/mobile/lib/calendar/incidenceview.h \
b/mobile/lib/calendar/incidenceview.h index 5aac00b..e3e5433 100644
--- a/mobile/lib/calendar/incidenceview.h
+++ b/mobile/lib/calendar/incidenceview.h
@@ -22,7 +22,7 @@
#include <AkonadiCore/Collection>
#include <AkonadiCore/Item>
-#include <KCalCore/incidence.h>
+#include <KCalCore/Incidence>
#include <incidenceeditor-ng/combinedincidenceeditor.h>
#include <incidenceeditor-ng/editoritemmanager.h>
diff --git a/mobile/tasks/mainview.cpp b/mobile/tasks/mainview.cpp
index 3f4defd..b92880f 100644
--- a/mobile/tasks/mainview.cpp
+++ b/mobile/tasks/mainview.cpp
@@ -57,7 +57,7 @@
#include <kaction.h>
#include <kactioncollection.h>
-#include <KCalCore/todo.h>
+#include <KCalCore/Todo>
#include <QDebug>
#include <KGlobal>
#include <klocale.h>
diff --git a/mobile/tasks/searchwidget.cpp b/mobile/tasks/searchwidget.cpp
index f652ac2..88555d8 100644
--- a/mobile/tasks/searchwidget.cpp
+++ b/mobile/tasks/searchwidget.cpp
@@ -21,7 +21,7 @@
#include "stylesheetloader.h"
-#include <KCalCore/todo.h>
+#include <KCalCore/Todo>
#include <QtCore/QDate>
#include <QtCore/QDebug>
diff --git a/mobile/tasks/tasksexporthandler.cpp \
b/mobile/tasks/tasksexporthandler.cpp index 25cc226..46e9d45 100644
--- a/mobile/tasks/tasksexporthandler.cpp
+++ b/mobile/tasks/tasksexporthandler.cpp
@@ -19,10 +19,10 @@
#include "tasksexporthandler.h"
-#include <KCalCore/filestorage.h>
-#include <KCalCore/icalformat.h>
-#include <KCalCore/memorycalendar.h>
-#include <KCalCore/todo.h>
+#include <KCalCore/FileStorage>
+#include <KCalCore/IcalFormat>
+#include <KCalCore/MemoryCalendar>
+#include <KCalCore/Todo>
#include <kfiledialog.h>
#include <klocale.h>
diff --git a/mobile/tasks/tasksimporthandler.cpp \
b/mobile/tasks/tasksimporthandler.cpp index 18e9611..fa1a98e 100644
--- a/mobile/tasks/tasksimporthandler.cpp
+++ b/mobile/tasks/tasksimporthandler.cpp
@@ -19,10 +19,10 @@
#include "tasksimporthandler.h"
-#include <KCalCore/filestorage.h>
-#include <KCalCore/icalformat.h>
-#include <KCalCore/memorycalendar.h>
-#include <KCalCore/todo.h>
+#include <KCalCore/FileStorage>
+#include <KCalCore/IcalFormat>
+#include <KCalCore/MemoryCalendar>
+#include <KCalCore/Todo>
#include <klocale.h>
#include <kmessagebox.h>
diff --git a/mobile/tasks/taskthreadgroupercomparator.cpp \
b/mobile/tasks/taskthreadgroupercomparator.cpp index 7b2c5d3..9aaf251 100644
--- a/mobile/tasks/taskthreadgroupercomparator.cpp
+++ b/mobile/tasks/taskthreadgroupercomparator.cpp
@@ -24,7 +24,7 @@
#include "settings.h"
#include <calendarsupport/utils.h>
-#include <KCalCore/todo.h>
+#include <KCalCore/Todo>
#include <QDebug>
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic