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

Remove unused updateStorageFormat method for resources

parent 2c807fe6
......@@ -43,7 +43,8 @@ using namespace KAlarmCal;
AkonadiCalendarUpdater::AkonadiCalendarUpdater(const Collection& collection, bool dirResource,
bool ignoreKeepFormat, bool newCollection, QObject* parent, QWidget* promptParent)
bool ignoreKeepFormat, bool newCollection,
QObject* parent, QWidget* promptParent)
: CalendarUpdater(collection.id(), ignoreKeepFormat, parent, promptParent)
, mCollection(collection)
, mDirResource(dirResource)
......
......@@ -343,15 +343,6 @@ KACalendar::Compat AkonadiResource::compatibilityVersion(QString& versionString)
return attr->compatibility();
}
/******************************************************************************
* Update the resource to the current KAlarm storage format.
*/
bool AkonadiResource::updateStorageFormat()
{
//TODO: implement updateStorageFormat(): see AkonadiResourceMigrator::updateStorageFormat()
return false;
}
/******************************************************************************
* Edit the resource's configuration.
*/
......@@ -709,12 +700,7 @@ void AkonadiResource::notifyCollectionChanged(Resource& res, const Collection& c
|| !hadCompat
|| *collection.attribute<CompatibilityAttribute>() != *akres->mCollection.attribute<CompatibilityAttribute>())
{
//TODO: check if a temporary AkonadiResource object is actually needed, as in the comment
// Update to current KAlarm format if necessary, and if the user agrees.
// Create a new temporary 'Resource' object, because the one passed
// to this method can get overwritten with an old version of its
// CompatibilityAttribute before AkonadiResourceMigration finishes,
// due to AkonadiDataModel still containing an out of date value.
qCDebug(KALARM_LOG) << "AkonadiResource::setCollectionChanged:" << collection.id() << ": compatibility ->" << collection.attribute<CompatibilityAttribute>()->compatibility();
// Note that the AkonadiResource will be deleted once no more
// QSharedPointers reference it.
......
......@@ -217,9 +217,6 @@ public:
*/
KACalendar::Compat compatibilityVersion(QString& versionString) const override;
/** Update the resource to the current KAlarm storage format. */
bool updateStorageFormat() override;
/** Edit the resource's configuration. */
void editResource(QWidget* dialogParent) override;
......
......@@ -229,11 +229,6 @@ KACalendar::Compat Resource::compatibilityVersion(QString& versionString) const
return mResource->compatibilityVersion(versionString);
}
bool Resource::updateStorageFormat()
{
return mResource.isNull() ? false : mResource->updateStorageFormat();
}
void Resource::editResource(QWidget* dialogParent)
{
if (!mResource.isNull())
......
......@@ -266,9 +266,6 @@ public:
*/
KACalendar::Compat compatibilityVersion(QString& versionString) const;
/** Update the resource to the current KAlarm storage format. */
bool updateStorageFormat();
/** Edit the resource's configuration. */
void editResource(QWidget* dialogParent);
......
......@@ -289,9 +289,6 @@ public:
*/
virtual KACalendar::Compat compatibilityVersion(QString& versionString) const = 0;
/** Update the resource to the current KAlarm storage format. */
virtual bool updateStorageFormat() = 0;
/** Edit the resource's configuration. */
virtual void editResource(QWidget* dialogParent) = 0;
......@@ -439,6 +436,7 @@ protected:
void setFailed();
static QString storageTypeStr(bool description, bool file, bool local);
template <class T> static T* resource(Resource&);
template <class T> static const T* resource(const Resource&);
......
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