Swiftdiff options
| author | Edwin Mons <edwin.mons@isode.com> | 2019-11-19 13:36:05 (GMT) |
|---|---|---|
| committer | Edwin Mons <edwin.mons@isode.com> | 2019-11-19 13:58:45 (GMT) |
| commit | 261ba8d8595ed8cb90f9c4feb1d6ef642942bcba (patch) | |
| tree | c7e60d473509db8c4dbff5aa83fbde963d8dd75e /Swift/Controllers/Settings | |
| parent | 697ae6ae84512a744958b24118197ec7bfdbc1f0 (diff) | |
| download | swift-261ba8d8595ed8cb90f9c4feb1d6ef642942bcba.zip swift-261ba8d8595ed8cb90f9c4feb1d6ef642942bcba.tar.bz2 | |
Remove std::endl from SWIFT_LOG calls
The std::endl is now added by ~Log, but only for output to stderr or a
log file. Calls to the Android logging system or manually set callbacks
will not include the newline in the logging output.
JIRA: SWIFT-430
Test-Information:
Unit tests pass on Debian 9
Checked that running Swift with logging to stderr still had a newline.
Change-Id: I096fdba78a3b8f87db2097951c28c528592183e8
Diffstat (limited to 'Swift/Controllers/Settings')
| -rw-r--r-- | Swift/Controllers/Settings/XMLSettingsProvider.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Swift/Controllers/Settings/XMLSettingsProvider.cpp b/Swift/Controllers/Settings/XMLSettingsProvider.cpp index f1049f1..a316cef 100644 --- a/Swift/Controllers/Settings/XMLSettingsProvider.cpp +++ b/Swift/Controllers/Settings/XMLSettingsProvider.cpp | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (c) 2012-2016 Isode Limited. | 2 | * Copyright (c) 2012-2019 Isode Limited. |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * See the COPYING file for more information. | 4 | * See the COPYING file for more information. |
| 5 | */ | 5 | */ |
| @@ -20,14 +20,14 @@ XMLSettingsProvider::XMLSettingsProvider(const std::string& xmlConfig) : level_( | |||
| 20 | PlatformXMLParserFactory factory; | 20 | PlatformXMLParserFactory factory; |
| 21 | auto parser = factory.createXMLParser(this, true); | 21 | auto parser = factory.createXMLParser(this, true); |
| 22 | if (parser->parse(xmlConfig)) { | 22 | if (parser->parse(xmlConfig)) { |
| 23 | SWIFT_LOG(debug) << "Found and parsed system config" << std::endl; | 23 | SWIFT_LOG(debug) << "Found and parsed system config"; |
| 24 | } | 24 | } |
| 25 | else { | 25 | else { |
| 26 | SWIFT_LOG(debug) << "Found invalid system config" << std::endl; | 26 | SWIFT_LOG(debug) << "Found invalid system config"; |
| 27 | } | 27 | } |
| 28 | } | 28 | } |
| 29 | else { | 29 | else { |
| 30 | SWIFT_LOG(debug) << "No system config found" << std::endl; | 30 | SWIFT_LOG(debug) << "No system config found"; |
| 31 | } | 31 | } |
| 32 | } | 32 | } |
| 33 | 33 | ||
| @@ -110,7 +110,7 @@ void XMLSettingsProvider::handleStartElement(const std::string& element, const s | |||
| 110 | void XMLSettingsProvider::handleEndElement(const std::string& /*element*/, const std::string& /*ns*/) { | 110 | void XMLSettingsProvider::handleEndElement(const std::string& /*element*/, const std::string& /*ns*/) { |
| 111 | if (level_ == SettingLevel) { | 111 | if (level_ == SettingLevel) { |
| 112 | values_[currentElement_] = currentText_; | 112 | values_[currentElement_] = currentText_; |
| 113 | SWIFT_LOG(debug) << "Setting value of " << currentElement_ << " to " << currentText_ << std::endl; | 113 | SWIFT_LOG(debug) << "Setting value of " << currentElement_ << " to " << currentText_; |
| 114 | } | 114 | } |
| 115 | level_--; | 115 | level_--; |
| 116 | } | 116 | } |