1 files changed, 13 insertions, 13 deletions

diff --git a/cpp/src/slice2docbook/GenUtil.cpp b/cpp/src/slice2docbook/GenUtil.cpp
index 0c00efcd0be..1827ec2f829 100644
--- a/cpp/src/slice2docbook/GenUtil.cpp
+++ b/cpp/src/slice2docbook/GenUtil.cpp
@@ -15,7 +15,7 @@ using namespace std;
 using namespace Slice;
 
 string
-Slice::typeToString(const Type_ptr& type)
+Slice::typeToString(const TypePtr& type)
 {
     static const char* builtinTable[] =
     {
@@ -35,21 +35,21 @@ Slice::typeToString(const Type_ptr& type)
 
     string result;
 
-    Builtin_ptr builtin = Builtin_ptr::dynamicCast(type);
+    BuiltinPtr builtin = BuiltinPtr::dynamicCast(type);
     if(builtin)
 	result = "<type>" + string(builtinTable[builtin -> kind()])
 	    + "</type>";
 
-    Proxy_ptr proxy = Proxy_ptr::dynamicCast(type);
+    ProxyPtr proxy = ProxyPtr::dynamicCast(type);
     if(proxy)
 	result = "<classname>" + proxy -> _class() -> scoped().substr(2) +
 	    "*</classname>";
 
-    ClassDecl_ptr cl = ClassDecl_ptr::dynamicCast(type);
+    ClassDeclPtr cl = ClassDeclPtr::dynamicCast(type);
     if(cl)
 	result = "<classname>" + cl -> scoped().substr(2) + "</classname>";
 
-    Contained_ptr contained = Contained_ptr::dynamicCast(type);
+    ContainedPtr contained = ContainedPtr::dynamicCast(type);
     if(contained)
     {
 	if(result.empty())
@@ -66,19 +66,19 @@ Slice::typeToString(const Type_ptr& type)
 }
 
 string
-Slice::addLink(const string& s, const Container_ptr& container)
+Slice::addLink(const string& s, const ContainerPtr& container)
 {
     TypeList types = container -> lookupType(s, false);
     if(!types.empty())
     {
 	string result;
 
-	if(ClassDecl_ptr::dynamicCast(types.front()))
+	if(ClassDeclPtr::dynamicCast(types.front()))
 	    result = "<classname>" + s + "</classname>";
 	else
 	    result = "<type>" + s + "</type>";
 
-	Contained_ptr p = Contained_ptr::dynamicCast(types.front());
+	ContainedPtr p = ContainedPtr::dynamicCast(types.front());
 	if(p)
 	    result = "<link linkend=" + scopedToId(p -> scoped()) + ">"
 		+ result + "</link>";
@@ -92,11 +92,11 @@ Slice::addLink(const string& s, const Container_ptr& container)
 	string result = "<link linkend=" +
 	    scopedToId(contList.front() -> scoped()) + ">";
 
-	if(Module_ptr::dynamicCast(contList.front()))
+	if(ModulePtr::dynamicCast(contList.front()))
 	    result += "<classname>" + s + "</classname>";
-	else if(Operation_ptr::dynamicCast(contList.front()))
+	else if(OperationPtr::dynamicCast(contList.front()))
 	    result += "<function>" + s + "</function>";
-	else if(DataMember_ptr::dynamicCast(contList.front()))
+	else if(DataMemberPtr::dynamicCast(contList.front()))
 	    result += "<structfield>" + s + "</structfield>";
 	else
 	    assert(false);
@@ -136,7 +136,7 @@ string
 Slice::scopedToId(const string& scoped)
 {
     static map<string, int> idMap;
-    static int nextId_ = 0;
+    static int _nextId = 0;
 
     string s;
     if(scoped[0] == ':')
@@ -147,7 +147,7 @@ Slice::scopedToId(const string& scoped)
     int id = idMap[s];
     if(id == 0)
     {
-	id = ++nextId_;
+	id = ++_nextId;
 	idMap[s] = id;
     }