fix build breaks

pandatool/src/egg-palettize/eggPalettize.cxx

@@ -22,11 +22,12 @@
 #include "pal_string_utils.h"
 #include "filenameUnifier.h"
 
-#include <eggData.h>
-#include <bamFile.h>
-#include <notify.h>
-#include <notifyCategory.h>
-#include <notifySeverity.h>
+#include "dcast.h"
+#include "eggData.h"
+#include "bamFile.h"
+#include "notify.h"
+#include "notifyCategory.h"
+#include "notifySeverity.h"
 
 #include <stdio.h>
 

pandatool/src/eggbase/eggReader.cxx

@@ -25,6 +25,7 @@
 #include "eggGroupNode.h"
 #include "eggSwitchCondition.h"
 #include "string_utils.h"
+#include "dcast.h"
 
 ////////////////////////////////////////////////////////////////////
 //     Function: EggReader::Constructor

pandatool/src/eggcharbase/eggCharacterCollection.cxx

@@ -21,14 +21,15 @@
 #include "eggJointData.h"
 #include "eggSliderData.h"
 
-#include <eggGroup.h>
-#include <eggTable.h>
-#include <eggPrimitive.h>
-#include <eggVertex.h>
-#include <eggMorphList.h>
-#include <eggSAnimData.h>
-#include <indirectCompareNames.h>
-#include <indent.h>
+#include "dcast.h"
+#include "eggGroup.h"
+#include "eggTable.h"
+#include "eggPrimitive.h"
+#include "eggVertex.h"
+#include "eggMorphList.h"
+#include "eggSAnimData.h"
+#include "indirectCompareNames.h"
+#include "indent.h"
 
 #include <algorithm>
 

pandatool/src/eggcharbase/eggJointData.cxx

@@ -20,9 +20,10 @@
 #include "eggJointNodePointer.h"
 #include "eggMatrixTablePointer.h"
 
-#include <eggGroup.h>
-#include <eggTable.h>
-#include <indent.h>
+#include "dcast.h"
+#include "eggGroup.h"
+#include "eggTable.h"
+#include "indent.h"
 
 
 ////////////////////////////////////////////////////////////////////

pandatool/src/eggcharbase/eggJointNodePointer.cxx

@@ -18,9 +18,10 @@
 
 #include "eggJointNodePointer.h"
 
-#include <eggObject.h>
-#include <eggGroup.h>
-#include <pointerTo.h>
+#include "dcast.h"
+#include "eggObject.h"
+#include "eggGroup.h"
+#include "pointerTo.h"
 
 
 TypeHandle EggJointNodePointer::_type_handle;

pandatool/src/eggcharbase/eggMatrixTablePointer.cxx

@@ -18,8 +18,9 @@
 
 #include "eggMatrixTablePointer.h"
 
-#include <eggXfmAnimData.h>
-#include <eggXfmSAnim.h>
+#include "dcast.h"
+#include "eggXfmAnimData.h"
+#include "eggXfmSAnim.h"
 
 TypeHandle EggMatrixTablePointer::_type_handle;
 

pandatool/src/eggprogs/eggTopstrip.cxx

@@ -18,12 +18,13 @@
 
 #include "eggTopstrip.h"
 
-#include <eggJointData.h>
-#include <eggCharacterCollection.h>
-#include <eggCharacterData.h>
-#include <eggJointPointer.h>
-#include <eggTable.h>
-#include <compose_matrix.h>
+#include "dcast.h"
+#include "eggJointData.h"
+#include "eggCharacterCollection.h"
+#include "eggCharacterData.h"
+#include "eggJointPointer.h"
+#include "eggTable.h"
+#include "compose_matrix.h"
 
 ////////////////////////////////////////////////////////////////////
 //     Function: EggTopstrip::Constructor

pandatool/src/flt/fltBead.cxx

@@ -28,6 +28,8 @@
 #include "fltTransformRotateScale.h"
 #include "config_flt.h"
 
