Beautify doxygen source code

Just whitespace changes

Source/DoxygenTranslator/src/JavaDocConverter.cpp

@@ -15,8 +15,8 @@
 #include <vector>
 #include <list>
 #include "../../Modules/swigmod.h"
-#define APPROX_LINE_LENGTH 64	//characters per line allowed
-#define TAB_SIZE 8		//current tab size in spaces
+#define APPROX_LINE_LENGTH 64   // characters per line allowed
+#define TAB_SIZE 8              // current tab size in spaces
 //TODO {@link} {@linkplain} {@docRoot}, and other useful doxy commands that are not a javadoc tag
 
 // define static tables, they are filled in JavaDocConverter's constructor
@@ -26,8 +26,7 @@ using std::string;
 using std::list;
 using std::vector;
 
-void JavaDocConverter::fillStaticTables()
-{
+void JavaDocConverter::fillStaticTables() {
   if (tagHandlers.size()) // fill only once
     return;
 
@@ -99,15 +98,13 @@ void JavaDocConverter::fillStaticTables()
   tagHandlers["invariant"] = make_pair(&JavaDocConverter::handleParagraph, "");
   tagHandlers["latexonly"] = make_pair(&JavaDocConverter::handleParagraph, "");
   tagHandlers["manonly"] = make_pair(&JavaDocConverter::handleParagraph, "");
-  tagHandlers["partofdescription"] = make_pair(
-      &JavaDocConverter::handleParagraph, "");
+  tagHandlers["partofdescription"] = make_pair(&JavaDocConverter::handleParagraph, "");
   tagHandlers["rtfonly"] = make_pair(&JavaDocConverter::handleParagraph, "");
   tagHandlers["short"] = make_pair(&JavaDocConverter::handleParagraph, "");
   tagHandlers["xmlonly"] = make_pair(&JavaDocConverter::handleParagraph, "");
   // these commands are kept as-is, they are supported by JavaDoc
   tagHandlers["author"] = make_pair(&JavaDocConverter::handleTagSame, "");
-  tagHandlers["authors"] = make_pair(&JavaDocConverter::handleTagSame,
-      "author");
+  tagHandlers["authors"] = make_pair(&JavaDocConverter::handleTagSame, "author");
   tagHandlers["deprecated"] = make_pair(&JavaDocConverter::handleTagSame, "");
   tagHandlers["exception"] = make_pair(&JavaDocConverter::handleTagSame, "");
   tagHandlers["package"] = make_pair(&JavaDocConverter::handleTagSame, "");
@@ -116,8 +113,7 @@ void JavaDocConverter::fillStaticTables()
   tagHandlers["ref"] = make_pair(&JavaDocConverter::handleTagRef, "");
   tagHandlers["result"] = make_pair(&JavaDocConverter::handleTagSame, "return");
   tagHandlers["return"] = make_pair(&JavaDocConverter::handleTagSame, "");
-  tagHandlers["returns"] = make_pair(&JavaDocConverter::handleTagSame,
-      "return");
+  tagHandlers["returns"] = make_pair(&JavaDocConverter::handleTagSame, "return");
   //tagHandlers["see"] = make_pair(&JavaDocConverter::handleTagSame, "");
   //tagHandlers["sa"] = make_pair(&JavaDocConverter::handleTagSame, "see");
   tagHandlers["since"] = make_pair(&JavaDocConverter::handleTagSame, "");
@@ -126,104 +122,77 @@ void JavaDocConverter::fillStaticTables()
   tagHandlers["version"] = make_pair(&JavaDocConverter::handleTagSame, "");
   // these commands have special handlers
   tagHandlers["code"] = make_pair(&JavaDocConverter::handleTagExtended, "code");
-  tagHandlers["cond"] = make_pair(&JavaDocConverter::handleTagMessage,
-      "Conditional comment: ");
-  tagHandlers["copyright"] = make_pair(&JavaDocConverter::handleTagMessage,
-      "Copyright: ");
+  tagHandlers["cond"] = make_pair(&JavaDocConverter::handleTagMessage, "Conditional comment: ");
+  tagHandlers["copyright"] = make_pair(&JavaDocConverter::handleTagMessage, "Copyright: ");
   tagHandlers["else"] = make_pair(&JavaDocConverter::handleTagIf, "Else: ");
-  tagHandlers["elseif"] = make_pair(&JavaDocConverter::handleTagIf,
-      "Else if: ");
-  tagHandlers["endcond"] = make_pair(&JavaDocConverter::handleTagMessage,
-      "End of conditional comment.");
+  tagHandlers["elseif"] = make_pair(&JavaDocConverter::handleTagIf, "Else if: ");
+  tagHandlers["endcond"] = make_pair(&JavaDocConverter::handleTagMessage, "End of conditional comment.");
   // space in second arg prevents Javadoc to treat '@ example' as command. File name of
   // example is still informative to user.
-  tagHandlers["example"] = make_pair(&JavaDocConverter::handleTagSame,
-      " example");
+  tagHandlers["example"] = make_pair(&JavaDocConverter::handleTagSame, " example");
   tagHandlers["if"] = make_pair(&JavaDocConverter::handleTagIf, "If: ");
   tagHandlers["ifnot"] = make_pair(&JavaDocConverter::handleTagIf, "If not: ");
   tagHandlers["image"] = make_pair(&JavaDocConverter::handleTagImage, "");
   tagHandlers["link"] = make_pair(&JavaDocConverter::handleTagLink, "");
   tagHandlers["see"] = make_pair(&JavaDocConverter::handleTagSee, "");
   tagHandlers["sa"] = make_pair(&JavaDocConverter::handleTagSee, "");
-  tagHandlers["note"] = make_pair(&JavaDocConverter::handleTagMessage,
-      "Note: ");
+  tagHandlers["note"] = make_pair(&JavaDocConverter::handleTagMessage, "Note: ");
   tagHandlers["overload"] = make_pair(&JavaDocConverter::handleTagMessage,
-      "This is an overloaded member function, provided for"
-          " convenience. It differs from the above function only in what"
-          " argument(s) it accepts.");
+                                      "This is an overloaded member function, provided for"
+                                      " convenience. It differs from the above function only in what" " argument(s) it accepts.");
   tagHandlers["par"] = make_pair(&JavaDocConverter::handleTagPar, "");
-  tagHandlers["remark"] = make_pair(&JavaDocConverter::handleTagMessage,
-      "Remarks: ");
-  tagHandlers["remarks"] = make_pair(&JavaDocConverter::handleTagMessage,
-      "Remarks: ");
-  tagHandlers["todo"] = make_pair(&JavaDocConverter::handleTagMessage,
-      "TODO: ");
-  tagHandlers["verbatim"] = make_pair(&JavaDocConverter::handleTagExtended,
-      "literal");
+  tagHandlers["remark"] = make_pair(&JavaDocConverter::handleTagMessage, "Remarks: ");
+  tagHandlers["remarks"] = make_pair(&JavaDocConverter::handleTagMessage, "Remarks: ");
+  tagHandlers["todo"] = make_pair(&JavaDocConverter::handleTagMessage, "TODO: ");
+  tagHandlers["verbatim"] = make_pair(&JavaDocConverter::handleTagExtended, "literal");
 
   // \f commands output literal Latex formula, which is still better than nothing.
   tagHandlers["f$"] = make_pair(&JavaDocConverter::handleTagVerbatim, "");
   tagHandlers["f["] = make_pair(&JavaDocConverter::handleTagVerbatim, "");
   tagHandlers["f{"] = make_pair(&JavaDocConverter::handleTagVerbatim, "");
 
-  tagHandlers["warning"] = make_pair(&JavaDocConverter::handleTagMessage,
-      "Warning: ");
+  tagHandlers["warning"] = make_pair(&JavaDocConverter::handleTagMessage, "Warning: ");
   // this command just prints it's contents
   // (it is internal command of swig's parser, contains plain text)
-  tagHandlers["plainstd::string"] = make_pair(
-      &JavaDocConverter::handlePlainString, "");
-  tagHandlers["plainstd::endl"] = make_pair(&JavaDocConverter::handleNewLine,
-      "");
+  tagHandlers["plainstd::string"] = make_pair(&JavaDocConverter::handlePlainString, "");
+  tagHandlers["plainstd::endl"] = make_pair(&JavaDocConverter::handleNewLine, "");
   tagHandlers["n"] = make_pair(&JavaDocConverter::handleNewLine, "");
 
   // HTML tags
   tagHandlers["<a"] = make_pair(&JavaDocConverter::handleDoxyHtmlTag, "<a");
   tagHandlers["<b"] = make_pair(&JavaDocConverter::handleDoxyHtmlTag, "<b");
-  tagHandlers["<blockquote"] = make_pair(&JavaDocConverter::handleDoxyHtmlTag,
-      "<blockquote");
-  tagHandlers["<body"] = make_pair(&JavaDocConverter::handleDoxyHtmlTag,
-      "<body");
+  tagHandlers["<blockquote"] = make_pair(&JavaDocConverter::handleDoxyHtmlTag, "<blockquote");
+  tagHandlers["<body"] = make_pair(&JavaDocConverter::handleDoxyHtmlTag, "<body");
   tagHandlers["<br"] = make_pair(&JavaDocConverter::handleDoxyHtmlTag, "<br");
-  tagHandlers["<center"] = make_pair(&JavaDocConverter::handleDoxyHtmlTag,
-      "<center");
-  tagHandlers["<caption"] = make_pair(&JavaDocConverter::handleDoxyHtmlTag,
-      "<caption");
-  tagHandlers["<code"] = make_pair(&JavaDocConverter::handleDoxyHtmlTag,
-      "<code");
+  tagHandlers["<center"] = make_pair(&JavaDocConverter::handleDoxyHtmlTag, "<center");
+  tagHandlers["<caption"] = make_pair(&JavaDocConverter::handleDoxyHtmlTag, "<caption");
+  tagHandlers["<code"] = make_pair(&JavaDocConverter::handleDoxyHtmlTag, "<code");
   tagHandlers["<dd"] = make_pair(&JavaDocConverter::handleDoxyHtmlTag, "<dd");
   tagHandlers["<dfn"] = make_pair(&JavaDocConverter::handleDoxyHtmlTag, "<dfn");
   tagHandlers["<div"] = make_pair(&JavaDocConverter::handleDoxyHtmlTag, "<div");
   tagHandlers["<dl"] = make_pair(&JavaDocConverter::handleDoxyHtmlTag, "<dl");
   tagHandlers["<dt"] = make_pair(&JavaDocConverter::handleDoxyHtmlTag, "<dt");
   tagHandlers["<em"] = make_pair(&JavaDocConverter::handleDoxyHtmlTag, "<em");
-  tagHandlers["<form"] = make_pair(&JavaDocConverter::handleDoxyHtmlTag,
-      "<form");
+  tagHandlers["<form"] = make_pair(&JavaDocConverter::handleDoxyHtmlTag, "<form");
   tagHandlers["<hr"] = make_pair(&JavaDocConverter::handleDoxyHtmlTag, "<hr");
   tagHandlers["<h1"] = make_pair(&JavaDocConverter::handleDoxyHtmlTag, "<h1");
   tagHandlers["<h2"] = make_pair(&JavaDocConverter::handleDoxyHtmlTag, "<h2");
   tagHandlers["<h3"] = make_pair(&JavaDocConverter::handleDoxyHtmlTag, "<h3");
   tagHandlers["<i"] = make_pair(&JavaDocConverter::handleDoxyHtmlTag, "<i");
-  tagHandlers["<input"] = make_pair(&JavaDocConverter::handleDoxyHtmlTag,
-      "<input");
+  tagHandlers["<input"] = make_pair(&JavaDocConverter::handleDoxyHtmlTag, "<input");
   tagHandlers["<img"] = make_pair(&JavaDocConverter::handleDoxyHtmlTag, "<img");
   tagHandlers["<li"] = make_pair(&JavaDocConverter::handleDoxyHtmlTag, "<li");
-  tagHandlers["<meta"] = make_pair(&JavaDocConverter::handleDoxyHtmlTag,
-      "<meta");
-  tagHandlers["<multicol"] = make_pair(&JavaDocConverter::handleDoxyHtmlTag,
-      "<multicol");
+  tagHandlers["<meta"] = make_pair(&JavaDocConverter::handleDoxyHtmlTag, "<meta");
+  tagHandlers["<multicol"] = make_pair(&JavaDocConverter::handleDoxyHtmlTag, "<multicol");
   tagHandlers["<ol"] = make_pair(&JavaDocConverter::handleDoxyHtmlTag, "<ol");
   tagHandlers["<p"] = make_pair(&JavaDocConverter::handleDoxyHtmlTag, "<p");
   tagHandlers["<pre"] = make_pair(&JavaDocConverter::handleDoxyHtmlTag, "<pre");
-  tagHandlers["<small"] = make_pair(&JavaDocConverter::handleDoxyHtmlTag,
-      "<small");
-  tagHandlers["<span"] = make_pair(&JavaDocConverter::handleDoxyHtmlTag,
-      "<span");
-  tagHandlers["<strong"] = make_pair(&JavaDocConverter::handleDoxyHtmlTag,
-      "<strong");
+  tagHandlers["<small"] = make_pair(&JavaDocConverter::handleDoxyHtmlTag, "<small");
+  tagHandlers["<span"] = make_pair(&JavaDocConverter::handleDoxyHtmlTag, "<span");
+  tagHandlers["<strong"] = make_pair(&JavaDocConverter::handleDoxyHtmlTag, "<strong");
   tagHandlers["<sub"] = make_pair(&JavaDocConverter::handleDoxyHtmlTag, "<sub");
   tagHandlers["<sup"] = make_pair(&JavaDocConverter::handleDoxyHtmlTag, "<sup");
-  tagHandlers["<table"] = make_pair(&JavaDocConverter::handleDoxyHtmlTag,
-      "<table");
+  tagHandlers["<table"] = make_pair(&JavaDocConverter::handleDoxyHtmlTag, "<table");
   tagHandlers["<td"] = make_pair(&JavaDocConverter::handleDoxyHtmlTag, "<td");
   tagHandlers["<th"] = make_pair(&JavaDocConverter::handleDoxyHtmlTag, "<th");
   tagHandlers["<tr"] = make_pair(&JavaDocConverter::handleDoxyHtmlTag, "<tr");
@@ -233,50 +202,33 @@ void JavaDocConverter::fillStaticTables()
   tagHandlers["<var"] = make_pair(&JavaDocConverter::handleDoxyHtmlTag, "<var");
 
   // HTML entities
-  tagHandlers["&copy"] = make_pair(&JavaDocConverter::handleHtmlEntity,
-      "&copy");
-  tagHandlers["&trade"] = make_pair(&JavaDocConverter::handleHtmlEntity,
-      "&trade");
+  tagHandlers["&copy"] = make_pair(&JavaDocConverter::handleHtmlEntity, "&copy");
+  tagHandlers["&trade"] = make_pair(&JavaDocConverter::handleHtmlEntity, "&trade");
   tagHandlers["&reg"] = make_pair(&JavaDocConverter::handleHtmlEntity, "&reg");
   tagHandlers["&lt"] = make_pair(&JavaDocConverter::handleHtmlEntity, "&lt");
   tagHandlers["&gt"] = make_pair(&JavaDocConverter::handleHtmlEntity, "&gt");
   tagHandlers["&amp"] = make_pair(&JavaDocConverter::handleHtmlEntity, "&amp");
-  tagHandlers["&apos"] = make_pair(&JavaDocConverter::handleHtmlEntity,
-      "&apos");
-  tagHandlers["&quot"] = make_pair(&JavaDocConverter::handleHtmlEntity,
-      "&quot");
-  tagHandlers["&lsquo"] = make_pair(&JavaDocConverter::handleHtmlEntity,
-      "&lsquo");
-  tagHandlers["&rsquo"] = make_pair(&JavaDocConverter::handleHtmlEntity,
-      "&rsquo");
-  tagHandlers["&ldquo"] = make_pair(&JavaDocConverter::handleHtmlEntity,
-      "&ldquo");
-  tagHandlers["&rdquo"] = make_pair(&JavaDocConverter::handleHtmlEntity,
-      "&rdquo");
-  tagHandlers["&ndash"] = make_pair(&JavaDocConverter::handleHtmlEntity,
-      "&ndash");
-  tagHandlers["&mdash"] = make_pair(&JavaDocConverter::handleHtmlEntity,
-      "&mdash");
-  tagHandlers["&nbsp"] = make_pair(&JavaDocConverter::handleHtmlEntity,
-      "&nbsp");
-  tagHandlers["&times"] = make_pair(&JavaDocConverter::handleHtmlEntity,
-      "&times");
-  tagHandlers["&minus"] = make_pair(&JavaDocConverter::handleHtmlEntity,
-      "&minus");
-  tagHandlers["&sdot"] = make_pair(&JavaDocConverter::handleHtmlEntity,
-      "&sdot");
+  tagHandlers["&apos"] = make_pair(&JavaDocConverter::handleHtmlEntity, "&apos");
+  tagHandlers["&quot"] = make_pair(&JavaDocConverter::handleHtmlEntity, "&quot");
+  tagHandlers["&lsquo"] = make_pair(&JavaDocConverter::handleHtmlEntity, "&lsquo");
+  tagHandlers["&rsquo"] = make_pair(&JavaDocConverter::handleHtmlEntity, "&rsquo");
+  tagHandlers["&ldquo"] = make_pair(&JavaDocConverter::handleHtmlEntity, "&ldquo");
+  tagHandlers["&rdquo"] = make_pair(&JavaDocConverter::handleHtmlEntity, "&rdquo");
+  tagHandlers["&ndash"] = make_pair(&JavaDocConverter::handleHtmlEntity, "&ndash");
+  tagHandlers["&mdash"] = make_pair(&JavaDocConverter::handleHtmlEntity, "&mdash");
+  tagHandlers["&nbsp"] = make_pair(&JavaDocConverter::handleHtmlEntity, "&nbsp");
+  tagHandlers["&times"] = make_pair(&JavaDocConverter::handleHtmlEntity, "&times");
+  tagHandlers["&minus"] = make_pair(&JavaDocConverter::handleHtmlEntity, "&minus");
+  tagHandlers["&sdot"] = make_pair(&JavaDocConverter::handleHtmlEntity, "&sdot");
   tagHandlers["&sim"] = make_pair(&JavaDocConverter::handleHtmlEntity, "&sim");
   tagHandlers["&le"] = make_pair(&JavaDocConverter::handleHtmlEntity, "&le");
   tagHandlers["&ge"] = make_pair(&JavaDocConverter::handleHtmlEntity, "&ge");
-  tagHandlers["&larr"] = make_pair(&JavaDocConverter::handleHtmlEntity,
-      "&larr");
-  tagHandlers["&rarr"] = make_pair(&JavaDocConverter::handleHtmlEntity,
-      "&rarr");
+  tagHandlers["&larr"] = make_pair(&JavaDocConverter::handleHtmlEntity, "&larr");
+  tagHandlers["&rarr"] = make_pair(&JavaDocConverter::handleHtmlEntity, "&rarr");
 }
 
 JavaDocConverter::JavaDocConverter(int flags) :
