Clean headers in lib qmljs and plugins qmljstools, qmljseditor.

Change-Id: I3256db8f4d42b6326d986d754b45e6c6c2030839
Reviewed-by: Orgad Shaneh <[email protected]>

27 files changed, 48 insertions, 18 deletions

diff --git a/src/libs/qmljs/qmljsbind.h b/src/libs/qmljs/qmljsbind.h
index c40117efa64..14a64e024ee 100644
--- a/src/libs/qmljs/qmljsbind.h
+++ b/src/libs/qmljs/qmljsbind.h
@@ -39,6 +39,7 @@
 
 namespace QmlJS {
 
+class DiagnosticMessage;
 class Document;
 
 class QMLJS_EXPORT Bind: protected AST::Visitor
diff --git a/src/libs/qmljs/qmljsbundle.h b/src/libs/qmljs/qmljsbundle.h
index 3a75a1edb4e..110f56ee363 100644
--- a/src/libs/qmljs/qmljsbundle.h
+++ b/src/libs/qmljs/qmljsbundle.h
@@ -33,7 +33,7 @@
 
 #include <qmljs/qmljs_global.h>
 #include <qmljs/persistenttrie.h>
-#include <qmljs/qmljsdocument.h>
+#include <qmljs/qmljsdialect.h>
 
 #include <QString>
 #include <QHash>
diff --git a/src/libs/qmljs/qmljscheck.cpp b/src/libs/qmljs/qmljscheck.cpp
index ce06d4cd8e7..e71c0a21659 100644
--- a/src/libs/qmljs/qmljscheck.cpp
+++ b/src/libs/qmljs/qmljscheck.cpp
@@ -36,6 +36,7 @@
 
 #include <utils/qtcassert.h>
 
+#include <QColor>
 #include <QDir>
 
 using namespace QmlJS;
diff --git a/src/libs/qmljs/qmljscompletioncontextfinder.cpp b/src/libs/qmljs/qmljscompletioncontextfinder.cpp
index 448677ebf63..b260c5ba93c 100644
--- a/src/libs/qmljs/qmljscompletioncontextfinder.cpp
+++ b/src/libs/qmljs/qmljscompletioncontextfinder.cpp
@@ -29,6 +29,7 @@
 ****************************************************************************/
 
 #include "qmljscompletioncontextfinder.h"
+#include "qmljsscanner.h"
 
 #include <QTextDocument>
 #include <QStringList>
diff --git a/src/libs/qmljs/qmljscontext.cpp b/src/libs/qmljs/qmljscontext.cpp
index f81cf2dccc5..df467ed304a 100644
--- a/src/libs/qmljs/qmljscontext.cpp
+++ b/src/libs/qmljs/qmljscontext.cpp
@@ -31,6 +31,8 @@
 #include "qmljscontext.h"
 
 #include "parser/qmljsast_p.h"
+#include "parser/qmljsengine_p.h"
+#include "qmljsvalueowner.h"
 
 using namespace QmlJS;
 using namespace QmlJS::AST;
diff --git a/src/libs/qmljs/qmljscontext.h b/src/libs/qmljs/qmljscontext.h
index 13f43557718..deaadddee67 100644
--- a/src/libs/qmljs/qmljscontext.h
+++ b/src/libs/qmljs/qmljscontext.h
@@ -32,7 +32,8 @@
 #define QMLJS_CONTEXT_H
 
 #include "qmljs_global.h"
-#include "qmljsvalueowner.h"
+#include "qmljsdocument.h"
+#include "qmljsinterpreter.h"
 #include "qmljsviewercontext.h"
 
 #include <QSharedPointer>
diff --git a/src/libs/qmljs/qmljsdialect.cpp b/src/libs/qmljs/qmljsdialect.cpp
index 277bd03dc1f..27069421bf4 100644
--- a/src/libs/qmljs/qmljsdialect.cpp
+++ b/src/libs/qmljs/qmljsdialect.cpp
@@ -29,6 +29,9 @@
 ****************************************************************************/
 
 #include "qmljsdialect.h"
+#include "qmljsconstants.h"
+
+#include <QDebug>
 
 namespace QmlJS {
 
diff --git a/src/libs/qmljs/qmljsdialect.h b/src/libs/qmljs/qmljsdialect.h
index 6dac12cc3e0..9d9113ca7ee 100644
--- a/src/libs/qmljs/qmljsdialect.h
+++ b/src/libs/qmljs/qmljsdialect.h
@@ -31,7 +31,7 @@
 #ifndef QMLJSDIALECT_H
 #define QMLJSDIALECT_H
 
-#include "qmljsconstants.h"
+#include "qmljs_global.h"
 
 #include <utils/fileutils.h>
 
diff --git a/src/libs/qmljs/qmljsdocument.h b/src/libs/qmljs/qmljsdocument.h
index d984b2deb88..5c8b6df12d7 100644
--- a/src/libs/qmljs/qmljsdocument.h
+++ b/src/libs/qmljs/qmljsdocument.h
@@ -38,7 +38,7 @@
 
 #include "qmljsdialect.h"
 #include "parser/qmldirparser_p.h"
-#include "parser/qmljsengine_p.h"
+#include "parser/qmljsastfwd_p.h"
 #include "qmljs_global.h"
 #include "qmljsconstants.h"
 #include "qmljsimportdependencies.h"
@@ -46,11 +46,14 @@
 namespace QmlJS {
 
 class Bind;
+class DiagnosticMessage;
+class Engine;
 class Snapshot;
 class ImportDependencies;
 
 class QMLJS_EXPORT Document
 {
+    Q_DISABLE_COPY(Document)
 public:
     typedef QSharedPointer<const Document> Ptr;
     typedef QSharedPointer<Document> MutablePtr;
diff --git a/src/libs/qmljs/qmljsevaluate.cpp b/src/libs/qmljs/qmljsevaluate.cpp
index 2a7aa042d64..7c5ef71f468 100644
--- a/src/libs/qmljs/qmljsevaluate.cpp
+++ b/src/libs/qmljs/qmljsevaluate.cpp
@@ -31,6 +31,7 @@
 #include "qmljsevaluate.h"
 #include "qmljscontext.h"
 #include "qmljsscopechain.h"
+#include "qmljsvalueowner.h"
 #include "parser/qmljsast_p.h"
 
 using namespace QmlJS;
diff --git a/src/libs/qmljs/qmljsimportdependencies.cpp b/src/libs/qmljs/qmljsimportdependencies.cpp
index dc0e745822f..d383be41896 100644
--- a/src/libs/qmljs/qmljsimportdependencies.cpp
+++ b/src/libs/qmljs/qmljsimportdependencies.cpp
@@ -31,6 +31,7 @@
 #include "qmljsimportdependencies.h"
 #include "qmljsinterpreter.h"
 #include "qmljsqrcparser.h"
+#include "qmljsviewercontext.h"
 
 #include <utils/qtcassert.h>
 
diff --git a/src/libs/qmljs/qmljsimportdependencies.h b/src/libs/qmljs/qmljsimportdependencies.h
index 2125ac125f3..62d09282295 100644
--- a/src/libs/qmljs/qmljsimportdependencies.h
+++ b/src/libs/qmljs/qmljsimportdependencies.h
@@ -31,7 +31,7 @@
 #ifndef QMLJSIMPORTCACHE_H
 #define QMLJSIMPORTCACHE_H
 
-#include "qmljsviewercontext.h"
+#include "qmljsconstants.h"
 #include "qmljsdialect.h"
 
 #include <languageutils/componentversion.h>
@@ -52,6 +52,7 @@ QT_END_NAMESPACE
 
 namespace QmlJS {
 class ImportInfo;
+class ViewerContext;
 namespace Internal { class ImportDependenciesPrivate; }
 class ImportDependencies;
 
diff --git a/src/libs/qmljs/qmljsindenter.cpp b/src/libs/qmljs/qmljsindenter.cpp
index f73515c6a2d..89c17044427 100644
--- a/src/libs/qmljs/qmljsindenter.cpp
+++ b/src/libs/qmljs/qmljsindenter.cpp
@@ -67,6 +67,7 @@
 */
 
 #include <qmljs/qmljsindenter.h>
+#include <qmljs/qmljsscanner.h>
 
 #include <QTextBlock>
 
diff --git a/src/libs/qmljs/qmljsinterpreter.h b/src/libs/qmljs/qmljsinterpreter.h
index 1756fbf3f6d..6b8ffe549d3 100644
--- a/src/libs/qmljs/qmljsinterpreter.h
+++ b/src/libs/qmljs/qmljsinterpreter.h
@@ -33,8 +33,10 @@
 
 #include <qmljs/qmljs_global.h>
 #include <qmljs/qmljsconstants.h>
-#include <qmljs/qmljsdocument.h>
 #include <qmljs/qmljsimportdependencies.h>
+#include <qmljs/parser/qmljsastfwd_p.h>
+
+#include <languageutils/fakemetaobject.h>
 
 #include <QFileInfoList>
 #include <QHash>
@@ -67,6 +69,7 @@ class JSImportScope;
 class NameId;
 class NullValue;
 class NumberValue;
+class ModuleApiInfo;
 class ObjectValue;
 class QmlEnumValue;
 class QmlPrototypeReference;
diff --git a/src/libs/qmljs/qmljslineinfo.cpp b/src/libs/qmljs/qmljslineinfo.cpp
index e3e39d7e224..54c01a809d1 100644
--- a/src/libs/qmljs/qmljslineinfo.cpp
+++ b/src/libs/qmljs/qmljslineinfo.cpp
@@ -67,6 +67,7 @@
 */
 
 #include <qmljs/qmljslineinfo.h>
+#include <qmljs/qmljsscanner.h>
 
 using namespace QmlJS;
 
diff --git a/src/libs/qmljs/qmljslineinfo.h b/src/libs/qmljs/qmljslineinfo.h
index b002da8fce2..55b37021791 100644
--- a/src/libs/qmljs/qmljslineinfo.h
+++ b/src/libs/qmljs/qmljslineinfo.h
@@ -32,12 +32,12 @@
 #define QMLJSLINEINFO_H
 
 #include <qmljs/qmljs_global.h>
-#include <qmljs/qmljsscanner.h>
 
 #include <QRegExp>
 #include <QTextBlock>
 
 namespace QmlJS {
+class Token;
 
 class QMLJS_EXPORT LineInfo
 {
diff --git a/src/libs/qmljs/qmljsmodelmanagerinterface.cpp b/src/libs/qmljs/qmljsmodelmanagerinterface.cpp
index be839396e8e..37d2e595c10 100644
--- a/src/libs/qmljs/qmljsmodelmanagerinterface.cpp
+++ b/src/libs/qmljs/qmljsmodelmanagerinterface.cpp
@@ -36,6 +36,7 @@
 #include "qmljsplugindumper.h"
 #include "qmljstypedescriptionreader.h"
 #include "qmljsdialect.h"
+#include "qmljsviewercontext.h"
 
 #include <cplusplus/cppmodelmanagerbase.h>
 #include <utils/hostosinfo.h>
diff --git a/src/libs/qmljs/qmljsmodelmanagerinterface.h b/src/libs/qmljs/qmljsmodelmanagerinterface.h
index 8b4a91fc989..df232598811 100644
--- a/src/libs/qmljs/qmljsmodelmanagerinterface.h
+++ b/src/libs/qmljs/qmljsmodelmanagerinterface.h
@@ -33,25 +33,21 @@
 
 #include "qmljs_global.h"
 #include "qmljsbundle.h"
-#include "qmljsconstants.h"
 #include "qmljsdocument.h"
 #include "qmljsqrcparser.h"
-#include "qmljsviewercontext.h"
 #include "qmljsdialect.h"
 
 #include <cplusplus/CppDocument.h>
 #include <utils/environment.h>
-#include <utils/fileutils.h>
 
 #include <QFuture>
 #include <QFutureSynchronizer>
 #include <QHash>
-#include <QMultiHash>
 #include <QObject>
 #include <QPointer>
 #include <QStringList>
-#include <QStringList>
-#include <QTimer>
+
+QT_FORWARD_DECLARE_CLASS(QTimer)
 
 namespace ProjectExplorer { class Project; }
 
diff --git a/src/libs/qmljs/qmljsreformatter.cpp b/src/libs/qmljs/qmljsreformatter.cpp
index be393f92ee3..fd987851b84 100644
--- a/src/libs/qmljs/qmljsreformatter.cpp
+++ b/src/libs/qmljs/qmljsreformatter.cpp
@@ -33,6 +33,7 @@
 #include "qmljscodeformatter.h"
 #include "parser/qmljsast_p.h"
 #include "parser/qmljsastvisitor_p.h"
+#include "parser/qmljsengine_p.h"
 
 #include <QString>
 #include <QTextBlock>
diff --git a/src/libs/qmljs/qmljsscopechain.cpp b/src/libs/qmljs/qmljsscopechain.cpp
index 1fa71328cea..5416b8e195b 100644
--- a/src/libs/qmljs/qmljsscopechain.cpp
+++ b/src/libs/qmljs/qmljsscopechain.cpp
@@ -32,6 +32,7 @@
 #include "qmljsbind.h"
 #include "qmljsevaluate.h"
 #include "qmljsmodelmanagerinterface.h"
+#include "parser/qmljsengine_p.h"
 
 using namespace QmlJS;
 
diff --git a/src/libs/qmljs/qmljsstaticanalysismessage.cpp b/src/libs/qmljs/qmljsstaticanalysismessage.cpp
index bd8a7e78aab..df2cf1f61d2 100644
--- a/src/libs/qmljs/qmljsstaticanalysismessage.cpp
+++ b/src/libs/qmljs/qmljsstaticanalysismessage.cpp
@@ -30,10 +30,12 @@
 
 #include "qmljsstaticanalysismessage.h"
 #include "qmljsconstants.h"
+#include "parser/qmljsengine_p.h"
 
 #include <utils/qtcassert.h>
 
 #include <QCoreApplication>
+#include <QRegExp>
 
 using namespace QmlJS;
 using namespace QmlJS::StaticAnalysis;
diff --git a/src/libs/qmljs/qmljsstaticanalysismessage.h b/src/libs/qmljs/qmljsstaticanalysismessage.h
index f4f22e373ec..41e4bfd3ab2 100644
--- a/src/libs/qmljs/qmljsstaticanalysismessage.h
+++ b/src/libs/qmljs/qmljsstaticanalysismessage.h
@@ -33,13 +33,16 @@
 
 #include "qmljs_global.h"
 #include "qmljsconstants.h"
-#include "parser/qmljsengine_p.h"
+#include "parser/qmljsastfwd_p.h"
 
-#include <QRegExp>
 #include <QString>
 #include <QList>
 
+QT_FORWARD_DECLARE_CLASS(QRegExp)
+
 namespace QmlJS {
+class DiagnosticMessage;
+
 namespace StaticAnalysis {
 
 enum Type
diff --git a/src/libs/qmljs/qmljstypedescriptionreader.cpp b/src/libs/qmljs/qmljstypedescriptionreader.cpp
index e37d72aba0a..a7351bd7407 100644
--- a/src/libs/qmljs/qmljstypedescriptionreader.cpp
+++ b/src/libs/qmljs/qmljstypedescriptionreader.cpp
@@ -30,6 +30,7 @@
 
 #include "qmljstypedescriptionreader.h"
 
+#include "qmljsdocument.h"
 #include "parser/qmljsparser_p.h"
 #include "parser/qmljslexer_p.h"
 #include "parser/qmljsengine_p.h"
diff --git a/src/libs/qmljs/qmljstypedescriptionreader.h b/src/libs/qmljs/qmljstypedescriptionreader.h
index 7a4fe1f61fe..f37367b59fb 100644
--- a/src/libs/qmljs/qmljstypedescriptionreader.h
+++ b/src/libs/qmljs/qmljstypedescriptionreader.h
@@ -31,7 +31,10 @@
 #ifndef QMLJSTYPEDESCRIPTIONREADER_H
 #define QMLJSTYPEDESCRIPTIONREADER_H
 
-#include "qmljsdocument.h"
+#include "qmljs_global.h"
+#include <qmljs/parser/qmljsastfwd_p.h>
+
+#include <languageutils/fakemetaobject.h>
 
 // for Q_DECLARE_TR_FUNCTIONS
 #include <QCoreApplication>
@@ -43,6 +46,7 @@ QT_END_NAMESPACE
 
 namespace QmlJS {
 
+class ModuleApiInfo;
 namespace AST {
 class UiProgram;
 class UiObjectDefinition;
diff --git a/src/libs/qmljs/qmljsutils.cpp b/src/libs/qmljs/qmljsutils.cpp
index 3a721a54b06..bcbdde5ccc1 100644
--- a/src/libs/qmljs/qmljsutils.cpp
+++ b/src/libs/qmljs/qmljsutils.cpp
@@ -32,6 +32,8 @@
 
 #include "parser/qmljsast_p.h"
 
+#include <QColor>
+
 using namespace QmlJS;
 using namespace QmlJS::AST;
 
diff --git a/src/libs/qmljs/qmljsutils.h b/src/libs/qmljs/qmljsutils.h
index b0aab716b12..48de0b2229b 100644
--- a/src/libs/qmljs/qmljsutils.h
+++ b/src/libs/qmljs/qmljsutils.h
@@ -36,7 +36,7 @@
 #include "parser/qmljsastfwd_p.h"
 #include "parser/qmljsengine_p.h"
 
-#include <QColor>
+QT_FORWARD_DECLARE_CLASS(QColor)
 
 namespace QmlJS {
 
diff --git a/src/libs/qmljs/qmljsviewercontext.h b/src/libs/qmljs/qmljsviewercontext.h
index 955f384e4cc..3bf85c21250 100644
--- a/src/libs/qmljs/qmljsviewercontext.h
+++ b/src/libs/qmljs/qmljsviewercontext.h
@@ -32,7 +32,6 @@
 #define VIEWERCONTEXT_H
 
 #include "qmljs_global.h"
-#include "qmljsconstants.h"
 #include "qmljsdialect.h"
 
 #include <QStringList>