+#include "dcast.h"
+
 #include <assert.h>
 
 TypeHandle FltBead::_type_handle;

pandatool/src/flt/fltHeader.h

@@ -19,7 +19,7 @@
 #ifndef FLTHEADER_H
 #define FLTHEADER_H
 
-#include <pandatoolbase.h>
+#include "pandatoolbase.h"
 
 #include "fltBeadID.h"
 #include "fltVertex.h"
@@ -30,9 +30,12 @@
 #include "fltTrackplane.h"
 #include "fltInstanceDefinition.h"
 
-#include <filename.h>
-#include <dSearchPath.h>
-#include <distanceUnit.h>
+#include "filename.h"
+#include "dSearchPath.h"
+#include "distanceUnit.h"
+#include "pvector.h"
+#include "pset.h"
+#include "pmap.h"
 
 ////////////////////////////////////////////////////////////////////
 //       Class : FltHeader

pandatool/src/flt/fltRecord.cxx

@@ -35,8 +35,9 @@
 #include "fltExternalReference.h"
 #include "config_flt.h"
 
-#include <indent.h>
-#include <datagramIterator.h>
+#include "dcast.h"
+#include "indent.h"
+#include "datagramIterator.h"
 
 #include <assert.h>
 

pandatool/src/flt/fltRecordWriter.h

@@ -19,12 +19,13 @@
 #ifndef FLTRECORDWRITER_H
 #define FLTRECORDWRITER_H
 
-#include <pandatoolbase.h>
+#include "pandatoolbase.h"
 
 #include "fltOpcode.h"
 #include "fltError.h"
 
-#include <datagram.h>
+#include "datagram.h"
+#include "pset.h"
 
 class FltHeader;
 

pandatool/src/fltegg/fltToEggConverter.cxx

@@ -18,26 +18,27 @@
 
 #include "fltToEggConverter.h"
 
-#include <fltRecord.h>
-#include <fltLOD.h>
-#include <fltGroup.h>
-#include <fltObject.h>
-#include <fltBeadID.h>
-#include <fltBead.h>
-#include <fltFace.h>
-#include <fltVertex.h>
-#include <fltVertexList.h>
-#include <fltExternalReference.h>
-#include <eggData.h>
-#include <eggGroup.h>
-#include <eggSwitchCondition.h>
-#include <eggPrimitive.h>
-#include <eggPolygon.h>
-#include <eggPoint.h>
-#include <eggVertex.h>
-#include <eggVertexPool.h>
-#include <eggExternalReference.h>
-#include <string_utils.h>
+#include "fltRecord.h"
+#include "fltLOD.h"
+#include "fltGroup.h"
+#include "fltObject.h"
+#include "fltBeadID.h"
+#include "fltBead.h"
+#include "fltFace.h"
+#include "fltVertex.h"
+#include "fltVertexList.h"
+#include "fltExternalReference.h"
+#include "dcast.h"
+#include "eggData.h"
+#include "eggGroup.h"
+#include "eggSwitchCondition.h"
+#include "eggPrimitive.h"
+#include "eggPolygon.h"
+#include "eggPoint.h"
+#include "eggVertex.h"
+#include "eggVertexPool.h"
+#include "eggExternalReference.h"
+#include "string_utils.h"
 
 
 ////////////////////////////////////////////////////////////////////

pandatool/src/fltprogs/fltCopy.cxx

@@ -18,11 +18,12 @@
 
 #include "fltCopy.h"
 
-#include <cvsSourceDirectory.h>
-#include <fltHeader.h>
-#include <fltFace.h>
-#include <fltExternalReference.h>
-#include <fltError.h>
+#include "cvsSourceDirectory.h"
+#include "fltHeader.h"
+#include "fltFace.h"
+#include "fltExternalReference.h"
+#include "fltError.h"
+#include "dcast.h"
 
 ////////////////////////////////////////////////////////////////////
 //     Function: FltCopy::Constructor

