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/QtScaledAvatarCache.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/QtScaledAvatarCache.cpp')
| -rw-r--r-- | Swift/QtUI/QtScaledAvatarCache.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Swift/QtUI/QtScaledAvatarCache.cpp b/Swift/QtUI/QtScaledAvatarCache.cpp index 37ea6a9..e3a28d6 100644 --- a/Swift/QtUI/QtScaledAvatarCache.cpp +++ b/Swift/QtUI/QtScaledAvatarCache.cpp | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (c) 2011-2016 Isode Limited. | 2 | * Copyright (c) 2011-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 | */ |
| @@ -53,8 +53,8 @@ QString QtScaledAvatarCache::getScaledAvatarPath(const QString& path) { | |||
| 53 | if (avatarFile.exists() && !avatarFile.absolutePath().startsWith(":/")) { | 53 | if (avatarFile.exists() && !avatarFile.absolutePath().startsWith(":/")) { |
| 54 | QString cacheSubPath = QString("ScaledAvatarCacheV%1/%2").arg(QString::number(QT_SCALED_AVATAR_CACHE_VERSION), QString::number(size)); | 54 | QString cacheSubPath = QString("ScaledAvatarCacheV%1/%2").arg(QString::number(QT_SCALED_AVATAR_CACHE_VERSION), QString::number(size)); |
| 55 | if (!avatarFile.dir().mkpath(cacheSubPath)) { | 55 | if (!avatarFile.dir().mkpath(cacheSubPath)) { |
| 56 | SWIFT_LOG(error) << "avatarFile.dir(): " << Q2PSTRING(avatarFile.dir().absolutePath()) << std::endl; | 56 | SWIFT_LOG(error) << "avatarFile.dir(): " << Q2PSTRING(avatarFile.dir().absolutePath()); |
| 57 | SWIFT_LOG(error) << "Failed creating cache folder: " << Q2PSTRING(cacheSubPath) << std::endl; | 57 | SWIFT_LOG(error) << "Failed creating cache folder: " << Q2PSTRING(cacheSubPath); |
| 58 | return path; | 58 | return path; |
| 59 | } | 59 | } |
| 60 | QDir targetDir(avatarFile.dir().absoluteFilePath(cacheSubPath)); | 60 | QDir targetDir(avatarFile.dir().absoluteFilePath(cacheSubPath)); |
| @@ -75,7 +75,7 @@ QString QtScaledAvatarCache::getScaledAvatarPath(const QString& path) { | |||
| 75 | return path; | 75 | return path; |
| 76 | } | 76 | } |
| 77 | } else { | 77 | } else { |
| 78 | SWIFT_LOG(warning) << "Failed to load " << Q2PSTRING(path) << std::endl; | 78 | SWIFT_LOG(warning) << "Failed to load " << Q2PSTRING(path); |
| 79 | } | 79 | } |
| 80 | } | 80 | } |
| 81 | return targetFile; | 81 | return targetFile; |