Review Request 111012: KFileItemModelRolesUpdater polishing, step 4: final cleanups

[Frank Reininghaus]

-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
http://git.reviewboard.kde.org/r/111012/
-----------------------------------------------------------

Review request for Dolphin.


Description
-------

This depends on https://git.reviewboard.kde.org/r/111008/ and https://git.reviewboard.kde.org/r/111009/ and https://git.reviewboard.kde.org/r/111011/

To keep the other 3 patches as readable as possible, I've kept these final changes for a separate patch.

(a) With the recent changes, KFileItemModelRolesUpdater::resolveNextPendingRoles() is never called when a preview job is running -> no checks needed any more in that function.

(b) KFileItemModelRolesUpdater::applyResolvedRoles(): Always check if an icon is stored in the model already, and remove the "m_state == ResolvingSortRole || m_state == PreviewJobRunning" check. Without this change, it could happen that the sort role "type" has been resolved for the item already, i.e., the mime type and the final icon are known when we arrive here, but there is still no icon stored in the model. Hm, now that I think of it, I should maybe have put that change at the beginning of the patch series because we now have a temporary regression between steps 2 and 4.


Diffs
-----

  dolphin/src/kitemviews/kfileitemmodelrolesupdater.cpp e539b45 

Diff: http://git.reviewboard.kde.org/r/111012/diff/


Testing
-------

Works for me.


Thanks,

Frank Reininghaus

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://mail.kde.org/mailman/private/kfm-devel/attachments/20130613/810a31d8/attachment.htm>