pandatool/src/lwo/lwoBoundingBox.cxx

@@ -19,7 +19,8 @@
 #include "lwoBoundingBox.h"
 #include "lwoInputFile.h"
 
-#include <indent.h>
+#include "dcast.h"
+#include "indent.h"
 
 TypeHandle LwoBoundingBox::_type_handle;
 

pandatool/src/lwo/lwoDiscontinuousVertexMap.cxx

@@ -19,7 +19,9 @@
 #include "lwoDiscontinuousVertexMap.h"
 #include "lwoInputFile.h"
 
-#include <indent.h>
+#include "dcast.h"
+#include "indent.h"
+
 #include <algorithm>
 
 TypeHandle LwoDiscontinuousVertexMap::_type_handle;

pandatool/src/lwo/lwoHeader.cxx

@@ -19,7 +19,8 @@
 #include "lwoHeader.h"
 #include "lwoInputFile.h"
 
-#include <indent.h>
+#include "dcast.h"
+#include "indent.h"
 
 TypeHandle LwoHeader::_type_handle;
 

pandatool/src/lwo/lwoLayer.cxx

@@ -19,7 +19,8 @@
 #include "lwoLayer.h"
 #include "lwoInputFile.h"
 
-#include <indent.h>
+#include "dcast.h"
+#include "indent.h"
 
 TypeHandle LwoLayer::_type_handle;
 

pandatool/src/lwo/lwoPoints.cxx

@@ -19,7 +19,8 @@
 #include "lwoPoints.h"
 #include "lwoInputFile.h"
 
-#include <indent.h>
+#include "dcast.h"
+#include "indent.h"
 
 TypeHandle LwoPoints::_type_handle;
 

pandatool/src/lwo/lwoPolygonTags.cxx

@@ -19,7 +19,8 @@
 #include "lwoPolygonTags.h"
 #include "lwoInputFile.h"
 
-#include <indent.h>
+#include "dcast.h"
+#include "indent.h"
 
 TypeHandle LwoPolygonTags::_type_handle;
 

pandatool/src/lwo/lwoPolygons.cxx

@@ -19,7 +19,8 @@
 #include "lwoPolygons.h"
 #include "lwoInputFile.h"
 
-#include <indent.h>
+#include "dcast.h"
+#include "indent.h"
 
 TypeHandle LwoPolygons::_type_handle;
 

pandatool/src/lwo/lwoStillImage.cxx

@@ -19,7 +19,8 @@
 #include "lwoStillImage.h"
 #include "lwoInputFile.h"
 
-#include <indent.h>
+#include "dcast.h"
+#include "indent.h"
 
 TypeHandle LwoStillImage::_type_handle;
 

pandatool/src/lwo/lwoSurfaceBlock.cxx

@@ -27,7 +27,8 @@
 #include "lwoSurfaceBlockWrap.h"
 #include "lwoSurfaceBlockVMapName.h"
 
-#include <indent.h>
+#include "dcast.h"
+#include "indent.h"
 
 TypeHandle LwoSurfaceBlock::_type_handle;
 

pandatool/src/lwo/lwoSurfaceBlockAxis.cxx

@@ -19,7 +19,8 @@
 #include "lwoSurfaceBlockAxis.h"
 #include "lwoInputFile.h"
 
-#include <indent.h>
+#include "dcast.h"
+#include "indent.h"
 
 TypeHandle LwoSurfaceBlockAxis::_type_handle;
 

pandatool/src/lwo/lwoSurfaceBlockChannel.cxx

@@ -19,7 +19,8 @@
 #include "lwoSurfaceBlockChannel.h"
 #include "lwoInputFile.h"
 
-#include <indent.h>
+#include "dcast.h"
+#include "indent.h"
 
 TypeHandle LwoSurfaceBlockChannel::_type_handle;
 

