diff options
-rw-r--r-- | src/qml/common/qqmljsmemorypool_p.h | 14 | ||||
-rw-r--r-- | src/qmlcompiler/qqmljsannotation_p.h | 7 |
2 files changed, 11 insertions, 10 deletions
diff --git a/src/qml/common/qqmljsmemorypool_p.h b/src/qml/common/qqmljsmemorypool_p.h index dcf3fafb67..e8d49b40fd 100644 --- a/src/qml/common/qqmljsmemorypool_p.h +++ b/src/qml/common/qqmljsmemorypool_p.h @@ -52,10 +52,10 @@ // #include <QtCore/qglobal.h> -#include <QtCore/qshareddata.h> -#include <QtCore/qdebug.h> +#include <QtCore/qstring.h> +#include <QtCore/qvector.h> -#include <cstring> +#include <cstdlib> QT_BEGIN_NAMESPACE @@ -63,14 +63,12 @@ namespace QQmlJS { class Managed; -class MemoryPool : public QSharedData +class MemoryPool { - MemoryPool(const MemoryPool &other); - void operator =(const MemoryPool &other); + Q_DISABLE_COPY_MOVE(MemoryPool); public: - MemoryPool() {} - + MemoryPool() = default; ~MemoryPool() { if (_blocks) { diff --git a/src/qmlcompiler/qqmljsannotation_p.h b/src/qmlcompiler/qqmljsannotation_p.h index a36d68855f..3a9abe29d4 100644 --- a/src/qmlcompiler/qqmljsannotation_p.h +++ b/src/qmlcompiler/qqmljsannotation_p.h @@ -39,10 +39,13 @@ // // We mean it. -#include <variant> #include <private/qqmljsast_p.h> -#include <qglobal.h> + +#include <QtCore/qglobal.h> +#include <QtCore/qhash.h> + +#include <variant> QT_BEGIN_NAMESPACE |