commit 95b46238e9f0420e2e79ce2bda2cabc24aff4769
author Steven Moreland <smoreland@google.com> Tue Sep 20 14:46:55 2016 -0700
committer Steven Moreland <smoreland@google.com> Wed Sep 21 16:09:48 2016 -0700
tree 0077f8e4adc83fbc3eb8178711f25d34d905e04a
parent 1858dba3eda8d57735060cbcb78c6d3805ec122d

c2hal: Emit camelCase and PascalCase things.

Test: built, verified test headers output. Made sure it still worked on
opengl/telephony/libhardware headers.

Change-Id: Iabeb0e912dc7df6b2eae76b962531a30c83593bf

c2hal/CompositeDeclaration.cpp

diff --git a/c2hal/CompositeDeclaration.cpp b/c2hal/CompositeDeclaration.cpp
index e15365d..a9eba59 100644
--- a/c2hal/CompositeDeclaration.cpp
+++ b/c2hal/CompositeDeclaration.cpp
@@ -21,7 +21,6 @@
 #include <algorithm>
 #include <iostream>
 #include <string>
-#include <hidl-util/StringHelper.h>
 
 namespace android {
 
@@ -29,8 +28,12 @@
         const Type::Qualifier::Qualification qualifier,
         const std::string &name,
         std::vector<android::Declaration *> *fieldDeclarations)
-    : Declaration(name), mQualifier(qualifier), mFieldDeclarations(fieldDeclarations)
-    {}
+    : Declaration(""),
+      mQualifier(qualifier),
+      mFieldDeclarations(fieldDeclarations)
+    {
+        setName(name);
+    }
 
 CompositeDeclaration::~CompositeDeclaration() {
     if(mFieldDeclarations != NULL) {
@@ -41,6 +44,10 @@
     delete mFieldDeclarations;
 }
 
+void CompositeDeclaration::setName(const std::string &name) {
+    Declaration::setName(name);
+    forcePascalCase();
+}
 
 const Type::Qualifier::Qualification &CompositeDeclaration::getQualifier() const {
     return mQualifier;
@@ -127,15 +134,7 @@
 }
 
 std::string CompositeDeclaration::getInterfaceName() const {
-    std::string baseName{getName()};
-
-    if (baseName.length() > 2 &&
-        baseName.substr(baseName.length() - 2) == "_t") {
-
-        baseName = baseName.substr(0, baseName.length() - 2);
-    }
-
-    return "I" + StringHelper::SnakeCaseToCamelCase(baseName);
+    return "I" + getName();
 }
 
 bool CompositeDeclaration::isInterface() const {