From d806944f067268f13b0892a6158e40225c82a3f5 Mon Sep 17 00:00:00 2001
From: Kai Koehne <kai.koehne@digia.com>
Date: Tue, 18 Jun 2013 09:24:07 +0200
Subject: [PATCH] Fix code indentation and comment formatting

Change-Id: Ic94200988add19d608648c8d3bd56bbfe74bde79
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
---
 src/corelib/global/qlogging.cpp | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/corelib/global/qlogging.cpp b/src/corelib/global/qlogging.cpp
index 85ff89ebdd..a37fc15b61 100644
--- a/src/corelib/global/qlogging.cpp
+++ b/src/corelib/global/qlogging.cpp
@@ -917,21 +917,19 @@ static void qt_message_print(QtMsgType msgType, const QMessageLogContext &contex
 static void qt_message_fatal(QtMsgType, const QMessageLogContext &context, const QString &message)
 {
 #if defined(Q_CC_MSVC) && defined(QT_DEBUG) && defined(_DEBUG) && defined(_CRT_ERROR)
-        wchar_t contextFileL[256];
-        // we probably should let the compiler do this for us, by
-        // declaring QMessageLogContext::file to be const wchar_t * in
-        // the first place, but the #ifdefery above is very complex
-        // and we wouldn't be able to change it later on...
-        convert_to_wchar_t_elided(contextFileL, sizeof contextFileL / sizeof *contextFileL, context.file);
+    wchar_t contextFileL[256];
+    // we probably should let the compiler do this for us, by declaring QMessageLogContext::file to
+    // be const wchar_t * in the first place, but the #ifdefery above is very complex  and we
+    // wouldn't be able to change it later on...
+    convert_to_wchar_t_elided(contextFileL, sizeof contextFileL / sizeof *contextFileL,
+                              context.file);
     // get the current report mode
     int reportMode = _CrtSetReportMode(_CRT_ERROR, _CRTDBG_MODE_WNDW);
     _CrtSetReportMode(_CRT_ERROR, reportMode);
 
-        int ret = _CrtDbgReportW(_CRT_ERROR, contextFileL,
-                             context.line, _CRT_WIDE(QT_VERSION_STR),
-                             reinterpret_cast<const wchar_t *> (
-                                 message.utf16()));
-    if (ret == 0  && reportMode & _CRTDBG_MODE_WNDW)
+    int ret = _CrtDbgReportW(_CRT_ERROR, contextFileL, context.line, _CRT_WIDE(QT_VERSION_STR),
+                             reinterpret_cast<const wchar_t *>(message.utf16()));
+    if ((ret == 0) && (reportMode & _CRTDBG_MODE_WNDW))
         return; // ignore
     else if (ret == 1)
         _CrtDbgBreak();