2 files changed, 15 insertions, 19 deletions
diff --git a/Swift/Controllers/AccountController.cpp b/Swift/Controllers/AccountController.cpp
index 27655c0..b877ce9 100644
--- a/Swift/Controllers/AccountController.cpp
+++ b/Swift/Controllers/AccountController.cpp
@@ -837,37 +837,37 @@ void AccountController::handleQuitRequest() {
 #define SERIALIZE_STRING(option) result += Base64::encode(createByteArray(options.option)); result += ",";
 #define SERIALIZE_SAFE_STRING(option) result += safeByteArrayToString(Base64::encode(options.option)); result += ",";
 #define SERIALIZE_URL(option) SERIALIZE_STRING(option.toString())
 
 std::string AccountController::serializeClientOptions(const ClientOptions& options) {
     std::string result;
-    SERIALIZE_BOOL(useStreamCompression);
+    SERIALIZE_BOOL(useStreamCompression)
     switch (options.useTLS) {
         case ClientOptions::NeverUseTLS: result += "1";break;
         case ClientOptions::UseTLSWhenAvailable: result += "2";break;
         case ClientOptions::RequireTLS: result += "3";break;
     }
     result += ",";
-    SERIALIZE_BOOL(allowPLAINWithoutTLS);
-    SERIALIZE_BOOL(useStreamResumption);
-    SERIALIZE_BOOL(useAcks);
-    SERIALIZE_STRING(manualHostname);
-    SERIALIZE_INT(manualPort);
+    SERIALIZE_BOOL(allowPLAINWithoutTLS)
+    SERIALIZE_BOOL(useStreamResumption)
+    SERIALIZE_BOOL(useAcks)
+    SERIALIZE_STRING(manualHostname)
+    SERIALIZE_INT(manualPort)
     switch (options.proxyType) {
         case ClientOptions::NoProxy: result += "1";break;
         case ClientOptions::SystemConfiguredProxy: result += "2";break;
         case ClientOptions::SOCKS5Proxy: result += "3";break;
         case ClientOptions::HTTPConnectProxy: result += "4";break;
     }
     result += ",";
-    SERIALIZE_STRING(manualProxyHostname);
-    SERIALIZE_INT(manualProxyPort);
-    SERIALIZE_URL(boshURL);
-    SERIALIZE_URL(boshHTTPConnectProxyURL);
-    SERIALIZE_SAFE_STRING(boshHTTPConnectProxyAuthID);
-    SERIALIZE_SAFE_STRING(boshHTTPConnectProxyAuthPassword);
-    SERIALIZE_BOOL(tlsOptions.schannelTLS1_0Workaround);
-    SERIALIZE_BOOL(singleSignOn);
+    SERIALIZE_STRING(manualProxyHostname)
+    SERIALIZE_INT(manualProxyPort)
+    SERIALIZE_URL(boshURL)
+    SERIALIZE_URL(boshHTTPConnectProxyURL)
+    SERIALIZE_SAFE_STRING(boshHTTPConnectProxyAuthID)
+    SERIALIZE_SAFE_STRING(boshHTTPConnectProxyAuthPassword)
+    SERIALIZE_BOOL(tlsOptions.schannelTLS1_0Workaround)
+    SERIALIZE_BOOL(singleSignOn)
     return result;
 }
 
 }
diff --git a/Swift/Controllers/Settings/XMLSettingsProvider.cpp b/Swift/Controllers/Settings/XMLSettingsProvider.cpp
index 8415209..f1049f1 100644
--- a/Swift/Controllers/Settings/XMLSettingsProvider.cpp
+++ b/Swift/Controllers/Settings/XMLSettingsProvider.cpp
@@ -65,13 +65,13 @@ void XMLSettingsProvider::storeSetting(const Setting<bool>& /*settingPath*/, con
 }
 
 int XMLSettingsProvider::getSetting(const Setting<int>& setting) {
     if (values_.find(setting.getKey()) != values_.end()) {
         std::string value = values_[setting.getKey()];
         try {
-            return value.empty() ? setting.getDefaultValue() : boost::lexical_cast<int>(value);;
+            return value.empty() ? setting.getDefaultValue() : boost::lexical_cast<int>(value);
         }
         catch(boost::bad_lexical_cast &) {}
     }
     return setting.getDefaultValue();
 }
 
@@ -120,10 +120,6 @@ void XMLSettingsProvider::handleCharacterData(const std::string& data) {
         currentText_ += data;
     }
 }
 
 
 }
-
-
-
-