Commit 0c9d64a2 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Adapt to KCalendarCore namespace change

parent cf2b3f35
......@@ -32,4 +32,4 @@
*/
// DOXYGEN_PROJECTNAME=KAlarm Library
// DOXYGEN_REFERENCES=kdecore kcalcore kholidays kpimidentities akonadi
// DOXYGEN_REFERENCES=kdecore kcalendarcore kholidays kpimidentities akonadi
......@@ -25,9 +25,9 @@
#include "kaevent.h"
using namespace KAlarmCal;
#include <kcalcore/event.h>
#include <kcalcore/alarm.h>
using namespace KCalCore;
#include <kcalendarcore/event.h>
#include <kcalendarcore/alarm.h>
using namespace KCalendarCore;
#include <AkonadiCore/collection.h>
#include <KHolidays/HolidayRegion>
......
......@@ -25,7 +25,7 @@
#include "kalarmcal_export.h"
#include <kcalcore/todo.h>
#include <kcalendarcore/todo.h>
#include <AkonadiCore/item.h>
#include <QString>
......
......@@ -27,9 +27,9 @@
#include "collectionattribute.h"
#include <kcalcore/event.h>
#include <kcalcore/alarm.h>
#include <kcalcore/memorycalendar.h>
#include <kcalendarcore/event.h>
#include <kcalendarcore/alarm.h>
#include <kcalendarcore/memorycalendar.h>
#include <klocalizedstring.h>
#include "kalarmcal_debug.h"
......@@ -39,7 +39,7 @@
#include <QFileInfo>
#include <QTextStream>
using namespace KCalCore;
using namespace KCalendarCore;
using Akonadi::Collection;
namespace KAlarmCal
......
......@@ -24,15 +24,15 @@
#define KALARM_KACALENDAR_H
#include "kalarmcal_export.h"
#include <kcalcore/filestorage.h>
#include <kcalcore/calendar.h>
#include <kcalcore/event.h>
#include <kcalendarcore/filestorage.h>
#include <kcalendarcore/calendar.h>
#include <kcalendarcore/event.h>
#include <collection.h>
#include <QByteArray>
#include <QStringList>
namespace KCalCore
namespace KCalendarCore
{
class Alarm;
}
......
......@@ -26,7 +26,7 @@
#include "identities.h"
#include "version.h"
#include <kcalcore/memorycalendar.h>
#include <kcalendarcore/memorycalendar.h>
#include <KHolidays/Holiday>
#include <KHolidays/HolidayRegion>
......@@ -34,7 +34,7 @@
#include "kalarmcal_debug.h"
using namespace KCalCore;
using namespace KCalendarCore;
using namespace KHolidays;
namespace KAlarmCal
......
......@@ -32,8 +32,8 @@
#include <collection.h>
#include <item.h>
#include <kcalcore/person.h>
#include <kcalcore/calendar.h>
#include <kcalendarcore/person.h>
#include <kcalendarcore/calendar.h>
#include <AkonadiCore/item.h>
#include <QBitArray>
......
......@@ -22,8 +22,8 @@
#include "karecurrence.h"
#include <kcalcore/recurrence.h>
#include <kcalcore/icalformat.h>
#include <kcalendarcore/recurrence.h>
#include <kcalendarcore/icalformat.h>
#include "kalarmcal_debug.h"
......@@ -31,7 +31,7 @@
#include <QDate>
#include <QLocale>
using namespace KCalCore;
using namespace KCalendarCore;
namespace KAlarmCal
{
......
......@@ -26,10 +26,10 @@
#include "kalarmcal_export.h"
#include "kadatetime.h"
#include <kcalcore/recurrencerule.h>
#include <kcalcore/duration.h>
#include <kcalcore/incidencebase.h>
namespace KCalCore
#include <kcalendarcore/recurrencerule.h>
#include <kcalendarcore/duration.h>
#include <kcalendarcore/incidencebase.h>
namespace KCalendarCore
{
class Recurrence;
}
......@@ -43,7 +43,7 @@ namespace KAlarmCal
* @short Represents recurrences for KAlarm.
*
* This class represents the restricted range of recurrence types which are
* handled by KAlarm, and translates between these and the libkcalcore
* handled by KAlarm, and translates between these and the libkcalendarcore
* Recurrence class. In particular, it handles yearly recurrences on 29th
* February in non-leap years specially:
*
......@@ -51,7 +51,7 @@ namespace KAlarmCal
* February or 1st March, or not at all, in non-leap years. It allows such
* 29th February recurrences to be combined with the 29th of other months in
* a simple way, represented simply as the 29th of multiple months including
* February. For storage in the libkcalcore calendar, the 29th day of the month
* February. For storage in the libkcalendarcore calendar, the 29th day of the month
* recurrence for other months is combined with a last-day-of-February or a
* 60th-day-of-the-year recurrence rule, thereby conforming to RFC2445.
*
......@@ -61,7 +61,7 @@ class KALARMCAL_EXPORT KARecurrence
{
public:
/** The recurrence's period type.
* This is a subset of the possible KCalCore recurrence types.
* This is a subset of the possible KCalendarCore recurrence types.
*/
enum Type {
NO_RECUR, //!< does not recur
......
......@@ -23,7 +23,7 @@
#include "repetition.h"
#include "kadatetime.h"
using namespace KCalCore;
using namespace KCalendarCore;
namespace KAlarmCal
{
......
......@@ -24,7 +24,7 @@
#define KALARM_REPETITION_H
#include "kalarmcal_export.h"
#include <kcalcore/duration.h>
#include <kcalendarcore/duration.h>
namespace KAlarmCal
{
......
Markdown is supported
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