[mapguide-commits] r7038 - in trunk/MgDev/BuildTools/DoxyTransform: . DoxyTransform Doxygen.NET

[svn_mapguide at osgeo.org]

Author: jng
Date: 2012-09-19 06:12:50 -0700 (Wed, 19 Sep 2012)
New Revision: 7038

Modified:
   trunk/MgDev/BuildTools/DoxyTransform/
   trunk/MgDev/BuildTools/DoxyTransform/DoxyTransform.exe
   trunk/MgDev/BuildTools/DoxyTransform/DoxyTransform/Program.cs
   trunk/MgDev/BuildTools/DoxyTransform/Doxygen.NET.dll
   trunk/MgDev/BuildTools/DoxyTransform/Doxygen.NET/Docs.cs
Log:
#2114: Merge to trunk


Property changes on: trunk/MgDev/BuildTools/DoxyTransform
___________________________________________________________________
Added: svn:mergeinfo
   + /branches/2.4/MgDev/BuildTools/DoxyTransform:6749-6756,6777-6783,6785-6787,6789,6791-6794,6796-6801,6954-6962,6986-7006,7036-7037
/sandbox/rfc94/BuildTools/DoxyTransform:5099-5163

Modified: trunk/MgDev/BuildTools/DoxyTransform/DoxyTransform/Program.cs
===================================================================
--- trunk/MgDev/BuildTools/DoxyTransform/DoxyTransform/Program.cs	2012-09-19 13:09:47 UTC (rev 7037)
+++ trunk/MgDev/BuildTools/DoxyTransform/DoxyTransform/Program.cs	2012-09-19 13:12:50 UTC (rev 7038)
@@ -142,6 +142,7 @@
                     return "System.Double";
                 case "float":
                     return "System.Single";
+                case "INT8": //These are exposed as short in .net
                 case "INT16":
                     return "System.Int16";
                 case "INT32":
@@ -152,6 +153,9 @@
                     return "System.String";
                 case "CREFSTRING":
                     return "System.String";
+                case "BYTE_ARRAY_IN":
+                case "BYTE_ARRAY_OUT":
+                    return "System.Byte[]";
                 default:
                     return mgType;
             }

Modified: trunk/MgDev/BuildTools/DoxyTransform/DoxyTransform.exe
===================================================================
(Binary files differ)

Modified: trunk/MgDev/BuildTools/DoxyTransform/Doxygen.NET/Docs.cs
===================================================================
--- trunk/MgDev/BuildTools/DoxyTransform/Doxygen.NET/Docs.cs	2012-09-19 13:09:47 UTC (rev 7037)
+++ trunk/MgDev/BuildTools/DoxyTransform/Doxygen.NET/Docs.cs	2012-09-19 13:12:50 UTC (rev 7038)
@@ -217,9 +217,14 @@
             {
                 string kind = member.Attributes["kind"].Value;
                 string name = member["name"].InnerText;
-                string args = member["argsstring"] != null ? 
-                    member["argsstring"].InnerText.Replace("(", "").Replace(")", "").Trim() :
-                    string.Empty;
+                string args = string.Empty;
+                if (member["argsstring"] != null) {
+                    //This is to strip any const and pure virtual modifiers
+                    string str = member["argsstring"].InnerText;
+                    if (str.LastIndexOf("(") >= 0 && str.LastIndexOf(")") >= 0)
+                        str = str.Substring(str.LastIndexOf("("), str.LastIndexOf(")") - str.LastIndexOf("("));
+                    args = str.Replace("(", "").Replace(")", "").Trim();
+                }
 
                 List<Parameter> parameters = new List<Parameter>();
                 

Modified: trunk/MgDev/BuildTools/DoxyTransform/Doxygen.NET.dll
===================================================================
(Binary files differ)