-    DoxygenTranslator(flags)
-{
+  DoxygenTranslator(flags) {
   fillStaticTables();
 }
 
@@ -288,11 +240,9 @@ JavaDocConverter::JavaDocConverter(int flags) :
  * which results in short lines. To be useful, this function should have much
  * better algorithm.
  */
-std::string JavaDocConverter::formatCommand(std::string unformattedLine,
-                                            int indent)
-{
+std::string JavaDocConverter::formatCommand(std::string unformattedLine, int indent) {
   std::string formattedLines;
-  return unformattedLine;  // currently disabled
+  return unformattedLine; // currently disabled
   int lastPosition = 0;
   int i = 0;
   int isFirstLine = 1;
@@ -310,12 +260,10 @@ std::string JavaDocConverter::formatCommand(std::string unformattedLine,
       if (!isFirstLine)
         for (int j = 0; j < indent; j++) {
           formattedLines.append("\t");
-        }
-      else {
+      } else {
         isFirstLine = 0;
       }
-      formattedLines.append(
-          unformattedLine.substr(lastPosition, i - lastPosition + 1));
+      formattedLines.append(unformattedLine.substr(lastPosition, i - lastPosition + 1));
       formattedLines.append("\n *");
 
     }
@@ -326,9 +274,7 @@ std::string JavaDocConverter::formatCommand(std::string unformattedLine,
         formattedLines.append("\t");
       }
     }
-    formattedLines.append(
-        unformattedLine.substr(lastPosition,
-            unformattedLine.length() - lastPosition));
+    formattedLines.append(unformattedLine.substr(lastPosition, unformattedLine.length() - lastPosition));
   }
 
   return formattedLines;
@@ -341,8 +287,7 @@ std::string JavaDocConverter::formatCommand(std::string unformattedLine,
  * true - parameters are copied to output regardless of presence in
  * function params list.
  */
-bool JavaDocConverter::paramExists(std::string param)
-{
+bool JavaDocConverter::paramExists(std::string param) {
 
   if (GetFlag(currentNode, "feature:doxygen:nostripparams")) {
     return true;
@@ -352,7 +297,7 @@ bool JavaDocConverter::paramExists(std::string param)
 
   for (Parm *p = plist; p;) {
 
-    if (Getattr(p, "name") && Char (Getattr(p, "name")) == param) {
+    if (Getattr(p, "name") && Char(Getattr(p, "name")) == param) {
       return true;
     }
     /* doesn't seem to work always: in some cases (especially for 'self' parameters)
@@ -367,16 +312,14 @@ bool JavaDocConverter::paramExists(std::string param)
   return false;
 }
 
-std::string JavaDocConverter::translateSubtree(DoxygenEntity &doxygenEntity)
-{
+std::string JavaDocConverter::translateSubtree(DoxygenEntity &doxygenEntity) {
   std::string translatedComment;
 
   if (doxygenEntity.isLeaf) {
     return translatedComment;
   }
 
-  for (DoxygenEntityListIt p = doxygenEntity.entityList.begin();
-      p != doxygenEntity.entityList.end(); p++) {
+  for (DoxygenEntityListIt p = doxygenEntity.entityList.begin(); p != doxygenEntity.entityList.end(); p++) {
 
     translateEntity(*p, translatedComment);
     translateSubtree(*p);
@@ -388,9 +331,7 @@ std::string JavaDocConverter::translateSubtree(DoxygenEntity &doxygenEntity)
 /**
  * Checks if a handler for the given tag exists, and calls it.
  */
-void JavaDocConverter::translateEntity(DoxygenEntity &tag,
-                                       std::string &translatedComment)
-{
+void JavaDocConverter::translateEntity(DoxygenEntity &tag, std::string &translatedComment) {
 
   std::map<std::string, std::pair<tagHandler, std::string> >::iterator it;
   it = tagHandlers.find(tag.typeOfEntity);
@@ -405,35 +346,24 @@ void JavaDocConverter::translateEntity(DoxygenEntity &tag,
 }
 
 
-void JavaDocConverter::handleTagAnchor(DoxygenEntity& tag,
-                                       std::string& translatedComment,
-                                       std::string &)
-{
+void JavaDocConverter::handleTagAnchor(DoxygenEntity &tag, std::string &translatedComment, std::string &) {
   translatedComment += "<a id=\"" + translateSubtree(tag) + "\"></a>";
 }
 
 
-void JavaDocConverter::handleTagHtml(DoxygenEntity& tag,
-                                     std::string& translatedComment,
-                                     std::string &arg)
-{
+void JavaDocConverter::handleTagHtml(DoxygenEntity &tag, std::string &translatedComment, std::string &arg) {
   if (tag.entityList.size()) { // do not include empty tags
     std::string tagData = translateSubtree(tag);
     // wrap the thing, ignoring whitespace
     size_t wsPos = tagData.find_last_not_of("\n\t ");
     if (wsPos != std::string::npos)
-      translatedComment += "<" + arg + ">" + tagData.substr(0, wsPos + 1) + "</"
-          + arg + ">" + tagData.substr(wsPos + 1);
+      translatedComment += "<" + arg + ">" + tagData.substr(0, wsPos + 1) + "</" + arg + ">" + tagData.substr(wsPos + 1);
     else
-      translatedComment += "<" + arg + ">" + translateSubtree(tag) + "</" + arg
-          + "> ";
+      translatedComment += "<" + arg + ">" + translateSubtree(tag) + "</" + arg + "> ";
   }
 }
 
-void JavaDocConverter::handleDoxyHtmlTag(DoxygenEntity& tag,
-                                         std::string& translatedComment,
-                                         std::string &arg)
-{
+void JavaDocConverter::handleDoxyHtmlTag(DoxygenEntity &tag, std::string &translatedComment, std::string &arg) {
   std::string htmlTagArgs = tag.data;
   if (htmlTagArgs == "/") {
     // end html tag, for example "</ul>
@@ -443,18 +373,12 @@ void JavaDocConverter::handleDoxyHtmlTag(DoxygenEntity& tag,
   }
 }
 
-void JavaDocConverter::handleHtmlEntity(DoxygenEntity&,
-                                        std::string& translatedComment,
-                                        std::string &arg)
-{
+void JavaDocConverter::handleHtmlEntity(DoxygenEntity &, std::string &translatedComment, std::string &arg) {
   // html entities can be preserved for Java
   translatedComment += arg + ';';
 }
 
-void JavaDocConverter::handleNewLine(DoxygenEntity&,
-                                     std::string& translatedComment,
-                                     std::string&)
-{
+void JavaDocConverter::handleNewLine(DoxygenEntity &, std::string &translatedComment, std::string &) {
   // <br> tag is added, because otherwise to much text is joined
   // into same paragraph by javadoc. For example, doxy list:
   // - item one
@@ -466,10 +390,7 @@ void JavaDocConverter::handleNewLine(DoxygenEntity&,
   translatedComment += "<br>\n * ";
 }
 
-void JavaDocConverter::handleTagChar(DoxygenEntity& tag,
-                                     std::string& translatedComment,
-                                     std::string &arg)
-{
+void JavaDocConverter::handleTagChar(DoxygenEntity &tag, std::string &translatedComment, std::string &arg) {
   // escape it if we need to, else just print
   if (arg.size())
     translatedComment += arg;
@@ -478,57 +399,37 @@ void JavaDocConverter::handleTagChar(DoxygenEntity& tag,
 }
 
 // handles tags which are the same in Doxygen and Javadoc.
-void JavaDocConverter::handleTagSame(DoxygenEntity& tag,
-                                     std::string& translatedComment,
-                                     std::string &arg)
-{
+void JavaDocConverter::handleTagSame(DoxygenEntity &tag, std::string &translatedComment, std::string &arg) {
   if (arg.size())
     tag.typeOfEntity = arg;
-  translatedComment += formatCommand(
-      std::string("@" + tag.typeOfEntity + " " + translateSubtree(tag)), 2);
+  translatedComment += formatCommand(std::string("@" + tag.typeOfEntity + " " + translateSubtree(tag)), 2);
 }
 
-void JavaDocConverter::handleParagraph(DoxygenEntity& tag,
-                                       std::string& translatedComment,
-                                       std::string&)
-{
+void JavaDocConverter::handleParagraph(DoxygenEntity &tag, std::string &translatedComment, std::string &) {
   translatedComment += formatCommand(translateSubtree(tag), 0);
 }
 
-void JavaDocConverter::handlePlainString(DoxygenEntity& tag,
-                                         std::string& translatedComment,
-                                         std::string&)
-{
+void JavaDocConverter::handlePlainString(DoxygenEntity &tag, std::string &translatedComment, std::string &) {
   translatedComment += tag.data;
   // if (tag.data.size() && tag.data[tag.data.size()-1] != ' ')
-  // 	translatedComment += " ";
+  //    translatedComment += " ";
 }
 
-void JavaDocConverter::handleTagVerbatim(DoxygenEntity& tag,
-                                         std::string& translatedComment,
-                                         std::string &arg)
-{
+void JavaDocConverter::handleTagVerbatim(DoxygenEntity &tag, std::string &translatedComment, std::string &arg) {
   translatedComment += arg + " ";
-  for (DoxygenEntityListCIt it = tag.entityList.begin();
-      it != tag.entityList.end(); it++) {
+  for (DoxygenEntityListCIt it = tag.entityList.begin(); it != tag.entityList.end(); it++) {
     translatedComment += it->data;
   }
 }
 
-void JavaDocConverter::handleTagExtended(DoxygenEntity& tag,
-                                         std::string& translatedComment,
-                                         std::string &arg)
-{
+void JavaDocConverter::handleTagExtended(DoxygenEntity &tag, std::string &translatedComment, std::string &arg) {
   std::string dummy;
   translatedComment += "{@" + arg + " ";
   handleParagraph(tag, translatedComment, dummy);
   translatedComment += "}";
 }
 
-void JavaDocConverter::handleTagIf(DoxygenEntity& tag,
-                                   std::string& translatedComment,
-                                   std::string &arg)
-{
+void JavaDocConverter::handleTagIf(DoxygenEntity &tag, std::string &translatedComment, std::string &arg) {
   std::string dummy;
   translatedComment += arg;
   if (tag.entityList.size()) {
@@ -538,19 +439,13 @@ void JavaDocConverter::handleTagIf(DoxygenEntity& tag,
   }
 }
 
-void JavaDocConverter::handleTagMessage(DoxygenEntity& tag,
-                                        std::string& translatedComment,
-                                        std::string &arg)
-{
+void JavaDocConverter::handleTagMessage(DoxygenEntity &tag, std::string &translatedComment, std::string &arg) {
   std::string dummy;
   translatedComment += formatCommand(arg, 0);
   handleParagraph(tag, translatedComment, dummy);
 }
 
-void JavaDocConverter::handleTagImage(DoxygenEntity& tag,
-                                      std::string& translatedComment,
-                                      std::string&)
-{
+void JavaDocConverter::handleTagImage(DoxygenEntity &tag, std::string &translatedComment, std::string &) {
   if (tag.entityList.size() < 2)
     return;
 
@@ -577,10 +472,7 @@ void JavaDocConverter::handleTagImage(DoxygenEntity& tag,
   translatedComment += "/>";
 }
 
-void JavaDocConverter::handleTagPar(DoxygenEntity& tag,
-                                    std::string& translatedComment,
-                                    std::string&)
-{
+void JavaDocConverter::handleTagPar(DoxygenEntity &tag, std::string &translatedComment, std::string &) {
   std::string dummy;
   translatedComment += "<p";
   if (tag.entityList.size()) {
@@ -593,10 +485,7 @@ void JavaDocConverter::handleTagPar(DoxygenEntity& tag,
 }
 
 
-void JavaDocConverter::handleTagParam(DoxygenEntity& tag,
-                                      std::string& translatedComment,
-                                      std::string&)
-{
+void JavaDocConverter::handleTagParam(DoxygenEntity &tag, std::string &translatedComment, std::string &) {
   std::string dummy;
 
   if (!tag.entityList.size())
@@ -611,10 +500,7 @@ void JavaDocConverter::handleTagParam(DoxygenEntity& tag,
 }
 
 
-void JavaDocConverter::handleTagRef(DoxygenEntity& tag,
-                                    std::string& translatedComment,
-                                    std::string&)
-{
+void JavaDocConverter::handleTagRef(DoxygenEntity &tag, std::string &translatedComment, std::string &) {
   std::string dummy;
   if (!tag.entityList.size())
     return;
@@ -632,19 +518,17 @@ void JavaDocConverter::handleTagRef(DoxygenEntity& tag,
 }
 
 
-string JavaDocConverter::convertLink(string linkObject)
-{
+string JavaDocConverter::convertLink(string linkObject) {
   if (GetFlag(currentNode, "feature:doxygen:nolinktranslate"))
     return linkObject;
   // find the params in function in linkObject (if any)
   size_t lbracePos = linkObject.find('(', 0);
   size_t rbracePos = linkObject.find(')', 0);
-  if (lbracePos == string::npos || rbracePos == string::npos
-      || lbracePos >= rbracePos)
+  if (lbracePos == string::npos || rbracePos == string::npos || lbracePos >= rbracePos)
     return "";
 
   string paramsStr = linkObject.substr(lbracePos + 1,
-      rbracePos - lbracePos - 1);
+                                       rbracePos - lbracePos - 1);
   // strip the params, to fill them later
   string additionalObject = linkObject.substr(rbracePos + 1, string::npos);
   linkObject = linkObject.substr(0, lbracePos);
@@ -679,7 +563,7 @@ string JavaDocConverter::convertLink(string linkObject)
       SwigType_add_qualifier(swigType, "const");
 
     // handle pointers, references and arrays
-    for (int j = (int) params[i].size() - 1; j >= 0; j--) {
+    for (int j = (int)params[i].size() - 1; j >= 0; j--) {
       // skip all the [...] blocks, write 'p.' for every of it
       if (paramStr[j] == ']') {
         while (j >= 0 && paramStr[j] != '[')
@@ -699,8 +583,7 @@ string JavaDocConverter::convertLink(string linkObject)
           typeNameStart = 0;
         else
           typeNameStart++;
-        Append(swigType,
-            paramStr.substr(typeNameStart, j - typeNameStart + 1).c_str());
+        Append(swigType, paramStr.substr(typeNameStart, j - typeNameStart + 1).c_str());
         break;
       }
     }
@@ -708,11 +591,10 @@ string JavaDocConverter::convertLink(string linkObject)
     // make dummy param list, to lookup typemaps for it
     Parm *dummyParam = NewParm(swigType, "", 0);
     Swig_typemap_attach_parms("jstype", dummyParam, NULL);
-    Language::instance()->replaceSpecialVariables(0,
-        Getattr(dummyParam, "tmap:jstype"), dummyParam);
+    Language::instance()->replaceSpecialVariables(0, Getattr(dummyParam, "tmap:jstype"), dummyParam);
 
     //Swig_print(dummyParam, 1);
-    linkObject += Char (Getattr(dummyParam, "tmap:jstype"));
+    linkObject += Char(Getattr(dummyParam, "tmap:jstype"));
     if (i != params.size() - 1)
       linkObject += ",";
 
@@ -724,10 +606,7 @@ string JavaDocConverter::convertLink(string linkObject)
   return linkObject + additionalObject;
 }
 
-void JavaDocConverter::handleTagLink(DoxygenEntity& tag,
-                                     std::string& translatedComment,
-                                     std::string&)
-{
+void JavaDocConverter::handleTagLink(DoxygenEntity &tag, std::string &translatedComment, std::string &) {
   std::string dummy;
   if (!tag.entityList.size())
     return;
@@ -743,10 +622,7 @@ void JavaDocConverter::handleTagLink(DoxygenEntity& tag,
   translatedComment += "}";
 }
 
-void JavaDocConverter::handleTagSee(DoxygenEntity& tag,
-                                    std::string& translatedComment,
-                                    std::string&)
-{
+void JavaDocConverter::handleTagSee(DoxygenEntity &tag, std::string &translatedComment, std::string &) {
   std::string dummy;
   if (!tag.entityList.size())
     return;
@@ -762,7 +638,6 @@ void JavaDocConverter::handleTagSee(DoxygenEntity& tag,
       // handleNewLine(*it, translatedComment, dummy);
       continue;
     }
-
     // restore entities which may be used in C++ type declaration
     if (it->typeOfEntity == "&amp") {
       methodRef += '&';
@@ -779,8 +654,7 @@ void JavaDocConverter::handleTagSee(DoxygenEntity& tag,
   size_t lbrace = methodRef.find('(');
   size_t dblColon = methodRef.find("::");
   if (dblColon < lbrace) {
-    methodRef = methodRef.substr(0, dblColon) + '#'
-        + methodRef.substr(dblColon + 2);
+    methodRef = methodRef.substr(0, dblColon) + '#' + methodRef.substr(dblColon + 2);
   }
 
   translatedComment += "@see ";
@@ -808,8 +682,7 @@ void JavaDocConverter::handleTagSee(DoxygenEntity& tag,
  |-endline
  *
  */
-int JavaDocConverter::shiftEndlinesUpTree(DoxygenEntity &root, int level)
-{
+int JavaDocConverter::shiftEndlinesUpTree(DoxygenEntity &root, int level) {
   DoxygenEntityListIt it = root.entityList.begin();
   while (it != root.entityList.end()) {
     // remove line endings
@@ -828,7 +701,7 @@ int JavaDocConverter::shiftEndlinesUpTree(DoxygenEntity &root, int level)
 
   int removedCount = 0;
   while (!root.entityList.empty()
-      && root.entityList.rbegin()->typeOfEntity == "plainstd::endl") {
+         && root.entityList.rbegin()->typeOfEntity == "plainstd::endl") {
     root.entityList.pop_back();
     removedCount++;
   }
@@ -841,8 +714,7 @@ int JavaDocConverter::shiftEndlinesUpTree(DoxygenEntity &root, int level)
  * to indentation of the first line. Indentation of non-empty lines is not
  * changed - garbage in garbage out.
  */
-std::string JavaDocConverter::indentAndInsertAsterisks(const string &doc)
-{
+std::string JavaDocConverter::indentAndInsertAsterisks(const string &doc) {
 
   size_t idx = doc.find('\n');
   size_t indent = 0;
@@ -857,10 +729,10 @@ std::string JavaDocConverter::indentAndInsertAsterisks(const string &doc)
     }
   }
 
-  if (indent == 0) { // we can't indent the first line less than 0
+  if (indent == 0) {
+    // we can't indent the first line less than 0
     indent = 1;
   }
-
   // Create the first line of Javadoc comment.
   string indentStr(indent - 1, ' ');
   string translatedStr = indentStr + "/**";
@@ -881,13 +753,11 @@ std::string JavaDocConverter::indentAndInsertAsterisks(const string &doc)
       // line without '*' found - is it empty?
       if (translatedStr[nonspaceIdx] != '\n') {
         // add '* ' to each line without it
-        translatedStr = translatedStr.substr(0, nonspaceIdx) + "* "
-            + translatedStr.substr(nonspaceIdx);
+        translatedStr = translatedStr.substr(0, nonspaceIdx) + "* " + translatedStr.substr(nonspaceIdx);
         //printf(translatedStr.c_str());
       } else {
         // we found empty line, replace it with indented '*'
-        translatedStr = translatedStr.substr(0, idx + 1) + indentStr + "* "
-            + translatedStr.substr(nonspaceIdx);
+        translatedStr = translatedStr.substr(0, idx + 1) + indentStr + "* " + translatedStr.substr(nonspaceIdx);
       }
     }
     idx = translatedStr.find('\n', nonspaceIdx);
@@ -908,8 +778,7 @@ std::string JavaDocConverter::indentAndInsertAsterisks(const string &doc)
   return translatedStr;
 }
 
-String *JavaDocConverter::makeDocumentation(Node *node)
-{
+String *JavaDocConverter::makeDocumentation(Node *node) {
 
   String *documentation = getDoxygenComment(node);
 
@@ -919,7 +788,7 @@ String *JavaDocConverter::makeDocumentation(Node *node)
 
   if (GetFlag(node, "feature:doxygen:notranslate")) {
 
-    string doc = Char (documentation);
+    string doc = Char(documentation);
 
     string translatedStr = indentAndInsertAsterisks(doc);
 
@@ -936,7 +805,6 @@ String *JavaDocConverter::makeDocumentation(Node *node)
     std::cout << "---RESORTED LIST---" << std::endl;
     printTree(entityList);
   }
-
   // store the current node
   // (currently just to handle params)
   currentNode = node;
@@ -949,13 +817,13 @@ String *JavaDocConverter::makeDocumentation(Node *node)
 
   // strip line endings at the beginning
   while (!root.entityList.empty()
-      && root.entityList.begin()->typeOfEntity == "plainstd::endl") {
+         && root.entityList.begin()->typeOfEntity == "plainstd::endl") {
     root.entityList.pop_front();
   }
 
   // and at the end
   while (!root.entityList.empty()
-      && root.entityList.rbegin()->typeOfEntity == "plainstd::endl") {
+         && root.entityList.rbegin()->typeOfEntity == "plainstd::endl") {
     root.entityList.pop_back();
   }
 
@@ -971,8 +839,6 @@ String *JavaDocConverter::makeDocumentation(Node *node)
   return NewString(javaDocString.c_str());
 }
 
-void JavaDocConverter::addError(int warningType, const std::string &message)
-{
-  Swig_warning(warningType, "", 0, "Doxygen parser warning: %s. \n",
-      message.c_str());
+void JavaDocConverter::addError(int warningType, const std::string &message) {
+  Swig_warning(warningType, "", 0, "Doxygen parser warning: %s. \n", message.c_str());
 }