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>
This commit is contained in:
Xiao Hongying
2011-09-02 19:10:41 +08:00
committed by Eike Ziller
parent 084f116e7c
commit e67d0d1964
23 changed files with 15 additions and 61 deletions

View File

@@ -34,10 +34,7 @@
#include "qsystem.h" #include "qsystem.h"
#include <QTimer> #include <QTimer>
#include <QMessageBox>
#include <QFileDialog>
#include <QAbstractItemView> #include <QAbstractItemView>
#include <QHeaderView>
#include <QTableWidgetItem> #include <QTableWidgetItem>
#include <QResizeEvent> #include <QResizeEvent>
#include <QScrollBar> #include <QScrollBar>

View File

@@ -34,11 +34,9 @@
#include "ui_newtestcasedlg.h" #include "ui_newtestcasedlg.h"
#include "testgenerator.h" #include "testgenerator.h"
#include <QPushButton>
#include <QFileDialog> #include <QFileDialog>
#include <QRegExpValidator> #include <QRegExpValidator>
#include <QRegExp> #include <QRegExp>
#include <QDir>
#include <QDebug> #include <QDebug>
NewTestCaseDlg::NewTestCaseDlg(const QString &path, QWidget *parent) : NewTestCaseDlg::NewTestCaseDlg(const QString &path, QWidget *parent) :

View File

@@ -32,13 +32,8 @@
#include "qsystem.h" #include "qsystem.h"
#include <QApplication>
#include <QProcess>
#include <QFile> #include <QFile>
#include <QDir> #include <QDir>
#include <QDateTime>
#include <QtNetwork/QUdpSocket>
#include <QTimer>
#include <QHostInfo> #include <QHostInfo>
#include <stdlib.h> #include <stdlib.h>

View File

@@ -40,6 +40,7 @@
#include "testcontextmenu.h" #include "testcontextmenu.h"
#include "testsuite.h" #include "testsuite.h"
#include "testoutputwindow.h" #include "testoutputwindow.h"
#include "testconfigurations.h"
#include <coreplugin/actionmanager/actionmanager.h> #include <coreplugin/actionmanager/actionmanager.h>
#include <coreplugin/actionmanager/actioncontainer.h> #include <coreplugin/actionmanager/actioncontainer.h>
@@ -60,6 +61,7 @@
#include <utils/linecolumnlabel.h> #include <utils/linecolumnlabel.h>
#include <projectexplorer/session.h> #include <projectexplorer/session.h>
#include <projectexplorer/project.h> #include <projectexplorer/project.h>
#include <projectexplorer/projectexplorer.h>
#include <debugger/debuggerplugin.h> #include <debugger/debuggerplugin.h>
#include <debugger/debuggerrunner.h> #include <debugger/debuggerrunner.h>
#include <debugger/debuggerengine.h> #include <debugger/debuggerengine.h>
@@ -69,12 +71,9 @@
# include <debugger/qtuitest/qtuitestengine.h> # include <debugger/qtuitest/qtuitestengine.h>
#endif #endif
#include <QtCore/QDebug>
#include <QtCore/QtPlugin> #include <QtCore/QtPlugin>
#include <QtGui/QAction>
#include <QtGui/QMenu> #include <QtGui/QMenu>
#include <QtGui/QMessageBox> #include <QtGui/QMessageBox>
#include <QtGui/QPushButton>
#include <QMenuBar> #include <QMenuBar>
#include <QDebug> #include <QDebug>
#include <QToolButton> #include <QToolButton>

View File

@@ -35,9 +35,9 @@
#include "testsuite.h" #include "testsuite.h"
#include <projectexplorer/project.h>
#include <coreplugin/inavigationwidgetfactory.h> #include <coreplugin/inavigationwidgetfactory.h>
#include <extensionsystem/iplugin.h> #include <extensionsystem/iplugin.h>
#include <QtCore/QObject>
class TestContextMenu; class TestContextMenu;
class TestResultsWindow; class TestResultsWindow;

View File

@@ -42,7 +42,6 @@
#include <QHeaderView> #include <QHeaderView>
#include <QResizeEvent> #include <QResizeEvent>
#include <QSize>
#include <QTimer> #include <QTimer>
#include <QFileInfo> #include <QFileInfo>
#include <QDesktopServices> #include <QDesktopServices>

