diff options
author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2010-11-03 10:03:48 +0100 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2010-11-03 10:03:48 +0100 |
commit | a82d57de8a342f97f8af3abf5507b96a82580f0b (patch) | |
tree | 0fd44d9f87a94ef6b912ed145b2c652f784be5e5 /src/plugins/qt4projectmanager | |
parent | 4768bb8df2dd69298c099ca5473f9ad294422977 (diff) | |
download | qt-creator-a82d57de8a342f97f8af3abf5507b96a82580f0b.tar.gz |
Qt4ProjectManager/Symbian: Header cleanup.
Diffstat (limited to 'src/plugins/qt4projectmanager')
21 files changed, 66 insertions, 107 deletions
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60deployconfiguration.cpp b/src/plugins/qt4projectmanager/qt-s60/s60deployconfiguration.cpp index 6d21f54d11..43152236c3 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60deployconfiguration.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/s60deployconfiguration.cpp @@ -29,34 +29,19 @@ #include "s60deployconfiguration.h" #include "s60deployconfigurationwidget.h" -#include "s60devicerunconfiguration.h" - #include "qt4project.h" #include "qt4target.h" -#include "s60devices.h" -#include "s60manager.h" #include "qt4projectmanagerconstants.h" -#include "qtversionmanager.h" -#include "profilereader.h" -#include "s60manager.h" -#include "s60devices.h" -#include "symbiandevicemanager.h" #include "qt4buildconfiguration.h" -#include "qt4projectmanagerconstants.h" #include "s60createpackagestep.h" -#include "qtoutputformatter.h" -#include <coreplugin/icore.h> -#include <coreplugin/messagemanager.h> -#include <coreplugin/progressmanager/progressmanager.h> #include <utils/qtcassert.h> -#include <utils/pathchooser.h> +#include <symbianutils/symbiandevicemanager.h> + #include <projectexplorer/buildsteplist.h> -#include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/project.h> -#include <projectexplorer/buildconfiguration.h> -#include <QFileInfo> +#include <QtCore/QFileInfo> using namespace ProjectExplorer; using namespace Qt4ProjectManager; diff --git a/src/plugins/qt4projectmanager/qt-s60/s60deployconfiguration.h b/src/plugins/qt4projectmanager/qt-s60/s60deployconfiguration.h index 072ea984da..a82eaa45ab 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60deployconfiguration.h +++ b/src/plugins/qt4projectmanager/qt-s60/s60deployconfiguration.h @@ -31,10 +31,13 @@ #define S60DEPLOYCONFIGURATION_H #include <projectexplorer/deployconfiguration.h> -#include <projectexplorer/buildconfiguration.h> -#include <projectexplorer/runconfiguration.h> #include <projectexplorer/toolchaintype.h> +namespace ProjectExplorer { +class BuildConfiguration; +class RunConfiguration; +} + namespace Qt4ProjectManager { class QtVersion; @@ -50,7 +53,7 @@ class S60DeployConfiguration : public ProjectExplorer::DeployConfiguration friend class S60DeployConfigurationFactory; public: - S60DeployConfiguration(ProjectExplorer::Target *parent); + explicit S60DeployConfiguration(ProjectExplorer::Target *parent); virtual ~S60DeployConfiguration(); bool isEnabled(ProjectExplorer::BuildConfiguration *configuration) const; diff --git a/src/plugins/qt4projectmanager/qt-s60/s60deployconfigurationwidget.cpp b/src/plugins/qt4projectmanager/qt-s60/s60deployconfigurationwidget.cpp index 8a8b1f250c..23a6a2db4e 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60deployconfigurationwidget.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/s60deployconfigurationwidget.cpp @@ -32,11 +32,11 @@ #include "s60devicerunconfiguration.h" #include "s60runconfigbluetoothstarter.h" -#include "bluetoothlistener_gui.h" -#include "s60manager.h" -#include "launcher.h" -#include "bluetoothlistener.h" -#include "symbiandevicemanager.h" +#include <symbianutils/bluetoothlistener_gui.h> + +#include <symbianutils/launcher.h> +#include <symbianutils/bluetoothlistener.h> +#include <symbianutils/symbiandevicemanager.h> #include <utils/detailswidget.h> #include <utils/qtcassert.h> diff --git a/src/plugins/qt4projectmanager/qt-s60/s60deployconfigurationwidget.h b/src/plugins/qt4projectmanager/qt-s60/s60deployconfigurationwidget.h index 2a5def4447..cca228ee52 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60deployconfigurationwidget.h +++ b/src/plugins/qt4projectmanager/qt-s60/s60deployconfigurationwidget.h @@ -30,11 +30,11 @@ #ifndef S60DEPLOYCONFIGURATIONWIDGET_H #define S60DEPLOYCONFIGURATIONWIDGET_H +#include <projectexplorer/deployconfiguration.h> + #include <QtGui/QWidget> #include <QtCore/QPointer> -#include <projectexplorer/deployconfiguration.h> - QT_BEGIN_NAMESPACE class QLabel; class QLineEdit; diff --git a/src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp b/src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp index 2e1ad5abad..2b7947510a 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp @@ -32,25 +32,25 @@ #include "qt4buildconfiguration.h" #include "s60deployconfiguration.h" #include "s60devicerunconfiguration.h" -#include "symbiandevicemanager.h" #include "s60runconfigbluetoothstarter.h" -#include <QtGui/QMessageBox> -#include <QtGui/QMainWindow> -#include <QtCore/QCoreApplication> -#include <QtCore/QTimer> -#include <QDateTime> -#include <QFile> -#include <QFileInfo> -#include <QDir> - #include <coreplugin/icore.h> #include <projectexplorer/buildsteplist.h> #include <projectexplorer/target.h> -#include <projectexplorer/ioutputparser.h> #include <projectexplorer/projectexplorerconstants.h> #include <qt4projectmanagerconstants.h> +#include <symbianutils/launcher.h> +#include <symbianutils/symbiandevicemanager.h> + +#include <QtGui/QMessageBox> +#include <QtGui/QMainWindow> + +#include <QtCore/QTimer> +#include <QtCore/QDateTime> +#include <QtCore/QDir> +#include <QtCore/QEventLoop> + using namespace ProjectExplorer; using namespace Qt4ProjectManager::Internal; @@ -418,6 +418,10 @@ BuildStepConfigWidget *S60DeployStep::createConfigWidget() return new S60DeployStepWidget(); } +S60DeployStepWidget::S60DeployStepWidget() : ProjectExplorer::BuildStepConfigWidget() +{ +} + void S60DeployStepWidget::init() { } diff --git a/src/plugins/qt4projectmanager/qt-s60/s60deploystep.h b/src/plugins/qt4projectmanager/qt-s60/s60deploystep.h index 4d2d9c7239..38779bb6b1 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60deploystep.h +++ b/src/plugins/qt4projectmanager/qt-s60/s60deploystep.h @@ -27,20 +27,21 @@ ** **************************************************************************/ - #ifndef S60DeployStep_H #define S60DeployStep_H #include <projectexplorer/buildstep.h> -#include "launcher.h" - #include <QtCore/QString> -#include <QtCore/QEventLoop> + +QT_FORWARD_DECLARE_CLASS(QEventLoop) namespace SymbianUtils { class SymbianDevice; } +namespace trk{ +class Launcher; +} namespace ProjectExplorer { class IOutputParser; @@ -57,7 +58,7 @@ class S60DeployStepFactory : public ProjectExplorer::IBuildStepFactory Q_OBJECT public: explicit S60DeployStepFactory(QObject *parent = 0); - ~S60DeployStepFactory(); + virtual ~S60DeployStepFactory(); // used to show the list of possible additons to a target, returns a list of types QStringList availableCreationIds(ProjectExplorer::BuildStepList *parent) const; @@ -151,13 +152,11 @@ class S60DeployStepWidget : public ProjectExplorer::BuildStepConfigWidget { Q_OBJECT public: - S60DeployStepWidget() - : ProjectExplorer::BuildStepConfigWidget() - {} + S60DeployStepWidget(); + void init(); QString summaryText() const; QString displayName() const; - }; } // Internal diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp index ad0bf4cea6..652dc983bb 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp @@ -32,34 +32,28 @@ #include "s60deployconfiguration.h" #include "qt4project.h" #include "qt4target.h" -#include "qtversionmanager.h" -#include "profilereader.h" #include "s60manager.h" #include "s60devices.h" #include "s60runconfigbluetoothstarter.h" -#include "bluetoothlistener_gui.h" -#include "symbiandevicemanager.h" -#include "qt4buildconfiguration.h" #include "qt4projectmanagerconstants.h" -#include "s60createpackagestep.h" #include "qtoutputformatter.h" +#include <symbianutils/bluetoothlistener_gui.h> +#include <symbianutils/launcher.h> +#include <symbianutils/symbiandevicemanager.h> + +#include <utils/qtcassert.h> + #include <coreplugin/icore.h> -#include <coreplugin/messagemanager.h> #include <coreplugin/progressmanager/progressmanager.h> -#include <utils/qtcassert.h> -#include <utils/pathchooser.h> -#include <projectexplorer/buildsteplist.h> -#include <projectexplorer/deployconfiguration.h> -#include <projectexplorer/projectexplorerconstants.h> -#include <projectexplorer/project.h> #include <debugger/debuggerengine.h> -#include <debugger/debuggerplugin.h> #include <QtGui/QMessageBox> #include <QtGui/QMainWindow> -#include <QtCore/QCoreApplication> +#include <QtCore/QFileInfo> +#include <QtCore/QDateTime> +#include <QtCore/QDir> using namespace ProjectExplorer; using namespace Qt4ProjectManager; diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.h b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.h index d4009a700b..985c2066c5 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.h +++ b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.h @@ -30,31 +30,27 @@ #ifndef S60DEVICERUNCONFIGURATION_H #define S60DEVICERUNCONFIGURATION_H -#include "launcher.h" - #include <debugger/debuggerrunner.h> #include <projectexplorer/runconfiguration.h> #include <projectexplorer/toolchaintype.h> -#include <QtCore/QProcess> #include <QtCore/QFutureInterface> -#include <QtCore/QSharedPointer> #include <QtCore/QScopedPointer> +#include <QtCore/QStringList> QT_BEGIN_NAMESPACE class QMessageBox; class QWidget; QT_END_NAMESPACE -namespace Debugger { -class DebuggerStartParameters; -class DebuggerRunControl; -} - namespace SymbianUtils { class SymbianDevice; } +namespace trk { +class Launcher; +} + namespace Qt4ProjectManager { class QtVersion; diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfigurationwidget.cpp b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfigurationwidget.cpp index 485d5dc7ce..339343dfac 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfigurationwidget.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfigurationwidget.cpp @@ -32,16 +32,10 @@ #include <utils/detailswidget.h> -#include <QtGui/QLabel> #include <QtGui/QLineEdit> #include <QtGui/QVBoxLayout> #include <QtGui/QHBoxLayout> #include <QtGui/QFormLayout> -#include <QtGui/QStyle> -#include <QtGui/QApplication> -#include <QtGui/QSpacerItem> -#include <QtGui/QMainWindow> -#include <QtGui/QMessageBox> namespace Qt4ProjectManager { namespace Internal { diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devices.cpp b/src/plugins/qt4projectmanager/qt-s60/s60devices.cpp index ec646942b0..9a76a089d6 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60devices.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/s60devices.cpp @@ -28,7 +28,6 @@ **************************************************************************/ #include "s60devices.h" -#include "gccetoolchain.h" #include <utils/environment.h> diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devicespreferencepane.cpp b/src/plugins/qt4projectmanager/qt-s60/s60devicespreferencepane.cpp index 7d8d1656cc..81d48aa0ec 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60devicespreferencepane.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/s60devicespreferencepane.cpp @@ -29,7 +29,6 @@ #include "s60devicespreferencepane.h" #include "ui_s60devicespreferencepane.h" -#include "s60devices.h" #include <qt4projectmanager/qt4projectmanagerconstants.h> diff --git a/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.cpp b/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.cpp index e76b2f825a..d01a368653 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.cpp @@ -31,25 +31,15 @@ #include "qt4project.h" #include "qt4target.h" -#include "qtversionmanager.h" -#include "profilereader.h" #include "s60manager.h" -#include "s60devices.h" -#include "qt4buildconfiguration.h" #include "qt4projectmanagerconstants.h" #include "qtoutputformatter.h" -#include <coreplugin/icore.h> -#include <coreplugin/messagemanager.h> #include <utils/qtcassert.h> #include <utils/detailswidget.h> -#include <projectexplorer/projectexplorerconstants.h> -#include <projectexplorer/project.h> -#include <projectexplorer/persistentsettings.h> #include <QtGui/QLabel> #include <QtGui/QVBoxLayout> -#include <QtGui/QLineEdit> #include <QtGui/QFormLayout> using namespace ProjectExplorer; diff --git a/src/plugins/qt4projectmanager/qt-s60/s60manager.cpp b/src/plugins/qt4projectmanager/qt-s60/s60manager.cpp index e71e03d675..cb0dae8594 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60manager.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/s60manager.cpp @@ -31,7 +31,6 @@ #include "qtversionmanager.h" #include "s60devicespreferencepane.h" -#include "symbiandevicemanager.h" #include "winscwtoolchain.h" #include "gccetoolchain.h" #include "rvcttoolchain.h" @@ -40,6 +39,8 @@ #include "s60createpackagestep.h" #include "s60deploystep.h" +#include <symbianutils/symbiandevicemanager.h> + #include <coreplugin/icore.h> #include <extensionsystem/pluginmanager.h> #include <projectexplorer/projectexplorerconstants.h> @@ -49,7 +50,6 @@ #include <QtGui/QMainWindow> #include <QtCore/QDir> -#include <QtCore/QFileInfo> namespace { const char S60_AUTODETECTION_SOURCE[] = "QTS60"; diff --git a/src/plugins/qt4projectmanager/qt-s60/s60projectchecker.cpp b/src/plugins/qt4projectmanager/qt-s60/s60projectchecker.cpp index 9442de8a98..4716a981f6 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60projectchecker.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/s60projectchecker.cpp @@ -32,7 +32,6 @@ #include <projectexplorer/projectexplorerconstants.h> #include <qt4projectmanager/qt-s60/s60manager.h> #include <qt4projectmanager/qt4project.h> -#include <qt4projectmanager/qtversionmanager.h> #include <QtCore/QCoreApplication> diff --git a/src/plugins/qt4projectmanager/qt-s60/s60runconfigbluetoothstarter.cpp b/src/plugins/qt4projectmanager/qt-s60/s60runconfigbluetoothstarter.cpp index 8dcb15633b..13467dd446 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60runconfigbluetoothstarter.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/s60runconfigbluetoothstarter.cpp @@ -28,9 +28,9 @@ **************************************************************************/ #include "s60runconfigbluetoothstarter.h" -#include "bluetoothlistener.h" -#include "symbiandevicemanager.h" -#include "trkdevice.h" +#include <symbianutils/bluetoothlistener.h> +#include <symbianutils/symbiandevicemanager.h> +#include <symbianutils/trkdevice.h> #include <coreplugin/icore.h> #include <coreplugin/messagemanager.h> diff --git a/src/plugins/qt4projectmanager/qt-s60/s60runconfigbluetoothstarter.h b/src/plugins/qt4projectmanager/qt-s60/s60runconfigbluetoothstarter.h index a741b6a986..1664e750c6 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60runconfigbluetoothstarter.h +++ b/src/plugins/qt4projectmanager/qt-s60/s60runconfigbluetoothstarter.h @@ -30,8 +30,8 @@ #ifndef S60RUNCONFIGBLUETOOTHSTARTER_H #define S60RUNCONFIGBLUETOOTHSTARTER_H -#include "communicationstarter.h" -#include "bluetoothlistener_gui.h" +#include <symbianutils/communicationstarter.h> +#include <symbianutils/bluetoothlistener_gui.h> namespace Qt4ProjectManager { namespace Internal { diff --git a/src/plugins/qt4projectmanager/qt-s60/sbsv2parser.cpp b/src/plugins/qt4projectmanager/qt-s60/sbsv2parser.cpp index 5f60d29971..a791057bc9 100644 --- a/src/plugins/qt4projectmanager/qt-s60/sbsv2parser.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/sbsv2parser.cpp @@ -30,13 +30,8 @@ #include "sbsv2parser.h" #include <extensionsystem/pluginmanager.h> -#include <projectexplorer/gnumakeparser.h> #include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/taskhub.h> -#include <projectexplorer/taskwindow.h> - -#include <QtCore/QFile> -#include <QtCore/QFileInfo> using namespace Qt4ProjectManager; using namespace ProjectExplorer; diff --git a/src/plugins/qt4projectmanager/qt-s60/signsisparser.cpp b/src/plugins/qt4projectmanager/qt-s60/signsisparser.cpp index 2145183bf3..752c730c63 100644 --- a/src/plugins/qt4projectmanager/qt-s60/signsisparser.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/signsisparser.cpp @@ -31,7 +31,6 @@ #include "signsisparser.h" #include <projectexplorer/projectexplorerconstants.h> -#include <projectexplorer/taskwindow.h> using namespace Qt4ProjectManager; using namespace ProjectExplorer; diff --git a/src/plugins/qt4projectmanager/qt-s60/winscwparser.cpp b/src/plugins/qt4projectmanager/qt-s60/winscwparser.cpp index 0d04793f65..96fb315b2f 100644 --- a/src/plugins/qt4projectmanager/qt-s60/winscwparser.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/winscwparser.cpp @@ -28,8 +28,8 @@ **************************************************************************/ #include "winscwparser.h" + #include <projectexplorer/projectexplorerconstants.h> -#include <projectexplorer/taskwindow.h> #include <QtCore/QDir> diff --git a/src/plugins/qt4projectmanager/qtoutputformatter.cpp b/src/plugins/qt4projectmanager/qtoutputformatter.cpp index 017adc442e..ea1cd16314 100644 --- a/src/plugins/qt4projectmanager/qtoutputformatter.cpp +++ b/src/plugins/qt4projectmanager/qtoutputformatter.cpp @@ -35,6 +35,7 @@ #include <QtCore/QFileInfo> #include <QtCore/QUrl> #include <QtGui/QPlainTextEdit> +#include <QtGui/QTextCursor> using namespace ProjectExplorer; using namespace Qt4ProjectManager; diff --git a/src/plugins/qt4projectmanager/qtoutputformatter.h b/src/plugins/qt4projectmanager/qtoutputformatter.h index a62b1c1d7a..08396e0c9b 100644 --- a/src/plugins/qt4projectmanager/qtoutputformatter.h +++ b/src/plugins/qt4projectmanager/qtoutputformatter.h @@ -33,9 +33,11 @@ #include "qt4projectmanager_global.h" #include <projectexplorer/outputformatter.h> + #include <QtCore/QRegExp> -#include <QtCore/QSharedPointer> -#include <QtGui/QTextCharFormat> +#include <QtCore/QWeakPointer> + +QT_FORWARD_DECLARE_CLASS(QTextCursor) namespace ProjectExplorer { class Project; |