KUriFilter: port away from KServiceTypeTrader
ClosedPublic
Actions

Authored by dfaure on Dec 5 2017, 6:40 PM.

Details

Reviewers

apol
davidedmundson

Commits

Summary

Instead, locate the desktop files and read them, into a memory cache.
This allows to run the KIO unittests without installing KIO.

Test Plan

kurifiltertest and kurifiltersearchprovideractionstest
now pass with empty XDG_DATA_DIRS.

Repository

R241 KIO

Lint

Automatic diff as part of commit; lint not applicable.

Unit

Automatic diff as part of commit; unit tests not applicable.

Restricted Application added a subscriber: Frameworks. · View Herald Transcript

dfaure requested review of this revision.Dec 5 2017, 6:40 PM

Drop the use of KService; broke reading of "Keys" without the servicetype available

LGTM

src/urifilters/ikws/searchproviderregistry.h
47	Maybe QVector?

This revision is now accepted and ready to land.Dec 10 2017, 11:40 PM

This revision was automatically updated to reflect the committed changes.

		Path
M		autotests/kurifiltertest.cpp (4 lines)
M		src/urifilters/ikws/CMakeLists.txt (11 lines)
M		src/urifilters/ikws/ikwsopts.h (3 lines)
M		src/urifilters/ikws/ikwsopts.cpp (10 lines)
M		src/urifilters/ikws/kuriikwsfilter.cpp (5 lines)
M		src/urifilters/ikws/kuriikwsfiltereng.h (8 lines)
M		src/urifilters/ikws/kuriikwsfiltereng.cpp (13 lines)
M		src/urifilters/ikws/kurisearchfilter.cpp (3 lines)
M		src/urifilters/ikws/searchprovider.h (7 lines)
M		src/urifilters/ikws/searchprovider.cpp (45 lines)
A	M	src/urifilters/ikws/searchproviderregistry.h (61 lines)
A	M	src/urifilters/ikws/searchproviderregistry.cpp (84 lines)
M		src/widgets/kurifilter.cpp (1 line)

Diff	ID	Base	Description	Created	Lint	Unit
Base			Base
Diff 1	23529	315bd37		Dec 5 2017, 6:40 PM	★	★
Diff 2	23535	315bd37	Drop the use of KService; broke reading of "Keys" without the servicetype…	Dec 5 2017, 8:18 PM	★	★
Diff 3	23747	e512b1f	R241:6246cc48067845208cf5acd8b798abd68349cf18	Dec 11 2017, 8:02 AM	★	★