Move a few more headers

starseeker · starseeker · commit 840d57c2f18f · 2022-10-02T17:57:56.000-04:00
diff --git a/include/core/CMakeLists.txt b/include/core/CMakeLists.txt
@@ -2,9 +2,9 @@ set(CORE_HDRS
   aggrTypeDescriptor.h
   attrDescriptor.h
   attrDescriptorList.h
-# baseType.h
-# complexSupport.h
-# create_Aggr.h
+  baseType.h
+  complexSupport.h
+  create_Aggr.h
 # derivedAttribute.h
 # dictSchema.h
 # dictdefs.h
diff --git a/include/core/aggrTypeDescriptor.h b/include/core/aggrTypeDescriptor.h
@@ -2,7 +2,7 @@
 #define AGGRTYPEDESCRIPTOR_H
 
 #include "typeDescriptor.h"
-#include "create_Aggr.h"
+#include "core/create_Aggr.h"
 
 #include "assert.h"
 
diff --git a/include/core/baseType.h b/include/core/baseType.h
diff --git a/include/core/complexSupport.h b/include/core/complexSupport.h
diff --git a/include/core/create_Aggr.h b/include/core/create_Aggr.h
diff --git a/src/cleditor/SdaiSchemaInit.h b/src/cleditor/SdaiSchemaInit.h
@@ -15,7 +15,7 @@
 #include <STEPundefined.h>
 #include <ExpDict.h>
 #include <STEPattribute.h>
-#include <complexSupport.h>
+#include "core/complexSupport.h"
 
 #include <SdaiHeaderSchemaClasses.h>
 #include <SdaiHeaderSchema.h>
diff --git a/src/clstepcore/CMakeLists.txt b/src/clstepcore/CMakeLists.txt
@@ -63,9 +63,6 @@ set(LIBSTEPCORE_SRCS
 )
 
 set(SC_CLSTEPCORE_HDRS
-  baseType.h
-  complexSupport.h
-  create_Aggr.h
   derivedAttribute.h
   dictSchema.h
   dictdefs.h
diff --git a/src/clstepcore/ExpDict.h b/src/clstepcore/ExpDict.h
@@ -23,7 +23,7 @@
 
 #include <SingleLinkList.h>
 
-#include <baseType.h>
+#include "core/baseType.h"
 #include <dictdefs.h>
 #include <Str.h>
 
@@ -41,7 +41,7 @@
 #include "derivedAttribute.h"
 #include "inverseAttribute.h"
 
-#include "create_Aggr.h"
+#include "core/create_Aggr.h"
 #include "dictionaryInstance.h"
 
 #include "uniquenessRule.h"
diff --git a/src/clstepcore/Registry.h b/src/clstepcore/Registry.h
@@ -17,7 +17,7 @@
 #include <errordesc.h>
 #include <sc_hash.h>
 #include <Str.h>
-#include <complexSupport.h>
+#include "core/complexSupport.h"
 
 
 // defined and created in Registry.cc
diff --git a/src/clstepcore/STEPaggregate.h b/src/clstepcore/STEPaggregate.h
@@ -19,7 +19,7 @@ class TypeDescriptor;
 #include <sc_export.h>
 #include <errordesc.h>
 #include <SingleLinkList.h>
-#include <baseType.h>
+#include "core/baseType.h"
 #include <sdai.h>
 #include <STEPundefined.h>
 #include <string>
diff --git a/src/clstepcore/STEPattribute.h b/src/clstepcore/STEPattribute.h
@@ -16,7 +16,7 @@
 #include <sc_export.h>
 #include <stdio.h>
 #include <errordesc.h>
-#include <baseType.h>
+#include "core/baseType.h"
 
 #include <sdai.h>
 
diff --git a/src/clstepcore/STEPcomplex.cc b/src/clstepcore/STEPcomplex.cc
@@ -2,7 +2,7 @@
 #include <ctype.h>
 
 #include <STEPcomplex.h>
-#include <complexSupport.h>
+#include "core/complexSupport.h"
 #include <STEPattribute.h>
 #include <STEPaggregate.h>
 #include <sstream>
diff --git a/src/clstepcore/STEPcomplex.h b/src/clstepcore/STEPcomplex.h
@@ -4,7 +4,7 @@
 #include <sc_export.h>
 #include <errordesc.h>
 #include <sdai.h>
-#include <baseType.h>
+#include "core/baseType.h"
 #include <ExpDict.h>
 #include <Registry.h>
 
diff --git a/src/clstepcore/collect.cc b/src/clstepcore/collect.cc
@@ -11,7 +11,7 @@
  * Date:        11/14/96                                                     *
  *****************************************************************************/
 
-#include "complexSupport.h"
+#include "core/complexSupport.h"
 
 /**
  * Inserts a new ComplexList to our list.  The ComplexLists are ordered by
diff --git a/src/clstepcore/complexlist.cc b/src/clstepcore/complexlist.cc
@@ -10,7 +10,7 @@
  * Date:        01/07/97                                                     *
  *****************************************************************************/
 
-#include "complexSupport.h"
+#include "core/complexSupport.h"
 
 /**
  * Destructor for ComplexList.
diff --git a/src/clstepcore/create_Aggr.cc b/src/clstepcore/create_Aggr.cc
@@ -1,4 +1,4 @@
-#include "create_Aggr.h"
+#include "core/create_Aggr.h"
 #include <STEPaggregate.h>
 
 EnumAggregate * create_EnumAggregate() {
diff --git a/src/clstepcore/entlist.cc b/src/clstepcore/entlist.cc
@@ -13,7 +13,7 @@
  * Date:        9/18/96                                                      *
  *****************************************************************************/
 
-#include "complexSupport.h"
+#include "core/complexSupport.h"
 
 /**
  * Returns the number of EntLists in this's list (EntList->next, next->next
diff --git a/src/clstepcore/entnode.cc b/src/clstepcore/entnode.cc
@@ -11,7 +11,7 @@
  * Date:        9/18/96                                                      *
  *****************************************************************************/
 
-#include "complexSupport.h"
+#include "core/complexSupport.h"
 
 /**
  * Given a list of entity names, creates a sorted linked list of EntNodes
diff --git a/src/clstepcore/match-ors.cc b/src/clstepcore/match-ors.cc
@@ -13,7 +13,7 @@
  * Date:        10/17/96                                                     *
  *****************************************************************************/
 
-#include "complexSupport.h"
+#include "core/complexSupport.h"
 
 /**
  * Loops through descendants of this, invoking their matchOR functions.
diff --git a/src/clstepcore/multlist.cc b/src/clstepcore/multlist.cc
@@ -13,7 +13,7 @@
  * Date:        9/18/96                                                      *
  *****************************************************************************/
 
-#include "complexSupport.h"
+#include "core/complexSupport.h"
 
 /**
  * Deletes the childList of this, before this is deleted.
diff --git a/src/clstepcore/non-ors.cc b/src/clstepcore/non-ors.cc
@@ -10,7 +10,7 @@
  * Date:        10/17/96                                                     *
  *****************************************************************************/
 
-#include "complexSupport.h"
+#include "core/complexSupport.h"
 
 /**
  * Checks if we match the nodes of ents.  If only one unmarked is left
diff --git a/src/clstepcore/orlist.cc b/src/clstepcore/orlist.cc
@@ -10,7 +10,7 @@
  * Date:        9/18/96                                                      *
  *****************************************************************************/
 
-#include "complexSupport.h"
+#include "core/complexSupport.h"
 
 /**
  * Check if we matched nm.  We have two possibilities here:  If we have a
diff --git a/src/clstepcore/print.cc b/src/clstepcore/print.cc
@@ -7,7 +7,7 @@
  * Date:        10/31/96                                                     *
  *****************************************************************************/
 
-#include "complexSupport.h"
+#include "core/complexSupport.h"
 
 // Local function prototypes:
 static char * joinText( JoinType, char * );
diff --git a/src/clstepcore/sdai.h b/src/clstepcore/sdai.h
@@ -29,7 +29,7 @@ extern const char * SCLversion;
 
 #include "dictdefs.h"
 
-#include "baseType.h"
+#include "core/baseType.h"
 #include "Str.h"
 #include "errordesc.h"
 
diff --git a/src/clstepcore/test/test_operators_SDAI_Select.cc b/src/clstepcore/test/test_operators_SDAI_Select.cc
@@ -7,7 +7,7 @@
 #include <iostream>
 
 #include "ExpDict.h"
-#include "baseType.h"
+#include "core/baseType.h"
 #include "sdaiSelect.h"
 
 using namespace std;
diff --git a/src/clstepcore/trynext.cc b/src/clstepcore/trynext.cc
@@ -11,7 +11,7 @@
  * Date:        10/24/96                                                     *
  *****************************************************************************/
 
-#include "complexSupport.h"
+#include "core/complexSupport.h"
 
 // Local function prototypes:
 static EntList * firstCandidate( EntList * );
diff --git a/src/exp2cxx/multpass.c b/src/exp2cxx/multpass.c
@@ -159,7 +159,7 @@ void print_schemas_separate( Express express, void * complexCol, FILES * files )
     // which hasn't been closed yet.  (That's done on 2nd line below.)) */
     fprintf( files->initall, "     reg.SetCompCollect( gencomplex() );\n" );
     fprintf( files->initall, "}\n\n" );
-    fprintf( files->incall,  "\n#include <complexSupport.h>\n" );
+    fprintf( files->incall,  "\n#include \"core\/complexSupport.h\"\n" );
     fprintf( files->incall,  "ComplexCollect *gencomplex();\n" );
 
     /* Function GetModelContents() is printed at the end of the schema.xx
diff --git a/src/exp2cxx/write.cc b/src/exp2cxx/write.cc
@@ -116,7 +116,7 @@ static void writeheader( ostream & os, int noLists )
            << " * file, however, there are no complex entities, so this\n"
            << " * function is a stub.\n"
            << " */" << endl << endl;
-        os << "#include \"complexSupport.h\"\n\n";
+        os << "#include \"core/complexSupport.h\"\n\n";
         os << "ComplexCollect *gencomplex()" << endl;
         os << "{" << endl;
         return;
@@ -128,7 +128,7 @@ static void writeheader( ostream & os, int noLists )
        << " * support structures.  The structures will be used in the SCL to\n"
        << " * validate user requests to instantiate complex entities.\n"
        << " */" << endl << endl;
-    os << "#include \"complexSupport.h\"\n\n";
+    os << "#include \"core/complexSupport.h\"\n\n";
     os << "ComplexCollect *gencomplex()" << endl;
     os << "    /*" << endl
        << "     * This function contains instantiation statements for all the\n"
diff --git a/src/exp2python/src/multpass_python.c b/src/exp2python/src/multpass_python.c
@@ -150,7 +150,7 @@ void print_schemas_separate( Express express, FILES * files )
     // which hasn't been closed yet.  (That's done on 2nd line below.)) * /
     //fprintf( files->initall, "\t reg.SetCompCollect( gencomplex() );\n" );
     //fprintf( files->initall, "}\n\n" );
-    //fprintf( files->incall,  "\n#include <complexSupport.h>\n" );
+    //fprintf( files->incall,  "\n#include \"core/complexSupport.h\"\n" );
     //fprintf( files->incall,  "ComplexCollect *gencomplex();\n" ); */
 
     /* Function GetModelContents() is printed at the end of the schema.xx
diff --git a/src/test/scl2html/scl2html.cc b/src/test/scl2html/scl2html.cc
@@ -49,7 +49,7 @@
 void PrintAttrTypeWithAnchor( const TypeDescriptor * typeDesc, ofstream & outhtml ) {
     std::string buf;
 
-    // The type.  See src/clstepcore/baseType.h for info
+    // The type.  See core/baseType.h for info
     PrimitiveType base = typeDesc->Type();
 
     // the type descriptor for the "referent type," if any.

Original file line number	Diff line number	Diff line change
`@@ -63,9 +63,6 @@ set(LIBSTEPCORE_SRCS`
`63`	`63`	`)`
`64`	`64`
`65`	`65`	`set(SC_CLSTEPCORE_HDRS`
`66`		`- baseType.h`
`67`		`- complexSupport.h`
`68`		`- create_Aggr.h`
`69`	`66`	`derivedAttribute.h`
`70`	`67`	`dictSchema.h`
`71`	`68`	`dictdefs.h`