Commit a82654a4 authored by Tobias Hunger's avatar Tobias Hunger

Android: Remove some Android namespace usages

Change-Id: I74df950ff9de6ddc639a4b32bec55c269b5fb0e1
Reviewed-by: default avatarDaniel Teske <daniel.teske@digia.com>
parent eb4d64a8
......@@ -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 {
......
......@@ -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;
}
......
......@@ -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),
......
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment