Bug Fixes in KDE Base
Fix build after bad merge, by restoring these files to their frameworks version.
Aseigo told me to use "git checkout --theirs applet.h" in order to
"take the 4.10 version of the changes where there were conflicts",
but it turns out that this was very bad advice: it loses ALL the changes
ever made to the file in the frameworks branch.