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,8 +1,8 @@
/*
- * Copyright (c) 2010-2016 Isode Limited.
+ * Copyright (c) 2010-2019 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#include <SwifTools/Application/ApplicationPathProvider.h>
@@ -22,13 +22,13 @@ ApplicationPathProvider::~ApplicationPathProvider() {
boost::filesystem::path ApplicationPathProvider::getProfileDir(const std::string& profile) const {
boost::filesystem::path result(getHomeDir() / profile);
try {
boost::filesystem::create_directory(result);
}
catch (const boost::filesystem::filesystem_error& e) {
- SWIFT_LOG(error) << e.what() << std::endl;
+ SWIFT_LOG(error) << e.what();
}
return result;
}
boost::filesystem::path ApplicationPathProvider::getResourcePath(const std::string& resource) const {
std::vector<boost::filesystem::path> resourcePaths = getResourceDirs();
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,8 +1,8 @@
/*
- * Copyright (c) 2010-2016 Isode Limited.
+ * Copyright (c) 2010-2019 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#include <SwifTools/Application/MacOSXApplicationPathProvider.h>
@@ -20,13 +20,13 @@ MacOSXApplicationPathProvider::MacOSXApplicationPathProvider(const std::string&
boost::filesystem::path MacOSXApplicationPathProvider::getDataDir() const {
boost::filesystem::path result(getHomeDir() / "Library/Application Support" / getApplicationName());
try {
boost::filesystem::create_directory(result);
}
catch (const boost::filesystem::filesystem_error& e) {
- SWIFT_LOG(error) << e.what() << std::endl;
+ SWIFT_LOG(error) << e.what();
}
return result;
}
boost::filesystem::path MacOSXApplicationPathProvider::getHomeDir() const {
return boost::filesystem::path(getenv("HOME"));
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,8 +1,8 @@
/*
- * Copyright (c) 2010-2016 Isode Limited.
+ * Copyright (c) 2010-2019 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#include <SwifTools/Application/UnixApplicationPathProvider.h>
@@ -51,12 +51,12 @@ boost::filesystem::path UnixApplicationPathProvider::getDataDir() const {
: boost::filesystem::path(dataDir)) / boost::to_lower_copy(getApplicationName());
try {
boost::filesystem::create_directories(dataPath);
}
catch (const boost::filesystem::filesystem_error& e) {
- SWIFT_LOG(error) << "file system error: " << e.what() << std::endl;
+ SWIFT_LOG(error) << "file system error: " << e.what();
}
return dataPath;
}
}
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,8 +1,8 @@
/*
- * Copyright (c) 2016-2017 Isode Limited.
+ * Copyright (c) 2016-2019 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#include <SwifTools/AutoUpdater/SparkleAutoUpdater.h>
@@ -43,13 +43,13 @@ SparkleAutoUpdater::SparkleAutoUpdater(const std::string& appcastFeed) : d(new P
auto canDoSilentUpdates = applicationInstallationLocationWritable();
[d->updater setAutomaticallyDownloadsUpdates: canDoSilentUpdates];
SWIFT_LOG(debug) << (canDoSilentUpdates ?
"The current running user has enough permissions to do a silent update." :
- "The current running user has insufficient permissions to do a silent update.") << std::endl;
+ "The current running user has insufficient permissions to do a silent update.");
setAppcastFeed(appcastFeed);
}
SparkleAutoUpdater::~SparkleAutoUpdater() {
[d->updater release];
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,8 +1,8 @@
/*
- * Copyright (c) 2016-2017 Isode Limited.
+ * Copyright (c) 2016-2019 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#import <SwifTools/AutoUpdater/SparkleAutoUpdaterDelegate.h>
@@ -46,13 +46,13 @@ using namespace Swift;
onNewUpdateState(AutoUpdater::State::DownloadingUpdate);
}
- (void)updater:(SUUpdater *)updater failedToDownloadUpdate:(SUAppcastItem *)item error:(NSError *)error {
(void)updater;
(void)item;
- SWIFT_LOG(error) << ns2StdString([error localizedDescription]) << std::endl;
+ SWIFT_LOG(error) << ns2StdString([error localizedDescription]);
onNewUpdateState(AutoUpdater::State::ErrorCheckingForUpdate);
}
- (void)updater:(SUUpdater *)updater willInstallUpdate:(SUAppcastItem *)update {
(void)updater;
(void)update;
@@ -68,12 +68,12 @@ using namespace Swift;
- (void)updater:(SUUpdater *)updater didAbortWithError:(NSError *)error {
(void)updater;
if ([error code] == SUNoUpdateError) {
onNewUpdateState(AutoUpdater::State::NoUpdateAvailable);
}
else {
- SWIFT_LOG(error) << ns2StdString([error localizedDescription]) << std::endl;
+ SWIFT_LOG(error) << ns2StdString([error localizedDescription]);
onNewUpdateState(AutoUpdater::State::ErrorCheckingForUpdate);
}
}
@end
diff --git a/SwifTools/CrashReporter.cpp b/SwifTools/CrashReporter.cpp
index bf637c8..b02e73b 100644
--- a/SwifTools/CrashReporter.cpp
+++ b/SwifTools/CrashReporter.cpp
@@ -1,8 +1,8 @@
/*
- * Copyright (c) 2012-2016 Isode Limited.
+ * Copyright (c) 2012-2019 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#include <Swiften/Base/Log.h>
#include <Swiften/Base/Platform.h>
@@ -43,13 +43,13 @@ CrashReporter::CrashReporter(const boost::filesystem::path& path, const std::str
// Create the path that will contain the crash dumps
if (!boost::filesystem::exists(path)) {
try {
boost::filesystem::create_directories(path);
}
catch (const boost::filesystem::filesystem_error& e) {
- SWIFT_LOG(error) << "ERROR: " << e.what() << std::endl;
+ SWIFT_LOG(error) << "ERROR: " << e.what();
}
}
p = std::make_shared<Private>();
#if defined(SWIFTEN_PLATFORM_WINDOWS)
// FIXME: Need UTF8 conversion from string to wstring
diff --git a/SwifTools/HunspellChecker.cpp b/SwifTools/HunspellChecker.cpp
index 1de369b..019a4dc 100644
--- a/SwifTools/HunspellChecker.cpp
+++ b/SwifTools/HunspellChecker.cpp
@@ -81,18 +81,18 @@ bool HunspellChecker::isAutomaticallyDetectingLanguage() {
return false;
}
void HunspellChecker::setActiveLanguage(const std::string& language) {
auto dictionaries = detectedDictionaries();
if (dictionaries.find(language) != dictionaries.end()) {
- SWIFT_LOG(debug) << "Initialized Hunspell with dic,aff files " << dictionaries[language].dicPath << " , " << dictionaries[language].affPath << std::endl;
+ SWIFT_LOG(debug) << "Initialized Hunspell with dic,aff files " << dictionaries[language].dicPath << " , " << dictionaries[language].affPath;
speller_ = std::unique_ptr<Hunspell>(new Hunspell(dictionaries[language].affPath.c_str(), dictionaries[language].dicPath.c_str()));
activeLangauge_ = language;
}
else {
- SWIFT_LOG(warning) << "Unsupported language '" << language << "'" << std::endl;
+ SWIFT_LOG(warning) << "Unsupported language '" << language << "'";
}
}
std::string HunspellChecker::activeLanguage() const {
return activeLangauge_.get_value_or("");
}
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,8 +1,8 @@
/*
- * Copyright (c) 2015-2016 Isode Limited.
+ * Copyright (c) 2015-2019 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#include <SwifTools/Notifier/NotificationCenterNotifier.h>
@@ -85,11 +85,11 @@ void NotificationCenterNotifier::handleUserNotificationActivated(const std::stri
if (p->callbacksForNotifications.find(identifier) != p->callbacksForNotifications.end()) {
if (!(*p->callbacksForNotifications[identifier]->callback).empty()) {
(*p->callbacksForNotifications[identifier]->callback)();
}
}
else {
- SWIFT_LOG(warning) << "Missing callback entry for activated notification. The activate notification may come from another instance." << std::endl;
+ SWIFT_LOG(warning) << "Missing callback entry for activated notification. The activate notification may come from another instance.";
}
}
}