View File

@@ -39,7 +39,6 @@
#include <coreplugin/ioutputpane.h> #include <coreplugin/ioutputpane.h>
#include <QTableWidget> #include <QTableWidget>
#include <QBrush>
class ResultsView; class ResultsView;
class TestResultsWindow; class TestResultsWindow;

2
src/plugins/qttest/testcode.cpp Executable file → Normal file
View File

@@ -70,8 +70,6 @@
#include <QIODevice> #include <QIODevice>
#include <QRegExp> #include <QRegExp>
#include <QDebug> #include <QDebug>
#include <QMessageBox>
#include <QMetaMethod>
class SystemTestCodeSync : protected QmlJS::AST::Visitor class SystemTestCodeSync : protected QmlJS::AST::Visitor
{ {

6
src/plugins/qttest/testcode.h Executable file → Normal file
View File

@@ -33,17 +33,13 @@
#ifndef TESTCODE_H #ifndef TESTCODE_H
#define TESTCODE_H #define TESTCODE_H
#include "testconfigurations.h"
#include <qmljs/qmljsdocument.h> #include <qmljs/qmljsdocument.h>
#include <cplusplus/CppDocument.h> #include <cplusplus/CppDocument.h>
#include <QStringList> #include <QDateTime>
#include <QDate>
#include <QPointer> #include <QPointer>
#include <QTimer> #include <QTimer>
class QVConfig;
class TestCollectionPrivate; class TestCollectionPrivate;
namespace Core { namespace Core {

1
src/plugins/qttest/testconfigurations.cpp Executable file → Normal file
View File

@@ -53,7 +53,6 @@
#include <QDir> #include <QDir>
#include <QProcess> #include <QProcess>
#include <QMessageBox> #include <QMessageBox>
#include <QApplication>
#include <QRegExp> #include <QRegExp>
#include <QStringList> #include <QStringList>
#include <QDebug> #include <QDebug>

9
src/plugins/qttest/testconfigurations.h Executable file → Normal file
View File

@@ -33,14 +33,9 @@
#ifndef TESTCONFIGURATIONS_H #ifndef TESTCONFIGURATIONS_H
#define TESTCONFIGURATIONS_H #define TESTCONFIGURATIONS_H
#ifndef QTTEST_PLUGIN_LEAN #include <projectexplorer/project.h>
# include "testcontrol.h" #include <utils/ssh/sshconnection.h>
#endif
#include "projectexplorer/project.h"
#include <../../libs/utils/ssh/sshconnection.h>
#include <QStringList>
#include <QPointer> #include <QPointer>
#include <QTimer> #include <QTimer>

View File

@@ -44,6 +44,8 @@
#include <coreplugin/editormanager/ieditor.h> #include <coreplugin/editormanager/ieditor.h>
#include <coreplugin/editormanager/editormanager.h> #include <coreplugin/editormanager/editormanager.h>
#include <QDir>
TestContextMenuPrivate *TestContextMenu::m_instance = 0; TestContextMenuPrivate *TestContextMenu::m_instance = 0;
int TestContextMenu::m_refCount = 0; int TestContextMenu::m_refCount = 0;

5
src/plugins/qttest/testcontextmenu.h Executable file → Normal file
View File

@@ -35,11 +35,6 @@
#include "testsettings.h" #include "testsettings.h"
#include "extensionsystem/iplugin.h"
#include "projectexplorer/projectexplorer.h"
#include <QString>
namespace Core { namespace Core {
class IEditor; class IEditor;
} }

View File

@@ -33,7 +33,6 @@
#include "testexecuter.h" #include "testexecuter.h"
#include "testgenerator.h" #include "testgenerator.h"
#include "qsystem.h" #include "qsystem.h"
#include "testcode.h"
#include "testsuite.h" #include "testsuite.h"
#include "testoutputwindow.h" #include "testoutputwindow.h"
#include "resultsview.h" #include "resultsview.h"
@@ -57,9 +56,7 @@
#include <sys/types.h> #include <sys/types.h>
#include <signal.h> #include <signal.h>
#include <QApplication>
#include <QDir> #include <QDir>
#include <QBuffer>
#include <QTimer> #include <QTimer>
#include <QProcess> #include <QProcess>
#include <QMessageBox> #include <QMessageBox>

View File

@@ -47,6 +47,7 @@
#include <QtCore/QFutureWatcher> #include <QtCore/QFutureWatcher>
#include <QProcess> #include <QProcess>
#include <QVariantMap>
#define NO_X_SERVER_AVAILABLE "No X-server available for testing" #define NO_X_SERVER_AVAILABLE "No X-server available for testing"
#define COMPILE_ERROR "Compile error" #define COMPILE_ERROR "Compile error"

View File

@@ -37,7 +37,6 @@
#include <QFile> #include <QFile>
#include <QTextStream> #include <QTextStream>
#include <QDir> #include <QDir>
#include <QDateTime>
#include <QMessageBox> #include <QMessageBox>
#include <QDebug> #include <QDebug>

View File

@@ -33,6 +33,7 @@
#include "testresultuploader.h" #include "testresultuploader.h"
#include "testoutputwindow.h" #include "testoutputwindow.h"
#include "qsystem.h" #include "qsystem.h"
#include "testconfigurations.h"
#include <QFileInfo> #include <QFileInfo>
#include <QTextEdit> #include <QTextEdit>

View File

@@ -34,10 +34,12 @@
#define TESTRESULTUPLOADER_H #define TESTRESULTUPLOADER_H
#include "testsettings.h" #include "testsettings.h"
#include "testconfigurations.h"
#include <QObject> #include <QObject>
#include <QProcess> #include <QProcess>
#include <QFile>
class TestConfig;
class TestResultUploader : public QObject class TestResultUploader : public QObject
{ {

View File

@@ -54,23 +54,12 @@
#include <coreplugin/actionmanager/command.h> #include <coreplugin/actionmanager/command.h>
#include <coreplugin/id.h> #include <coreplugin/id.h>
#include <QHeaderView>
#include <QDir> #include <QDir>
#include <QPixmap> #include <QPixmap>
#include <QStringList> #include <QStringList>
#include <QApplication>
#include <QMessageBox>
#include <QMouseEvent> #include <QMouseEvent>
#include <QTextStream>
#include <QKeySequence>
#include <QMenuBar>
#include <QMenu> #include <QMenu>
#include <QProcess>
#include <QDebug> #include <QDebug>
#include <QLabel>
#include <QLineEdit>
#include <QRadioButton>
#include <QContextMenuEvent>
static const char *childAssigned_xpm[] = { static const char *childAssigned_xpm[] = {
"8 8 3 1", "8 8 3 1",

0
src/plugins/qttest/testsettings.cpp Executable file → Normal file
View File

1
src/plugins/qttest/testsettings.h Executable file → Normal file
View File

@@ -34,7 +34,6 @@
#define TESTSETTINGS_H #define TESTSETTINGS_H
#include <QObject> #include <QObject>
#include <QString>
// class TestSettingsPrivate; // class TestSettingsPrivate;
class TestSettingsPrivate : public QObject class TestSettingsPrivate : public QObject

View File

@@ -35,12 +35,8 @@
#include <projectexplorer/project.h> #include <projectexplorer/project.h>
#include <QtCore/QTextCodec>
#include <QDebug>
#include <QPlainTextEdit>
#include <QMessageBox>
#include <QFileDialog> #include <QFileDialog>
#include <QRegExp> #include <QDebug>
using namespace QtTest; using namespace QtTest;
using namespace QtTest::Internal; using namespace QtTest::Internal;

View File

@@ -34,11 +34,9 @@
#define TESTSETTINGSPROPERTIESPAGE_H #define TESTSETTINGSPROPERTIESPAGE_H
#include "testsettings.h" #include "testsettings.h"
#include "ui_testsettingspropertiespage.h"
#include <projectexplorer/iprojectproperties.h> #include <projectexplorer/iprojectproperties.h>
#include <ui_testsettingspropertiespage.h>
#include <QStringList>
class TestConfig; class TestConfig;