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/io/Io.h b/tools/aapt2/io/Io.h
index 49b9fc3..33cdc7b 100644
--- a/tools/aapt2/io/Io.h
+++ b/tools/aapt2/io/Io.h
@@ -17,9 +17,10 @@
#ifndef AAPT_IO_IO_H
#define AAPT_IO_IO_H
-#include <google/protobuf/io/zero_copy_stream_impl_lite.h>
#include <string>
+#include "google/protobuf/io/zero_copy_stream_impl_lite.h"
+
namespace aapt {
namespace io {
@@ -29,7 +30,7 @@
*
* The code style here matches the protobuf style.
*/
-class InputStream : public google::protobuf::io::ZeroCopyInputStream {
+class InputStream : public ::google::protobuf::io::ZeroCopyInputStream {
public:
virtual std::string GetError() const { return {}; }
@@ -42,7 +43,7 @@
*
* The code style here matches the protobuf style.
*/
-class OutputStream : public google::protobuf::io::ZeroCopyOutputStream {
+class OutputStream : public ::google::protobuf::io::ZeroCopyOutputStream {
public:
virtual std::string GetError() const { return {}; }
@@ -54,7 +55,7 @@
* If there was an error, check the individual streams' HadError/GetError
* methods.
*/
-bool copy(OutputStream* out, InputStream* in);
+bool Copy(OutputStream* out, InputStream* in);
} // namespace io
} // namespace aapt