From 8bd37ba458633ee7b2aeec0a7593817000aa84b2 Mon Sep 17 00:00:00 2001 From: Chih-Hung Hsieh Date: Wed, 10 Aug 2016 14:15:30 -0700 Subject: Fix clang-tidy warnings in aapt and aapt2. * Add explicit keyword to conversion constructors. * Add NOLINT(implicit) comments for implicit conversion constructors. Bug: 28341362 * Use const reference type for read-only parameters. Bug: 30407689 * Use const reference type to avoid unnecessary copy. Bug: 30413862 Test: build with WITH_TIDY=1 Change-Id: Id6d21961f313a1ad92b15a37fdaa5be9e8ab48e1 Merged-In: Id6d21961f313a1ad92b15a37fdaa5be9e8ab48e1 --- tools/aapt2/ResourceTable.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'tools/aapt2/ResourceTable.cpp') diff --git a/tools/aapt2/ResourceTable.cpp b/tools/aapt2/ResourceTable.cpp index c93ecc768022..eeec8da3a1eb 100644 --- a/tools/aapt2/ResourceTable.cpp +++ b/tools/aapt2/ResourceTable.cpp @@ -151,7 +151,7 @@ bool ResourceTable::addResource(const ResourceNameRef& name, const ConfigDescrip return addResourceImpl(name, ResourceId{}, config, source, std::move(value), kValidNameChars); } -bool ResourceTable::addResource(const ResourceNameRef& name, const ResourceId resId, +bool ResourceTable::addResource(const ResourceNameRef& name, const ResourceId& resId, const ConfigDescription& config, const SourceLine& source, std::unique_ptr value) { return addResourceImpl(name, resId, config, source, std::move(value), kValidNameChars); @@ -165,7 +165,7 @@ bool ResourceTable::addResourceAllowMangled(const ResourceNameRef& name, kValidNameMangledChars); } -bool ResourceTable::addResourceImpl(const ResourceNameRef& name, const ResourceId resId, +bool ResourceTable::addResourceImpl(const ResourceNameRef& name, const ResourceId& resId, const ConfigDescription& config, const SourceLine& source, std::unique_ptr value, const char16_t* validChars) { if (!name.package.empty() && name.package != mPackage) { @@ -255,17 +255,17 @@ bool ResourceTable::addResourceImpl(const ResourceNameRef& name, const ResourceI return true; } -bool ResourceTable::markPublic(const ResourceNameRef& name, const ResourceId resId, +bool ResourceTable::markPublic(const ResourceNameRef& name, const ResourceId& resId, const SourceLine& source) { return markPublicImpl(name, resId, source, kValidNameChars); } -bool ResourceTable::markPublicAllowMangled(const ResourceNameRef& name, const ResourceId resId, +bool ResourceTable::markPublicAllowMangled(const ResourceNameRef& name, const ResourceId& resId, const SourceLine& source) { return markPublicImpl(name, resId, source, kValidNameMangledChars); } -bool ResourceTable::markPublicImpl(const ResourceNameRef& name, const ResourceId resId, +bool ResourceTable::markPublicImpl(const ResourceNameRef& name, const ResourceId& resId, const SourceLine& source, const char16_t* validChars) { if (!name.package.empty() && name.package != mPackage) { Logger::error(source) -- cgit v1.2.3-59-g8ed1b