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
@@ -1,32 +1,27 @@
 /*
  * Copyright (c) 2012-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <Swift/Controllers/SettingConstants.h>
 
 namespace Swift {
 
 const SettingsProvider::Setting<bool> SettingConstants::IDLE_GOES_OFFLINE = SettingsProvider::Setting<bool>("idleGoesOffline", false);
 const SettingsProvider::Setting<int> SettingConstants::IDLE_TIMEOUT = SettingsProvider::Setting<int>("idleTimeout", 600);
 const SettingsProvider::Setting<bool> SettingConstants::SHOW_NOTIFICATIONS = SettingsProvider::Setting<bool>("showNotifications", true);
 const SettingsProvider::Setting<bool> SettingConstants::REQUEST_DELIVERYRECEIPTS = SettingsProvider::Setting<bool>("requestDeliveryReceipts", false);
 const SettingsProvider::Setting<bool> SettingConstants::FORGET_PASSWORDS = SettingsProvider::Setting<bool>("forgetPasswords", false);
 const SettingsProvider::Setting<bool> SettingConstants::REMEMBER_RECENT_CHATS = SettingsProvider::Setting<bool>("rememberRecentChats", true);
 const SettingsProvider::Setting<std::string> SettingConstants::LAST_LOGIN_JID = SettingsProvider::Setting<std::string>("lastLoginJID", "");
 const SettingsProvider::Setting<bool> SettingConstants::LOGIN_AUTOMATICALLY = SettingsProvider::Setting<bool>("loginAutomatically", false);
 const SettingsProvider::Setting<bool> SettingConstants::SHOW_OFFLINE("showOffline", false);
 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
@@ -30,83 +30,61 @@ namespace Swift {
             /**
              * The #REQUEST_DELIVERYRECEIPTS settings specifies whether to request delivery receipts
              * for messages to contacts that support message receipts.
              */
             static const SettingsProvider::Setting<bool> REQUEST_DELIVERYRECEIPTS;
             static const SettingsProvider::Setting<bool> FORGET_PASSWORDS;
             static const SettingsProvider::Setting<bool> REMEMBER_RECENT_CHATS;
             static const SettingsProvider::Setting<std::string> LAST_LOGIN_JID;
             static const SettingsProvider::Setting<bool> LOGIN_AUTOMATICALLY;
             /**
              * The #SHOW_OFFLINE setting specifies whether or not to show offline contacts in the
              * roster.
              *
              * If set true Swift will show offline contacts; else not.
              */
             static const SettingsProvider::Setting<bool> SHOW_OFFLINE;
             /**
              * The #EXPANDED_ROSTER_GROUPS setting specifies the list of groups that are expanded
              * in the roster UI.
              *
              * Its value is a string with group names seperated by newlines.
              */
             static const SettingsProvider::Setting<std::string> EXPANDED_ROSTER_GROUPS;
             static const SettingsProvider::Setting<bool> PLAY_SOUNDS;
             /**
              * The #HIGHLIGHT_RULES setting specifies the highlight rules and the associated actions.
              *
              * 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.
              *
              * Supported values are:
              * - "no" : It is up to the user whether to accept the invitation and enter a room or not.
              * - "presence" : The invitation is automatically accepted if it is from a contact that is
              *   already allowed to see the user's presence status.
              * - "domain" : The invitation is automatically accepted if it is from a contact that is
              *   already allowed to see the user's presence status or from a contact of user's domain.
              */
             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.
              *
              * If set true Swift will sign out the user when the
              * smart card is removed; else not.
              */
             static const SettingsProvider::Setting<bool> DISCONNECT_ON_CARD_REMOVAL;
             /**
              * The #SINGLE_SIGN_ON setting
              * specifies whether to log in using Single Sign On.
              * This is currently supported on Windows.
              *
              * If set true Swift will use GSSAPI authentication to
              * 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;
     };
 }