Use hxx extensions instead of hpp

Change-Id: Idaeccc43c62207e5ce4dd014f648a4b385090713

diff --git a/scilab/modules/xml/sci_gateway/cpp/sci_extraction.cpp b/scilab/modules/xml/sci_gateway/cpp/sci_extraction.cpp
index e0e0b24..11d86bc 100644 (file)
--- a/scilab/modules/xml/sci_gateway/cpp/sci_extraction.cpp
+++ b/scilab/modules/xml/sci_gateway/cpp/sci_extraction.cpp
@@ -10,7 +10,7 @@
  *
  */
 
-#include "extraction.hpp"
+#include "extraction.hxx"
 
 using namespace org_modules_xml;
 

diff --git a/scilab/modules/xml/sci_gateway/cpp/sci_insertion.cpp b/scilab/modules/xml/sci_gateway/cpp/sci_insertion.cpp
index 59e2ed3..a7d8052 100644 (file)
--- a/scilab/modules/xml/sci_gateway/cpp/sci_insertion.cpp
+++ b/scilab/modules/xml/sci_gateway/cpp/sci_insertion.cpp
@@ -10,8 +10,8 @@
  *
  */
 
-#include "insertion.hpp"
-#include "XMLList_insertion.hpp"
+#include "insertion.hxx"
+#include "XMLList_insertion.hxx"
 
 int sci_percent_c_i_XMLDoc(char *fname, unsigned long fname_len)
 {

diff --git a/scilab/modules/xml/src/cpp/XMLList_insertion.hpp b/scilab/modules/xml/src/cpp/XMLList_insertion.hxx
similarity index 100%
rename from scilab/modules/xml/src/cpp/XMLList_insertion.hpp
rename to scilab/modules/xml/src/cpp/XMLList_insertion.hxx

diff --git a/scilab/modules/xml/src/cpp/extraction.hpp b/scilab/modules/xml/src/cpp/extraction.hxx
similarity index 99%
rename from scilab/modules/xml/src/cpp/extraction.hpp
rename to scilab/modules/xml/src/cpp/extraction.hxx
index 8320120..ed37405 100644 (file)
--- a/scilab/modules/xml/src/cpp/extraction.hpp
+++ b/scilab/modules/xml/src/cpp/extraction.hxx
@@ -190,7 +190,7 @@ int createVariableOnStack(char * fname, XMLElement & elem, const char * field, i
         if (err.iErr)
         {
             printError(&err, 0);
-            Scierror(999,_("%s: Memory allocation error.\n"), fname);
+            Scierror(999, _("%s: Memory allocation error.\n"), fname);
             return 0;
         }
 

diff --git a/scilab/modules/xml/src/cpp/insertion.hpp b/scilab/modules/xml/src/cpp/insertion.hxx
similarity index 100%
rename from scilab/modules/xml/src/cpp/insertion.hpp
rename to scilab/modules/xml/src/cpp/insertion.hxx

diff --git a/scilab/modules/xml/xml.vcxproj b/scilab/modules/xml/xml.vcxproj
index a90b323..6b81938 100644 (file)
--- a/scilab/modules/xml/xml.vcxproj
+++ b/scilab/modules/xml/xml.vcxproj
@@ -234,15 +234,15 @@
     <ClInclude Include="includes\xmlObjects.h" />
     <ClInclude Include="includes\xml_constants.h" />
     <ClInclude Include="includes\xml_mlist.h" />
-    <ClInclude Include="src\cpp\extraction.hpp" />
-    <ClInclude Include="src\cpp\insertion.hpp" />
+    <ClInclude Include="src\cpp\extraction.hxx" />
+    <ClInclude Include="src\cpp\insertion.hxx" />
     <ClInclude Include="src\cpp\SplitString.hxx" />
     <ClInclude Include="src\cpp\VariableScope.hxx" />
     <ClInclude Include="src\cpp\XMLAttr.hxx" />
     <ClInclude Include="src\cpp\XMLDocument.hxx" />
     <ClInclude Include="src\cpp\XMLElement.hxx" />
     <ClInclude Include="src\cpp\XMLList.hxx" />
-    <ClInclude Include="src\cpp\XMLList_insertion.hpp" />
+    <ClInclude Include="src\cpp\XMLList_insertion.hxx" />
     <ClInclude Include="src\cpp\XMLNodeList.hxx" />
     <ClInclude Include="src\cpp\XMLNodeSet.hxx" />
     <ClInclude Include="src\cpp\XMLNotHandledElement.hxx" />

diff --git a/scilab/modules/xml/xml.vcxproj.filters b/scilab/modules/xml/xml.vcxproj.filters
index 807cc2c..927c63d 100644 (file)
--- a/scilab/modules/xml/xml.vcxproj.filters
+++ b/scilab/modules/xml/xml.vcxproj.filters
@@ -7,7 +7,7 @@
     </Filter>
     <Filter Include="Header Files">
       <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+      <Extensions>h.hxx;hxx;hm;inl;inc;xsd</Extensions>
     </Filter>
     <Filter Include="Resource Files">
       <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
@@ -40,7 +40,7 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="src\cpp\extraction.hpp">
+    <ClInclude Include="src\cpp\extraction.hxx">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\VariableScope.hxx">
@@ -76,10 +76,10 @@
     <ClInclude Include="src\cpp\XMLXPath.hxx">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="src\cpp\insertion.hpp">
+    <ClInclude Include="src\cpp\insertion.hxx">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="src\cpp\XMLList_insertion.hpp">
+    <ClInclude Include="src\cpp\XMLList_insertion.hxx">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="src\cpp\XMLRhsValue.hxx">