diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/libs/cplusplus/Macro.h | 6 | ||||
-rw-r--r-- | src/libs/cplusplus/PreprocessorEnvironment.h | 3 | ||||
-rw-r--r-- | src/libs/cplusplus/pp-engine.cpp | 8 | ||||
-rw-r--r-- | src/libs/cplusplus/pp-engine.h | 4 | ||||
-rw-r--r-- | src/libs/cplusplus/pp-macro-expander.cpp | 8 | ||||
-rw-r--r-- | src/plugins/cppeditor/cppeditor.cpp | 2 |
6 files changed, 15 insertions, 16 deletions
diff --git a/src/libs/cplusplus/Macro.h b/src/libs/cplusplus/Macro.h index c67c67f5e7..e3fc10986b 100644 --- a/src/libs/cplusplus/Macro.h +++ b/src/libs/cplusplus/Macro.h @@ -80,10 +80,10 @@ public: void addFormal(const QByteArray &formal) { _formals.append(formal); } - QByteArray fileName() const + QString fileName() const { return _fileName; } - void setFileName(const QByteArray &fileName) + void setFileName(const QString &fileName) { _fileName = fileName; } unsigned line() const @@ -120,7 +120,7 @@ private: QByteArray _name; QByteArray _definition; QVector<QByteArray> _formals; - QByteArray _fileName; + QString _fileName; unsigned _line; union diff --git a/src/libs/cplusplus/PreprocessorEnvironment.h b/src/libs/cplusplus/PreprocessorEnvironment.h index d0c5efeb19..228dc27a5d 100644 --- a/src/libs/cplusplus/PreprocessorEnvironment.h +++ b/src/libs/cplusplus/PreprocessorEnvironment.h @@ -53,6 +53,7 @@ #include <QList> #include <QByteArray> +#include <QString> namespace CPlusPlus { @@ -88,7 +89,7 @@ private: void rehash(); public: - QByteArray currentFile; + QString currentFile; unsigned currentLine; bool hideNext; diff --git a/src/libs/cplusplus/pp-engine.cpp b/src/libs/cplusplus/pp-engine.cpp index f24b23b6e0..239db98545 100644 --- a/src/libs/cplusplus/pp-engine.cpp +++ b/src/libs/cplusplus/pp-engine.cpp @@ -564,7 +564,7 @@ void Preprocessor::popState() _savedStates.removeLast(); } -QByteArray Preprocessor::operator()(const QByteArray &filename, +QByteArray Preprocessor::operator()(const QString &filename, const QByteArray &source) { QByteArray preprocessed; @@ -635,7 +635,7 @@ void Preprocessor::processNewline(bool force) out(QByteArray::number(_dot->lineno)); out(' '); out('"'); - out(env->currentFile); + out(env->currentFile.toUtf8()); out('"'); out('\n'); } else { @@ -714,7 +714,7 @@ bool Preprocessor::markGeneratedTokens(bool markGeneratedTokens, return previous; } -void Preprocessor::preprocess(const QByteArray &fileName, const QByteArray &source, +void Preprocessor::preprocess(const QString &fileName, const QByteArray &source, QByteArray *result) { QByteArray *previousResult = _result; @@ -722,7 +722,7 @@ void Preprocessor::preprocess(const QByteArray &fileName, const QByteArray &sour pushState(createStateFromSource(source)); - const QByteArray previousFileName = env->currentFile; + const QString previousFileName = env->currentFile; env->currentFile = fileName; const unsigned previousCurrentLine = env->currentLine; diff --git a/src/libs/cplusplus/pp-engine.h b/src/libs/cplusplus/pp-engine.h index 2895e2eddf..46ea0bc061 100644 --- a/src/libs/cplusplus/pp-engine.h +++ b/src/libs/cplusplus/pp-engine.h @@ -67,10 +67,10 @@ class CPLUSPLUS_EXPORT Preprocessor public: Preprocessor(Client *client, Environment *env); - QByteArray operator()(const QByteArray &filename, + QByteArray operator()(const QString &filename, const QByteArray &source); - void preprocess(const QByteArray &filename, + void preprocess(const QString &filename, const QByteArray &source, QByteArray *result); 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; } diff --git a/src/plugins/cppeditor/cppeditor.cpp b/src/plugins/cppeditor/cppeditor.cpp index 6b2c0e1d42..13bdb1f5b2 100644 --- a/src/plugins/cppeditor/cppeditor.cpp +++ b/src/plugins/cppeditor/cppeditor.cpp @@ -761,7 +761,7 @@ CPPEditor::Link CPPEditor::findLinkAt(const QTextCursor &cursor, foreach (const Document::MacroUse use, doc->macroUses()) { if (use.contains(endOfName - 1)) { const Macro ¯o = use.macro(); - link.fileName = QString::fromUtf8(macro.fileName()); + link.fileName = macro.fileName(); link.line = macro.line(); link.pos = use.begin(); link.length = use.end() - use.begin(); |