Commit a1d3569a authored by David Jarvie's avatar David Jarvie
Browse files

Remove inappropriate 'const'

parent 79780d64
......@@ -49,7 +49,6 @@ public:
static AkonadiResourceMigrator* instance();
static void reset();
static void execute();
static void updateToCurrentFormat(const Resource&, bool ignoreKeepFormat, QObject* parent);
static bool completed() { return mCompleted; }
Q_SIGNALS:
......
......@@ -53,6 +53,8 @@ public:
static void updateToCurrentFormat(const 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.
......@@ -61,8 +63,6 @@ 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;
......
......@@ -63,7 +63,7 @@ TemplateListModel* createTemplateListModel(QObject* parent);
TemplateListModel* allTemplateListModel();
ResourceCreator* createResourceCreator(KAlarmCal::CalEvent::Type defaultType, QWidget* parent);
void updateCalendarToCurrentFormat(const Resource&, bool ignoreKeepFormat, QObject* parent);
void updateCalendarToCurrentFormat(Resource&, bool ignoreKeepFormat, QObject* parent);
} // namespace DataModel
......
......@@ -217,7 +217,7 @@ void ResourceSelector::editResource()
*/
void ResourceSelector::updateResource()
{
const Resource resource = currentResource();
Resource resource = currentResource();
if (!resource.isValid())
return;
DataModel::updateCalendarToCurrentFormat(resource, true, this);
......@@ -231,6 +231,7 @@ void ResourceSelector::removeResource()
Resource resource = currentResource();
if (!resource.isValid())
return;
qCDebug(KALARM_LOG) << "ResourceSelector::removeResource:" << resource.displayName();
const QString name = resource.configName();
// Check if it's the standard or only resource for at least one type.
const CalEvent::Types allTypes = resource.alarmTypes();
......
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