Move stepcore headers through r*

starseeker · starseeker · commit fc4edb9b069e · 2022-10-02T17:57:57.000-04:00
diff --git a/include/core/CMakeLists.txt b/include/core/CMakeLists.txt
@@ -17,19 +17,19 @@ set(CORE_HDRS
   ExpDict.h
   explicitItemId.h
   globalRule.h
-# implicitItemId.h
-# instmgr.h
-# interfaceSpec.h
-# interfacedItem.h
-# inverseAttribute.h
-# inverseAttributeList.h
-# mgrnode.h
-# mgrnodearray.h
-# mgrnodelist.h
-# needFunc.h
-# read_func.h
-# realTypeDescriptor.h
-# Registry.h
+  implicitItemId.h
+  instmgr.h
+  interfaceSpec.h
+  interfacedItem.h
+  inverseAttribute.h
+  inverseAttributeList.h
+  mgrnode.h
+  mgrnodearray.h
+  mgrnodelist.h
+  needFunc.h
+  read_func.h
+  realTypeDescriptor.h
+  Registry.h
 # schRename.h
 # sdai.h
 # sdaiApplication_instance.h
diff --git a/include/core/Registry.h b/include/core/Registry.h
diff --git a/include/core/dispnodelist.h b/include/core/dispnodelist.h
@@ -20,7 +20,7 @@
 #include <gennode.h>
 //#include <gennode.inline.h>
 #include <editordefines.h>
-#include <mgrnode.h>
+#include "core/mgrnode.h"
 #include "core/dispnode.h"
 #include <gennodelist.h>
 
diff --git a/include/core/instmgr.h b/include/core/instmgr.h
@@ -31,13 +31,13 @@
 #include <gennodelist.h>
 #include <gennodearray.h>
 
-#include <mgrnode.h>
-#include <mgrnodelist.h>
+#include "core/mgrnode.h"
+#include "core/mgrnodelist.h"
 
 #include "core/dispnode.h"
 #include "core/dispnodelist.h"
 
-#include <mgrnodearray.h>
+#include "core/mgrnodearray.h"
 
 class SC_CORE_EXPORT InstMgrBase {
     public:
diff --git a/include/core/mgrnode.h b/include/core/mgrnode.h
diff --git a/include/core/mgrnodearray.h b/include/core/mgrnodearray.h
@@ -23,8 +23,8 @@
 #include <gennodelist.h>
 //#include <gennode.inline.h>
 
-#include <mgrnode.h>
-#include <mgrnodelist.h>
+#include "core/mgrnode.h"
+#include "core/mgrnodelist.h"
 
 #include <gennodearray.h>
 
diff --git a/include/core/mgrnodelist.h b/include/core/mgrnodelist.h
diff --git a/include/core/needFunc.h b/include/core/needFunc.h
diff --git a/include/core/read_func.h b/include/core/read_func.h
diff --git a/include/core/realTypeDescriptor.h b/include/core/realTypeDescriptor.h
diff --git a/src/cleditor/STEPfile.h b/src/cleditor/STEPfile.h
@@ -16,13 +16,13 @@
 #include <sc_export.h>
 #include <string>
 #include "core/instmgr.h"
-#include <Registry.h>
+#include "core/Registry.h"
 #include <fstream>
 #include <dirobj.h>
 #include <errordesc.h>
 #include <time.h>
 
-#include <read_func.h>
+#include "core/read_func.h"
 
 //error reporting level
 #define READ_COMPLETE    10
diff --git a/src/cleditor/SdaiHeaderSchema.h b/src/cleditor/SdaiHeaderSchema.h
@@ -6,7 +6,7 @@
 
 #include <sc_export.h>
 #include <sdai.h>
-#include <Registry.h>
+#include "core/Registry.h"
 #include <STEPaggregate.h>
 #include <SdaiHeaderSchemaClasses.h>
 #include <SdaiSchemaInit.h>
diff --git a/src/cleditor/SdaiHeaderSchemaInit.cc b/src/cleditor/SdaiHeaderSchemaInit.cc
@@ -4,7 +4,7 @@
 // it since your modifications will be lost if exp2cxx is used to
 // regenerate it.
 
-#include <Registry.h>
+#include "core/Registry.h"
 #include "core/ExpDict.h"
 #include <STEPattribute.h>
 #include <SdaiHeaderSchema.h>
diff --git a/src/cleditor/SdaiSchemaInit.h b/src/cleditor/SdaiSchemaInit.h
@@ -10,7 +10,7 @@
 
 #include <sc_export.h>
 #include <sdai.h>
-#include <Registry.h>
+#include "core/Registry.h"
 #include <STEPaggregate.h>
 #include <STEPundefined.h>
 #include "core/ExpDict.h"
diff --git a/src/cleditor/cmdmgr.h b/src/cleditor/cmdmgr.h
@@ -18,8 +18,8 @@
 #include <gennodearray.h>
 
 #include <editordefines.h>
-#include <mgrnode.h>
-#include <mgrnodelist.h>
+#include "core/mgrnode.h"
+#include "core/mgrnodelist.h"
 #include "core/dispnode.h"
 #include "core/dispnodelist.h"
 #include <SingleLinkList.h>
diff --git a/src/cllazyfile/instMgrHelper.h b/src/cllazyfile/instMgrHelper.h
@@ -3,7 +3,7 @@
 
 #include <sc_export.h>
 
-#include <mgrnode.h>
+#include "core/mgrnode.h"
 #include <lazyInstMgr.h>
 #include "core/instmgr.h"
 
diff --git a/src/cllazyfile/lazyInstMgr.cc b/src/cllazyfile/lazyInstMgr.cc
@@ -1,6 +1,6 @@
 #include "lazyTypes.h"
 #include "lazyInstMgr.h"
-#include "Registry.h"
+#include "core/Registry.h"
 #include <SubSuperIterators.h>
 #include "SdaiSchemaInit.h"
 #include "instMgrHelper.h"
diff --git a/src/cllazyfile/lazyInstMgr.h b/src/cllazyfile/lazyInstMgr.h
@@ -9,7 +9,7 @@
 #include "lazyFileReader.h"
 #include "lazyTypes.h"
 
-#include "Registry.h"
+#include "core/Registry.h"
 #include "sc_export.h"
 
 #include "judyLArray.h"
diff --git a/src/cllazyfile/sectionReader.cc b/src/cllazyfile/sectionReader.cc
@@ -12,9 +12,9 @@
 #  define ULLONG_MAX _UI64_MAX
 #endif
 
-#include "Registry.h"
+#include "core/Registry.h"
 #include "sdaiApplication_instance.h"
-#include "read_func.h"
+#include "core/read_func.h"
 #include "SdaiSchemaInit.h"
 #include "STEPcomplex.h"
 
diff --git a/src/clstepcore/CMakeLists.txt b/src/clstepcore/CMakeLists.txt
@@ -63,19 +63,6 @@ set(LIBSTEPCORE_SRCS
 )
 
 set(SC_CLSTEPCORE_HDRS
-  implicitItemId.h
-  instmgr.h
-  interfaceSpec.h
-  interfacedItem.h
-  inverseAttribute.h
-  inverseAttributeList.h
-  mgrnode.h
-  mgrnodearray.h
-  mgrnodelist.h
-  needFunc.h
-  read_func.h
-  realTypeDescriptor.h
-  Registry.h
   schRename.h
   sdai.h
   sdaiApplication_instance.h
diff --git a/src/clstepcore/Registry.cc b/src/clstepcore/Registry.cc
@@ -10,7 +10,7 @@
 */
 
 #include "core/ExpDict.h"
-#include <Registry.h>
+#include "core/Registry.h"
 
 /* these may be shared between multiple Registry instances, so don't create/destroy in Registry ctor/dtor
  *                                                        Name, FundamentalType, Originating Schema, Description */
diff --git a/src/clstepcore/STEPaggregate.cc b/src/clstepcore/STEPaggregate.cc
@@ -12,7 +12,7 @@
 
 #include <stdio.h>
 
-#include <read_func.h>
+#include "core/read_func.h"
 #include <STEPaggregate.h>
 #include <STEPattribute.h>
 #include "core/instmgr.h"
diff --git a/src/clstepcore/STEPattribute.cc b/src/clstepcore/STEPattribute.cc
@@ -12,7 +12,7 @@
 #include <iomanip>
 #include <string>
 
-#include <read_func.h>
+#include "core/read_func.h"
 #include <STEPattribute.h>
 #include "core/instmgr.h"
 #include <STEPundefined.h>
diff --git a/src/clstepcore/STEPcomplex.h b/src/clstepcore/STEPcomplex.h
@@ -6,7 +6,7 @@
 #include <sdai.h>
 #include "core/baseType.h"
 #include "core/ExpDict.h"
-#include <Registry.h>
+#include "core/Registry.h"
 
 #include <list>
 
diff --git a/src/clstepcore/STEPundefined.h b/src/clstepcore/STEPundefined.h
@@ -15,7 +15,7 @@
 #include <sc_export.h>
 #include <errordesc.h>
 #include <string>
-#include <read_func.h>
+#include "core/read_func.h"
 
 class SC_CORE_EXPORT SCLundefined  {
     protected:
diff --git a/src/clstepcore/dispnodelist.cc b/src/clstepcore/dispnodelist.cc
@@ -15,8 +15,8 @@
 #include <gennode.h>
 #include <gennodelist.h>
 
-#include <mgrnode.h>
-#include <mgrnodelist.h>
+#include "core/mgrnode.h"
+#include "core/mgrnodelist.h"
 #include "core/dispnode.h"
 #include "core/dispnodelist.h"
 
diff --git a/src/clstepcore/entityDescriptor.cc b/src/clstepcore/entityDescriptor.cc
@@ -1,7 +1,7 @@
 #include <string>
 
 #include "core/entityDescriptor.h"
-#include "Registry.h"
+#include "core/Registry.h"
 #include "core/attrDescriptor.h"
 #include "core/inverseAttribute.h"
 #include "SubSuperIterators.h"
diff --git a/src/clstepcore/mgrnode.cc b/src/clstepcore/mgrnode.cc
@@ -12,8 +12,8 @@
 
 /* $Id: mgrnode.cc,v 3.0.1.3 1997/11/05 22:11:37 sauderd DP3.1 $ */
 
-#include <mgrnode.h>
-#include <mgrnodelist.h>
+#include "core/mgrnode.h"
+#include "core/mgrnodelist.h"
 #include "core/dispnode.h"
 #include "core/dispnodelist.h"
 
diff --git a/src/clstepcore/mgrnodearray.cc b/src/clstepcore/mgrnodearray.cc
@@ -32,7 +32,7 @@ static int PrintFunctionTrace = 2;
 // values within functions get printed out
 //static int PrintValues = 3;
 
-#include <mgrnodearray.h>
+#include "core/mgrnodearray.h"
 //#include <STEPentity.h>
 #include <sdai.h>
 
diff --git a/src/clstepcore/mgrnodelist.cc b/src/clstepcore/mgrnodelist.cc
@@ -12,8 +12,8 @@
 
 /* $Id: mgrnodelist.cc,v 3.0.1.2 1997/11/05 22:11:39 sauderd DP3.1 $ */
 
-#include <mgrnode.h>
-#include <mgrnodelist.h>
+#include "core/mgrnode.h"
+#include "core/mgrnodelist.h"
 #include "core/dispnode.h"
 #include "core/dispnodelist.h"
 
diff --git a/src/clstepcore/needFunc.cc b/src/clstepcore/needFunc.cc
@@ -1,4 +1,4 @@
-#include <needFunc.h>
+#include "core/needFunc.h"
 
 ///////////////////////////////////////////////////////////////////////////////
 // Function defined as a stub (necessary to use the scl)
diff --git a/src/clstepcore/read_func.cc b/src/clstepcore/read_func.cc
@@ -2,7 +2,7 @@
 #include <errordesc.h>
 #include <stdio.h>
 #include <sdai.h>
-#include <read_func.h>
+#include "core/read_func.h"
 #include <STEPattribute.h>
 #include "Str.h"
 
diff --git a/src/clstepcore/sdaiApplication_instance.cc b/src/clstepcore/sdaiApplication_instance.cc
@@ -15,7 +15,7 @@
 #include "core/instmgr.h"
 #include <STEPcomplex.h>
 #include <STEPattribute.h>
-#include <read_func.h> //for ReadTokenSeparator, used when comments are inside entities
+#include "core/read_func.h" //for ReadTokenSeparator, used when comments are inside entities
 
 #include "sdaiApplication_instance.h"
 #include "superInvAttrIter.h"
diff --git a/src/exp2cxx/classes_wrapper.cc b/src/exp2cxx/classes_wrapper.cc
@@ -76,7 +76,7 @@ void print_file_header( FILES * files ) {
     fprintf( files->incall, "#endif\n" );
 
     fprintf( files->incall, "#include <sdai.h>\n\n" );
-    fprintf( files->incall, "\n#include <Registry.h>\n" );
+    fprintf( files->incall, "\n#include \"core/Registry.h\"\n" );
     fprintf( files->incall, "\n#include <STEPaggregate.h>\n" );
     fprintf( files->incall, "\n#include <STEPundefined.h>\n" );
     fprintf( files->incall, "\n#include \"core/ExpDict.h\"\n" );
@@ -494,7 +494,7 @@ void SCHEMAprint( Schema schema, FILES * files, void * complexCol, int suffix )
                  "#include \"schema.h\"\n"
                  "#endif\n" );
 #endif
-        fprintf( initfile, "#include <Registry.h>\n#include <string>\n" );
+        fprintf( initfile, "#include \"core/Registry.h\"\n#include <string>\n" );
 
         fprintf( initfile, "\nvoid %sInit (Registry& reg) {\n", schnm );
 
diff --git a/src/test/p21read/p21read.cc b/src/test/p21read/p21read.cc
@@ -17,7 +17,7 @@ extern void SchemaInit( class Registry & );
 #include <sdai.h>
 #include <STEPattribute.h>
 #include "core/ExpDict.h"
-#include <Registry.h>
+#include "core/Registry.h"
 #include <errordesc.h>
 #include <algorithm>
 #include <string>
