Remove USE_KRESOURCES define

CMakeLists.txt

@@ -17,25 +17,6 @@ include_directories(
   ${kcalcore_BINARY_DIR}
 )
 
-############### Build Options ###############
-
-# KALARM_USE_KRESOURCES - builds to use KResources instead of Akonadi
-option(KALARM_USE_KRESOURCES "Build to use KResources" OFF)
-
-set(USE_KRESOURCES false)
-if(KALARM_USE_KRESOURCES AND NOT KDEPIM_NO_KRESOURCES)
-    set(USE_KRESOURCES true)
-    add_definitions(
-      -DKRESOURCES_DEPRECATED=
-      -DKCAL_DEPRECATED=
-    )
-    # This one won't be needed when CMake 2.8.13 is depended on.
-    add_definitions(
-      -DKRESOURCES_DEPRECATED_EXPORT=KRESOURCES_EXPORT
-      -DKCAL_DEPRECATED_EXPORT=KCAL_EXPORT
-    )
-endif()
-
 ########### next target ###############
 set(kalarmcal_LIB_SRCS
     kacalendar.cpp
@@ -47,7 +28,6 @@ set(kalarmcal_LIB_SRCS
     repetition.cpp
     version.cpp
    )
-if(NOT USE_KRESOURCES)
     # The includes in akonadi/ use exceptions, we must enable them here for clang to be happy.
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}")
 
@@ -56,10 +36,8 @@ if(NOT USE_KRESOURCES)
 	compatibilityattribute.cpp
 	eventattribute.cpp
        )
