Remove usage of kde4-config, restore CSS and images
ClosedPublic

Authored by ltoscano on Mar 11 2017, 10:48 PM.

Details

Summary
  • kde4-config it not available anymore. qtpaths could be used. Instead, have the kioslave compute the values and pass them to the program (environment variables to not change too much the Perl code). The two variables contain the version number and the path to the CSS file.
  • use the proper address for the shared resources provided by KDocTools.
Test Plan

The version number and the path to the CSS are correctly shown
in the generated output and the links to resources provided
by kio_help are now correct.

Diff Detail

Repository
R452 KIOs for development
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.
ltoscano created this revision.Mar 11 2017, 10:48 PM
mpyne accepted this revision.Mar 18 2017, 6:09 PM

Sorry for the delay in review. I have a couple of quibbles but the changes look good.

perldoc/perldoc.h
44

I don't mind a private section here (it's more compatible with modern C++ best practices) but if we add it we should also move the m_pod2htmlPath member to be private instead of protected.

perldoc/pod2html.pl
1254

We should probably use || instead of //, otherwise we would let a defined-but-empty value through instead of setting the version to "Unknown".

Of course we should now be reasonably convinced that the version will be set (aside from power users doing something weird), so the error check here could probably even be removed. But if left in, it should be done properly.

This revision is now accepted and ready to land.Mar 18 2017, 6:09 PM

I'm going to apply some changes based the suggestions and commit.

perldoc/perldoc.h
44

Uhm, maybe it's more logical to set it protected as the other. I will change it.

perldoc/pod2html.pl
1254

Right, I was not sure (and I didn't try), I will change it.

This revision was automatically updated to reflect the committed changes.