pandatool/src/lwo/lwoSurfaceBlockCoordSys.cxx

@@ -19,7 +19,8 @@
 #include "lwoSurfaceBlockCoordSys.h"
 #include "lwoInputFile.h"
 
-#include <indent.h>
+#include "dcast.h"
+#include "indent.h"
 
 TypeHandle LwoSurfaceBlockCoordSys::_type_handle;
 

pandatool/src/lwo/lwoSurfaceBlockEnabled.cxx

@@ -19,7 +19,8 @@
 #include "lwoSurfaceBlockEnabled.h"
 #include "lwoInputFile.h"
 
-#include <indent.h>
+#include "dcast.h"
+#include "indent.h"
 
 TypeHandle LwoSurfaceBlockEnabled::_type_handle;
 

pandatool/src/lwo/lwoSurfaceBlockHeader.cxx

@@ -23,7 +23,8 @@
 #include "lwoSurfaceBlockOpacity.h"
 #include "lwoSurfaceBlockAxis.h"
 
-#include <indent.h>
+#include "dcast.h"
+#include "indent.h"
 
 TypeHandle LwoSurfaceBlockHeader::_type_handle;
 

pandatool/src/lwo/lwoSurfaceBlockImage.cxx

@@ -19,7 +19,8 @@
 #include "lwoSurfaceBlockImage.h"
 #include "lwoInputFile.h"
 
-#include <indent.h>
+#include "dcast.h"
+#include "indent.h"
 
 TypeHandle LwoSurfaceBlockImage::_type_handle;
 

pandatool/src/lwo/lwoSurfaceBlockOpacity.cxx

@@ -19,7 +19,8 @@
 #include "lwoSurfaceBlockOpacity.h"
 #include "lwoInputFile.h"
 
-#include <indent.h>
+#include "dcast.h"
+#include "indent.h"
 
 TypeHandle LwoSurfaceBlockOpacity::_type_handle;
 

pandatool/src/lwo/lwoSurfaceBlockProjection.cxx

@@ -19,7 +19,8 @@
 #include "lwoSurfaceBlockProjection.h"
 #include "lwoInputFile.h"
 
-#include <indent.h>
+#include "dcast.h"
+#include "indent.h"
 
 TypeHandle LwoSurfaceBlockProjection::_type_handle;
 

pandatool/src/lwo/lwoSurfaceBlockRefObj.cxx

@@ -19,7 +19,8 @@
 #include "lwoSurfaceBlockRefObj.h"
 #include "lwoInputFile.h"
 
-#include <indent.h>
+#include "dcast.h"
+#include "indent.h"
 
 TypeHandle LwoSurfaceBlockRefObj::_type_handle;
 

pandatool/src/lwo/lwoSurfaceBlockRepeat.cxx

@@ -19,7 +19,8 @@
 #include "lwoSurfaceBlockRepeat.h"
 #include "lwoInputFile.h"
 
-#include <indent.h>
+#include "dcast.h"
+#include "indent.h"
 
 TypeHandle LwoSurfaceBlockRepeat::_type_handle;
 

pandatool/src/lwo/lwoSurfaceBlockTMap.cxx

@@ -22,7 +22,8 @@
 #include "lwoSurfaceBlockTransform.h"
 #include "lwoSurfaceBlockRefObj.h"
 
-#include <indent.h>
+#include "dcast.h"
+#include "indent.h"
 
 TypeHandle LwoSurfaceBlockTMap::_type_handle;
 

pandatool/src/lwo/lwoSurfaceBlockTransform.cxx

@@ -19,7 +19,8 @@
 #include "lwoSurfaceBlockTransform.h"
 #include "lwoInputFile.h"
 
-#include <indent.h>
+#include "dcast.h"
+#include "indent.h"
 
 TypeHandle LwoSurfaceBlockTransform::_type_handle;
 

