forked from qt-creator/qt-creator
		
	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:
		
				
					committed by
					
						
						Eike Ziller
					
				
			
			
				
	
			
			
			
						parent
						
							084f116e7c
						
					
				
				
					commit
					e67d0d1964
				
			@@ -34,10 +34,7 @@
 | 
			
		||||
#include "qsystem.h"
 | 
			
		||||
 | 
			
		||||
#include <QTimer>
 | 
			
		||||
#include <QMessageBox>
 | 
			
		||||
#include <QFileDialog>
 | 
			
		||||
#include <QAbstractItemView>
 | 
			
		||||
#include <QHeaderView>
 | 
			
		||||
#include <QTableWidgetItem>
 | 
			
		||||
#include <QResizeEvent>
 | 
			
		||||
#include <QScrollBar>
 | 
			
		||||
 
 | 
			
		||||
@@ -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) :
 | 
			
		||||
 
 | 
			
		||||
@@ -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>
 | 
			
		||||
 
 | 
			
		||||
@@ -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>
 | 
			
		||||
 
 | 
			
		||||
@@ -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;
 | 
			
		||||
 
 | 
			
		||||
@@ -42,7 +42,6 @@
 | 
			
		||||
 | 
			
		||||
#include <QHeaderView>
 | 
			
		||||
#include <QResizeEvent>
 | 
			
		||||
#include <QSize>
 | 
			
		||||
#include <QTimer>
 | 
			
		||||
#include <QFileInfo>
 | 
			
		||||
#include <QDesktopServices>
 | 
			
		||||
 
 | 
			
		||||
@@ -39,7 +39,6 @@
 | 
			
		||||
#include <coreplugin/ioutputpane.h>
 | 
			
		||||
 | 
			
		||||
#include <QTableWidget>
 | 
			
		||||
#include <QBrush>
 | 
			
		||||
 | 
			
		||||
class ResultsView;
 | 
			
		||||
class TestResultsWindow;
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										2
									
								
								src/plugins/qttest/testcode.cpp
									
									
									
									
									
										
										
										Executable file → Normal file
									
								
							
							
						
						
									
										2
									
								
								src/plugins/qttest/testcode.cpp
									
									
									
									
									
										
										
										Executable file → Normal file
									
								
							@@ -70,8 +70,6 @@
 | 
			
		||||
#include <QIODevice>
 | 
			
		||||
#include <QRegExp>
 | 
			
		||||
#include <QDebug>
 | 
			
		||||
#include <QMessageBox>
 | 
			
		||||
#include <QMetaMethod>
 | 
			
		||||
 | 
			
		||||
