Commit 058888d6 authored by David Jarvie's avatar David Jarvie
Browse files

Fix build

parent 7fd82b5d
......@@ -177,16 +177,17 @@ void KAlarmApp::initialise()
{
if (initialiseTimerResources()) // initialise calendars and alarm timer
{
connect(Resources::instance(), &Resources::resourceAdded,
this, &KAlarmApp::slotResourceAdded);
connect(Resources::instance(), &Resources::resourcePopulated,
this, &KAlarmApp::slotResourcePopulated);
connect(Resources::instance(), &Resources::resourcePopulated,
this, &KAlarmApp::purgeNewArchivedDefault);
connect(Resources::instance(), &Resources::resourcesCreated,
this, &KAlarmApp::checkWritableCalendar);
connect(AkonadiModel::instance(), &AkonadiModel::migrationCompleted,
this, &KAlarmApp::checkWritableCalendar);
Resources* resources = Resources::instance();
connect(resources, &Resources::resourceAdded,
this, &KAlarmApp::slotResourceAdded);
connect(resources, &Resources::resourcePopulated,
this, &KAlarmApp::slotResourcePopulated);
connect(resources, &Resources::resourcePopulated,
this, &KAlarmApp::purgeNewArchivedDefault);
connect(resources, &Resources::resourcesCreated,
this, &KAlarmApp::checkWritableCalendar);
connect(resources, &Resources::migrationCompleted,
this, &KAlarmApp::checkWritableCalendar);
KConfigGroup config(KSharedConfig::openConfig(), "General");
mNoSystemTray = config.readEntry("NoSystemTray", false);
......
......@@ -50,11 +50,9 @@ public:
* user and convert the calendar.
* @param parent Parent object. If possible, this should be a QWidget.
*/
static void updateToCurrentFormat(const Resource&, bool ignoreKeepFormat, QObject* parent);
static void updateToCurrentFormat(Resource&, bool ignoreKeepFormat, QObject* parent);
#endif
static QString conversionPrompt(const QString& calendarName, const QString& calendarVersion, bool whole);
public Q_SLOTS:
/** If the calendar is not in the current KAlarm format, prompt the user
* whether to convert to the current format, and then perform the conversion.
......@@ -63,6 +61,8 @@ public Q_SLOTS:
virtual bool update() = 0;
protected:
static QString conversionPrompt(const QString& calendarName, const QString& calendarVersion, bool whole);
static QList<CalendarUpdater*> mInstances;
ResourceId mResourceId;
QObject* mParent;
......
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