Generate an instance with KSharedConfig::Ptr for singleton and arg
ClosedPublic
Actions

Authored by graesslin on Nov 16 2016, 2:06 PM.

Details

Reviewers

mdawson
dfaure

Group Reviewers

Frameworks

Commits

R237:cd4e6504dfbd: Generate an instance with KSharedConfig::Ptr for singleton and arg

Summary

In case a kcfg with arg="true" was used and singleton the static
instance method only accepted a QString config name. This made it
impossible to combine a singleton config with an already existing and
open KSharedConfig::Ptr.

With this change an overloaded instance method is added which takes a
KSharedConfig::Ptr as argument. The private ctor, though, only takes a
KSharedConfig::Ptr and the instance method taking a QString argument
uses KSharedConfig::openConfig on the config file name.

This provides full API compatibility and at the same time allows to use
KSharedConfig in addition to the arg name based variant.

Test Plan

kconfigcompiler tests still pass and a config with singleton
and arg="true" generates the code as I need it

Diff Detail

Repository

R237 KConfig

Lint

Automatic diff as part of commit; lint not applicable.

Unit

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

graesslin updated this revision to Diff 8220.Nov 16 2016, 2:06 PM

graesslin retitled this revision from to Generate an instance with KSharedConfig::Ptr for singleton and arg.

graesslin updated this object.

graesslin edited the test plan for this revision. (Show Details)

graesslin added a reviewer: Frameworks.

How can tests still pass? they compare the generated code.

In D3386#63201, @apol wrote:

How can tests still pass? they compare the generated code.

eh no idea. I did a make clean, make, make test in the folder. Maybe there is no test for the singleton + arg="true" combination?

Just checked: the only test with a combination of arg="true" and singleton is signals_test_singleton.kcfgc which is used by kconfigcompiler_test_signals.cpp, but there is no code comparison in that test.

The only other arg="true" case is test8a.kcfg, but that one is not a singleton.

Then please include a test with your new feature.

Added a test case

ping!

graesslin added reviewers: dfaure, mdawson.Nov 30 2016, 9:01 AM

Is this another patch that doesn't say to which repository it applies? Or am i just too stupid to find it in phabricator?

Created and added the KConfig repository.

LGTM!

This revision is now accepted and ready to land.Dec 1 2016, 10:57 PM

Closed by commit R237:cd4e6504dfbd: Generate an instance with KSharedConfig::Ptr for singleton and arg (authored by graesslin). · Explain WhyDec 2 2016, 6:37 PM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

		Path
M		autotests/kconfig_compiler/CMakeLists.txt (1 line)
M		autotests/kconfig_compiler/kconfigcompiler_test.cpp (1 line)
A	M	autotests/kconfig_compiler/test8c.h.ref (70 lines)
A	M	autotests/kconfig_compiler/test8c.cpp.ref (65 lines)
A	M	autotests/kconfig_compiler/test8c.kcfg (17 lines)
A	M	autotests/kconfig_compiler/test8c.kcfgc (4 lines)
M		autotests/kconfig_compiler/test8main.cpp (3 lines)
M		src/kconfig_compiler/kconfig_compiler.cpp (33 lines)

Diff	ID	Base	Description	Created	Lint	Unit
Base			Base
Diff 1	8220	24c3350		Nov 16 2016, 2:06 PM	★	★
Diff 2	8228	24c3350	Added a test case	Nov 16 2016, 4:13 PM	★	★
Diff 3	8702	5950ee5	R237:cd4e6504dfbdface00037625f0cedda511e6d839	Dec 2 2016, 6:04 PM	★	★

Commit	Tree	Parents	Author	Summary	Date
081ed0e13241	7bba454a7fae	24c335069300	Martin Gräßlin	Generate an instance with KSharedConfig::Ptr for singleton and arg (Show More…)	Nov 16 2016, 1:59 PM