AAPT2: Rename to match new style
Use Google3 naming style to match new
projects' and open source google projects' style.
Preferred to do this in a massive CL so as to avoid
style inconsistencies that plague legacy code bases.
This is a relatively NEW code base, may as well keep
it up to date.
Test: name/style refactor - existing tests pass
Change-Id: Ie80ecb78d46ec53efdfca2336bb57d96cbb7fb87
diff --git a/tools/aapt2/unflatten/BinaryResourceParser.h b/tools/aapt2/unflatten/BinaryResourceParser.h
index 99f2bd4..dc668fd 100644
--- a/tools/aapt2/unflatten/BinaryResourceParser.h
+++ b/tools/aapt2/unflatten/BinaryResourceParser.h
@@ -17,16 +17,17 @@
#ifndef AAPT_BINARY_RESOURCE_PARSER_H
#define AAPT_BINARY_RESOURCE_PARSER_H
+#include <string>
+
+#include "android-base/macros.h"
+#include "androidfw/ResourceTypes.h"
+
#include "ResourceTable.h"
#include "ResourceValues.h"
#include "Source.h"
-
#include "process/IResourceTableConsumer.h"
#include "util/Util.h"
-#include <androidfw/ResourceTypes.h>
-#include <string>
-
namespace aapt {
struct SymbolTable_entry;
@@ -45,44 +46,44 @@
* add any resources parsed to `table`. `source` is for logging purposes.
*/
BinaryResourceParser(IAaptContext* context, ResourceTable* table,
- const Source& source, const void* data, size_t dataLen);
-
- BinaryResourceParser(const BinaryResourceParser&) = delete; // No copy.
+ const Source& source, const void* data, size_t data_len);
/*
* Parses the binary resource table and returns true if successful.
*/
- bool parse();
+ bool Parse();
private:
- bool parseTable(const android::ResChunk_header* chunk);
- bool parsePackage(const android::ResChunk_header* chunk);
- bool parseTypeSpec(const android::ResChunk_header* chunk);
- bool parseType(const ResourceTablePackage* package,
+ DISALLOW_COPY_AND_ASSIGN(BinaryResourceParser);
+
+ bool ParseTable(const android::ResChunk_header* chunk);
+ bool ParsePackage(const android::ResChunk_header* chunk);
+ bool ParseTypeSpec(const android::ResChunk_header* chunk);
+ bool ParseType(const ResourceTablePackage* package,
const android::ResChunk_header* chunk);
- std::unique_ptr<Item> parseValue(const ResourceNameRef& name,
+ std::unique_ptr<Item> ParseValue(const ResourceNameRef& name,
const ConfigDescription& config,
const android::Res_value* value,
uint16_t flags);
- std::unique_ptr<Value> parseMapEntry(const ResourceNameRef& name,
+ std::unique_ptr<Value> ParseMapEntry(const ResourceNameRef& name,
const ConfigDescription& config,
const android::ResTable_map_entry* map);
- std::unique_ptr<Style> parseStyle(const ResourceNameRef& name,
+ std::unique_ptr<Style> ParseStyle(const ResourceNameRef& name,
const ConfigDescription& config,
const android::ResTable_map_entry* map);
- std::unique_ptr<Attribute> parseAttr(const ResourceNameRef& name,
+ std::unique_ptr<Attribute> ParseAttr(const ResourceNameRef& name,
const ConfigDescription& config,
const android::ResTable_map_entry* map);
- std::unique_ptr<Array> parseArray(const ResourceNameRef& name,
+ std::unique_ptr<Array> ParseArray(const ResourceNameRef& name,
const ConfigDescription& config,
const android::ResTable_map_entry* map);
- std::unique_ptr<Plural> parsePlural(const ResourceNameRef& name,
+ std::unique_ptr<Plural> ParsePlural(const ResourceNameRef& name,
const ConfigDescription& config,
const android::ResTable_map_entry* map);
@@ -92,30 +93,30 @@
* read and added to the Value.
* Returns true if the mapEntry was meta data.
*/
- bool collectMetaData(const android::ResTable_map& mapEntry, Value* value);
+ bool CollectMetaData(const android::ResTable_map& map_entry, Value* value);
- IAaptContext* mContext;
- ResourceTable* mTable;
+ IAaptContext* context_;
+ ResourceTable* table_;
- const Source mSource;
+ const Source source_;
- const void* mData;
- const size_t mDataLen;
+ const void* data_;
+ const size_t data_len_;
// The standard value string pool for resource values.
- android::ResStringPool mValuePool;
+ android::ResStringPool value_pool_;
// The string pool that holds the names of the types defined
// in this table.
- android::ResStringPool mTypePool;
+ android::ResStringPool type_pool_;
// The string pool that holds the names of the entries defined
// in this table.
- android::ResStringPool mKeyPool;
+ android::ResStringPool key_pool_;
// A mapping of resource ID to resource name. When we finish parsing
// we use this to convert all resource IDs to symbolic references.
- std::map<ResourceId, ResourceName> mIdIndex;
+ std::map<ResourceId, ResourceName> id_index_;
};
} // namespace aapt
@@ -128,11 +129,11 @@
inline const ResTable_map* begin(const ResTable_map_entry* map) {
return (const ResTable_map*)((const uint8_t*)map +
- aapt::util::deviceToHost32(map->size));
+ aapt::util::DeviceToHost32(map->size));
}
inline const ResTable_map* end(const ResTable_map_entry* map) {
- return begin(map) + aapt::util::deviceToHost32(map->count);
+ return begin(map) + aapt::util::DeviceToHost32(map->count);
}
} // namespace android