D20626: Refactor and cleanup

[Shubham]

shubham edited the test plan for this revision.

REPOSITORY
  R241 KIO

REVISION DETAIL
  https://phabricator.kde.org/D20626

To: shubham, dfaure
Cc: pino, kde-frameworks-devel, michaelh, ngraham, bruns