From a82654a4856d78e874df7c160e134abbf7538998 Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@digia.com>
Date: Tue, 3 Sep 2013 15:37:41 +0200
Subject: [PATCH] Android: Remove some Android namespace usages

Change-Id: I74df950ff9de6ddc639a4b32bec55c269b5fb0e1
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
---
 src/plugins/android/androidconfigurations.cpp          |  2 +-
 src/plugins/android/androidgdbserverkitinformation.cpp |  4 ++--
 src/plugins/android/androidmanifesteditorwidget.cpp    | 10 +++++-----
 src/plugins/android/androidtoolchain.cpp               |  2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/plugins/android/androidconfigurations.cpp b/src/plugins/android/androidconfigurations.cpp
index ac4bf5ead5..0a450beb98 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 0536a0f1cf..2f74ee2e0a 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 d078fb181a..ebbcb16215 100644
--- a/src/plugins/android/androidmanifesteditorwidget.cpp
+++ b/src/plugins/android/androidmanifesteditorwidget.cpp
@@ -65,6 +65,9 @@
 #include <QFileDialog>
 #include <QTimer>
 
+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 ca927d10d8..1b3bd7260b 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
-- 
GitLab