diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2019-07-09 14:30:24 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2019-07-11 11:14:54 +0200 |
| commit | f5e4f0784176a6c6e80176b1916ebe8a571f3646 (patch) | |
| tree | 8bbfa93b4645bee727a48f6d98d115ce548139ff /src/qml/jsruntime | |
| parent | be600348ef3530ba69290cb1610d673faafae866 (diff) | |
Disentangle includes and namespaces
Avoid using namespace in headers and include only the headers we
actually need.
Change-Id: I526a0f874dc09b07693fd87070665be396d3b637
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qml/jsruntime')
| -rw-r--r-- | src/qml/jsruntime/qv4include.cpp | 1 | ||||
| -rw-r--r-- | src/qml/jsruntime/qv4runtimecodegen.cpp | 1 | ||||
| -rw-r--r-- | src/qml/jsruntime/qv4runtimecodegen_p.h | 6 | ||||
| -rw-r--r-- | src/qml/jsruntime/qv4script.cpp | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/qml/jsruntime/qv4include.cpp b/src/qml/jsruntime/qv4include.cpp index 28457de643..92face6f94 100644 --- a/src/qml/jsruntime/qv4include.cpp +++ b/src/qml/jsruntime/qv4include.cpp @@ -50,7 +50,6 @@ #include <QtQml/qqmlfile.h> #include <private/qqmlengine_p.h> -#include <private/qqmlirbuilder_p.h> #include <private/qv4engine_p.h> #include <private/qv4functionobject_p.h> #include <private/qv4script_p.h> diff --git a/src/qml/jsruntime/qv4runtimecodegen.cpp b/src/qml/jsruntime/qv4runtimecodegen.cpp index 8d324acbd0..b6902d41b0 100644 --- a/src/qml/jsruntime/qv4runtimecodegen.cpp +++ b/src/qml/jsruntime/qv4runtimecodegen.cpp @@ -42,6 +42,7 @@ #include "qv4compilerscanfunctions_p.h" using namespace QV4; +using namespace QQmlJS; void RuntimeCodegen::generateFromFunctionExpression(const QString &fileName, const QString &sourceCode, diff --git a/src/qml/jsruntime/qv4runtimecodegen_p.h b/src/qml/jsruntime/qv4runtimecodegen_p.h index 006a6a3cde..71aaf1fb55 100644 --- a/src/qml/jsruntime/qv4runtimecodegen_p.h +++ b/src/qml/jsruntime/qv4runtimecodegen_p.h @@ -66,11 +66,11 @@ public: void generateFromFunctionExpression(const QString &fileName, const QString &sourceCode, - AST::FunctionExpression *ast, + QQmlJS::AST::FunctionExpression *ast, Compiler::Module *module); - void throwSyntaxError(const AST::SourceLocation &loc, const QString &detail) override; - void throwReferenceError(const AST::SourceLocation &loc, const QString &detail) override; + void throwSyntaxError(const QQmlJS::AST::SourceLocation &loc, const QString &detail) override; + void throwReferenceError(const QQmlJS::AST::SourceLocation &loc, const QString &detail) override; private: ExecutionEngine *engine; diff --git a/src/qml/jsruntime/qv4script.cpp b/src/qml/jsruntime/qv4script.cpp index f411a20476..2fab9e4b7b 100644 --- a/src/qml/jsruntime/qv4script.cpp +++ b/src/qml/jsruntime/qv4script.cpp @@ -52,7 +52,6 @@ #include <private/qqmljsparser_p.h> #include <private/qqmljsast_p.h> #include <private/qqmlengine_p.h> -#include <private/qqmlirbuilder_p.h> #include <private/qv4profiling_p.h> #include <qv4runtimecodegen_p.h> @@ -61,6 +60,7 @@ #include <QScopedValueRollback> using namespace QV4; +using namespace QQmlJS; Script::Script(ExecutionEngine *v4, QmlContext *qml, const QQmlRefPointer<ExecutableCompilationUnit> &compilationUnit) : line(1), column(0), context(v4->rootContext()), strictMode(false), inheritContext(true), parsed(false) |