summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEdwin Mons <edwin.mons@isode.com>2019-11-19 13:36:05 (GMT)
committerEdwin Mons <edwin.mons@isode.com>2019-11-19 13:58:45 (GMT)
commit261ba8d8595ed8cb90f9c4feb1d6ef642942bcba (patch)
treec7e60d473509db8c4dbff5aa83fbde963d8dd75e /Swift/QtUI/QtSwift.cpp
parent697ae6ae84512a744958b24118197ec7bfdbc1f0 (diff)
downloadswift-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.cpp8
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,3 +1,3 @@
/*
- * Copyright (c) 2010-2018 Isode Limited.
+ * Copyright (c) 2010-2019 Isode Limited.
* All rights reserved.
@@ -193,3 +193,3 @@ QtSwift::QtSwift(const po::variables_map& options) : networkFactories_(&clientMa
catch (...) {
- SWIFT_LOG(error) << "Error while retrieving the specified log file name from the command line" << std::endl;
+ SWIFT_LOG(error) << "Error while retrieving the specified log file name from the command line";
}
@@ -224,3 +224,3 @@ QtSwift::QtSwift(const po::variables_map& options) : networkFactories_(&clientMa
int error = QFontDatabase::addApplicationFont(P2QSTRING(fontPath));
- SWIFT_LOG_ASSERT(error != -1, error) << "Failed to load font " << fontPath << std::endl;
+ SWIFT_LOG_ASSERT(error != -1, error) << "Failed to load font " << fontPath;
}
@@ -230,3 +230,3 @@ QtSwift::QtSwift(const po::variables_map& options) : networkFactories_(&clientMa
int error = QFontDatabase::addApplicationFont(P2QSTRING(fontPath));
- SWIFT_LOG_ASSERT(error != -1, error) << "Failed to load font " << fontPath << std::endl;
+ SWIFT_LOG_ASSERT(error != -1, error) << "Failed to load font " << fontPath;
QFont::insertSubstitution(QApplication::font().family(),"NotoColorEmoji");