-endif()
 
 include_directories(
-  ${CMAKE_BINARY_DIR}/kcal
   ${CMAKE_BINARY_DIR}/kcalcore
   ${CMAKE_BINARY_DIR}/akonadi
   ${CMAKE_BINARY_DIR}/kholidays
@@ -67,29 +45,14 @@ include_directories(
 )
 add_library(kalarmcal ${LIBRARY_TYPE} ${kalarmcal_LIB_SRCS})
 generate_export_header(kalarmcal)
-if(USE_KRESOURCES)
-    file(APPEND "${CMAKE_CURRENT_BINARY_DIR}/kalarmcal_export.h" "\n// This library was built to use KResources.\n// It must be rebuilt in order to use Akonadi.\n#define KALARMCAL_USE_KRESOURCES\n")
-else()
-    file(APPEND "${CMAKE_CURRENT_BINARY_DIR}/kalarmcal_export.h" "\n// This library was built to use Akonadi.\n// It must be rebuilt in order to use KResources.\n#ifdef KALARMCAL_USE_KRESOURCES\n#undef KALARMCAL_USE_KRESOURCES\n#endif\n")
-endif()
-
-if(USE_KRESOURCES)
-    target_link_libraries(kalarmcal
-                          kcal
-                          kholidays
-                          kpimidentities
-                          KF5::CoreAddons
-                         )
-else()
-    target_link_libraries(kalarmcal
-                          akonadi-kde
-                          kcalcore
-                          kholidays
-                          kpimidentities
-                          KF5::CoreAddons
-                         )
-endif()
+file(APPEND "${CMAKE_CURRENT_BINARY_DIR}/kalarmcal_export.h" "\n// This library was built to use Akonadi.\n// It must be rebuilt in order to use KResources.\n#ifdef KALARMCAL_USE_KRESOURCES\n#undef KALARMCAL_USE_KRESOURCES\n#endif\n")
 
+target_link_libraries(kalarmcal
+                      kcal
+                      kholidays
+                      kpimidentities
+                      KF5::CoreAddons
+                      )
 set_target_properties(kalarmcal PROPERTIES 
                       VERSION ${LIB_VERSION} 
                       SOVERSION ${LIB_SOVERSION} 
@@ -109,12 +72,10 @@ install(FILES
 	DESTINATION ${INCLUDE_INSTALL_DIR}/kalarmcal
 	COMPONENT Devel
 )
-if(NOT USE_KRESOURCES)
-    install(FILES
+install(FILES
 	    collectionattribute.h
 	    compatibilityattribute.h
 	    eventattribute.h
 	    DESTINATION ${INCLUDE_INSTALL_DIR}/kalarmcal
 	    COMPONENT Devel
            )
-endif()

alarmtext.cpp

@@ -24,9 +24,6 @@
 
 #include "kaevent.h"
 
-#ifdef KALARMCAL_USE_KRESOURCES
-#include <kcal/todo.h>
-#endif
 #include <klocale.h>
 #include <klocalizedstring.h>
 #include <kglobal.h>
@@ -147,11 +144,7 @@ void AlarmText::setEmail(const QString& to, const QString& from, const QString&
     d->mKMailSerialNum = kmailSerialNumber;
 }
 
-#ifndef KALARMCAL_USE_KRESOURCES
 void AlarmText::setTodo(const KCalCore::Todo::Ptr& todo)
-#else
-void AlarmText::setTodo(const KCal::Todo* todo)
-#endif
 {
     d->clear();
     d->mType    = Private::Todo;

alarmtext.h

@@ -25,11 +25,7 @@
 
 #include "kalarmcal_export.h"
 
-#ifndef KALARMCAL_USE_KRESOURCES
 #include <kcalcore/todo.h>
-#else
-namespace KCal { class Todo; }
-#endif
 #include <QtCore/QString>
 
 
@@ -87,17 +83,10 @@ class KALARMCAL_EXPORT AlarmText
         void setEmail(const QString& to, const QString& from, const QString& cc, const QString& time,
                       const QString& subject, const QString& body, unsigned long kmailSerialNumber = 0);
 
-#ifndef KALARMCAL_USE_KRESOURCES
         /** Set the instance contents to be a todo.
          *  @param todo Todo instance to set as the text
          */
         void setTodo(const KCalCore::Todo::Ptr& todo);
-#else
-        /** Set the instance contents to be a todo.
-         *  @param todo Todo instance to set as the text
-         */
-        void setTodo(const KCal::Todo* todo);
-#endif
 
         /** Return the text for a text message alarm, in display format.
          *  - An email is returned as a sequence of headers followed by the message body.

kacalendar.cpp

@@ -25,7 +25,6 @@
 #include "kaevent.h"
 #include "version.h"
 
-#ifndef KALARMCAL_USE_KRESOURCES
 #include "collectionattribute.h"
 
 #include <kcalcore/event.h>
@@ -33,11 +32,6 @@
 #include <kcalcore/memorycalendar.h>
 
 #include <kmessagebox.h>
-#else
-#include <kcal/event.h>
-#include <kcal/alarm.h>
-#include <kcal/calendarlocal.h>
-#endif
 
 #include <kglobal.h>
 #include <klocalizedstring.h>
@@ -48,24 +42,18 @@
 #include <QFileInfo>
 #include <QTextStream>
 
-#ifndef KALARMCAL_USE_KRESOURCES
 using namespace KCalCore;
 using Akonadi::Collection;
-#else
-using namespace KCal;
-#endif
 
 static const KCatalogLoader loader(QLatin1String("libkalarmcal"));
 
 namespace KAlarmCal
 {
 
-#ifndef KALARMCAL_USE_KRESOURCES
 const QLatin1String MIME_BASE("application/x-vnd.kde.alarm");
 const QLatin1String MIME_ACTIVE("application/x-vnd.kde.alarm.active");
 const QLatin1String MIME_ARCHIVED("application/x-vnd.kde.alarm.archived");
 const QLatin1String MIME_TEMPLATE("application/x-vnd.kde.alarm.template");
-#endif
 
 static const QByteArray VERSION_PROPERTY("VERSION");     // X-KDE-KALARM-VERSION VCALENDAR property
 
@@ -74,11 +62,7 @@ static bool isUTC(const QString& localFile);
 class Private
 {
     public:
-#ifndef KALARMCAL_USE_KRESOURCES
         static int  readKAlarmVersion(const FileStorage::Ptr&, QString& subVersion, QString& versionString);
-#else
-        static int  readKAlarmVersion(CalendarLocal&, const QString& localFile, QString& subVersion, QString& versionString);
-#endif
 
         static QByteArray mIcalProductId;
 };
@@ -105,17 +89,10 @@ QByteArray icalProductId()
 /******************************************************************************
 * Set the X-KDE-KALARM-VERSION property in a calendar.
 */
-#ifndef KALARMCAL_USE_KRESOURCES
 void setKAlarmVersion(const Calendar::Ptr& calendar)
 {
     calendar->setCustomProperty(APPNAME, VERSION_PROPERTY, QString::fromLatin1(KAEvent::currentCalendarVersionString()));
 }
-#else
-void setKAlarmVersion(CalendarLocal& calendar)
-{
-    calendar.setCustomProperty(APPNAME, VERSION_PROPERTY, QString::fromLatin1(KAEvent::currentCalendarVersionString()));
-}
-#endif
 
 /******************************************************************************
 * Check the version of KAlarm which wrote a calendar file, and convert it in
@@ -123,18 +100,10 @@ void setKAlarmVersion(CalendarLocal& calendar)
 * updated. The compatibility of the calendar format is indicated by the return
 * value.
 */
-#ifndef KALARMCAL_USE_KRESOURCES
 int updateVersion(const FileStorage::Ptr& fileStorage, QString& versionString)
-#else
-int updateVersion(CalendarLocal& calendar, const QString& localFile, QString& versionString)
-#endif
 {
     QString subVersion;
-#ifndef KALARMCAL_USE_KRESOURCES
     int version = Private::readKAlarmVersion(fileStorage, subVersion, versionString);
-#else
-    int version = Private::readKAlarmVersion(calendar, localFile, subVersion, versionString);
-#endif
     if (version == CurrentFormat)
         return CurrentFormat;       // calendar is in the current KAlarm format
     if (version == IncompatibleFormat  ||  version > KAEvent::currentCalendarVersion())
@@ -142,9 +111,7 @@ int updateVersion(CalendarLocal& calendar, const QString& localFile, QString& ve
 
     // Calendar was created by an earlier version of KAlarm.
     // Convert it to the current format.
-#ifndef KALARMCAL_USE_KRESOURCES
     const QString localFile = fileStorage->fileName();
-#endif
     int ver = version;
     if (version == KAlarmCal::Version(0,5,7)  &&  !localFile.isEmpty())
     {
@@ -158,11 +125,7 @@ int updateVersion(CalendarLocal& calendar, const QString& localFile, QString& ve
         qDebug() << "KAlarm version" << version;
 
     // Convert events to current KAlarm format for when/if the calendar is saved
-#ifndef KALARMCAL_USE_KRESOURCES
     KAEvent::convertKCalEvents(fileStorage->calendar(), ver);
-#else
-    KAEvent::convertKCalEvents(calendar, ver);
-#endif
     return version;
 }
 
@@ -175,40 +138,24 @@ int updateVersion(CalendarLocal& calendar, const QString& localFile, QString& ve
 *       = IncompatibleFormat if it was created by KAlarm pre-0.3.5, or another program
 *       = version number if created by another KAlarm version.
 */
-#ifndef KALARMCAL_USE_KRESOURCES
 int Private::readKAlarmVersion(const FileStorage::Ptr& fileStorage, QString& subVersion, QString& versionString)
-#else
-int Private::readKAlarmVersion(CalendarLocal& calendar, const QString& localFile, QString& subVersion, QString& versionString)
-#endif
 {
     subVersion.clear();
-#ifndef KALARMCAL_USE_KRESOURCES
     Calendar::Ptr calendar = fileStorage->calendar();
     versionString = calendar->customProperty(KACalendar::APPNAME, VERSION_PROPERTY);
     qDebug() << "File=" << fileStorage->fileName() << ", version=" << versionString;
 
-#else
-    versionString = calendar.customProperty(KACalendar::APPNAME, VERSION_PROPERTY);
-#endif
 
     if (versionString.isEmpty())
     {
         // Pre-KAlarm 1.4 defined the KAlarm version number in the PRODID field.
         // If another application has written to the file, this may not be present.
-#ifndef KALARMCAL_USE_KRESOURCES
         const QString prodid = calendar->productId();
-#else
-        const QString prodid = calendar.productId();
-#endif
         if (prodid.isEmpty())
         {
             // Check whether the calendar file is empty, in which case
             // it can be written to freely.
-#ifndef KALARMCAL_USE_KRESOURCES
             QFileInfo fi(fileStorage->fileName());
-#else
-            QFileInfo fi(localFile);
-#endif
             if (!fi.size())
                 return KACalendar::CurrentFormat;
         }
@@ -380,11 +327,7 @@ QString uid(const QString& id, Type status)
 * triggered. They will be archived once KAlarm tries to handle them.
 * Do not call this function for the displaying alarm calendar.
 */
-#ifndef KALARMCAL_USE_KRESOURCES
 Type status(const Event::Ptr& event, QString* param)
-#else
-Type status(const Event* event, QString* param)
-#endif
 {
     // Set up a static quick lookup for type strings
     typedef QMap<QString, Type> PropertyMap;
@@ -441,11 +384,7 @@ Type status(const Event* event, QString* param)
 * If a parameter is supplied, it will be appended as a second parameter to the
 * custom property.
 */
-#ifndef KALARMCAL_USE_KRESOURCES
 void setStatus(const Event::Ptr& event, Type status, const QString& param)
-#else
-void setStatus(Event* event, Type status, const QString& param)
-#endif
 {
     if (!event)
         return;
@@ -465,7 +404,6 @@ void setStatus(Event* event, Type status, const QString& param)
     event->setCustomProperty(KACalendar::APPNAME, staticStrings->STATUS_PROPERTY, text);
 }
 
-#ifndef KALARMCAL_USE_KRESOURCES
 Type type(const QString& mimeType)
 {
     if (mimeType == MIME_ACTIVE)
@@ -516,7 +454,6 @@ QStringList mimeTypes(Types types)
     }
     return mimes;
 }
-#endif
 
 } // namespace CalEvent
 

kacalendar.h

@@ -24,36 +24,24 @@
 #define KALARM_KACALENDAR_H
 
 #include "kalarmcal_export.h"
-#ifndef KALARMCAL_USE_KRESOURCES
 #include <kcalcore/filestorage.h>
 #include <kcalcore/calendar.h>
 #include <kcalcore/event.h>
 #include <akonadi/collection.h>
-#endif
 #include <QtCore/QByteArray>
 #include <QtCore/QStringList>
 
-#ifndef KALARMCAL_USE_KRESOURCES
 namespace KCalCore {
   class Alarm;
 }
-#else
-namespace KCal {
-  class Event;
-  class Alarm;
-  class CalendarLocal;
-}
-#endif
 
 namespace KAlarmCal
 {
 
-#ifndef KALARMCAL_USE_KRESOURCES
 extern const QLatin1String KALARMCAL_EXPORT MIME_BASE;      //!< The base mime type for KAlarm alarms
 extern const QLatin1String KALARMCAL_EXPORT MIME_ACTIVE;    //!< The mime type for KAlarm active alarms
 extern const QLatin1String KALARMCAL_EXPORT MIME_ARCHIVED;  //!< The mime type for KAlarm archived alarms
 extern const QLatin1String KALARMCAL_EXPORT MIME_TEMPLATE;  //!< The mime type for KAlarm alarm templates
-#endif
 
 /**
  * @short Class representing attributes of a KAlarm calendar.
@@ -66,7 +54,6 @@ extern const QLatin1String KALARMCAL_EXPORT MIME_TEMPLATE;  //!< The mime type f
  */
 namespace KACalendar
 {
-#ifndef KALARMCAL_USE_KRESOURCES
     /** Compatibility of resource backend calendar format. */
     enum Compatibility
     {
@@ -77,17 +64,6 @@ namespace KACalendar
         Incompatible = 0x08             //!< not written by KAlarm, or in a newer KAlarm version
     };
     Q_DECLARE_FLAGS(Compat, Compatibility)
-#else
-    /** Compatibility of resource calendar format. */
-    enum Compat
-    {
-        Current,       //!< in current KAlarm format
-        Converted,     //!< in current KAlarm format, but not yet saved
-        Convertible,   //!< in an older KAlarm format
-        Incompatible,  //!< not written by KAlarm, or in a newer KAlarm version
-        ByEvent        //!< individual events have their own compatibility status
-    };
-#endif
 
     /** Special calendar storage format version codes.
      *  Positive version values are actual KAlarm format version numbers.
@@ -95,9 +71,7 @@ namespace KACalendar
     enum
     {
         CurrentFormat      = 0,    //!< current KAlarm format
-#ifndef KALARMCAL_USE_KRESOURCES
         MixedFormat        = -2,   //!< calendar may contain more than one version
-#endif
         IncompatibleFormat = -1    //!< not written by KAlarm, or a newer KAlarm version
     };
 
@@ -114,18 +88,10 @@ namespace KACalendar
                                    unknown KAlarm format;
      *          >0 the older KAlarm version which wrote the calendar
      */
-#ifndef KALARMCAL_USE_KRESOURCES
     KALARMCAL_EXPORT int updateVersion(const KCalCore::FileStorage::Ptr&, QString& versionString);
-#else
-    KALARMCAL_EXPORT int updateVersion(KCal::CalendarLocal& calendar, const QString& localFile, QString& versionString);
-#endif
 
-#ifndef KALARMCAL_USE_KRESOURCES
     /** Set the KAlarm version custom property for a calendar. */
     KALARMCAL_EXPORT void setKAlarmVersion(const KCalCore::Calendar::Ptr&);
-#else
-    KALARMCAL_EXPORT void setKAlarmVersion(KCal::CalendarLocal&);
-#endif
 
     /** Set the program name and version for use in calendars. */
     KALARMCAL_EXPORT void setProductId(const QByteArray& progName, const QByteArray& progVersion);
@@ -163,7 +129,6 @@ namespace CalEvent
     Q_DECLARE_FLAGS(Types, Type)
 
     KALARMCAL_EXPORT QString uid(const QString& id, Type);
-#ifndef KALARMCAL_USE_KRESOURCES
     KALARMCAL_EXPORT Type    status(const KCalCore::Event::Ptr&, QString* param = 0);
     KALARMCAL_EXPORT void    setStatus(const KCalCore::Event::Ptr&, Type, const QString& param = QString());
 
@@ -175,10 +140,6 @@ namespace CalEvent
     KALARMCAL_EXPORT QString mimeType(Type);
     /** Return the mime type strings corresponding to alarm Types. */
     KALARMCAL_EXPORT QStringList mimeTypes(Types);
-#else
-    KALARMCAL_EXPORT Type    status(const KCal::Event*, QString* param = 0);
-    KALARMCAL_EXPORT void    setStatus(KCal::Event*, Type, const QString& param = QString());
-#endif
 } // namespace CalEvent
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(CalEvent::Types)

kaevent.h

@@ -30,33 +30,19 @@
 #include "kacalendar.h"
 #include "repetition.h"
 
-#ifndef KALARMCAL_USE_KRESOURCES
 #include <akonadi/collection.h>
 #include <akonadi/item.h>
 #include <kcalcore/person.h>
 #include <kcalcore/calendar.h>
-#else
-#include <kcal/person.h>
-#endif
 
 #include <QtCore/QBitArray>
 #include <QColor>
 #include <QFont>
 #include <QtCore/QVector>
-#ifdef KALARMCAL_USE_KRESOURCES
-#include <QtCore/QList>
-#endif
 #include <QtCore/QSharedDataPointer>
 #include <QtCore/QMetaType>
 
 namespace KHolidays { class HolidayRegion; }
-#ifdef KALARMCAL_USE_KRESOURCES
-namespace KCal {
-    class CalendarLocal;
-    class Event;
-}
-class AlarmResource;
-#endif
 
 namespace KAlarmCal
 {
@@ -357,19 +343,11 @@ class KALARMCAL_EXPORT KAEvent
          */
         KAEvent(const KDateTime&, const QString& text, const QColor& bg, const QColor& fg,
                 const QFont& f, SubAction, int lateCancel, Flags flags, bool changesPending = false);
-#ifndef KALARMCAL_USE_KRESOURCES
         /** Construct an event and initialise it from a KCalCore::Event. */
         explicit KAEvent(const KCalCore::Event::Ptr&);
 
         /** Initialise the instance from a KCalCore::Event. */
         void set(const KCalCore::Event::Ptr&);
-#else
-        /** Construct an event and initialise it from a KCal::Event. */
-        explicit KAEvent(const KCal::Event*);
-
-        /** Initialise the instance from a KCal::Event. */
-        void set(const KCal::Event*);
-#endif
 
         KAEvent(const KAEvent& other);
         ~KAEvent();
@@ -397,7 +375,6 @@ class KALARMCAL_EXPORT KAEvent
                  const QColor& fg, const QFont& font, SubAction action, int lateCancel,
                  Flags flags, bool changesPending = false);
 
-#ifndef KALARMCAL_USE_KRESOURCES
         /** Update an existing KCalCore::Event with the KAEvent data.
          *  @param event  Event to update.
          *  @param u      how to deal with the Event's UID.
@@ -408,13 +385,6 @@ class KALARMCAL_EXPORT KAEvent
          *                             are left untouched.
          */
         bool updateKCalEvent(const KCalCore::Event::Ptr& event, UidAction u, bool setCustomProperties = true) const;
-#else
-        /** Update an existing KCal::Event with the KAEvent data.
-         *  @param event  Event to update.
-         *  @param u      how to deal with the Event's UID.
-         */
-        bool updateKCalEvent(KCal::Event* event, UidAction u) const;
-#endif
 
         /** Return whether the instance represents a valid event. */
         bool isValid() const;
@@ -424,12 +394,10 @@ class KALARMCAL_EXPORT KAEvent
         /** Return the enabled status of the alarm. */
         bool enabled() const;
 
-#ifndef KALARMCAL_USE_KRESOURCES
         /** Set the read-only status of the alarm. */
         void setReadOnly(bool ro);
         /** Return the read-only status of the alarm. */
         bool isReadOnly() const;
-#endif
 
         /** Set the event to be archived when it expires or is deleted.
          *  Normally this is set when the event has triggered at least once.
@@ -470,7 +438,6 @@ class KALARMCAL_EXPORT KAEvent
         /** Return the revision number of the event (SEQUENCE property in iCalendar). */
         int revision() const;
 
-#ifndef KALARMCAL_USE_KRESOURCES
         /** Set the ID of the Akonadi Collection which contains the event. */
         void setCollectionId(Akonadi::Collection::Id id);
         /** Set the ID of the Akonadi Collection which contains the event.
@@ -503,18 +470,6 @@ class KALARMCAL_EXPORT KAEvent
 
         /** Return the original KCalCore::Event's custom properties in the source calendar. */
         QMap<QByteArray, QString> customProperties() const;
-#else
-        /** Set the resource which owns this event.
-         *  Note that this is stored for convenience only - it is not used by this class.
-         *  @see resource()
-        */
-        void setResource(AlarmResource* r);
-
-        /** Get the resource which owns this event, as set by setResource().
-         *  Note that this is stored for convenience only - it is not used by this class.
-        */
-        AlarmResource* resource() const;
-#endif
 
         /** Return the action sub-type of the event's main alarm. For display alarms,
          *  this is MESSAGE or FILE, while other types of alarm simply return the
@@ -603,21 +558,8 @@ class KALARMCAL_EXPORT KAEvent
         bool commandXterm() const;
         /** Return whether the command output is to be displayed in an alarm message window. */
         bool commandDisplay() const;
-#ifndef KALARMCAL_USE_KRESOURCES
         /** Set or clear the command execution error for the last time the alarm triggered. */
         void setCommandError(CmdErrType error) const;
-#else
-        /** Set or clear the command execution error for the last time the alarm triggered.
-         *  @param writeConfig  true to write the error status to the config file.
-         */
-        void setCommandError(CmdErrType error, bool writeConfig = true) const;
-        /** Initialise the last command error status of the alarm from the config file.
-         *  @param configString  the parameter read from the config file containing the command alarm error status.
-         */
-        void setCommandError(const QString& configString);
-        /** The config file group identifier containing command alarm error statuses. */
-        static QString commandErrorConfigGroup();
-#endif
         /** Return the command execution error for the last time the alarm triggered. */
         CmdErrType commandError() const;
 
@@ -636,13 +578,8 @@ class KALARMCAL_EXPORT KAEvent
         bool copyToKOrganizer() const;
 
         /** Set the email related data for the event. */
-#ifndef KALARMCAL_USE_KRESOURCES
         void setEmail(uint from, const KCalCore::Person::List&, const QString& subject,
                       const QStringList& attachments);
-#else
-        void setEmail(uint from, const QList<KCal::Person>&, const QString& subject,
-                      const QStringList& attachments);
-#endif
 
         /** Return the email message body, for an email alarm.
          *  @return email body, or empty if not an email alarm
@@ -655,11 +592,7 @@ class KALARMCAL_EXPORT KAEvent
         uint emailFromId() const;
 
         /** Return the list of email addressees, including names, for an email alarm. */
-#ifndef KALARMCAL_USE_KRESOURCES
         KCalCore::Person::List emailAddressees() const;
-#else
-        QList<KCal::Person> emailAddressees() const;
-#endif
 
         /** Return a list of the email addresses, including names, for an email alarm. */
         QStringList emailAddresses() const;
@@ -672,12 +605,7 @@ class KALARMCAL_EXPORT KAEvent
         /** Concatenate a list of email addresses into a string.
          *  @param sep  separator string to insert between addresses.
          */
-#ifndef KALARMCAL_USE_KRESOURCES
         static QString joinEmailAddresses(const KCalCore::Person::List& addresses, const QString& sep);
-#else
-        static QString joinEmailAddresses(const QList<KCal::Person>& addresses, const QString& sep);
-#endif
-
         /** Return the list of email addressees, excluding names, for an email alarm. */
         QStringList emailPureAddresses() const;
 
@@ -1150,11 +1078,7 @@ class KALARMCAL_EXPORT KAEvent
         /** Return the longest interval which can occur between consecutive recurrences.
          *  @see recurInterval()
          */
-#ifndef KALARMCAL_USE_KRESOURCES
         KCalCore::Duration longestRecurrenceInterval() const;
-#else
-        KCal::Duration longestRecurrenceInterval() const;
-#endif
 
         /** Adjust the event date/time to the first recurrence of the event, on or after
          *  the event start date/time. The event start date may not be a recurrence date,
@@ -1238,13 +1162,8 @@ class KALARMCAL_EXPORT KAEvent
          *  @param showDefer  whether the Defer button was displayed
          *  @return @c true if successful, @c false if alarm was not copied.
          */
-#ifndef KALARMCAL_USE_KRESOURCES
         bool setDisplaying(const KAEvent& event, KAAlarm::Type type, Akonadi::Collection::Id colId, const KDateTime& repeatAtLoginTime, bool showEdit, bool showDefer);
-#else
-        bool setDisplaying(const KAEvent& event, KAAlarm::Type type, const QString& resourceID, const KDateTime& repeatAtLoginTime, bool showEdit, bool showDefer);
-#endif
 
-#ifndef KALARMCAL_USE_KRESOURCES
         /** Reinstate the original event from the 'displaying' event.
          *  This instance is initialised from the supplied displaying @p event,
          *  and appropriate adjustments are made to convert it back to the
@@ -1255,9 +1174,6 @@ class KALARMCAL_EXPORT KAEvent
          *  @param showDefer  updated to true if Defer button was displayed, else false
          */
         void reinstateFromDisplaying(const KCalCore::Event::Ptr& event, Akonadi::Collection::Id& colId, bool& showEdit, bool& showDefer);
-#else