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/QtUI/QtSwift.cpp | |
| 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/QtUI/QtSwift.cpp')
| -rw-r--r-- | Swift/QtUI/QtSwift.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Swift/QtUI/QtSwift.cpp b/Swift/QtUI/QtSwift.cpp index f1ad38e..73fd733 100644 --- a/Swift/QtUI/QtSwift.cpp +++ b/Swift/QtUI/QtSwift.cpp | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (c) 2010-2018 Isode Limited. | 2 | * Copyright (c) 2010-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 | */ |
| @@ -191,7 +191,7 @@ QtSwift::QtSwift(const po::variables_map& options) : networkFactories_(&clientMa | |||
| 191 | Log::setLogFile(fileName); | 191 | Log::setLogFile(fileName); |
| 192 | } | 192 | } |
| 193 | catch (...) { | 193 | catch (...) { |
| 194 | SWIFT_LOG(error) << "Error while retrieving the specified log file name from the command line" << std::endl; | 194 | SWIFT_LOG(error) << "Error while retrieving the specified log file name from the command line"; |
| 195 | } | 195 | } |
| 196 | } | 196 | } |
| 197 | //TODO this old option can be purged | 197 | //TODO this old option can be purged |
| @@ -222,13 +222,13 @@ QtSwift::QtSwift(const po::variables_map& options) : networkFactories_(&clientMa | |||
| 222 | for (auto&& fontName : fontNames) { | 222 | for (auto&& fontName : fontNames) { |
| 223 | std::string fontPath = std::string(":/") + fontName; | 223 | std::string fontPath = std::string(":/") + fontName; |
| 224 | int error = QFontDatabase::addApplicationFont(P2QSTRING(fontPath)); | 224 | int error = QFontDatabase::addApplicationFont(P2QSTRING(fontPath)); |
| 225 | SWIFT_LOG_ASSERT(error != -1, error) << "Failed to load font " << fontPath << std::endl; | 225 | SWIFT_LOG_ASSERT(error != -1, error) << "Failed to load font " << fontPath; |
| 226 | } | 226 | } |
| 227 | 227 | ||
| 228 | #ifdef SWIFTEN_PLATFORM_LINUX | 228 | #ifdef SWIFTEN_PLATFORM_LINUX |
| 229 | std::string fontPath = std::string(":/themes/Default/Noto/NotoColorEmoji.ttf"); | 229 | std::string fontPath = std::string(":/themes/Default/Noto/NotoColorEmoji.ttf"); |
| 230 | int error = QFontDatabase::addApplicationFont(P2QSTRING(fontPath)); | 230 | int error = QFontDatabase::addApplicationFont(P2QSTRING(fontPath)); |
| 231 | SWIFT_LOG_ASSERT(error != -1, error) << "Failed to load font " << fontPath << std::endl; | 231 | SWIFT_LOG_ASSERT(error != -1, error) << "Failed to load font " << fontPath; |
| 232 | QFont::insertSubstitution(QApplication::font().family(),"NotoColorEmoji"); | 232 | QFont::insertSubstitution(QApplication::font().family(),"NotoColorEmoji"); |
| 233 | #endif | 233 | #endif |
| 234 | #ifdef SWIFTEN_PLATFORM_WINDOWS | 234 | #ifdef SWIFTEN_PLATFORM_WINDOWS |