Skip to content

Simplify SBZ and KPL file parsing

Quytelda Kahja requested to merge quytelda/krita:swatchbooker into master

This MR simplifies SBZ and KPL file parsing in KoColorSet.cpp.

These changes simplify the loadSbz() and loadKpl() functions by breaking them into smaller parts, as well as:

  • Removing unused variables
  • Fixing shadowed bindings
  • Converting large conditionals to guards
  • Factoring out repeated code
  • Outsourcing channel operations to the appropriate colorspace trait class

Test Plan

The most relevant unit test is libs-pigment-TestKoColorSet .

One can manually test the changes by loading an SBZ or KPL color palette in the Palettes docker, and verifying that the palettes are loaded correctly. There are some example files in libs/pigment/tests/data, and I also tested my own palette here.

Formalities Checklist

  • I confirmed this builds.
  • I confirmed Krita ran and the relevant functions work.
  • I tested the relevant unit tests and can confirm they are not broken. (If not possible, don't hesitate to ask for help!)
  • I made sure my commits build individually and have good descriptions as per KDE guidelines.
  • I made sure my code conforms to the standards set in the HACKING file.
  • I can confirm the code is licensed and attributed appropriately, and that unattributed code is mine, as per KDE Licensing Policy.

Reminder: the reviewer is responsible for merging the patch, this is to ensure at the least two people can build the patch. In case a patch breaks the build, both the author and the reviewer should be contacted to fix the build. If this is not possible, the commits shall be reverted, and a notification with the reasoning and any relevant logs shall be sent to the mailing list, kimageshop@kde.org.

Merge request reports