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/Source.h b/tools/aapt2/Source.h
index 422b361..459a8e6 100644
--- a/tools/aapt2/Source.h
+++ b/tools/aapt2/Source.h
@@ -17,12 +17,12 @@
#ifndef AAPT_SOURCE_H
#define AAPT_SOURCE_H
-#include "util/Maybe.h"
-#include "util/StringPiece.h"
-
#include <ostream>
#include <string>
+#include "util/Maybe.h"
+#include "util/StringPiece.h"
+
namespace aapt {
/**
@@ -36,13 +36,13 @@
Source() = default;
inline Source(const StringPiece& path)
- : path(path.toString()) { // NOLINT(implicit)
+ : path(path.ToString()) { // NOLINT(implicit)
}
inline Source(const StringPiece& path, size_t line)
- : path(path.toString()), line(line) {}
+ : path(path.ToString()), line(line) {}
- inline Source withLine(size_t line) const { return Source(path, line); }
+ inline Source WithLine(size_t line) const { return Source(path, line); }
};
//