diff options
author | Adam Lesinski <adamlesinski@google.com> | 2016-10-21 17:56:45 -0700 |
---|---|---|
committer | Adam Lesinski <adamlesinski@google.com> | 2016-10-26 19:30:23 -0700 |
commit | ce5e56e243d262a9b65459c3bd0bb9eaadd40628 (patch) | |
tree | cf0ecea98883d090d8d2856fc6d32046c7e3d9e8 /tools/aapt2/java/JavaClassGenerator.h | |
parent | 0f7cc4dc2c49a30c072cbc7aa6c0c5d5c31496d4 (diff) |
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
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.h')
-rw-r--r-- | tools/aapt2/java/JavaClassGenerator.h | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/tools/aapt2/java/JavaClassGenerator.h b/tools/aapt2/java/JavaClassGenerator.h index 2fdf2682a162..190e73b66b9e 100644 --- a/tools/aapt2/java/JavaClassGenerator.h +++ b/tools/aapt2/java/JavaClassGenerator.h @@ -17,14 +17,14 @@ #ifndef AAPT_JAVA_CLASS_GENERATOR_H #define AAPT_JAVA_CLASS_GENERATOR_H +#include <ostream> +#include <string> + #include "ResourceTable.h" #include "ResourceValues.h" #include "process/IResourceTableConsumer.h" #include "util/StringPiece.h" -#include <ostream> -#include <string> - namespace aapt { class AnnotationProcessor; @@ -35,7 +35,7 @@ struct JavaClassGeneratorOptions { * Specifies whether to use the 'final' modifier * on resource entries. Default is true. */ - bool useFinal = true; + bool use_final = true; enum class SymbolTypes { kAll, @@ -49,7 +49,7 @@ struct JavaClassGeneratorOptions { * A list of JavaDoc annotations to add to the comments of all generated * classes. */ - std::vector<std::string> javadocAnnotations; + std::vector<std::string> javadoc_annotations; }; /* @@ -69,34 +69,34 @@ class JavaClassGenerator { * We need to generate these symbols in a separate file. * Returns true on success. */ - bool generate(const StringPiece& packageNameToGenerate, std::ostream* out); + bool Generate(const StringPiece& packageNameToGenerate, std::ostream* out); - bool generate(const StringPiece& packageNameToGenerate, + bool Generate(const StringPiece& packageNameToGenerate, const StringPiece& outputPackageName, std::ostream* out); const std::string& getError() const; private: - bool addMembersToTypeClass(const StringPiece& packageNameToGenerate, + bool AddMembersToTypeClass(const StringPiece& packageNameToGenerate, const ResourceTablePackage* package, const ResourceTableType* type, ClassDefinition* outTypeClassDef); - void addMembersToStyleableClass(const StringPiece& packageNameToGenerate, + void AddMembersToStyleableClass(const StringPiece& packageNameToGenerate, const std::string& entryName, const Styleable* styleable, ClassDefinition* outStyleableClassDef); - bool skipSymbol(SymbolState state); + bool SkipSymbol(SymbolState state); - IAaptContext* mContext; - ResourceTable* mTable; - JavaClassGeneratorOptions mOptions; - std::string mError; + IAaptContext* context_; + ResourceTable* table_; + JavaClassGeneratorOptions options_; + std::string error_; }; inline const std::string& JavaClassGenerator::getError() const { - return mError; + return error_; } } // namespace aapt |