summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Smith <git@kismith.co.uk>2018-03-24 17:40:39 (GMT)
committerKevin Smith <git@kismith.co.uk>2018-03-24 17:40:39 (GMT)
commit92bba873587e0cfaf53aff6749d4537b13e275e8 (patch)
tree6929af5d8eb6a9a2c5a5827b6a0f6a5df056c083 /Swift/Controllers
parentd0fa44684ef84decb9cf567e4ebdf682e7a283f9 (diff)
downloadswift-92bba873587e0cfaf53aff6749d4537b13e275e8.zip
swift-92bba873587e0cfaf53aff6749d4537b13e275e8.tar.bz2
Add option for enabling future features
Test-Information: None Change-Id: I548a18ff47c45eafda31584858607e5705386911
Diffstat (limited to 'Swift/Controllers')
-rw-r--r--Swift/Controllers/SettingConstants.cpp1
-rw-r--r--Swift/Controllers/SettingConstants.h6
2 files changed, 7 insertions, 0 deletions
diff --git a/Swift/Controllers/SettingConstants.cpp b/Swift/Controllers/SettingConstants.cpp
index 5347d4e..1191c28 100644
--- a/Swift/Controllers/SettingConstants.cpp
+++ b/Swift/Controllers/SettingConstants.cpp
@@ -25,5 +25,6 @@ const SettingsProvider::Setting<std::string> SettingConstants::INVITE_AUTO_ACCEP
const SettingsProvider::Setting<bool> SettingConstants::DISCONNECT_ON_CARD_REMOVAL("disconnectOnCardRemoval", true);
const SettingsProvider::Setting<bool> SettingConstants::SINGLE_SIGN_ON("singleSignOn", false);
const SettingsProvider::Setting<bool> SettingConstants::MUC_MARKING_ELISION("mucMarkingElision", true);
+const SettingsProvider::Setting<bool> SettingConstants::FUTURE("future", false);
}
diff --git a/Swift/Controllers/SettingConstants.h b/Swift/Controllers/SettingConstants.h
index 61781e0..f82dfb5 100644
--- a/Swift/Controllers/SettingConstants.h
+++ b/Swift/Controllers/SettingConstants.h
@@ -104,5 +104,11 @@ namespace Swift {
* have their markings stripped.
*/
static const SettingsProvider::Setting<bool> MUC_MARKING_ELISION;
+
+ /**
+ * The #FUTURE setting enables use of experimental features
+ * planned for future releases.
+ */
+ static const SettingsProvider::Setting<bool> FUTURE;
};
}