Clean headers in lib qmljs and plugins qmljstools, qmljseditor.

Change-Id: I3256db8f4d42b6326d986d754b45e6c6c2030839
Reviewed-by: Orgad Shaneh <orgads@gmail.com>

src/libs/qmljs/qmljsbind.h

@@ -39,6 +39,7 @@
 
 namespace QmlJS {
 
+class DiagnosticMessage;
 class Document;
 
 class QMLJS_EXPORT Bind: protected AST::Visitor

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>

src/libs/qmljs/qmljscheck.cpp

@@ -36,6 +36,7 @@
 
 #include <utils/qtcassert.h>
 
+#include <QColor>
 #include <QDir>
 
 using namespace QmlJS;

src/libs/qmljs/qmljscompletioncontextfinder.cpp

@@ -29,6 +29,7 @@
 ****************************************************************************/
 
 #include "qmljscompletioncontextfinder.h"
+#include "qmljsscanner.h"
 
 #include <QTextDocument>
 #include <QStringList>

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;

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>

src/libs/qmljs/qmljsdialect.cpp

@@ -29,6 +29,9 @@
 ****************************************************************************/
 
 #include "qmljsdialect.h"
+#include "qmljsconstants.h"
+
+#include <QDebug>
 
 namespace QmlJS {
 

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>
 

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;

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;

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>
 

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;
 

src/libs/qmljs/qmljsindenter.cpp

@@ -67,6 +67,7 @@
 */
 
 #include <qmljs/qmljsindenter.h>
+#include <qmljs/qmljsscanner.h>
 
 #include <QTextBlock>
 

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;

src/libs/qmljs/qmljslineinfo.cpp

@@ -67,6 +67,7 @@
 */
 
 #include <qmljs/qmljslineinfo.h>
+#include <qmljs/qmljsscanner.h>
 
 using namespace QmlJS;
 

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
 {

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>

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; }
 

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>

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;
 

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;

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

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"

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;

src/libs/qmljs/qmljsutils.cpp

@@ -32,6 +32,8 @@
 
 #include "parser/qmljsast_p.h"
 
+#include <QColor>
+
 using namespace QmlJS;
 using namespace QmlJS::AST;
 

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 {
 

src/libs/qmljs/qmljsviewercontext.h

@@ -32,7 +32,6 @@
 #define VIEWERCONTEXT_H
 
 #include "qmljs_global.h"
-#include "qmljsconstants.h"
 #include "qmljsdialect.h"
 
 #include <QStringList>

src/plugins/qmldesigner/designercore/filemanager/firstdefinitionfinder.cpp

@@ -31,6 +31,7 @@
 #include "firstdefinitionfinder.h"
 
 #include <qmljs/parser/qmljsast_p.h>
+#include <qmljs/parser/qmljsengine_p.h>
 
 #include <QDebug>
 

src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp

@@ -42,6 +42,7 @@
 #include <qmljs/qmljsscopechain.h>
 #include <qmljs/parser/qmljsast_p.h>
 #include <qmljs/qmljsmodelmanagerinterface.h>
+#include <qmljs/qmljsvalueowner.h>
 #include <languageutils/fakemetaobject.h>
 
 namespace QmlDesigner {

src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp

@@ -45,6 +45,7 @@
 
 #include <qmljs/qmljslink.h>
 #include <qmljs/parser/qmljsast_p.h>
+#include <qmljs/parser/qmljsengine_p.h>
 #include <qmljs/qmljsmodelmanagerinterface.h>
 
 enum { debug = false };

src/plugins/qmldesigner/designercore/model/modeltotextmerger.cpp

@@ -36,6 +36,7 @@
 
 #include <nodelistproperty.h>
 #include <nodeproperty.h>
+#include <qmljs/parser/qmljsengine_p.h>
 #include <utils/algorithm.h>
 
 #include <QDebug>

src/plugins/qmldesigner/designercore/model/rewriterview.cpp

@@ -44,6 +44,7 @@
 #include "signalhandlerproperty.h"
 
 
+#include <qmljs/parser/qmljsengine_p.h>
 
 using namespace QmlDesigner::Internal;
 

src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp

@@ -51,6 +51,7 @@
 #include <qmljs/qmljsmodelmanagerinterface.h>
 #include <qmljs/qmljsqrcparser.h>
 #include <qmljs/qmljsinterpreter.h>
+#include <qmljs/qmljsvalueowner.h>
 
 #include <utils/qtcassert.h>
 

src/plugins/qmljseditor/qmljseditordocument.h

@@ -33,7 +33,6 @@
 
 #include "qmljseditor_global.h"
 
-#include <qmljs/qmljsdocument.h>
 #include <qmljstools/qmljssemanticinfo.h>
 #include <texteditor/textdocument.h>
 

src/plugins/qmljseditor/qmljsfindreferences.h

@@ -38,8 +38,6 @@
 #include <QFuture>
 #include <QFutureWatcher>
 #include <QPointer>
-#include <utils/filesearch.h>
-#include <qmljs/qmljsdocument.h>
 
 QT_FORWARD_DECLARE_CLASS(QTimer)
 

src/plugins/qmljseditor/qmljshoverhandler.cpp

@@ -42,6 +42,7 @@
 #include <qmljs/qmljscontext.h>
 #include <qmljs/qmljsscopechain.h>
 #include <qmljs/qmljsinterpreter.h>
+#include <qmljs/qmljsvalueowner.h>
 #include <qmljs/parser/qmljsast_p.h>
 #include <qmljs/parser/qmljsastfwd_p.h>
 #include <qmljs/qmljsutils.h>

src/plugins/qmljseditor/qmljswrapinloader.cpp

@@ -35,6 +35,7 @@
 
 #include <qmljs/parser/qmljsast_p.h>
 #include <qmljs/qmljsdocument.h>
+#include <qmljs/qmljsscopechain.h>
 #include <qmljs/qmljsutils.h>
 #include <qmljs/qmljsbind.h>
 #include <qmljstools/qmljsrefactoringchanges.h>

src/plugins/qmljseditor/qmloutlinemodel.cpp

@@ -36,6 +36,7 @@
 #include <qmljs/qmljsscopechain.h>
 #include <qmljs/qmljsmodelmanagerinterface.h>
 #include <qmljs/qmljsrewriter.h>
+#include <qmljs/qmljsvalueowner.h>
 #include <qmljstools/qmljsrefactoringchanges.h>
 
 #include <utils/fileutils.h>

src/plugins/qmljstools/qmljsmodelmanager.h

@@ -34,10 +34,6 @@
 #include "qmljstools_global.h"
 
 #include <qmljs/qmljsmodelmanagerinterface.h>
-#include <qmljs/qmljsqrcparser.h>
-#include <qmljs/qmljsconstants.h>
-
-#include <cplusplus/CppDocument.h>
 
 #include <QFuture>
 #include <QFutureSynchronizer>

src/plugins/qmljstools/qmljssemanticinfo.cpp

@@ -30,7 +30,10 @@
 
 #include "qmljssemanticinfo.h"
 
+#include <qmljs/parser/qmljsast_p.h>
 #include <qmljs/qmljsscopebuilder.h>
+#include <qmljs/qmljsscopechain.h>
+#include <qmljs/parser/qmljsengine_p.h>
 
 using namespace QmlJS;
 using namespace QmlJS::AST;

src/plugins/qmljstools/qmljssemanticinfo.h

@@ -33,12 +33,18 @@
 
 #include "qmljstools_global.h"
 
-#include <qmljs/parser/qmljsast_p.h>
+#include <qmljs/qmljsdocument.h>
-#include <qmljs/qmljsscopechain.h>
+#include <qmljs/qmljscontext.h>
 #include <qmljs/qmljsstaticanalysismessage.h>
+#include <qmljs/parser/qmljsengine_p.h>
 
 #include <QTextCursor>
 
+namespace QmlJS {
+class ScopeChain;
+namespace AST { class Node; }
+}
+
 namespace QmlJSTools {
 
 class QMLJSTOOLS_EXPORT Range

src/plugins/qmljstools/qmljstools_test.cpp

@@ -34,6 +34,7 @@
 
 #include <coreplugin/icore.h>
 #include <qmljs/qmljslink.h>
+#include <qmljs/qmljsvalueowner.h>
 #include <qmljstools/qmljsmodelmanager.h>
 
 #include <QtTest>

src/plugins/todo/qmljstodoitemsscanner.cpp

@@ -33,6 +33,8 @@
 
 #include <projectexplorer/project.h>
 
+#include <qmljs/parser/qmljsengine_p.h>
+
 namespace Todo {
 namespace Internal {
 

tests/auto/qml/codemodel/check/tst_check.cpp

@@ -43,6 +43,7 @@
 #include <qmljs/qmljscheck.h>
 #include <qmljs/qmljscontext.h>
 #include <qmljs/parser/qmljsast_p.h>
+#include <qmljs/parser/qmljsengine_p.h>
 
 #include <QtTest>
 #include <algorithm>

tests/auto/qml/reformatter/tst_reformatter.cpp

@@ -40,6 +40,7 @@
 #include <qmljs/qmljsmodelmanagerinterface.h>
 #include <qmljs/qmljsreformatter.h>
 #include <qmljs/parser/qmljsast_p.h>
+#include <qmljs/parser/qmljsengine_p.h>
 
 #include <QtTest>
 #include <algorithm>

tests/tools/qml-ast2dot/main.cpp

@@ -30,6 +30,7 @@
 
 #include <qmljs/parser/qmljsast_p.h>
 #include <qmljs/parser/qmljsastvisitor_p.h>
+#include <qmljs/parser/qmljsengine_p.h>
 #include <qmljs/qmljsdocument.h>
 #include <qmljs/qmljsmodelmanagerinterface.h>