diff options
Diffstat (limited to 'src/qml/jsruntime')
30 files changed, 9 insertions, 53 deletions
diff --git a/src/qml/jsruntime/qv4argumentsobject_p.h b/src/qml/jsruntime/qv4argumentsobject_p.h index 4edfe2a763..112db76eb3 100644 --- a/src/qml/jsruntime/qv4argumentsobject_p.h +++ b/src/qml/jsruntime/qv4argumentsobject_p.h @@ -15,7 +15,6 @@ // #include "qv4object_p.h" -#include "qv4functionobject_p.h" QT_BEGIN_NAMESPACE diff --git a/src/qml/jsruntime/qv4arraybuffer.cpp b/src/qml/jsruntime/qv4arraybuffer.cpp index 582369dcf3..f2be552cf8 100644 --- a/src/qml/jsruntime/qv4arraybuffer.cpp +++ b/src/qml/jsruntime/qv4arraybuffer.cpp @@ -3,8 +3,6 @@ #include "qv4arraybuffer_p.h" #include "qv4typedarray_p.h" #include "qv4dataview_p.h" -#include "qv4string_p.h" -#include "qv4jscall_p.h" #include "qv4symbol_p.h" using namespace QV4; diff --git a/src/qml/jsruntime/qv4arrayiterator_p.h b/src/qml/jsruntime/qv4arrayiterator_p.h index 2682dc79d0..423e59d23e 100644 --- a/src/qml/jsruntime/qv4arrayiterator_p.h +++ b/src/qml/jsruntime/qv4arrayiterator_p.h @@ -18,7 +18,6 @@ #include "qv4object_p.h" #include "qv4iterator_p.h" -#include "qv4arraydata_p.h" QT_BEGIN_NAMESPACE diff --git a/src/qml/jsruntime/qv4arrayobject.cpp b/src/qml/jsruntime/qv4arrayobject.cpp index ebe70406cb..46cdbf15d3 100644 --- a/src/qml/jsruntime/qv4arrayobject.cpp +++ b/src/qml/jsruntime/qv4arrayobject.cpp @@ -3,17 +3,12 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "qv4arrayobject_p.h" -#include "qv4objectiterator_p.h" #include "qv4arrayiterator_p.h" -#include "qv4sparsearray_p.h" #include "qv4objectproto_p.h" -#include "qv4jscall_p.h" #include "qv4argumentsobject_p.h" #include "qv4runtime_p.h" -#include "qv4string_p.h" #include "qv4symbol_p.h" #include <QtCore/qscopedvaluerollback.h> -#include "qv4proxy_p.h" using namespace QV4; diff --git a/src/qml/jsruntime/qv4booleanobject.cpp b/src/qml/jsruntime/qv4booleanobject.cpp index a7320184dc..3110ec7992 100644 --- a/src/qml/jsruntime/qv4booleanobject.cpp +++ b/src/qml/jsruntime/qv4booleanobject.cpp @@ -2,7 +2,6 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "qv4booleanobject_p.h" -#include "qv4string_p.h" using namespace QV4; diff --git a/src/qml/jsruntime/qv4context.cpp b/src/qml/jsruntime/qv4context.cpp index 6a2b4f37e0..b702dbe2db 100644 --- a/src/qml/jsruntime/qv4context.cpp +++ b/src/qml/jsruntime/qv4context.cpp @@ -2,16 +2,12 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include <QString> -#include "qv4debugging_p.h" #include <qv4context_p.h> #include <qv4object_p.h> #include <qv4objectproto_p.h> #include <private/qv4mm_p.h> #include <qv4argumentsobject_p.h> #include "qv4function_p.h" -#include "qv4errorobject_p.h" -#include "qv4string_p.h" -#include "qv4qmlcontext_p.h" #include "qv4stackframe_p.h" #include "qv4symbol_p.h" diff --git a/src/qml/jsruntime/qv4dataview.cpp b/src/qml/jsruntime/qv4dataview.cpp index 607ec02b99..f4ca09a127 100644 --- a/src/qml/jsruntime/qv4dataview.cpp +++ b/src/qml/jsruntime/qv4dataview.cpp @@ -3,7 +3,6 @@ #include "qv4dataview_p.h" #include "qv4arraybuffer_p.h" -#include "qv4string_p.h" #include "qv4symbol_p.h" #include <QtCore/private/qnumeric_p.h> diff --git a/src/qml/jsruntime/qv4dateobject.cpp b/src/qml/jsruntime/qv4dateobject.cpp index 769b8c161a..6f00ae7b6e 100644 --- a/src/qml/jsruntime/qv4dateobject.cpp +++ b/src/qml/jsruntime/qv4dateobject.cpp @@ -2,11 +2,7 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "qv4dateobject_p.h" -#include "qv4objectproto_p.h" -#include "qv4scopedvalue_p.h" #include "qv4runtime_p.h" -#include "qv4string_p.h" -#include "qv4jscall_p.h" #include "qv4symbol_p.h" #include <QtCore/QDebug> diff --git a/src/qml/jsruntime/qv4debugging_p.h b/src/qml/jsruntime/qv4debugging_p.h index 80bbf58ee9..b80567b339 100644 --- a/src/qml/jsruntime/qv4debugging_p.h +++ b/src/qml/jsruntime/qv4debugging_p.h @@ -15,8 +15,8 @@ // We mean it. // -#include "qv4global_p.h" -#include <private/qv4staticvalue_p.h> +#include <QtQml/private/qv4global_p.h> +#include <QtQml/private/qv4staticvalue_p.h> #include <QtCore/qobject.h> QT_BEGIN_NAMESPACE diff --git a/src/qml/jsruntime/qv4engine.cpp b/src/qml/jsruntime/qv4engine.cpp index 4dfd31beb2..a66478d61e 100644 --- a/src/qml/jsruntime/qv4engine.cpp +++ b/src/qml/jsruntime/qv4engine.cpp @@ -56,7 +56,6 @@ #include "qv4stackframe_p.h" #include "qv4atomics_p.h" #include "qv4urlobject_p.h" -#include "qv4jscall_p.h" #include "qv4variantobject_p.h" #include "qv4sequenceobject_p.h" #include "qv4qobjectwrapper_p.h" diff --git a/src/qml/jsruntime/qv4engine_p.h b/src/qml/jsruntime/qv4engine_p.h index caa22992af..aa79f89231 100644 --- a/src/qml/jsruntime/qv4engine_p.h +++ b/src/qml/jsruntime/qv4engine_p.h @@ -15,7 +15,6 @@ // #include "qv4global_p.h" -#include "qv4managed_p.h" #include "qv4context_p.h" #include "qv4stackframe_p.h" #include <private/qintrusivelist_p.h> diff --git a/src/qml/jsruntime/qv4errorobject.cpp b/src/qml/jsruntime/qv4errorobject.cpp index f3adadc887..207e72e149 100644 --- a/src/qml/jsruntime/qv4errorobject.cpp +++ b/src/qml/jsruntime/qv4errorobject.cpp @@ -9,7 +9,6 @@ #include <QtCore/QStringList> #include <QtCore/QDebug> -#include "qv4string_p.h" #include <private/qv4mm_p.h> #include <private/qv4codegen_p.h> diff --git a/src/qml/jsruntime/qv4errorobject_p.h b/src/qml/jsruntime/qv4errorobject_p.h index c8ebe11f30..543eaafab9 100644 --- a/src/qml/jsruntime/qv4errorobject_p.h +++ b/src/qml/jsruntime/qv4errorobject_p.h @@ -16,7 +16,6 @@ #include "qv4object_p.h" #include "qv4functionobject_p.h" -#include "qv4string_p.h" QT_BEGIN_NAMESPACE diff --git a/src/qml/jsruntime/qv4executableallocator.cpp b/src/qml/jsruntime/qv4executableallocator.cpp index f8b005e914..7d9a3be195 100644 --- a/src/qml/jsruntime/qv4executableallocator.cpp +++ b/src/qml/jsruntime/qv4executableallocator.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "qv4executableallocator_p.h" -#include "qv4functiontable_p.h" +#include <QtQml/private/qv4functiontable_p.h> #include <wtf/StdLibExtras.h> #include <wtf/PageAllocation.h> diff --git a/src/qml/jsruntime/qv4executableallocator_p.h b/src/qml/jsruntime/qv4executableallocator_p.h index d6551599e7..de9c0c7cd5 100644 --- a/src/qml/jsruntime/qv4executableallocator_p.h +++ b/src/qml/jsruntime/qv4executableallocator_p.h @@ -15,14 +15,14 @@ // We mean it. // -#include "qv4global_p.h" - #include <QMultiMap> #include <QHash> #include <QVector> #include <QByteArray> #include <QMutex> +#include <QtQml/private/qtqmlglobal_p.h> + namespace WTF { class PageAllocation; } diff --git a/src/qml/jsruntime/qv4executablecompilationunit.cpp b/src/qml/jsruntime/qv4executablecompilationunit.cpp index 0b659f30d8..ee7b7656cc 100644 --- a/src/qml/jsruntime/qv4executablecompilationunit.cpp +++ b/src/qml/jsruntime/qv4executablecompilationunit.cpp @@ -4,7 +4,6 @@ #include "qml/qqmlprivate.h" #include "qv4engine_p.h" #include "qv4executablecompilationunit_p.h" -#include "qv4stackframe_p.h" #include <private/qv4engine_p.h> #include <private/qv4regexp_p.h> diff --git a/src/qml/jsruntime/qv4function.cpp b/src/qml/jsruntime/qv4function.cpp index 1be093f0a4..0794941b13 100644 --- a/src/qml/jsruntime/qv4function.cpp +++ b/src/qml/jsruntime/qv4function.cpp @@ -3,12 +3,10 @@ #include "qml/qqmlprivate.h" #include "qv4function_p.h" -#include "qv4functionobject_p.h" #include "qv4managed_p.h" #include "qv4string_p.h" #include "qv4value_p.h" #include "qv4engine_p.h" -#include "qv4lookup_p.h" #include <private/qv4mm_p.h> #include <private/qv4identifiertable_p.h> #include <private/qv4functiontable_p.h> diff --git a/src/qml/jsruntime/qv4functionobject.cpp b/src/qml/jsruntime/qv4functionobject.cpp index 186535cb82..437f57e43f 100644 --- a/src/qml/jsruntime/qv4functionobject.cpp +++ b/src/qml/jsruntime/qv4functionobject.cpp @@ -2,13 +2,10 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "qv4object_p.h" -#include "qv4objectproto_p.h" -#include "qv4stringobject_p.h" #include "qv4function_p.h" #include "qv4symbol_p.h" #include <private/qv4mm_p.h> -#include "qv4arrayobject_p.h" #include "qv4scopedvalue_p.h" #include "qv4argumentsobject_p.h" @@ -27,7 +24,6 @@ #include <QtCore/QDebug> #include <algorithm> -#include "qv4profiling_p.h" using namespace QV4; diff --git a/src/qml/jsruntime/qv4functiontable_p.h b/src/qml/jsruntime/qv4functiontable_p.h index dd23273eeb..8937e2fe85 100644 --- a/src/qml/jsruntime/qv4functiontable_p.h +++ b/src/qml/jsruntime/qv4functiontable_p.h @@ -15,7 +15,7 @@ // We mean it. // -#include "qv4global_p.h" +#include <QtQml/private/qqmlglobal_p.h> namespace JSC { class MacroAssemblerCodeRef; diff --git a/src/qml/jsruntime/qv4globalobject.cpp b/src/qml/jsruntime/qv4globalobject.cpp index 0112347053..7e016cf8fc 100644 --- a/src/qml/jsruntime/qv4globalobject.cpp +++ b/src/qml/jsruntime/qv4globalobject.cpp @@ -6,12 +6,9 @@ #include "qv4value_p.h" #include "qv4context_p.h" #include "qv4function_p.h" -#include "qv4debugging_p.h" -#include "qv4profiling_p.h" #include "qv4script_p.h" #include "qv4scopedvalue_p.h" #include "qv4string_p.h" -#include "qv4jscall_p.h" #include <private/qv4codegen_p.h> #include <private/qv4alloca_p.h> diff --git a/src/qml/jsruntime/qv4globalobject_p.h b/src/qml/jsruntime/qv4globalobject_p.h index 7c857d37aa..71e06ef417 100644 --- a/src/qml/jsruntime/qv4globalobject_p.h +++ b/src/qml/jsruntime/qv4globalobject_p.h @@ -14,7 +14,7 @@ // We mean it. // -#include "qv4global_p.h" +#include <QtQml/private/qqmlglobal_p.h> #include "qv4functionobject_p.h" QT_BEGIN_NAMESPACE diff --git a/src/qml/jsruntime/qv4internalclass.cpp b/src/qml/jsruntime/qv4internalclass.cpp index 64f10175ea..c72effd406 100644 --- a/src/qml/jsruntime/qv4internalclass.cpp +++ b/src/qml/jsruntime/qv4internalclass.cpp @@ -6,7 +6,6 @@ #include <qv4engine_p.h> #include <qv4identifierhash_p.h> #include "qv4object_p.h" -#include "qv4identifiertable_p.h" #include "qv4value_p.h" #include "qv4mm_p.h" #include <private/qprimefornumbits_p.h> diff --git a/src/qml/jsruntime/qv4iterator_p.h b/src/qml/jsruntime/qv4iterator_p.h index ab3a569e12..46e48864ed 100644 --- a/src/qml/jsruntime/qv4iterator_p.h +++ b/src/qml/jsruntime/qv4iterator_p.h @@ -16,7 +16,6 @@ // #include "qv4object_p.h" -#include "qv4arraydata_p.h" QT_BEGIN_NAMESPACE diff --git a/src/qml/jsruntime/qv4jsonobject.cpp b/src/qml/jsruntime/qv4jsonobject.cpp index 9ff252a0c3..592e9079f1 100644 --- a/src/qml/jsruntime/qv4jsonobject.cpp +++ b/src/qml/jsruntime/qv4jsonobject.cpp @@ -9,7 +9,6 @@ #include <qv4scopedvalue_p.h> #include <qv4runtime_p.h> #include <qv4variantobject_p.h> -#include "qv4string_p.h" #include "qv4jscall_p.h" #include <qv4symbol_p.h> diff --git a/src/qml/jsruntime/qv4lookup.cpp b/src/qml/jsruntime/qv4lookup.cpp index 4e41fd60ce..3e5e961245 100644 --- a/src/qml/jsruntime/qv4lookup.cpp +++ b/src/qml/jsruntime/qv4lookup.cpp @@ -2,9 +2,9 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "qv4lookup_p.h" #include "qv4functionobject_p.h" -#include "qv4jscall_p.h" -#include "qv4string_p.h" #include <private/qv4identifiertable_p.h> +#include <QtQml/private/qv4runtime_p.h> +#include <QtQml/private/qv4qobjectwrapper_p.h> QT_BEGIN_NAMESPACE diff --git a/src/qml/jsruntime/qv4lookup_p.h b/src/qml/jsruntime/qv4lookup_p.h index 96c27c48fd..03ab132ec9 100644 --- a/src/qml/jsruntime/qv4lookup_p.h +++ b/src/qml/jsruntime/qv4lookup_p.h @@ -14,10 +14,7 @@ // We mean it. // -#include "qv4global_p.h" -#include "qv4runtime_p.h" #include "qv4engine_p.h" -#include "qv4context_p.h" #include "qv4object_p.h" #include "qv4internalclass_p.h" #include "qv4qmlcontext_p.h" diff --git a/src/qml/jsruntime/qv4managed.cpp b/src/qml/jsruntime/qv4managed.cpp index 647b858f0f..3524a1adcb 100644 --- a/src/qml/jsruntime/qv4managed.cpp +++ b/src/qml/jsruntime/qv4managed.cpp @@ -3,7 +3,6 @@ #include "qv4managed_p.h" #include <private/qv4mm_p.h> -#include "qv4errorobject_p.h" using namespace QV4; diff --git a/src/qml/jsruntime/qv4mapobject.cpp b/src/qml/jsruntime/qv4mapobject.cpp index 56218e6859..72e66e0e76 100644 --- a/src/qml/jsruntime/qv4mapobject.cpp +++ b/src/qml/jsruntime/qv4mapobject.cpp @@ -1,7 +1,6 @@ // Copyright (C) 2018 Crimson AS <info@crimson.no> // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only -#include "qv4setobject_p.h" // ### temporary #include "qv4mapobject_p.h" #include "qv4mapiterator_p.h" #include "qv4estable_p.h" diff --git a/src/qml/jsruntime/qv4mapobject_p.h b/src/qml/jsruntime/qv4mapobject_p.h index 058caf9d36..68bc7ceed8 100644 --- a/src/qml/jsruntime/qv4mapobject_p.h +++ b/src/qml/jsruntime/qv4mapobject_p.h @@ -16,9 +16,7 @@ // #include "qv4object_p.h" -#include "qv4objectproto_p.h" #include "qv4functionobject_p.h" -#include "qv4string_p.h" QT_BEGIN_NAMESPACE diff --git a/src/qml/jsruntime/qv4mathobject.cpp b/src/qml/jsruntime/qv4mathobject.cpp index 418e29ffcb..71ff6ec0f8 100644 --- a/src/qml/jsruntime/qv4mathobject.cpp +++ b/src/qml/jsruntime/qv4mathobject.cpp @@ -2,7 +2,6 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "qv4mathobject_p.h" -#include "qv4objectproto_p.h" #include "qv4symbol_p.h" #include <QtCore/qdatetime.h> |