From 5b78e0da1d64b6096829f54b29f14ec5643b5ece Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20Vr=C3=A1til?= <dvratil@redhat.com>
Date: Fri, 15 May 2015 16:00:32 +0200
Subject: Async: rename Async namespace to KAsync

---
 async/src/debug.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'async/src/debug.cpp')

diff --git a/async/src/debug.cpp b/async/src/debug.cpp
index fdf2fa1..64a3a3b 100644
--- a/async/src/debug.cpp
+++ b/async/src/debug.cpp
@@ -25,7 +25,7 @@
 #include <memory>
 #endif
 
-namespace Async
+namespace KAsync
 {
 
 Q_LOGGING_CATEGORY(Debug, "org.kde.async", QtWarningMsg);
@@ -37,15 +37,15 @@ QString demangleName(const char *name)
     int status = 1; // uses -3 to 0 error codes
     std::unique_ptr<char, void(*)(void*)> demangled(abi::__cxa_demangle(name, 0, 0, &status), std::free);
     if (status == 0) {
-        return QString(demangled.get());
+        return QString::fromLatin1(demangled.get());
     }
 #endif
-    return QString(name);
+    return QString::fromLatin1(name);
 }
 
 }
 
-using namespace Async;
+using namespace KAsync;
 
 int Tracer::lastId = 0;
 
@@ -53,12 +53,12 @@ Tracer::Tracer(Private::Execution *execution)
     : mId(lastId++)
     , mExecution(execution)
 {
-    msg(Async::Tracer::Start);
+    msg(KAsync::Tracer::Start);
 }
 
 Tracer::~Tracer()
 {
-    msg(Async::Tracer::End);
+    msg(KAsync::Tracer::End);
     // FIXME: Does this work on parallel executions?
     --lastId;
     --mId;
@@ -68,8 +68,8 @@ void Tracer::msg(Tracer::MsgType msgType)
 {
 #ifndef QT_NO_DEBUG
     qCDebug(Trace).nospace() << (QString().fill(QLatin1Char(' '), mId * 2) % 
-                                 (msgType == Async::Tracer::Start ? " START " : " END   ") %
-                                 QString::number(mId) % " " %
+                                 (msgType == KAsync::Tracer::Start ? QStringLiteral(" START ") : QStringLiteral(" END   ")) %
+                                 QString::number(mId) % QStringLiteral(" ") %
                                  mExecution->executor->mExecutorName);
 #endif
 }
-- 
cgit v1.2.3