diff options
Diffstat (limited to 'src/libs/cplusplus/pp-macro-expander.cpp')
| -rw-r--r-- | src/libs/cplusplus/pp-macro-expander.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/libs/cplusplus/pp-macro-expander.cpp b/src/libs/cplusplus/pp-macro-expander.cpp index 2cc83bd812..472f534eb9 100644 --- a/src/libs/cplusplus/pp-macro-expander.cpp +++ b/src/libs/cplusplus/pp-macro-expander.cpp @@ -108,7 +108,7 @@ const char *MacroExpander::expand(const char *__first, const char *__last, __result->append(QByteArray::number(env->currentLine)); __result->append(' '); __result->append('"'); - __result->append(env->currentFile); + __result->append(env->currentFile.toUtf8()); __result->append('"'); __result->append('\n'); ++lines; @@ -244,16 +244,14 @@ const char *MacroExpander::expand(const char *__first, const char *__last, { if (fast_name == "__LINE__") { - char buf [16]; - const size_t count = qsnprintf (buf, 16, "%d", env->currentLine + lines); - __result->append(buf, count); + __result->append(QByteArray::number(env->currentLine + lines)); continue; } else if (fast_name == "__FILE__") { __result->append('"'); - __result->append(env->currentFile); + __result->append(env->currentFile.toUtf8()); __result->append('"'); continue; } |