Ios: Remove some unneeded references to QmakeProjectManager.

Includes, namespace usings and casts.

Change-Id: Iaa9caa1387f1f96fa5d8537d8cfec78ab9786789
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
This commit is contained in:
Christian Kandeler
2015-08-10 10:18:54 +02:00
parent 37f6b4397d
commit 1c822544f0
6 changed files with 3 additions and 29 deletions

View File

@@ -42,9 +42,6 @@
#include <projectexplorer/toolchain.h> #include <projectexplorer/toolchain.h>
#include <projectexplorer/target.h> #include <projectexplorer/target.h>
#include <projectexplorer/taskhub.h> #include <projectexplorer/taskhub.h>
#include <qmakeprojectmanager/qmakebuildconfiguration.h>
#include <qmakeprojectmanager/qmakenodes.h>
#include <qmakeprojectmanager/qmakeproject.h>
#include <qtsupport/qtkitinformation.h> #include <qtsupport/qtkitinformation.h>
#include <utils/fileutils.h> #include <utils/fileutils.h>
#include <analyzerbase/ianalyzertool.h> #include <analyzerbase/ianalyzertool.h>
@@ -68,7 +65,6 @@
using namespace Analyzer; using namespace Analyzer;
using namespace ProjectExplorer; using namespace ProjectExplorer;
using namespace QmakeProjectManager;
namespace Ios { namespace Ios {
namespace Internal { namespace Internal {

View File

@@ -44,11 +44,6 @@
#include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/projectexplorerconstants.h>
#include <projectexplorer/toolchain.h> #include <projectexplorer/toolchain.h>
#include <projectexplorer/gcctoolchain.h> #include <projectexplorer/gcctoolchain.h>
#include <qmakeprojectmanager/qmakebuildconfiguration.h>
#include <qmakeprojectmanager/qmakeprojectmanagerconstants.h>
#include <qmakeprojectmanager/qmakeprojectmanager.h>
#include <qmakeprojectmanager/qmakeproject.h>
#include <qmakeprojectmanager/qmakenodes.h>
#include <qtsupport/qtkitinformation.h> #include <qtsupport/qtkitinformation.h>
#include <qtsupport/qtparser.h> #include <qtsupport/qtparser.h>
#include <utils/stringutils.h> #include <utils/stringutils.h>
@@ -57,7 +52,6 @@
using namespace Core; using namespace Core;
using namespace ProjectExplorer; using namespace ProjectExplorer;
using namespace QmakeProjectManager;
namespace Ios { namespace Ios {
namespace Internal { namespace Internal {

View File

@@ -42,13 +42,11 @@
#include <projectexplorer/toolchain.h> #include <projectexplorer/toolchain.h>
#include <projectexplorer/target.h> #include <projectexplorer/target.h>
#include <projectexplorer/taskhub.h> #include <projectexplorer/taskhub.h>
#include <qmakeprojectmanager/qmakebuildconfiguration.h>
#include <qmakeprojectmanager/qmakenodes.h>
#include <qmakeprojectmanager/qmakeproject.h>
#include <qtsupport/qtkitinformation.h> #include <qtsupport/qtkitinformation.h>
#include <utils/fileutils.h> #include <utils/fileutils.h>
#include <utils/qtcprocess.h> #include <utils/qtcprocess.h>
#include <QDateTime>
#include <QDir> #include <QDir>
#include <QTcpServer> #include <QTcpServer>
#include <QSettings> #include <QSettings>
@@ -63,7 +61,6 @@
using namespace Debugger; using namespace Debugger;
using namespace ProjectExplorer; using namespace ProjectExplorer;
using namespace QmakeProjectManager;
namespace Ios { namespace Ios {
namespace Internal { namespace Internal {

View File

@@ -44,9 +44,6 @@
#include <projectexplorer/kitmanager.h> #include <projectexplorer/kitmanager.h>
#include <projectexplorer/kitinformation.h> #include <projectexplorer/kitinformation.h>
#include <projectexplorer/devicesupport/devicemanager.h> #include <projectexplorer/devicesupport/devicemanager.h>
#include <qmakeprojectmanager/qmakebuildconfiguration.h>
#include <qmakeprojectmanager/qmakeproject.h>
#include <qmakeprojectmanager/qmakenodes.h>
#include <qtsupport/qtkitinformation.h> #include <qtsupport/qtkitinformation.h>
@@ -58,7 +55,6 @@
#define ASSERT_STATE(state) ASSERT_STATE_GENERIC(State, state, m_state) #define ASSERT_STATE(state) ASSERT_STATE_GENERIC(State, state, m_state)
using namespace ProjectExplorer; using namespace ProjectExplorer;
using namespace QmakeProjectManager;
namespace Ios { namespace Ios {
namespace Internal { namespace Internal {

View File

@@ -32,14 +32,11 @@
#include "iosconfigurations.h" #include "iosconfigurations.h"
#include "iosrunconfiguration.h" #include "iosrunconfiguration.h"
#include <projectexplorer/buildconfiguration.h>
#include <projectexplorer/projectexplorer.h> #include <projectexplorer/projectexplorer.h>
#include <projectexplorer/session.h>
#include <projectexplorer/target.h> #include <projectexplorer/target.h>
#include <projectexplorer/toolchain.h> #include <projectexplorer/toolchain.h>
#include <qmakeprojectmanager/qmakenodes.h>
#include <qmakeprojectmanager/qmakeproject.h> #include <qmakeprojectmanager/qmakeproject.h>
#include <qmakeprojectmanager/qmakeprojectmanagerconstants.h>
#include <qmakeprojectmanager/qmakebuildconfiguration.h>
#include <qtsupport/customexecutablerunconfiguration.h> #include <qtsupport/customexecutablerunconfiguration.h>
#include <qtsupport/qtkitinformation.h> #include <qtsupport/qtkitinformation.h>
#include <qtsupport/qtsupportconstants.h> #include <qtsupport/qtsupportconstants.h>
@@ -67,9 +64,7 @@ bool IosManager::supportsIos(Target *target)
QString IosManager::resDirForTarget(Target *target) QString IosManager::resDirForTarget(Target *target)
{ {
QmakeBuildConfiguration *bc = return target->activeBuildConfiguration()->buildDirectory().toString();
qobject_cast<QmakeBuildConfiguration *>(target->activeBuildConfiguration());
return bc->buildDirectory().toString();
} }
} // namespace Internal } // namespace Internal

View File

@@ -36,9 +36,6 @@
#include <utils/environment.h> #include <utils/environment.h>
#include <utils/hostosinfo.h> #include <utils/hostosinfo.h>
#include <qmakeprojectmanager/qmakeproject.h>
#include <qmakeprojectmanager/qmakeprojectmanagerconstants.h>
#include <qtsupport/qtkitinformation.h> #include <qtsupport/qtkitinformation.h>
#include <qtsupport/qtsupportconstants.h> #include <qtsupport/qtsupportconstants.h>
#include <qtsupport/qtversionmanager.h> #include <qtsupport/qtversionmanager.h>
@@ -48,7 +45,6 @@
using namespace Ios::Internal; using namespace Ios::Internal;
using namespace ProjectExplorer; using namespace ProjectExplorer;
using namespace QmakeProjectManager;
IosQtVersion::IosQtVersion() IosQtVersion::IosQtVersion()
: QtSupport::BaseQtVersion() : QtSupport::BaseQtVersion()