pandatool/src/lwo/lwoSurfaceBlockVMapName.cxx

@@ -19,7 +19,8 @@
 #include "lwoSurfaceBlockVMapName.h"
 #include "lwoInputFile.h"
 
-#include <indent.h>
+#include "dcast.h"
+#include "indent.h"
 
 TypeHandle LwoSurfaceBlockVMapName::_type_handle;
 

pandatool/src/lwo/lwoSurfaceBlockWrap.cxx

@@ -19,7 +19,8 @@
 #include "lwoSurfaceBlockWrap.h"
 #include "lwoInputFile.h"
 
-#include <indent.h>
+#include "dcast.h"
+#include "indent.h"
 
 TypeHandle LwoSurfaceBlockWrap::_type_handle;
 

pandatool/src/lwo/lwoSurfaceColor.cxx

@@ -19,7 +19,8 @@
 #include "lwoSurfaceColor.h"
 #include "lwoInputFile.h"
 
-#include <indent.h>
+#include "dcast.h"
+#include "indent.h"
 
 TypeHandle LwoSurfaceColor::_type_handle;
 

pandatool/src/lwo/lwoSurfaceParameter.cxx

@@ -19,7 +19,8 @@
 #include "lwoSurfaceParameter.h"
 #include "lwoInputFile.h"
 
-#include <indent.h>
+#include "dcast.h"
+#include "indent.h"
 
 TypeHandle LwoSurfaceParameter::_type_handle;
 

pandatool/src/lwo/lwoSurfaceSidedness.cxx

@@ -19,7 +19,8 @@
 #include "lwoSurfaceSidedness.h"
 #include "lwoInputFile.h"
 
-#include <indent.h>
+#include "dcast.h"
+#include "indent.h"
 
 TypeHandle LwoSurfaceSidedness::_type_handle;
 

pandatool/src/lwo/lwoSurfaceSmoothingAngle.cxx

@@ -19,8 +19,9 @@
 #include "lwoSurfaceSmoothingAngle.h"
 #include "lwoInputFile.h"
 
-#include <indent.h>
-#include <deg_2_rad.h>
+#include "dcast.h"
+#include "indent.h"
+#include "deg_2_rad.h"
 
 TypeHandle LwoSurfaceSmoothingAngle::_type_handle;
 

pandatool/src/lwo/lwoTags.cxx

@@ -19,7 +19,8 @@
 #include "lwoTags.h"
 #include "lwoInputFile.h"
 
-#include <indent.h>
+#include "dcast.h"
+#include "indent.h"
 
 TypeHandle LwoTags::_type_handle;
 

pandatool/src/lwo/lwoVertexMap.cxx

@@ -19,7 +19,8 @@
 #include "lwoVertexMap.h"
 #include "lwoInputFile.h"
 
-#include <indent.h>
+#include "dcast.h"
+#include "indent.h"
 
 TypeHandle LwoVertexMap::_type_handle;
 

pandatool/src/lwoegg/cLwoClip.cxx

@@ -19,8 +19,9 @@
 #include "cLwoClip.h"
 #include "lwoToEggConverter.h"
 
-#include <lwoClip.h>
-#include <lwoStillImage.h>
+#include "lwoClip.h"
+#include "lwoStillImage.h"
+#include "dcast.h"
 
 
 ////////////////////////////////////////////////////////////////////

pandatool/src/lwoegg/cLwoSurface.cxx

@@ -21,14 +21,15 @@
 #include "cLwoClip.h"
 #include "lwoToEggConverter.h"
 
-#include <lwoSurfaceColor.h>
-#include <lwoSurfaceParameter.h>
-#include <lwoSurfaceSmoothingAngle.h>
-#include <lwoSurfaceSidedness.h>
-#include <lwoSurfaceBlock.h>
-#include <eggPrimitive.h>
-#include <string_utils.h>
-#include <mathNumbers.h>
+#include "lwoSurfaceColor.h"
+#include "lwoSurfaceParameter.h"
+#include "lwoSurfaceSmoothingAngle.h"
+#include "lwoSurfaceSidedness.h"
+#include "lwoSurfaceBlock.h"
+#include "eggPrimitive.h"
+#include "string_utils.h"
+#include "mathNumbers.h"
+#include "dcast.h"
 
 
 ////////////////////////////////////////////////////////////////////

