Differential D454

Drop KHTML framework and part
ClosedPublic
Actions

Authored by elvisangelaccio on Oct 25 2015, 9:44 PM.

Details

Reviewers
rthomsen
Commits
R36:f2090934229e: Drop KHTML dependency and skip KHTMLPart when previewing
Summary

Drop the KHTML framework as dependency (which was actually needed only to
disable javascript and friends from the KHTMLPart) and drop the KHTMLPart as
well, when previewing an HTML or XML file. Now we always use the second available
service offer, which is the katepart by default. The user can still render an
HTML entry, by opening it in the browser.

BUG: 201162
BUG: 353786
BUG: 354182
FIXED-IN: 15.12.0

Test Plan

XML and HTML entries are now previewed by the katepart.

Diff Detail

Repository
R36 Ark
Branch
drop-khtml
Lint
No Linters Available
Unit
No Unit Test Coverage
elvisangelaccio updated this revision to Diff 1052.Oct 25 2015, 9:44 PM
elvisangelaccio retitled this revision from to Drop KHTML framework and part.
elvisangelaccio updated this object.
elvisangelaccio edited the test plan for this revision. (Show Details)
elvisangelaccio added a reviewer: rthomsen.
Restricted Application added a subscriber: kde-utils-devel. · View Herald TranscriptOct 25 2015, 9:44 PM
elvisangelaccio updated this object.Oct 25 2015, 9:48 PM
elvisangelaccio edited the test plan for this revision. (Show Details)
elvisangelaccio mentioned this in D452: Fix the XML preview.
rthomsen requested changes to this revision.Oct 26 2015, 11:11 AM
rthomsen edited edge metadata.
rthomsen added inline comments.
CMakeLists.txt
49 ↗(On Diff #1052)

Please arrange this list alphabetically.

part/arkviewer.cpp
233 ↗(On Diff #1052)

QLatin1String is still faster than QStringLiteral for QString::operator==. See documentation for QString.

248–251 ↗(On Diff #1052)

Is this still needed?

This revision now requires changes to proceed.Oct 26 2015, 11:11 AM
elvisangelaccio updated this revision to Diff 1060.Oct 26 2015, 2:32 PM
elvisangelaccio edited edge metadata.
elvisangelaccio marked 3 inline comments as done.
  • Merge branch 'master' into drop-khtml
  • Sort frameworks alphabetically
  • QStringLiteral -> QLatin1String
  • Don't check anymore for browserExtension()
part/arkviewer.cpp
248–251 ↗(On Diff #1052)

I don't think so. Theoretically any part could implement that interface, but right now only KHTMLPart does (according to lxr.kde.org).

rthomsen accepted this revision.Oct 26 2015, 3:54 PM
rthomsen edited edge metadata.

Ship it (if you have tested it with the new changes).

This revision is now accepted and ready to land.Oct 26 2015, 3:54 PM

Revision Contents
Changeset List

PathPackages
MCMakeLists.txt (2 lines)
Mpart/CMakeLists.txt (2 lines)
Mpart/arkviewer.h (3 lines)
Mpart/arkviewer.cpp (47 lines)

Diff 1060

View Options

CMakeLists.txt

Loading...
View Options

part/CMakeLists.txt

Loading...
View Options

part/arkviewer.h

Loading...
View Options

part/arkviewer.cpp

Loading...