Move d* headers in clstepcore

starseeker · starseeker · commit 94c978359de0 · 2022-10-02T17:57:56.000-04:00
diff --git a/include/core/CMakeLists.txt b/include/core/CMakeLists.txt
@@ -6,11 +6,11 @@ set(CORE_HDRS
   complexSupport.h
   create_Aggr.h
   derivedAttribute.h
-# dictSchema.h
-# dictdefs.h
-# dictionaryInstance.h
-# dispnode.h
-# dispnodelist.h
+  dictSchema.h
+  dictdefs.h
+  dictionaryInstance.h
+  dispnode.h
+  dispnodelist.h
 # entityDescriptor.h
 # entityDescriptorList.h
 # enumTypeDescriptor.h
diff --git a/include/core/dictSchema.h b/include/core/dictSchema.h
diff --git a/include/core/dictdefs.h b/include/core/dictdefs.h
diff --git a/include/core/dictionaryInstance.h b/include/core/dictionaryInstance.h
diff --git a/include/core/dispnode.h b/include/core/dispnode.h
diff --git a/include/core/dispnodelist.h b/include/core/dispnodelist.h
@@ -21,7 +21,7 @@
 //#include <gennode.inline.h>
 #include <editordefines.h>
 #include <mgrnode.h>
-#include <dispnode.h>
+#include "core/dispnode.h"
 #include <gennodelist.h>
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/src/cleditor/cmdmgr.h b/src/cleditor/cmdmgr.h
@@ -20,8 +20,8 @@
 #include <editordefines.h>
 #include <mgrnode.h>
 #include <mgrnodelist.h>
-#include <dispnode.h>
-#include <dispnodelist.h>
+#include "core/dispnode.h"
+#include "core/dispnodelist.h"
 #include <SingleLinkList.h>
 
 //#define NUM_CMDMGR_CMDS 9
diff --git a/src/clstepcore/CMakeLists.txt b/src/clstepcore/CMakeLists.txt
@@ -63,12 +63,6 @@ set(LIBSTEPCORE_SRCS
 )
 
 set(SC_CLSTEPCORE_HDRS
-  derivedAttribute.h
-  dictSchema.h
-  dictdefs.h
-  dictionaryInstance.h
-  dispnode.h
-  dispnodelist.h
   entityDescriptor.h
   entityDescriptorList.h
   enumTypeDescriptor.h
diff --git a/src/clstepcore/ExpDict.h b/src/clstepcore/ExpDict.h
@@ -24,7 +24,7 @@
 #include <SingleLinkList.h>
 
 #include "core/baseType.h"
-#include <dictdefs.h>
+#include "core/dictdefs.h"
 #include <Str.h>
 
 // each of these contains linked list, list node, iterator
@@ -42,7 +42,7 @@
 #include "inverseAttribute.h"
 
 #include "core/create_Aggr.h"
-#include "dictionaryInstance.h"
+#include "core/dictionaryInstance.h"
 
 #include "uniquenessRule.h"
 #include "whereRule.h"
@@ -53,7 +53,7 @@
 #include "interfaceSpec.h"
 #include "typeOrRuleVar.h"
 #include "globalRule.h"
-#include "dictSchema.h"
+#include "core/dictSchema.h"
 #include "schRename.h"
 
 #include "core/aggrTypeDescriptor.h"
diff --git a/src/clstepcore/dictSchema.cc b/src/clstepcore/dictSchema.cc
@@ -1,4 +1,4 @@
-#include "dictSchema.h"
+#include "core/dictSchema.h"
 
 #include "typeDescriptor.h"
 #include "entityDescriptor.h"
diff --git a/src/clstepcore/dispnode.cc b/src/clstepcore/dispnode.cc
@@ -16,8 +16,8 @@
 #include <gennodelist.h>
 //#include <gennode.inline.h>
 
-#include <dispnode.h>
-#include <dispnodelist.h>
+#include "core/dispnode.h"
+#include "core/dispnodelist.h"
 
 // define this to be the name of the display object
 class StepEntityEditor;
diff --git a/src/clstepcore/dispnodelist.cc b/src/clstepcore/dispnodelist.cc
@@ -17,8 +17,8 @@
 
 #include <mgrnode.h>
 #include <mgrnodelist.h>
-#include <dispnode.h>
-#include <dispnodelist.h>
+#include "core/dispnode.h"
+#include "core/dispnodelist.h"
 
 void DisplayNodeList::Remove( GenericNode * node ) {
     GenNodeList::Remove( node );
diff --git a/src/clstepcore/globalRule.h b/src/clstepcore/globalRule.h
@@ -1,7 +1,7 @@
 #ifndef GLOBALRULE_H
 #define GLOBALRULE_H
 
-#include "dictionaryInstance.h"
+#include "core/dictionaryInstance.h"
 #include "whereRule.h"
 #include "entityDescriptorList.h"
 
diff --git a/src/clstepcore/instmgr.h b/src/clstepcore/instmgr.h
@@ -34,8 +34,8 @@
 #include <mgrnode.h>
 #include <mgrnodelist.h>
 
-#include <dispnode.h>
-#include <dispnodelist.h>
+#include "core/dispnode.h"
+#include "core/dispnodelist.h"
 
 #include <mgrnodearray.h>
 
diff --git a/src/clstepcore/interfaceSpec.h b/src/clstepcore/interfaceSpec.h
@@ -1,7 +1,7 @@
 #ifndef INTERFACESPEC_H
 #define INTERFACESPEC_H
 
-#include "dictionaryInstance.h"
+#include "core/dictionaryInstance.h"
 #include "explicitItemId.h"
 #include "implicitItemId.h"
 
diff --git a/src/clstepcore/interfacedItem.h b/src/clstepcore/interfacedItem.h
@@ -1,7 +1,7 @@
 #ifndef INTERFACEDITEM_H
 #define INTERFACEDITEM_H
 
-#include "dictionaryInstance.h"
+#include "core/dictionaryInstance.h"
 
 #include "sdai.h"
 
diff --git a/src/clstepcore/mgrnode.cc b/src/clstepcore/mgrnode.cc
@@ -14,8 +14,8 @@
 
 #include <mgrnode.h>
 #include <mgrnodelist.h>
-#include <dispnode.h>
-#include <dispnodelist.h>
+#include "core/dispnode.h"
+#include "core/dispnodelist.h"
 
 #include <instmgr.h>
 //#include <STEPentity.h>
diff --git a/src/clstepcore/mgrnodelist.cc b/src/clstepcore/mgrnodelist.cc
@@ -14,8 +14,8 @@
 
 #include <mgrnode.h>
 #include <mgrnodelist.h>
-#include <dispnode.h>
-#include <dispnodelist.h>
+#include "core/dispnode.h"
+#include "core/dispnodelist.h"
 
 MgrNodeList::MgrNodeList( stateEnum type ) : GenNodeList( new MgrNode() ) {
 //    if(debug_level >= PrintFunctionTrace)
diff --git a/src/clstepcore/sdai.h b/src/clstepcore/sdai.h
@@ -27,7 +27,7 @@ extern const char * SCLversion;
 #include <string>
 
 
-#include "dictdefs.h"
+#include "core/dictdefs.h"
 
 #include "core/baseType.h"
 #include "Str.h"
diff --git a/src/clstepcore/typeDescriptor.h b/src/clstepcore/typeDescriptor.h
@@ -3,7 +3,7 @@
 
 #include "schRename.h"
 #include "whereRule.h"
-#include "dictSchema.h"
+#include "core/dictSchema.h"
 
 #include "sc_export.h"
 
diff --git a/src/clstepcore/typeOrRuleVar.h b/src/clstepcore/typeOrRuleVar.h
@@ -1,7 +1,7 @@
 #ifndef TYPEORRULEVAR_H
 #define TYPEORRULEVAR_H
 
-#include "dictionaryInstance.h"
+#include "core/dictionaryInstance.h"
 
 #include "sc_export.h"
 
diff --git a/src/clstepcore/uniquenessRule.h b/src/clstepcore/uniquenessRule.h
@@ -1,7 +1,7 @@
 #ifndef UNIQUENESSRULE_H
 #define UNIQUENESSRULE_H
 
-#include "dictionaryInstance.h"
+#include "core/dictionaryInstance.h"
 
 #include "sdai.h"
 
diff --git a/src/clstepcore/whereRule.h b/src/clstepcore/whereRule.h
@@ -3,7 +3,7 @@
 
 #include <string>
 #include "sdai.h"
-#include "dictionaryInstance.h"
+#include "core/dictionaryInstance.h"
 #include "typeOrRuleVar.h"
 
 #include "sc_export.h"

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#include "dictSchema.h"`
	`1`	`+#include "core/dictSchema.h"`
`2`	`2`
`3`	`3`	`#include "typeDescriptor.h"`
`4`	`4`	`#include "entityDescriptor.h"`