From 1b884d0a9dc28d8bca38fe8756482d991d0ea850 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Mon, 4 May 2015 01:20:48 +0200 Subject: GH-907 improve Java testing and PermGen deprecation handling --- logic/settings/SettingsObject.h | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'logic/settings/SettingsObject.h') diff --git a/logic/settings/SettingsObject.h b/logic/settings/SettingsObject.h index ac8419e8..99782a01 100644 --- a/logic/settings/SettingsObject.h +++ b/logic/settings/SettingsObject.h @@ -50,6 +50,16 @@ public: */ std::shared_ptr registerOverride(std::shared_ptr original); + /*! + * Registers a passthorugh setting for the given original setting in this settings object + * gate decides if the passthrough (true) or the original (false) is used for value + * + * This will fail if there is already a setting with the same ID as + * the one that is being registered. + * \return A valid Setting shared pointer if successful. + */ + std::shared_ptr registerPassthrough(std::shared_ptr original, std::shared_ptr gate); + /*! * Registers the given setting with this SettingsObject and connects the necessary signals. * -- cgit v1.2.3