Changeset View
Changeset View
Standalone View
Standalone View
src/core/jobs/collectionmodifyjob.cpp
Show First 20 Lines • Show All 94 Lines • ▼ Show 20 Line(s) | 60 | { | |||
---|---|---|---|---|---|
95 | if (d->mCollection.d_ptr->listPreferenceChanged) { | 95 | if (d->mCollection.d_ptr->listPreferenceChanged) { | ||
96 | cmd->setDisplayPref(ProtocolHelper::listPreference(d->mCollection.localListPreference(Collection::ListDisplay))); | 96 | cmd->setDisplayPref(ProtocolHelper::listPreference(d->mCollection.localListPreference(Collection::ListDisplay))); | ||
97 | cmd->setSyncPref(ProtocolHelper::listPreference(d->mCollection.localListPreference(Collection::ListSync))); | 97 | cmd->setSyncPref(ProtocolHelper::listPreference(d->mCollection.localListPreference(Collection::ListSync))); | ||
98 | cmd->setIndexPref(ProtocolHelper::listPreference(d->mCollection.localListPreference(Collection::ListIndex))); | 98 | cmd->setIndexPref(ProtocolHelper::listPreference(d->mCollection.localListPreference(Collection::ListIndex))); | ||
99 | } | 99 | } | ||
100 | if (d->mCollection.d_ptr->referencedChanged) { | 100 | if (d->mCollection.d_ptr->referencedChanged) { | ||
101 | cmd->setReferenced(d->mCollection.referenced()); | 101 | cmd->setReferenced(d->mCollection.referenced()); | ||
102 | } | 102 | } | ||
103 | if (d->mCollection.d_ptr->attributesChanged) { | 103 | if (d->mCollection.d_ptr->mAttributeStorage.hasModifiedAttributes()) { | ||
104 | cmd->setAttributes(ProtocolHelper::attributesToProtocol(d->mCollection)); | 104 | cmd->setAttributes(ProtocolHelper::attributesToProtocol(d->mCollection.d_ptr->mAttributeStorage.modifiedAttributes())); | ||
105 | } | 105 | } | ||
106 | if (auto attr = d->mCollection.attribute<Akonadi::PersistentSearchAttribute>()) { | 106 | if (auto attr = d->mCollection.attribute<Akonadi::PersistentSearchAttribute>()) { | ||
107 | cmd->setPersistentSearchCollections(attr->queryCollections()); | 107 | cmd->setPersistentSearchCollections(attr->queryCollections()); | ||
108 | cmd->setPersistentSearchQuery(attr->queryString()); | 108 | cmd->setPersistentSearchQuery(attr->queryString()); | ||
109 | cmd->setPersistentSearchRecursive(attr->isRecursive()); | 109 | cmd->setPersistentSearchRecursive(attr->isRecursive()); | ||
110 | cmd->setPersistentSearchRemote(attr->isRemoteSearchEnabled()); | 110 | cmd->setPersistentSearchRemote(attr->isRemoteSearchEnabled()); | ||
111 | } | 111 | } | ||
112 | if (!d->mCollection.d_ptr->mDeletedAttributes.isEmpty()) { | 112 | if (!d->mCollection.d_ptr->mAttributeStorage.deletedAttributes().empty()) { | ||
113 | cmd->setRemovedAttributes(d->mCollection.d_ptr->mDeletedAttributes); | 113 | cmd->setRemovedAttributes(d->mCollection.d_ptr->mAttributeStorage.deletedAttributes()); | ||
114 | } | 114 | } | ||
115 | 115 | | |||
116 | if (cmd->modifiedParts() == Protocol::ModifyCollectionCommand::None) { | 116 | if (cmd->modifiedParts() == Protocol::ModifyCollectionCommand::None) { | ||
117 | emitResult(); | 117 | emitResult(); | ||
118 | return; | 118 | return; | ||
119 | } | 119 | } | ||
120 | 120 | | |||
121 | d->sendCommand(cmd); | 121 | d->sendCommand(cmd); | ||
Show All 21 Lines |