Swift
summaryrefslogtreecommitdiffstats
path: root/SwifTools
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 /SwifTools
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 'SwifTools')
-rw-r--r--SwifTools/Application/ApplicationPathProvider.cpp4
-rw-r--r--SwifTools/Application/MacOSXApplicationPathProvider.cpp4
-rw-r--r--SwifTools/Application/UnixApplicationPathProvider.cpp4
-rw-r--r--SwifTools/AutoUpdater/SparkleAutoUpdater.mm4
-rw-r--r--SwifTools/AutoUpdater/SparkleAutoUpdaterDelegate.mm6
-rw-r--r--SwifTools/CrashReporter.cpp4
-rw-r--r--SwifTools/HunspellChecker.cpp4
-rw-r--r--SwifTools/Notifier/NotificationCenterNotifier.mm4
8 files changed, 17 insertions, 17 deletions
diff --git a/SwifTools/Application/ApplicationPathProvider.cpp b/SwifTools/Application/ApplicationPathProvider.cpp
index 8b952bb..77457ef 100644
--- a/SwifTools/Application/ApplicationPathProvider.cpp
+++ b/SwifTools/Application/ApplicationPathProvider.cpp
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (c) 2010-2016 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 */
@@ -25,7 +25,7 @@ boost::filesystem::path ApplicationPathProvider::getProfileDir(const std::string
25 boost::filesystem::create_directory(result); 25 boost::filesystem::create_directory(result);
26 } 26 }
27 catch (const boost::filesystem::filesystem_error& e) { 27 catch (const boost::filesystem::filesystem_error& e) {
28 SWIFT_LOG(error) << e.what() << std::endl; 28 SWIFT_LOG(error) << e.what();
29 } 29 }
30 return result; 30 return result;
31} 31}
diff --git a/SwifTools/Application/MacOSXApplicationPathProvider.cpp b/SwifTools/Application/MacOSXApplicationPathProvider.cpp
index 684d8b2..d7b99b9 100644
--- a/SwifTools/Application/MacOSXApplicationPathProvider.cpp
+++ b/SwifTools/Application/MacOSXApplicationPathProvider.cpp
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (c) 2010-2016 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 */
@@ -23,7 +23,7 @@ boost::filesystem::path MacOSXApplicationPathProvider::getDataDir() const {
23 boost::filesystem::create_directory(result); 23 boost::filesystem::create_directory(result);
24 } 24 }
25 catch (const boost::filesystem::filesystem_error& e) { 25 catch (const boost::filesystem::filesystem_error& e) {
26 SWIFT_LOG(error) << e.what() << std::endl; 26 SWIFT_LOG(error) << e.what();
27 } 27 }
28 return result; 28 return result;
29} 29}
diff --git a/SwifTools/Application/UnixApplicationPathProvider.cpp b/SwifTools/Application/UnixApplicationPathProvider.cpp
index e455d23..a345766 100644
--- a/SwifTools/Application/UnixApplicationPathProvider.cpp
+++ b/SwifTools/Application/UnixApplicationPathProvider.cpp
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (c) 2010-2016 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 */
@@ -54,7 +54,7 @@ boost::filesystem::path UnixApplicationPathProvider::getDataDir() const {
54 boost::filesystem::create_directories(dataPath); 54 boost::filesystem::create_directories(dataPath);
55 } 55 }
56 catch (const boost::filesystem::filesystem_error& e) { 56 catch (const boost::filesystem::filesystem_error& e) {
57 SWIFT_LOG(error) << "file system error: " << e.what() << std::endl; 57 SWIFT_LOG(error) << "file system error: " << e.what();
58 } 58 }
59 return dataPath; 59 return dataPath;
60} 60}
diff --git a/SwifTools/AutoUpdater/SparkleAutoUpdater.mm b/SwifTools/AutoUpdater/SparkleAutoUpdater.mm
index b4a4c05..274ab3c 100644
--- a/SwifTools/AutoUpdater/SparkleAutoUpdater.mm
+++ b/SwifTools/AutoUpdater/SparkleAutoUpdater.mm
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (c) 2016-2017 Isode Limited. 2 * Copyright (c) 2016-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 */
@@ -46,7 +46,7 @@ SparkleAutoUpdater::SparkleAutoUpdater(const std::string& appcastFeed) : d(new P
46 46
47 SWIFT_LOG(debug) << (canDoSilentUpdates ? 47 SWIFT_LOG(debug) << (canDoSilentUpdates ?
48 "The current running user has enough permissions to do a silent update." : 48 "The current running user has enough permissions to do a silent update." :
49 "The current running user has insufficient permissions to do a silent update.") << std::endl; 49 "The current running user has insufficient permissions to do a silent update.");
50 50
51 setAppcastFeed(appcastFeed); 51 setAppcastFeed(appcastFeed);
52} 52}
diff --git a/SwifTools/AutoUpdater/SparkleAutoUpdaterDelegate.mm b/SwifTools/AutoUpdater/SparkleAutoUpdaterDelegate.mm
index be58355..b9294d9 100644
--- a/SwifTools/AutoUpdater/SparkleAutoUpdaterDelegate.mm
+++ b/SwifTools/AutoUpdater/SparkleAutoUpdaterDelegate.mm
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (c) 2016-2017 Isode Limited. 2 * Copyright (c) 2016-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 */
@@ -49,7 +49,7 @@ using namespace Swift;
49- (void)updater:(SUUpdater *)updater failedToDownloadUpdate:(SUAppcastItem *)item error:(NSError *)error { 49- (void)updater:(SUUpdater *)updater failedToDownloadUpdate:(SUAppcastItem *)item error:(NSError *)error {
50 (void)updater; 50 (void)updater;
51 (void)item; 51 (void)item;
52 SWIFT_LOG(error) << ns2StdString([error localizedDescription]) << std::endl; 52 SWIFT_LOG(error) << ns2StdString([error localizedDescription]);
53 onNewUpdateState(AutoUpdater::State::ErrorCheckingForUpdate); 53 onNewUpdateState(AutoUpdater::State::ErrorCheckingForUpdate);
54} 54}
55 55
@@ -71,7 +71,7 @@ using namespace Swift;
71 onNewUpdateState(AutoUpdater::State::NoUpdateAvailable); 71 onNewUpdateState(AutoUpdater::State::NoUpdateAvailable);
72 } 72 }
73 else { 73 else {
74 SWIFT_LOG(error) << ns2StdString([error localizedDescription]) << std::endl; 74 SWIFT_LOG(error) << ns2StdString([error localizedDescription]);
75 onNewUpdateState(AutoUpdater::State::ErrorCheckingForUpdate); 75 onNewUpdateState(AutoUpdater::State::ErrorCheckingForUpdate);
76 } 76 }
77} 77}
diff --git a/SwifTools/CrashReporter.cpp b/SwifTools/CrashReporter.cpp
index bf637c8..b02e73b 100644
--- a/SwifTools/CrashReporter.cpp
+++ b/SwifTools/CrashReporter.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 */
@@ -46,7 +46,7 @@ CrashReporter::CrashReporter(const boost::filesystem::path& path, const std::str
46 boost::filesystem::create_directories(path); 46 boost::filesystem::create_directories(path);
47 } 47 }
48 catch (const boost::filesystem::filesystem_error& e) { 48 catch (const boost::filesystem::filesystem_error& e) {
49 SWIFT_LOG(error) << "ERROR: " << e.what() << std::endl; 49 SWIFT_LOG(error) << "ERROR: " << e.what();
50 } 50 }
51 } 51 }
52 52
diff --git a/SwifTools/HunspellChecker.cpp b/SwifTools/HunspellChecker.cpp
index 1de369b..019a4dc 100644
--- a/SwifTools/HunspellChecker.cpp
+++ b/SwifTools/HunspellChecker.cpp
@@ -84,12 +84,12 @@ bool HunspellChecker::isAutomaticallyDetectingLanguage() {
84void HunspellChecker::setActiveLanguage(const std::string& language) { 84void HunspellChecker::setActiveLanguage(const std::string& language) {
85 auto dictionaries = detectedDictionaries(); 85 auto dictionaries = detectedDictionaries();
86 if (dictionaries.find(language) != dictionaries.end()) { 86 if (dictionaries.find(language) != dictionaries.end()) {
87 SWIFT_LOG(debug) << "Initialized Hunspell with dic,aff files " << dictionaries[language].dicPath << " , " << dictionaries[language].affPath << std::endl; 87 SWIFT_LOG(debug) << "Initialized Hunspell with dic,aff files " << dictionaries[language].dicPath << " , " << dictionaries[language].affPath;
88 speller_ = std::unique_ptr<Hunspell>(new Hunspell(dictionaries[language].affPath.c_str(), dictionaries[language].dicPath.c_str())); 88 speller_ = std::unique_ptr<Hunspell>(new Hunspell(dictionaries[language].affPath.c_str(), dictionaries[language].dicPath.c_str()));
89 activeLangauge_ = language; 89 activeLangauge_ = language;
90 } 90 }
91 else { 91 else {
92 SWIFT_LOG(warning) << "Unsupported language '" << language << "'" << std::endl; 92 SWIFT_LOG(warning) << "Unsupported language '" << language << "'";
93 } 93 }
94} 94}
95 95
diff --git a/SwifTools/Notifier/NotificationCenterNotifier.mm b/SwifTools/Notifier/NotificationCenterNotifier.mm
index 1538186..e6fdfb6 100644
--- a/SwifTools/Notifier/NotificationCenterNotifier.mm
+++ b/SwifTools/Notifier/NotificationCenterNotifier.mm
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (c) 2015-2016 Isode Limited. 2 * Copyright (c) 2015-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 */
@@ -88,7 +88,7 @@ void NotificationCenterNotifier::handleUserNotificationActivated(const std::stri
88 } 88 }
89 } 89 }
90 else { 90 else {
91 SWIFT_LOG(warning) << "Missing callback entry for activated notification. The activate notification may come from another instance." << std::endl; 91 SWIFT_LOG(warning) << "Missing callback entry for activated notification. The activate notification may come from another instance.";
92 } 92 }
93} 93}
94 94