From 15195ba0defc9800dd02daa05f8cb5353cbd3adc Mon Sep 17 00:00:00 2001 From: Chris Luke Date: Tue, 6 May 2014 21:42:22 -0400 Subject: [PATCH] Fix erroneous newline handling in log4qt Qt's output functions seem to handle platform specific variations of newline for us. For example, on Windows if we output "\r\n", we'll actually get "\r\r\n". --- log4qt/layout.cpp | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/log4qt/layout.cpp b/log4qt/layout.cpp index 160f80d..40c490f 100644 --- a/log4qt/layout.cpp +++ b/log4qt/layout.cpp @@ -71,14 +71,11 @@ namespace Log4Qt QString Layout::endOfLine() { - // There seams to be no function in Qt for this - -#ifdef Q_OS_WIN32 - return QLatin1String("\r\n"); -#endif // Q_OS_WIN32 -//#ifdef Q_OS_MAC -// return QLatin1String("\r"); -//#endif // Q_OS_MAC + // Qt's output functions seem to handle + // platform specific variations of newline + // for us. For example, on Windows if we here + // return "\r\n", we'll actually get "\r\r\n" + // in the output. return QLatin1String("\n"); }