From 1c822544f0b9e6727c90b692427123d16100d087 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Mon, 10 Aug 2015 10:18:54 +0200 Subject: [PATCH] Ios: Remove some unneeded references to QmakeProjectManager. Includes, namespace usings and casts. Change-Id: Iaa9caa1387f1f96fa5d8537d8cfec78ab9786789 Reviewed-by: Eike Ziller --- src/plugins/ios/iosanalyzesupport.cpp | 4 ---- src/plugins/ios/iosbuildstep.cpp | 6 ------ src/plugins/ios/iosdebugsupport.cpp | 5 +---- src/plugins/ios/iosdeploystep.cpp | 4 ---- src/plugins/ios/iosmanager.cpp | 9 ++------- src/plugins/ios/iosqtversion.cpp | 4 ---- 6 files changed, 3 insertions(+), 29 deletions(-) diff --git a/src/plugins/ios/iosanalyzesupport.cpp b/src/plugins/ios/iosanalyzesupport.cpp index ce593c9b94d..fa1f9f9f8f7 100644 --- a/src/plugins/ios/iosanalyzesupport.cpp +++ b/src/plugins/ios/iosanalyzesupport.cpp @@ -42,9 +42,6 @@ #include #include #include -#include -#include -#include #include #include #include @@ -68,7 +65,6 @@ using namespace Analyzer; using namespace ProjectExplorer; -using namespace QmakeProjectManager; namespace Ios { namespace Internal { diff --git a/src/plugins/ios/iosbuildstep.cpp b/src/plugins/ios/iosbuildstep.cpp index e2339589ab6..1aea94c804d 100644 --- a/src/plugins/ios/iosbuildstep.cpp +++ b/src/plugins/ios/iosbuildstep.cpp @@ -44,11 +44,6 @@ #include #include #include -#include -#include -#include -#include -#include #include #include #include @@ -57,7 +52,6 @@ using namespace Core; using namespace ProjectExplorer; -using namespace QmakeProjectManager; namespace Ios { namespace Internal { diff --git a/src/plugins/ios/iosdebugsupport.cpp b/src/plugins/ios/iosdebugsupport.cpp index d6c2ebab011..1638393756c 100644 --- a/src/plugins/ios/iosdebugsupport.cpp +++ b/src/plugins/ios/iosdebugsupport.cpp @@ -42,13 +42,11 @@ #include #include #include -#include -#include -#include #include #include #include +#include #include #include #include @@ -63,7 +61,6 @@ using namespace Debugger; using namespace ProjectExplorer; -using namespace QmakeProjectManager; namespace Ios { namespace Internal { diff --git a/src/plugins/ios/iosdeploystep.cpp b/src/plugins/ios/iosdeploystep.cpp index 53e00794725..2ccb2294343 100644 --- a/src/plugins/ios/iosdeploystep.cpp +++ b/src/plugins/ios/iosdeploystep.cpp @@ -44,9 +44,6 @@ #include #include #include -#include -#include -#include #include @@ -58,7 +55,6 @@ #define ASSERT_STATE(state) ASSERT_STATE_GENERIC(State, state, m_state) using namespace ProjectExplorer; -using namespace QmakeProjectManager; namespace Ios { namespace Internal { diff --git a/src/plugins/ios/iosmanager.cpp b/src/plugins/ios/iosmanager.cpp index aecefef7466..031729ceee2 100644 --- a/src/plugins/ios/iosmanager.cpp +++ b/src/plugins/ios/iosmanager.cpp @@ -32,14 +32,11 @@ #include "iosconfigurations.h" #include "iosrunconfiguration.h" +#include #include -#include #include #include -#include #include -#include -#include #include #include #include @@ -67,9 +64,7 @@ bool IosManager::supportsIos(Target *target) QString IosManager::resDirForTarget(Target *target) { - QmakeBuildConfiguration *bc = - qobject_cast(target->activeBuildConfiguration()); - return bc->buildDirectory().toString(); + return target->activeBuildConfiguration()->buildDirectory().toString(); } } // namespace Internal diff --git a/src/plugins/ios/iosqtversion.cpp b/src/plugins/ios/iosqtversion.cpp index b73ef881107..faff6ebeb9c 100644 --- a/src/plugins/ios/iosqtversion.cpp +++ b/src/plugins/ios/iosqtversion.cpp @@ -36,9 +36,6 @@ #include #include -#include -#include - #include #include #include @@ -48,7 +45,6 @@ using namespace Ios::Internal; using namespace ProjectExplorer; -using namespace QmakeProjectManager; IosQtVersion::IosQtVersion() : QtSupport::BaseQtVersion()