class SystemTestCodeSync : protected QmlJS::AST::Visitor
 | 
			
		||||
{
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										6
									
								
								src/plugins/qttest/testcode.h
									
									
									
									
									
										
										
										Executable file → Normal file
									
								
							
							
						
						
									
										6
									
								
								src/plugins/qttest/testcode.h
									
									
									
									
									
										
										
										Executable file → Normal file
									
								
							@@ -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 {
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										1
									
								
								src/plugins/qttest/testconfigurations.cpp
									
									
									
									
									
										
										
										Executable file → Normal file
									
								
							
							
						
						
									
										1
									
								
								src/plugins/qttest/testconfigurations.cpp
									
									
									
									
									
										
										
										Executable file → Normal file
									
								
							@@ -53,7 +53,6 @@
 | 
			
		||||
#include <QDir>
 | 
			
		||||
#include <QProcess>
 | 
			
		||||
#include <QMessageBox>
 | 
			
		||||
#include <QApplication>
 | 
			
		||||
#include <QRegExp>
 | 
			
		||||
#include <QStringList>
 | 
			
		||||
#include <QDebug>
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										9
									
								
								src/plugins/qttest/testconfigurations.h
									
									
									
									
									
										
										
										Executable file → Normal file
									
								
							
							
						
						
									
										9
									
								
								src/plugins/qttest/testconfigurations.h
									
									
									
									
									
										
										
										Executable file → Normal file
									
								
							@@ -33,14 +33,9 @@
 | 
			
		||||
#ifndef TESTCONFIGURATIONS_H
 | 
			
		||||
#define TESTCONFIGURATIONS_H
 | 
			
		||||
 | 
			
		||||
#ifndef QTTEST_PLUGIN_LEAN
 | 
			
		||||
# include "testcontrol.h"
 | 
			
		||||
#endif
 | 
			
		||||
#include <projectexplorer/project.h>
 | 
			
		||||
#include <utils/ssh/sshconnection.h>
 | 
			
		||||
 | 
			
		||||
#include "projectexplorer/project.h"
 | 
			
		||||
#include <../../libs/utils/ssh/sshconnection.h>
 | 
			
		||||
 | 
			
		||||
#include <QStringList>
 | 
			
		||||
#include <QPointer>
 | 
			
		||||
#include <QTimer>
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -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;
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										5
									
								
								src/plugins/qttest/testcontextmenu.h
									
									
									
									
									
										
										
										Executable file → Normal file
									
								
							
							
						
						
									
										5
									
								
								src/plugins/qttest/testcontextmenu.h
									
									
									
									
									
										
										
										Executable file → Normal file
									
								
							@@ -35,11 +35,6 @@
 | 
			
		||||
 | 
			
		||||
#include "testsettings.h"
 | 
			
		||||
 | 
			
		||||
#include "extensionsystem/iplugin.h"
 | 
			
		||||
#include "projectexplorer/projectexplorer.h"
 | 
			
		||||
 | 
			
		||||
#include <QString>
 | 
			
		||||
 | 
			
		||||
namespace Core {
 | 
			
		||||
class IEditor;
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -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>
 | 
			
		||||
 
 | 
			
		||||
@@ -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"
 | 
			
		||||
 
 | 
			
		||||
@@ -37,7 +37,6 @@
 | 
			
		||||
#include <QFile>
 | 
			
		||||
#include <QTextStream>
 | 
			
		||||
#include <QDir>
 | 
			
		||||
#include <QDateTime>
 | 
			
		||||
#include <QMessageBox>
 | 
			
		||||
#include <QDebug>
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -33,6 +33,7 @@
 | 
			
		||||
#include "testresultuploader.h"
 | 
			
		||||
#include "testoutputwindow.h"
 | 
			
		||||
#include "qsystem.h"
 | 
			
		||||
#include "testconfigurations.h"
 | 
			
		||||
 | 
			
		||||
#include <QFileInfo>
 | 
			
		||||
#include <QTextEdit>
 | 
			
		||||
 
 | 
			
		||||
@@ -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
 | 
			
		||||
{
 | 
			
		||||
 
 | 
			
		||||
@@ -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",
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										0
									
								
								src/plugins/qttest/testsettings.cpp
									
									
									
									
									
										
										
										Executable file → Normal file
									
								
							
							
						
						
									
										0
									
								
								src/plugins/qttest/testsettings.cpp
									
									
									
									
									
										
										
										Executable file → Normal file
									
								
							
							
								
								
									
										1
									
								
								src/plugins/qttest/testsettings.h
									
									
									
									
									
										
										
										Executable file → Normal file
									
								
							
							
						
						
									
										1
									
								
								src/plugins/qttest/testsettings.h
									
									
									
									
									
										
										
										Executable file → Normal file
									
								
							@@ -34,7 +34,6 @@
 | 
			
		||||
#define TESTSETTINGS_H
 | 
			
		||||
 | 
			
		||||
#include <QObject>
 | 
			
		||||
#include <QString>
 | 
			
		||||
 | 
			
		||||
// class TestSettingsPrivate;
 | 
			
		||||
class TestSettingsPrivate : public QObject
 | 
			
		||||
 
 | 
			
		||||
@@ -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;
 | 
			
		||||
 
 | 
			
		||||
@@ -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;
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user