Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Marco Bubke
flatpak-qt-creator
Commits
a82d57de
Commit
a82d57de
authored
Nov 03, 2010
by
Friedemann Kleint
Browse files
Qt4ProjectManager/Symbian: Header cleanup.
parent
4768bb8d
Changes
21
Hide whitespace changes
Inline
Side-by-side
src/plugins/qt4projectmanager/qt-s60/s60deployconfiguration.cpp
View file @
a82d57de
...
...
@@ -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
;
...
...
src/plugins/qt4projectmanager/qt-s60/s60deployconfiguration.h
View file @
a82d57de
...
...
@@ -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
;
...
...
src/plugins/qt4projectmanager/qt-s60/s60deployconfigurationwidget.cpp
View file @
a82d57de
...
...
@@ -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>
...
...
src/plugins/qt4projectmanager/qt-s60/s60deployconfigurationwidget.h
View file @
a82d57de
...
...
@@ -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
;
...
...
src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp
View file @
a82d57de
...
...
@@ -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
()
{
}
...
...
src/plugins/qt4projectmanager/qt-s60/s60deploystep.h
View file @
a82d57de
...
...
@@ -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
...
...
src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
View file @
a82d57de
...
...
@@ -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
;
...
...
src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.h
View file @
a82d57de
...
...
@@ -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
;
...
...
src/plugins/qt4projectmanager/qt-s60/s60devicerunconfigurationwidget.cpp
View file @
a82d57de
...
...
@@ -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
{
...
...
src/plugins/qt4projectmanager/qt-s60/s60devices.cpp
View file @
a82d57de
...
...
@@ -28,7 +28,6 @@
**************************************************************************/
#include
"s60devices.h"
#include
"gccetoolchain.h"
#include
<utils/environment.h>
...
...
src/plugins/qt4projectmanager/qt-s60/s60devicespreferencepane.cpp
View file @
a82d57de
...
...
@@ -29,7 +29,6 @@
#include
"s60devicespreferencepane.h"
#include
"ui_s60devicespreferencepane.h"
#include
"s60devices.h"
#include
<qt4projectmanager/qt4projectmanagerconstants.h>
...
...
src/plugins/qt4projectmanager/qt-s60/s60emulatorrunconfiguration.cpp
View file @
a82d57de
...
...
@@ -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
;
...
...
src/plugins/qt4projectmanager/qt-s60/s60manager.cpp
View file @
a82d57de
...
...
@@ -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"
;
...
...
src/plugins/qt4projectmanager/qt-s60/s60projectchecker.cpp
View file @
a82d57de
...
...
@@ -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>
...
...
src/plugins/qt4projectmanager/qt-s60/s60runconfigbluetoothstarter.cpp
View file @
a82d57de
...
...
@@ -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>
...
...
src/plugins/qt4projectmanager/qt-s60/s60runconfigbluetoothstarter.h
View file @
a82d57de
...
...
@@ -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
{
...
...
src/plugins/qt4projectmanager/qt-s60/sbsv2parser.cpp
View file @
a82d57de
...
...
@@ -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
;
...
...
src/plugins/qt4projectmanager/qt-s60/signsisparser.cpp
View file @
a82d57de
...
...
@@ -31,7 +31,6 @@
#include
"signsisparser.h"
#include
<projectexplorer/projectexplorerconstants.h>
#include
<projectexplorer/taskwindow.h>
using
namespace
Qt4ProjectManager
;
using
namespace
ProjectExplorer
;
...
...
src/plugins/qt4projectmanager/qt-s60/winscwparser.cpp
View file @
a82d57de
...
...
@@ -28,8 +28,8 @@
**************************************************************************/
#include
"winscwparser.h"
#include
<projectexplorer/projectexplorerconstants.h>
#include
<projectexplorer/taskwindow.h>
#include
<QtCore/QDir>
...
...
src/plugins/qt4projectmanager/qtoutputformatter.cpp
View file @
a82d57de
...
...
@@ -35,6 +35,7 @@
#include
<QtCore/QFileInfo>
#include
<QtCore/QUrl>
#include
<QtGui/QPlainTextEdit>
#include
<QtGui/QTextCursor>
using
namespace
ProjectExplorer
;
using
namespace
Qt4ProjectManager
;
...
...
Prev
1
2
Next
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment