From d218b93a535085c85889164d45a83c3a519f9f4b Mon Sep 17 00:00:00 2001 From: Henri Chain Date: Tue, 18 Feb 2020 23:21:30 +0100 Subject: Fix code generation for entries with min/max Summary: - When GenerateProperties and Mutators are activated, the generated code did not handle min/max properly - In the case of a parameterized entry, generated code also did not handle min/max BUG: 418146 Test Plan: - auto tests included Reviewers: meven, crossi, ervin, bport, tcanabrava Reviewed By: meven, ervin Subscribers: kde-frameworks-devel Tags: #frameworks Differential Revision: https://phabricator.kde.org/D27497 --- src/kconfig_compiler/KConfigCommonStructs.h | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'src/kconfig_compiler/KConfigCommonStructs.h') diff --git a/src/kconfig_compiler/KConfigCommonStructs.h b/src/kconfig_compiler/KConfigCommonStructs.h index 71bf666e..06c8b80f 100644 --- a/src/kconfig_compiler/KConfigCommonStructs.h +++ b/src/kconfig_compiler/KConfigCommonStructs.h @@ -155,6 +155,11 @@ QString varPath(const QString &n, const KConfigParameters &cfg); // like using d-> in case of dpointer QString itemVar(const CfgEntry *e, const KConfigParameters &cfg); +// returns the name of the local inner item if there is one +// (before wrapping with KConfigCompilerSignallingItem) +// Otherwise return itemVar() +QString innerItemVar(const CfgEntry *e, const KConfigParameters &cfg); + QString itemPath(const CfgEntry *e, const KConfigParameters &cfg); QString filenameOnly(const QString &path); @@ -170,9 +175,16 @@ QString translatedString( // TODO: Sanitize those functions. QString newItem( - const CfgEntry* entry, + const CfgEntry *entry, + const QString &key, + const QString &defaultValue, + const KConfigParameters &cfg, + const QString ¶m = QString()); + +QString newInnerItem( + const CfgEntry *entry, const QString &key, - const QString& defaultValue, + const QString &defaultValue, const KConfigParameters &cfg, const QString ¶m = QString()); -- cgit v1.2.1