pandatool/src/lwoegg/cLwoSurfaceBlock.cxx

@@ -20,11 +20,12 @@
 #include "cLwoSurfaceBlockTMap.h"
 #include "lwoToEggConverter.h"
 
-#include <lwoSurfaceBlockChannel.h>
-#include <lwoSurfaceBlockEnabled.h>
-#include <lwoSurfaceBlockImage.h>
-#include <lwoSurfaceBlockRepeat.h>
-#include <lwoSurfaceBlockVMapName.h>
+#include "lwoSurfaceBlockChannel.h"
+#include "lwoSurfaceBlockEnabled.h"
+#include "lwoSurfaceBlockImage.h"
+#include "lwoSurfaceBlockRepeat.h"
+#include "lwoSurfaceBlockVMapName.h"
+#include "dcast.h"
 
 
 ////////////////////////////////////////////////////////////////////

pandatool/src/lwoegg/cLwoSurfaceBlockTMap.cxx

@@ -19,9 +19,10 @@
 #include "cLwoSurfaceBlockTMap.h"
 #include "lwoToEggConverter.h"
 
-#include <lwoSurfaceBlockTransform.h>
-#include <lwoSurfaceBlockRefObj.h>
-#include <compose_matrix.h>
+#include "lwoSurfaceBlockTransform.h"
+#include "lwoSurfaceBlockRefObj.h"
+#include "compose_matrix.h"
+#include "dcast.h"
 
 ////////////////////////////////////////////////////////////////////
 //     Function: CLwoSurfaceBlockTMap::Constructor

pandatool/src/lwoegg/lwoToEggConverter.cxx

@@ -23,17 +23,18 @@
 #include "cLwoPolygons.h"
 #include "cLwoSurface.h"
 
-#include <eggData.h>
-#include <lwoHeader.h>
-#include <lwoLayer.h>
-#include <lwoClip.h>
-#include <lwoPoints.h>
-#include <lwoPolygons.h>
-#include <lwoVertexMap.h>
-#include <lwoDiscontinuousVertexMap.h>
-#include <lwoTags.h>
-#include <lwoPolygonTags.h>
-#include <lwoInputFile.h>
+#include "eggData.h"
+#include "lwoHeader.h"
+#include "lwoLayer.h"
+#include "lwoClip.h"
+#include "lwoPoints.h"
+#include "lwoPolygons.h"
+#include "lwoVertexMap.h"
+#include "lwoDiscontinuousVertexMap.h"
+#include "lwoTags.h"
+#include "lwoPolygonTags.h"
+#include "lwoInputFile.h"
+#include "dcast.h"
 
 
 ////////////////////////////////////////////////////////////////////

pandatool/src/pstatserver/pStatView.cxx

@@ -18,12 +18,13 @@
 
 #include "pStatView.h"
 
-#include <pStatFrameData.h>
-#include <pStatCollectorDef.h>
-#include <vector_int.h>
+#include "pStatFrameData.h"
+#include "pStatCollectorDef.h"
+#include "vector_int.h"
+#include "plist.h"
+#include "pset.h"
 
 #include <algorithm>
-#include "plist.h"
 
 
 

pandatool/src/xfile/xFileToEggConverter.cxx

@@ -27,6 +27,7 @@
 #include "datagram.h"
 #include "eggMaterialCollection.h"
 #include "eggTextureCollection.h"
+#include "dcast.h"
 
 ////////////////////////////////////////////////////////////////////
 //     Function: XFileToEggConverter::Constructor