diff --git a/src/plugins/android/androidconfigurations.cpp b/src/plugins/android/androidconfigurations.cpp index ac4bf5ead5fd91e252ea8e5c0cf450038f316d2a..0a450beb98569bf03d74061a21c821150c9d5ac6 100644 --- a/src/plugins/android/androidconfigurations.cpp +++ b/src/plugins/android/androidconfigurations.cpp @@ -813,7 +813,7 @@ void AndroidConfigurations::updateAutomaticKitList() foreach (Kit *k, existingKits) { ProjectExplorer::ToolChain *tc = ToolChainKitInformation::toolChain(k); - if (tc && tc->type() == QLatin1String(Android::Constants::ANDROID_TOOLCHAIN_TYPE)) { + if (tc && tc->type() == QLatin1String(Constants::ANDROID_TOOLCHAIN_TYPE)) { k->makeUnSticky(); k->setAutoDetected(false); } else { diff --git a/src/plugins/android/androidgdbserverkitinformation.cpp b/src/plugins/android/androidgdbserverkitinformation.cpp index 0536a0f1cfd16320861f6f1dd062d2313976adbf..2f74ee2e0ad63777405d22ce6065bbc03a52cecb 100644 --- a/src/plugins/android/androidgdbserverkitinformation.cpp +++ b/src/plugins/android/androidgdbserverkitinformation.cpp @@ -85,8 +85,8 @@ bool AndroidGdbServerKitInformation::isAndroidKit(const Kit *kit) QtSupport::BaseQtVersion *qt = QtSupport::QtKitInformation::qtVersion(kit); ToolChain *tc = ToolChainKitInformation::toolChain(kit); if (qt && tc) - return qt->type() == QLatin1String(Android::Constants::ANDROIDQT) - && tc->type() == QLatin1String(Android::Constants::ANDROID_TOOLCHAIN_TYPE); + return qt->type() == QLatin1String(Constants::ANDROIDQT) + && tc->type() == QLatin1String(Constants::ANDROID_TOOLCHAIN_TYPE); return false; } diff --git a/src/plugins/android/androidmanifesteditorwidget.cpp b/src/plugins/android/androidmanifesteditorwidget.cpp index d078fb181a36e4a1e96fda9b0084dfb695976eef..ebbcb16215433f1df3f86e63ac42561f590db336 100644 --- a/src/plugins/android/androidmanifesteditorwidget.cpp +++ b/src/plugins/android/androidmanifesteditorwidget.cpp @@ -65,6 +65,9 @@ #include #include +using namespace Android; +using namespace Android::Internal; + namespace { const QLatin1String packageNameRegExp("^([a-z_]{1}[a-z0-9_]+(\\.[a-zA-Z_]{1}[a-zA-Z0-9_]*)*)$"); const char infoBarId[] = "Android.AndroidManifestEditor.InfoBar"; @@ -83,17 +86,14 @@ ProjectExplorer::Project *androidProject(const QString &file) if (!project->activeTarget()) continue; ProjectExplorer::Kit *kit = project->activeTarget()->kit(); - if (ProjectExplorer::DeviceTypeKitInformation::deviceTypeId(kit) == Android::Constants::ANDROID_DEVICE_TYPE + if (ProjectExplorer::DeviceTypeKitInformation::deviceTypeId(kit) == Constants::ANDROID_DEVICE_TYPE && fileName.isChildOf(Utils::FileName::fromString(project->projectDirectory()))) return project; } return 0; } -} // anonymous namespace - -using namespace Android; -using namespace Android::Internal; +} // anonymous namespace AndroidManifestEditorWidget::AndroidManifestEditorWidget(QWidget *parent, TextEditor::TextEditorActionHandler *ah) : TextEditor::PlainTextEditorWidget(parent), diff --git a/src/plugins/android/androidtoolchain.cpp b/src/plugins/android/androidtoolchain.cpp index ca927d10d877c8c6d19566d8f28341ba982e6ed2..1b3bd7260bd52e2cfee1d1fa35a342bcac9ebe02 100644 --- a/src/plugins/android/androidtoolchain.cpp +++ b/src/plugins/android/androidtoolchain.cpp @@ -96,7 +96,7 @@ AndroidToolChain::~AndroidToolChain() QString AndroidToolChain::type() const { - return QLatin1String(Android::Constants::ANDROID_TOOLCHAIN_TYPE); + return QLatin1String(Constants::ANDROID_TOOLCHAIN_TYPE); } QString AndroidToolChain::typeDisplayName() const