From e67d0d19647e55fe9d6cdbe380676b8b7d2f72cf Mon Sep 17 00:00:00 2001
From: Xiao Hongying <hongying.xiao@tieto.com>
Date: Fri, 2 Sep 2011 19:10:41 +0800
Subject: [PATCH] qttest: Cleanup includes and use forward declarations.
Task-number: QTCREATORBUG-5932
Change-Id: Ia8ce39d4e5261331b929721f8875ec0e2fdfab29
Reviewed-on: http://codereview.qt-project.org/5054
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
---
src/plugins/qttest/dialogs.cpp | 3 ---
src/plugins/qttest/newtestcasedlg.cpp | 2 --
src/plugins/qttest/qsystem.cpp | 5 -----
src/plugins/qttest/qttestplugin.cpp | 5 ++---
src/plugins/qttest/qttestplugin.h | 2 +-
src/plugins/qttest/resultsview.cpp | 1 -
src/plugins/qttest/resultsview.h | 1 -
src/plugins/qttest/testcode.cpp | 2 --
src/plugins/qttest/testcode.h | 6 +-----
src/plugins/qttest/testconfigurations.cpp | 1 -
src/plugins/qttest/testconfigurations.h | 9 ++-------
src/plugins/qttest/testcontextmenu.cpp | 2 ++
src/plugins/qttest/testcontextmenu.h | 5 -----
src/plugins/qttest/testexecuter.cpp | 3 ---
src/plugins/qttest/testexecuter.h | 1 +
src/plugins/qttest/testgenerator.cpp | 1 -
src/plugins/qttest/testresultuploader.cpp | 1 +
src/plugins/qttest/testresultuploader.h | 4 +++-
src/plugins/qttest/testselector.cpp | 11 -----------
src/plugins/qttest/testsettings.cpp | 0
src/plugins/qttest/testsettings.h | 1 -
src/plugins/qttest/testsettingspropertiespage.cpp | 6 +-----
src/plugins/qttest/testsettingspropertiespage.h | 4 +---
23 files changed, 15 insertions(+), 61 deletions(-)
mode change 100755 => 100644 src/plugins/qttest/testcode.cpp
mode change 100755 => 100644 src/plugins/qttest/testcode.h
mode change 100755 => 100644 src/plugins/qttest/testconfigurations.cpp
mode change 100755 => 100644 src/plugins/qttest/testconfigurations.h
mode change 100755 => 100644 src/plugins/qttest/testcontextmenu.h
mode change 100755 => 100644 src/plugins/qttest/testsettings.cpp
mode change 100755 => 100644 src/plugins/qttest/testsettings.h
diff --git a/src/plugins/qttest/dialogs.cpp b/src/plugins/qttest/dialogs.cpp
index 718212f3473..8cda83ded58 100644
--- a/src/plugins/qttest/dialogs.cpp
+++ b/src/plugins/qttest/dialogs.cpp
@@ -34,10 +34,7 @@
#include "qsystem.h"
#include <QTimer>
-#include <QMessageBox>
-#include <QFileDialog>
#include <QAbstractItemView>
-#include <QHeaderView>
#include <QTableWidgetItem>
#include <QResizeEvent>
#include <QScrollBar>
diff --git a/src/plugins/qttest/newtestcasedlg.cpp b/src/plugins/qttest/newtestcasedlg.cpp
index fcc66934344..96b33de86a6 100644
--- a/src/plugins/qttest/newtestcasedlg.cpp
+++ b/src/plugins/qttest/newtestcasedlg.cpp
@@ -34,11 +34,9 @@
#include "ui_newtestcasedlg.h"
#include "testgenerator.h"
-#include <QPushButton>
#include <QFileDialog>
#include <QRegExpValidator>
#include <QRegExp>
-#include <QDir>
#include <QDebug>
NewTestCaseDlg::NewTestCaseDlg(const QString &path, QWidget *parent) :
diff --git a/src/plugins/qttest/qsystem.cpp b/src/plugins/qttest/qsystem.cpp
index f343482a5c0..266a4e0971f 100644
--- a/src/plugins/qttest/qsystem.cpp
+++ b/src/plugins/qttest/qsystem.cpp
@@ -32,13 +32,8 @@
#include "qsystem.h"
-#include <QApplication>
-#include <QProcess>
#include <QFile>
#include <QDir>
-#include <QDateTime>
-#include <QtNetwork/QUdpSocket>
-#include <QTimer>
#include <QHostInfo>
#include <stdlib.h>
diff --git a/src/plugins/qttest/qttestplugin.cpp b/src/plugins/qttest/qttestplugin.cpp
index 30fecaa7cbf..b7518a7f34a 100644
--- a/src/plugins/qttest/qttestplugin.cpp
+++ b/src/plugins/qttest/qttestplugin.cpp
@@ -40,6 +40,7 @@
#include "testcontextmenu.h"
#include "testsuite.h"
#include "testoutputwindow.h"
+#include "testconfigurations.h"
#include <coreplugin/actionmanager/actionmanager.h>
#include <coreplugin/actionmanager/actioncontainer.h>
@@ -60,6 +61,7 @@
#include <utils/linecolumnlabel.h>
#include <projectexplorer/session.h>
#include <projectexplorer/project.h>
+#include <projectexplorer/projectexplorer.h>
#include <debugger/debuggerplugin.h>
#include <debugger/debuggerrunner.h>
#include <debugger/debuggerengine.h>
@@ -69,12 +71,9 @@
# include <debugger/qtuitest/qtuitestengine.h>
#endif
-#include <QtCore/QDebug>
#include <QtCore/QtPlugin>
-#include <QtGui/QAction>
#include <QtGui/QMenu>
#include <QtGui/QMessageBox>
-#include <QtGui/QPushButton>
#include <QMenuBar>
#include <QDebug>
#include <QToolButton>
diff --git a/src/plugins/qttest/qttestplugin.h b/src/plugins/qttest/qttestplugin.h
index d54459011f9..e6ab36b3b68 100644
--- a/src/plugins/qttest/qttestplugin.h
+++ b/src/plugins/qttest/qttestplugin.h
@@ -35,9 +35,9 @@
#include "testsuite.h"
+#include <projectexplorer/project.h>
#include <coreplugin/inavigationwidgetfactory.h>
#include <extensionsystem/iplugin.h>
-#include <QtCore/QObject>
class TestContextMenu;
class TestResultsWindow;
diff --git a/src/plugins/qttest/resultsview.cpp b/src/plugins/qttest/resultsview.cpp
index 89be797c8bd..6f7b977e190 100644
--- a/src/plugins/qttest/resultsview.cpp
+++ b/src/plugins/qttest/resultsview.cpp
@@ -42,7 +42,6 @@
#include <QHeaderView>
#include <QResizeEvent>
-#include <QSize>
#include <QTimer>
#include <QFileInfo>
#include <QDesktopServices>
diff --git a/src/plugins/qttest/resultsview.h b/src/plugins/qttest/resultsview.h
index dc03a05ae52..2e53672af29 100644
--- a/src/plugins/qttest/resultsview.h
+++ b/src/plugins/qttest/resultsview.h
@@ -39,7 +39,6 @@
#include <coreplugin/ioutputpane.h>
#include <QTableWidget>
-#include <QBrush>
class ResultsView;
class TestResultsWindow;
diff --git a/src/plugins/qttest/testcode.cpp b/src/plugins/qttest/testcode.cpp
old mode 100755
new mode 100644
index f57cfe7b539..252eb6d31b4
--- a/src/plugins/qttest/testcode.cpp
+++ b/src/plugins/qttest/testcode.cpp
@@ -70,8 +70,6 @@
#include <QIODevice>
#include <QRegExp>
#include <QDebug>
-#include <QMessageBox>
-#include <QMetaMethod>
class SystemTestCodeSync : protected QmlJS::AST::Visitor
{
diff --git a/src/plugins/qttest/testcode.h b/src/plugins/qttest/testcode.h
old mode 100755
new mode 100644
index 3187b40035f..f81ebe7456e
--- a/src/plugins/qttest/testcode.h
+++ b/src/plugins/qttest/testcode.h
@@ -33,17 +33,13 @@
#ifndef TESTCODE_H
#define TESTCODE_H
-#include "testconfigurations.h"
-
#include <qmljs/qmljsdocument.h>
#include <cplusplus/CppDocument.h>
-#include <QStringList>
-#include <QDate>
+#include <QDateTime>
#include <QPointer>
#include <QTimer>
-class QVConfig;
class TestCollectionPrivate;
namespace Core {
diff --git a/src/plugins/qttest/testconfigurations.cpp b/src/plugins/qttest/testconfigurations.cpp
old mode 100755
new mode 100644
index 2d8dc483fb5..26c2d492fb4
--- a/src/plugins/qttest/testconfigurations.cpp
+++ b/src/plugins/qttest/testconfigurations.cpp
@@ -53,7 +53,6 @@
#include <QDir>
#include <QProcess>
#include <QMessageBox>
-#include <QApplication>
#include <QRegExp>
#include <QStringList>
#include <QDebug>
diff --git a/src/plugins/qttest/testconfigurations.h b/src/plugins/qttest/testconfigurations.h
old mode 100755
new mode 100644
index 57eae2bace8..ace54700e77
--- a/src/plugins/qttest/testconfigurations.h
+++ b/src/plugins/qttest/testconfigurations.h
@@ -33,14 +33,9 @@
#ifndef TESTCONFIGURATIONS_H
#define TESTCONFIGURATIONS_H
-#ifndef QTTEST_PLUGIN_LEAN
-# include "testcontrol.h"
-#endif
-
-#include "projectexplorer/project.h"
-#include <../../libs/utils/ssh/sshconnection.h>
+#include <projectexplorer/project.h>
+#include <utils/ssh/sshconnection.h>
-#include <QStringList>
#include <QPointer>
#include <QTimer>
diff --git a/src/plugins/qttest/testcontextmenu.cpp b/src/plugins/qttest/testcontextmenu.cpp
index 03332312361..f82359ae2ef 100644
--- a/src/plugins/qttest/testcontextmenu.cpp
+++ b/src/plugins/qttest/testcontextmenu.cpp
@@ -44,6 +44,8 @@
#include <coreplugin/editormanager/ieditor.h>
#include <coreplugin/editormanager/editormanager.h>
+#include <QDir>
+
TestContextMenuPrivate *TestContextMenu::m_instance = 0;
int TestContextMenu::m_refCount = 0;
diff --git a/src/plugins/qttest/testcontextmenu.h b/src/plugins/qttest/testcontextmenu.h
old mode 100755
new mode 100644
index 15f630b6011..834e1cbe428
--- a/src/plugins/qttest/testcontextmenu.h
+++ b/src/plugins/qttest/testcontextmenu.h
@@ -35,11 +35,6 @@
#include "testsettings.h"
-#include "extensionsystem/iplugin.h"
-#include "projectexplorer/projectexplorer.h"
-
-#include <QString>
-
namespace Core {
class IEditor;
}
diff --git a/src/plugins/qttest/testexecuter.cpp b/src/plugins/qttest/testexecuter.cpp
index f85201d14b3..9003d980bd2 100644
--- a/src/plugins/qttest/testexecuter.cpp
+++ b/src/plugins/qttest/testexecuter.cpp
@@ -33,7 +33,6 @@
#include "testexecuter.h"
#include "testgenerator.h"
#include "qsystem.h"
-#include "testcode.h"
#include "testsuite.h"
#include "testoutputwindow.h"
#include "resultsview.h"
@@ -57,9 +56,7 @@
#include <sys/types.h>
#include <signal.h>
-#include <QApplication>
#include <QDir>
-#include <QBuffer>
#include <QTimer>
#include <QProcess>
#include <QMessageBox>
diff --git a/src/plugins/qttest/testexecuter.h b/src/plugins/qttest/testexecuter.h
index 8b891d02058..552b863ee31 100644
--- a/src/plugins/qttest/testexecuter.h
+++ b/src/plugins/qttest/testexecuter.h
@@ -47,6 +47,7 @@
#include <QtCore/QFutureWatcher>
#include <QProcess>
+#include <QVariantMap>
#define NO_X_SERVER_AVAILABLE "No X-server available for testing"
#define COMPILE_ERROR "Compile error"
diff --git a/src/plugins/qttest/testgenerator.cpp b/src/plugins/qttest/testgenerator.cpp
index e3d34423eac..b09e5eedc2f 100644
--- a/src/plugins/qttest/testgenerator.cpp
+++ b/src/plugins/qttest/testgenerator.cpp
@@ -37,7 +37,6 @@
#include <QFile>
#include <QTextStream>
#include <QDir>
-#include <QDateTime>
#include <QMessageBox>
#include <QDebug>
diff --git a/src/plugins/qttest/testresultuploader.cpp b/src/plugins/qttest/testresultuploader.cpp
index 2d335c2989b..4c29f2dd3f9 100644
--- a/src/plugins/qttest/testresultuploader.cpp
+++ b/src/plugins/qttest/testresultuploader.cpp
@@ -33,6 +33,7 @@
#include "testresultuploader.h"
#include "testoutputwindow.h"
#include "qsystem.h"
+#include "testconfigurations.h"
#include <QFileInfo>
#include <QTextEdit>
diff --git a/src/plugins/qttest/testresultuploader.h b/src/plugins/qttest/testresultuploader.h
index b76671f99f1..c04865351f3 100644
--- a/src/plugins/qttest/testresultuploader.h
+++ b/src/plugins/qttest/testresultuploader.h
@@ -34,10 +34,12 @@
#define TESTRESULTUPLOADER_H
#include "testsettings.h"
-#include "testconfigurations.h"
#include <QObject>
#include <QProcess>
+#include <QFile>
+
+class TestConfig;
class TestResultUploader : public QObject
{
diff --git a/src/plugins/qttest/testselector.cpp b/src/plugins/qttest/testselector.cpp
index 849a645c118..8f36e83ed29 100644
--- a/src/plugins/qttest/testselector.cpp
+++ b/src/plugins/qttest/testselector.cpp
@@ -54,23 +54,12 @@
#include <coreplugin/actionmanager/command.h>
#include <coreplugin/id.h>
-#include <QHeaderView>
#include <QDir>
#include <QPixmap>
#include <QStringList>
-#include <QApplication>
-#include <QMessageBox>
#include <QMouseEvent>
-#include <QTextStream>
-#include <QKeySequence>
-#include <QMenuBar>
#include <QMenu>
-#include <QProcess>
#include <QDebug>
-#include <QLabel>
-#include <QLineEdit>
-#include <QRadioButton>
-#include <QContextMenuEvent>
static const char *childAssigned_xpm[] = {
"8 8 3 1",
diff --git a/src/plugins/qttest/testsettings.cpp b/src/plugins/qttest/testsettings.cpp
old mode 100755
new mode 100644
diff --git a/src/plugins/qttest/testsettings.h b/src/plugins/qttest/testsettings.h
old mode 100755
new mode 100644
index da22944ce76..b01b1fc3fe9
--- a/src/plugins/qttest/testsettings.h
+++ b/src/plugins/qttest/testsettings.h
@@ -34,7 +34,6 @@
#define TESTSETTINGS_H
#include <QObject>
-#include <QString>
// class TestSettingsPrivate;
class TestSettingsPrivate : public QObject
diff --git a/src/plugins/qttest/testsettingspropertiespage.cpp b/src/plugins/qttest/testsettingspropertiespage.cpp
index fc49d7cbff5..33188f00f74 100644
--- a/src/plugins/qttest/testsettingspropertiespage.cpp
+++ b/src/plugins/qttest/testsettingspropertiespage.cpp
@@ -35,12 +35,8 @@
#include <projectexplorer/project.h>
-#include <QtCore/QTextCodec>
-#include <QDebug>
-#include <QPlainTextEdit>
-#include <QMessageBox>
#include <QFileDialog>
-#include <QRegExp>
+#include <QDebug>
using namespace QtTest;
using namespace QtTest::Internal;
diff --git a/src/plugins/qttest/testsettingspropertiespage.h b/src/plugins/qttest/testsettingspropertiespage.h
index 8c41a82fd3f..866f27e4ed6 100644
--- a/src/plugins/qttest/testsettingspropertiespage.h
+++ b/src/plugins/qttest/testsettingspropertiespage.h
@@ -34,11 +34,9 @@
#define TESTSETTINGSPROPERTIESPAGE_H
#include "testsettings.h"
+#include "ui_testsettingspropertiespage.h"
#include <projectexplorer/iprojectproperties.h>
-#include <ui_testsettingspropertiespage.h>
-
-#include <QStringList>
class TestConfig;
--
GitLab