Clean up includes in autotools-plugin.

Fixing an lupdate warning about cyclic dependencies of
autotoolsbuildsettingswidget.h.

Change-Id: I0e1c721df2c5f70ae9de38dd9bc5a34b63622ba7
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>

src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.cpp

@@ -33,6 +33,7 @@
 **************************************************************************/
 
 #include "autotoolsbuildconfiguration.h"
+#include "autotoolsbuildsettingswidget.h"
 #include "makestep.h"
 #include "autotoolsproject.h"
 #include "autotoolsprojectconstants.h"

src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.h

@@ -35,8 +35,6 @@
 #ifndef AUTOTOOLSBUILDCONFIGURATION_H
 #define AUTOTOOLSBUILDCONFIGURATION_H
 
-#include "autotoolsbuildsettingswidget.h"
-
 #include <projectexplorer/buildconfiguration.h>
 
 namespace AutotoolsProjectManager {

src/plugins/autotoolsprojectmanager/autotoolsbuildsettingswidget.cpp

@@ -39,6 +39,8 @@
 #include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/target.h>
 
+#include <utils/pathchooser.h>
+
 #include <QGridLayout>
 #include <QLabel>
 #include <QLineEdit>

src/plugins/autotoolsprojectmanager/autotoolsbuildsettingswidget.h

@@ -35,17 +35,16 @@
 #ifndef AUTOTOOLSBUILDSETTINGSWIDGET_H
 #define AUTOTOOLSBUILDSETTINGSWIDGET_H
 
-#include "autotoolsbuildconfiguration.h"
-
-#include <projectexplorer/buildconfiguration.h>
-#include <projectexplorer/project.h>
 #include <projectexplorer/buildstep.h>
-#include <utils/pathchooser.h>
 
 QT_BEGIN_NAMESPACE
 class QComboBox;
 QT_END_NAMESPACE
 
+namespace Utils {
+class PathChooser;
+}
+
 namespace AutotoolsProjectManager {
 namespace Internal {
 

src/plugins/autotoolsprojectmanager/autotoolsopenprojectwizard.cpp

@@ -34,6 +34,8 @@
 
 #include "autotoolsopenprojectwizard.h"
 
+#include <utils/pathchooser.h>
+
 #include <QVBoxLayout>
 #include <QFormLayout>
 #include <QLabel>

src/plugins/autotoolsprojectmanager/autotoolsopenprojectwizard.h

@@ -36,7 +36,10 @@
 #define AUTOTOOLSOPENPROJECTWIZARD_H
 
 #include <utils/wizard.h>
-#include <utils/pathchooser.h>
+
+namespace Utils {
+class PathChooser;
+}
 
 namespace AutotoolsProjectManager {
 namespace Internal {

src/plugins/autotoolsprojectmanager/autotoolsproject.cpp

@@ -54,6 +54,7 @@
 #include <cpptools/ModelManagerInterface.h>
 #include <coreplugin/icore.h>
 #include <utils/qtcassert.h>
+#include <utils/filesystemwatcher.h>
 
 #include <QFileInfo>
 #include <QTimer>

src/plugins/autotoolsprojectmanager/autotoolsproject.h

@@ -35,14 +35,18 @@
 #ifndef AUTOTOOLSPROJECT_H
 #define AUTOTOOLSPROJECT_H
 
-#include <coreplugin/editormanager/ieditor.h>
 #include <projectexplorer/project.h>
-#include <projectexplorer/projectexplorer.h>
-#include <projectexplorer/projectnodes.h>
-#include <utils/filesystemwatcher.h>
 
-#include <QPointer>
+QT_FORWARD_DECLARE_CLASS(QDir)
-#include <QDir>
+
+namespace Utils {
+class FileSystemWatcher;
+}
+
+namespace ProjectExplorer {
+class Node;
+class FolderNode;
+}
 
 namespace AutotoolsProjectManager {
 namespace Internal {

src/plugins/autotoolsprojectmanager/autotoolsprojectnode.cpp

@@ -35,6 +35,8 @@
 #include "autotoolsprojectnode.h"
 #include "autotoolsproject.h"
 
+#include <coreplugin/idocument.h>
+
 using namespace AutotoolsProjectManager;
 using namespace AutotoolsProjectManager::Internal;
 using namespace ProjectExplorer;

src/plugins/autotoolsprojectmanager/autotoolsprojectnode.h

@@ -36,7 +36,10 @@
 #define AUTOTOOLSPROJECTNODE_H
 
 #include <projectexplorer/projectnodes.h>
-#include <coreplugin/idocument.h>
+
+namespace Core {
+class IDocument;
+}
 
 namespace AutotoolsProjectManager {
 namespace Internal {

src/plugins/autotoolsprojectmanager/makefileparser.cpp

@@ -37,6 +37,7 @@
 #include <utils/qtcassert.h>
 
 #include <QFile>
+#include <QDir>
 #include <QFileInfoList>
 #include <QMutexLocker>
 

src/plugins/autotoolsprojectmanager/makefileparser.h

@@ -36,12 +36,11 @@
 #define MAKEFILEPARSER_H
 
 #include <QMutex>
-#include <QString>
 #include <QStringList>
 #include <QTextStream>
 #include <QObject>
-#include <QDir>
+
-#include <QFileInfo>
+QT_FORWARD_DECLARE_CLASS(QDir)
 
 namespace AutotoolsProjectManager {
 namespace Internal {

src/plugins/autotoolsprojectmanager/makefileparserthread.h

@@ -38,7 +38,7 @@
 #include "makefileparser.h"
 
 #include <QMutex>
-#include <QString>
+#include <QStringList>
 #include <QThread>
 
 namespace AutotoolsProjectManager {