summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2016-11-10 11:22:12 (GMT)
committerKevin Smith <kevin.smith@isode.com>2016-11-10 12:37:15 (GMT)
commit94ec9c25311f8d54519f045205d58526d885412a (patch)
tree423bf068441e7314e8736622f53dc2ce42f2244c /Swift/Controllers
parentd2ba1ab8a36333523bf794c23226bd044e1717c2 (diff)
downloadswift-94ec9c25311f8d54519f045205d58526d885412a.zip
swift-94ec9c25311f8d54519f045205d58526d885412a.tar.bz2
Move Qt specific setting constants to QtUISettingConstants.h
Test-Information: Builds on macOS 10.12.1, ./scons test=all passes, Swift successfully logins and remembered Trellis configuration. Change-Id: Id94d6af1448d44d7d46ba2b8606f3e5ebe98be7a
Diffstat (limited to 'Swift/Controllers')
-rw-r--r--Swift/Controllers/SettingConstants.cpp5
-rw-r--r--Swift/Controllers/SettingConstants.h22
2 files changed, 0 insertions, 27 deletions
diff --git a/Swift/Controllers/SettingConstants.cpp b/Swift/Controllers/SettingConstants.cpp
index c3de90f..dedf56b 100644
--- a/Swift/Controllers/SettingConstants.cpp
+++ b/Swift/Controllers/SettingConstants.cpp
@@ -20,13 +20,8 @@ const SettingsProvider::Setting<bool> SettingConstants::SHOW_OFFLINE("showOfflin
const SettingsProvider::Setting<std::string> SettingConstants::EXPANDED_ROSTER_GROUPS("GroupExpandiness", "");
const SettingsProvider::Setting<bool> SettingConstants::PLAY_SOUNDS("playSounds", true);
const SettingsProvider::Setting<std::string> SettingConstants::HIGHLIGHT_RULES("highlightRules", "@");
-const SettingsProvider::Setting<bool> SettingConstants::SPELL_CHECKER("spellChecker", false);
-const SettingsProvider::Setting<std::string> SettingConstants::SPELL_CHECKER_LANGUAGE("spellCheckerLanguage", "en_US");
const SettingsProvider::Setting<std::string> SettingConstants::INVITE_AUTO_ACCEPT_MODE("inviteAutoAcceptMode", "presence");
-const SettingsProvider::Setting<std::string> SettingConstants::TRELLIS_GRID_SIZE("trellisGridSize", "");
-const SettingsProvider::Setting<std::string> SettingConstants::TRELLIS_GRID_POSITIONS("trellisGridPositions", "");
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::ENABLE_SOFTWARE_UPDATES("enableSoftwareUpdates", true);
}
diff --git a/Swift/Controllers/SettingConstants.h b/Swift/Controllers/SettingConstants.h
index 95d0527..3f15c44 100644
--- a/Swift/Controllers/SettingConstants.h
+++ b/Swift/Controllers/SettingConstants.h
@@ -57,8 +57,6 @@ namespace Swift {
* Its value is a Boost serialized representation.
*/
static const SettingsProvider::Setting<std::string> HIGHLIGHT_RULES;
- static const SettingsProvider::Setting<bool> SPELL_CHECKER;
- static const SettingsProvider::Setting<std::string> SPELL_CHECKER_LANGUAGE;
/**
* The #INVITE_AUTO_ACCEPT_MODE setting specifies how to handle invites to chat rooms.
*
@@ -71,20 +69,6 @@ namespace Swift {
*/
static const SettingsProvider::Setting<std::string> INVITE_AUTO_ACCEPT_MODE;
/**
- * The #TRELLIS_GRID_SIZE setting specifies the dimensions of the grid used for the trellis
- * layout.
- *
- * Its value is a Qt serialized representation.
- */
- static const SettingsProvider::Setting<std::string> TRELLIS_GRID_SIZE;
- /**
- * The #TRELLIS_GRID_POSITIONS setting specifies where conversations to contacts or rooms go
- * in the trellis grid.
- *
- * Its value is a Qt serialized representation.
- */
- static const SettingsProvider::Setting<std::string> TRELLIS_GRID_POSITIONS;
- /**
* The #DISCONNECT_ON_CARD_REMOVAL setting
* specifies whether or not to sign out the user when
* the smartcard is removed.
@@ -102,11 +86,5 @@ namespace Swift {
* log in the user; else not.
*/
static const SettingsProvider::Setting<bool> SINGLE_SIGN_ON;
- /**
- * The #ENABLE_SOFTWARE_UPDATES settings specifies, whether Swift
- * should automatically check for software updates in regular
- * intervals and install them automatically.
- */
- static const SettingsProvider::Setting<bool> ENABLE_SOFTWARE_UPDATES;
};
}