putil: Rename config_util to config_putil

makepanda/makepanda.vcproj

@@ -1228,7 +1228,7 @@
 				<File RelativePath="..\panda\src\putil\pta_double.h"></File>
 				<File RelativePath="..\panda\src\putil\copyOnWritePointer.cxx"></File>
 				<File RelativePath="..\panda\src\putil\bitMask.cxx"></File>
-				<File RelativePath="..\panda\src\putil\config_util.h"></File>
+				<File RelativePath="..\panda\src\putil\config_putil.h"></File>
 				<File RelativePath="..\panda\src\putil\clockObject.h"></File>
 				<File RelativePath="..\panda\src\putil\lineStream.h"></File>
 				<File RelativePath="..\panda\src\putil\datagramInputFile.cxx"></File>
@@ -1307,7 +1307,7 @@
 				<File RelativePath="..\panda\src\putil\bamCacheRecord.I"></File>
 				<File RelativePath="..\panda\src\putil\animInterface.cxx"></File>
 				<File RelativePath="..\panda\src\putil\lineStreamBuf.h"></File>
-				<File RelativePath="..\panda\src\putil\config_util.cxx"></File>
+				<File RelativePath="..\panda\src\putil\config_putil.cxx"></File>
 				<File RelativePath="..\panda\src\putil\cachedTypedWritableReferenceCount.cxx"></File>
 				<File RelativePath="..\panda\src\putil\pythonCallbackObject.cxx"></File>
 				<File RelativePath="..\panda\src\putil\test_linestream.cxx"></File>

panda/src/android/android_main.cxx

@@ -12,7 +12,7 @@
  */
 
 #include "config_android.h"
-#include "config_util.h"
+#include "config_putil.h"
 #include "virtualFileMountAndroidAsset.h"
 #include "virtualFileSystem.h"
 #include "filename.h"

panda/src/audio/audioManager.cxx

@@ -18,7 +18,7 @@
 #include "nullAudioManager.h"
 #include "windowsRegistry.h"
 #include "virtualFileSystem.h"
-#include "config_util.h"
+#include "config_putil.h"
 #include "load_dso.h"
 
 #ifdef WIN32

panda/src/audiotraits/fmodAudioManager.cxx

@@ -20,7 +20,7 @@
 
 // Panda headers.
 #include "config_audio.h"
-#include "config_util.h"
+#include "config_putil.h"
 #include "fmodAudioManager.h"
 #include "fmodAudioSound.h"
 #include "filename.h"

panda/src/audiotraits/milesAudioManager.cxx

@@ -21,7 +21,7 @@
 #include "milesAudioStream.h"
 #include "globalMilesManager.h"
 #include "config_audio.h"
-#include "config_util.h"
+#include "config_putil.h"
 #include "config_express.h"
 #include "virtualFileSystem.h"
 #include "nullAudioSound.h"

panda/src/audiotraits/openalAudioManager.cxx

@@ -14,7 +14,7 @@
 
 // Panda headers.
 #include "config_audio.h"
-#include "config_util.h"
+#include "config_putil.h"
 #include "config_express.h"
 #include "config_openalAudio.h"
 #include "openalAudioManager.h"

panda/src/collada/load_collada_file.cxx

@@ -16,7 +16,7 @@
 #include "config_collada.h"
 #include "sceneGraphReducer.h"
 #include "virtualFileSystem.h"
-#include "config_util.h"
+#include "config_putil.h"
 #include "bamCacheRecord.h"
 
 static PT(PandaNode)

panda/src/display/graphicsPipeSelection.cxx

@@ -19,7 +19,7 @@
 #include "config_display.h"
 #include "typeRegistry.h"
 #include "pset.h"
-#include "config_util.h"
+#include "config_putil.h"
 
 #include <algorithm>
 

panda/src/egg/eggData.cxx

@@ -18,7 +18,7 @@
 #include "eggComment.h"
 #include "eggPoolUniquifier.h"
 #include "config_egg.h"
-#include "config_util.h"
+#include "config_putil.h"
 #include "config_express.h"
 #include "string_utils.h"
 #include "dSearchPath.h"

panda/src/egg2pg/load_egg_file.cxx

@@ -16,7 +16,7 @@
 #include "config_egg2pg.h"
 #include "sceneGraphReducer.h"
 #include "virtualFileSystem.h"
-#include "config_util.h"
+#include "config_putil.h"
 #include "bamCacheRecord.h"
 
 static PT(PandaNode)

panda/src/egg2pg/save_egg_file.cxx

@@ -17,7 +17,7 @@
 #include "modelRoot.h"
 #include "sceneGraphReducer.h"
 #include "virtualFileSystem.h"
-#include "config_util.h"
+#include "config_putil.h"
 
 /**
  * A convenience function; converts the indicated scene graph to an egg file

panda/src/glstuff/glGraphicsStateGuardian_src.cxx

@@ -14,7 +14,7 @@
  *   get_supports_cg_profile)
  */
 
-#include "config_util.h"
+#include "config_putil.h"
 #include "displayRegion.h"
 #include "renderBuffer.h"
 #include "geom.h"

panda/src/gobj/config_gobj.cxx

@@ -13,7 +13,7 @@
 
 #include "animateVerticesRequest.h"
 #include "bufferContext.h"
-#include "config_util.h"
+#include "config_putil.h"
 #include "config_gobj.h"
 #include "geom.h"
 #include "geomCacheEntry.h"

panda/src/gobj/shader.cxx

@@ -19,7 +19,7 @@
 #include "shader.h"
 #include "preparedGraphicsObjects.h"
 #include "virtualFileSystem.h"
-#include "config_util.h"
+#include "config_putil.h"
 #include "bamCache.h"
 #include "string_utils.h"
 

panda/src/gobj/texture.cxx

@@ -16,7 +16,7 @@
 #include "pandabase.h"
 #include "texture.h"
 #include "config_gobj.h"
-#include "config_util.h"
+#include "config_putil.h"
 #include "texturePool.h"
 #include "textureContext.h"
 #include "bamCache.h"

panda/src/gobj/texturePool.cxx

@@ -15,7 +15,7 @@
 
 #include "texturePool.h"
 #include "config_gobj.h"
-#include "config_util.h"
+#include "config_putil.h"
 #include "config_express.h"
 #include "string_utils.h"
 #include "virtualFileSystem.h"

panda/src/iphonedisplay/iPhoneGraphicsWindow.mm

@@ -31,7 +31,7 @@
 #include "throw_event.h"
 #include "pnmImage.h"
 #include "virtualFileSystem.h"
-#include "config_util.h"
+#include "config_putil.h"
 #include "pset.h"
 #include "pmutex.h"
 

panda/src/movies/movieTypeRegistry.cxx

@@ -14,7 +14,7 @@
 #include "movieTypeRegistry.h"
 #include "string_utils.h"
 #include "config_movies.h"
-#include "config_util.h"
+#include "config_putil.h"
 #include "load_dso.h"
 
 MovieTypeRegistry *MovieTypeRegistry::_global_ptr = NULL;

panda/src/osxdisplay/osxGraphicsWindow.mm

@@ -36,7 +36,7 @@
 #include "throw_event.h"
 #include "pnmImage.h"
 #include "virtualFileSystem.h"
-#include "config_util.h"
+#include "config_putil.h"
 #include "pset.h"
 #include "pmutex.h"
 

panda/src/pgraph/bamFile.cxx

@@ -16,7 +16,7 @@
 
 #include "bam.h"
 #include "bamCacheRecord.h"
-#include "config_util.h"
+#include "config_putil.h"
 #include "bamReader.h"
 #include "bamWriter.h"
 #include "filename.h"

panda/src/pgraph/loader.cxx

@@ -19,7 +19,7 @@
 #include "modelLoadRequest.h"
 #include "modelSaveRequest.h"
 #include "config_express.h"
-#include "config_util.h"
+#include "config_putil.h"
 #include "virtualFileSystem.h"
 #include "filename.h"
 #include "load_dso.h"

panda/src/pgraph/shaderPool.cxx

@@ -12,7 +12,7 @@
  */
 
 #include "shaderPool.h"
-#include "config_util.h"
+#include "config_putil.h"
 #include "config_express.h"
 #include "virtualFileSystem.h"
 #include "loader.h"

panda/src/physx/physxEnums.cxx

@@ -14,7 +14,7 @@
 #include "physxEnums.h"
 
 #include "string_utils.h"
-#include "config_util.h"
+#include "config_putil.h"
 
 ostream &
 operator << (ostream &out, PhysxEnums::PhysxUpAxis axis) {

panda/src/pnmtext/freetypeFont.cxx

@@ -16,7 +16,7 @@
 #ifdef HAVE_FREETYPE
 
 #include "config_pnmtext.h"
-#include "config_util.h"
+#include "config_putil.h"
 #include "config_express.h"
 #include "virtualFileSystem.h"
 #include "nurbsCurveEvaluator.h"

panda/src/putil/autoTextureScale.cxx

@@ -13,7 +13,7 @@
 
 #include "autoTextureScale.h"
 #include "string_utils.h"
-#include "config_util.h"
+#include "config_putil.h"
 
 ostream &
 operator << (ostream &out, AutoTextureScale ats) {

panda/src/putil/bamCache.cxx

@@ -18,7 +18,7 @@
 #include "hashVal.h"
 #include "datagramInputFile.h"
 #include "datagramOutputFile.h"
-#include "config_util.h"
+#include "config_putil.h"
 #include "bam.h"
 #include "typeRegistry.h"
 #include "string_utils.h"

panda/src/putil/bamCacheIndex.cxx

@@ -14,7 +14,7 @@
 #include "bamCacheIndex.h"
 #include "bamReader.h"
 #include "bamWriter.h"
-#include "config_util.h" // util_cat
+#include "config_putil.h" // util_cat
 #include "indent.h"
 #include <algorithm>
 

panda/src/putil/bamCacheRecord.cxx

@@ -17,7 +17,7 @@
 #include "virtualFileSystem.h"
 #include "virtualFile.h"
 #include "indent.h"
-#include "config_util.h" // util_cat
+#include "config_putil.h" // util_cat
 
 TypeHandle BamCacheRecord::_type_handle;
 

panda/src/putil/bamEnums.cxx

@@ -13,7 +13,7 @@
 
 #include "bamEnums.h"
 #include "string_utils.h"
-#include "config_util.h"
+#include "config_putil.h"
 
 ostream &
 operator << (ostream &out, BamEnums::BamEndian be) {

panda/src/putil/bamReader.cxx

@@ -17,7 +17,7 @@
 #include "bam.h"
 #include "bamReader.h"
 #include "datagramIterator.h"
-#include "config_util.h"
+#include "config_putil.h"
 #include "pipelineCyclerBase.h"
 
 TypeHandle BamReaderAuxData::_type_handle;

panda/src/putil/bamReader_ext.cxx

@@ -12,7 +12,7 @@
  */
 
 #include "bamReader_ext.h"
-#include "config_util.h"
+#include "config_putil.h"
 #include "pythonThread.h"
 
 #ifdef HAVE_PYTHON

panda/src/putil/bamWriter.cxx

@@ -15,7 +15,7 @@
 #include "pnotify.h"
 
 #include "typedWritable.h"
-#include "config_util.h"
+#include "config_putil.h"
 #include "bam.h"
 #include "bamWriter.h"
 #include "bamReader.h"

panda/src/putil/buttonRegistry.cxx

@@ -12,7 +12,7 @@
  */
 
 #include "buttonRegistry.h"
-#include "config_util.h"
+#include "config_putil.h"
 
 #include <stdio.h>
 

panda/src/putil/clockObject.cxx

@@ -12,7 +12,7 @@
  */
 
 #include "clockObject.h"
-#include "config_util.h"
+#include "config_putil.h"
 #include "configVariableEnum.h"
 #include "string_utils.h"
 #include "thread.h"

panda/src/putil/colorSpace.cxx

@@ -12,7 +12,7 @@
  */
 
 #include "colorSpace.h"
-#include "config_util.h"
+#include "config_putil.h"
 #include "configVariableEnum.h"
 #include "string_utils.h"
 

panda/src/putil/config_util.cxx → panda/src/putil/config_putil.cxx

@@ -6,12 +6,12 @@
  * license.  You should have received a copy of this license along
  * with this source code in a file named "LICENSE."
  *
- * @file config_util.cxx
+ * @file config_putil.cxx
  * @author cary
  * @date 2000-01-04
  */
 
-#include "config_util.h"
+#include "config_putil.h"
 #include "animInterface.h"
 #include "bamCacheIndex.h"
 #include "bamCacheRecord.h"
@@ -51,7 +51,7 @@
   #error Buildsystem error: BUILDING_PANDA_PUTIL not defined
 #endif
 
-ConfigureDef(config_util);
+ConfigureDef(config_putil);
 NotifyCategoryDef(util, "");
 NotifyCategoryDef(bam, util_cat);
 
@@ -88,7 +88,7 @@ ConfigVariableEnum<BamEnums::BamTextureMode> bam_texture_mode
  PRC_DESC("Set this to specify how textures should be written into Bam files."
           "See the panda source or documentation for available options."));
 
-ConfigureFn(config_util) {
+ConfigureFn(config_putil) {
   init_libputil();
 }
 

panda/src/putil/config_util.h → panda/src/putil/config_putil.h

@@ -6,7 +6,7 @@
  * license.  You should have received a copy of this license along
  * with this source code in a file named "LICENSE."
  *
- * @file config_util.h
+ * @file config_putil.h
  * @author cary
  * @date 2000-01-04
  */
@@ -24,7 +24,7 @@
 
 class DSearchPath;
 
-ConfigureDecl(config_util, EXPCL_PANDA_PUTIL, EXPTP_PANDA_PUTIL);
+ConfigureDecl(config_putil, EXPCL_PANDA_PUTIL, EXPTP_PANDA_PUTIL);
 NotifyCategoryDecl(util, EXPCL_PANDA_PUTIL, EXPTP_PANDA_PUTIL);
 NotifyCategoryDecl(bam, EXPCL_PANDA_PUTIL, EXPTP_PANDA_PUTIL);
 

panda/src/putil/copyOnWritePointer.cxx

@@ -12,7 +12,7 @@
  */
 
 #include "copyOnWritePointer.h"
-#include "config_util.h"
+#include "config_putil.h"
 #include "config_pipeline.h"
 
 #ifdef COW_THREADED

panda/src/putil/datagramInputFile.cxx

@@ -16,7 +16,7 @@
 #include "numeric_types.h"
 #include "datagramIterator.h"
 #include "profileTimer.h"
-#include "config_util.h"
+#include "config_putil.h"
 #include "config_express.h"
 #include "virtualFileSystem.h"
 #include "streamReader.h"

panda/src/putil/datagramOutputFile.h

@@ -21,7 +21,7 @@
 #include "fileReference.h"
 #include "virtualFile.h"
 #include "virtualFileSystem.h"
-#include "config_util.h"
+#include "config_putil.h"
 
 /**
  * This class can be used to write a binary file that consists of an arbitrary

panda/src/putil/factoryBase.cxx

@@ -13,7 +13,7 @@
 
 #include "factoryBase.h"
 #include "indent.h"
-#include "config_util.h"
+#include "config_putil.h"
 
 /**
  *

panda/src/putil/globalPointerRegistry.cxx

@@ -12,7 +12,7 @@
  */
 
 #include "globalPointerRegistry.h"
-#include "config_util.h"
+#include "config_putil.h"
 
 // In general, we use the util_cat->info() syntax in this file (instead of
 // util_cat.info()), because much of this work is done at static init time,

panda/src/putil/keyboardButton.cxx

@@ -84,7 +84,7 @@ DEFINE_KEYBD_BUTTON_HANDLE(rmeta)
 
 /**
  * This is intended to be called only once, by the static initialization
- * performed in config_util.cxx.
+ * performed in config_putil.cxx.
  */
 void KeyboardButton::
 init_keyboard_buttons() {

panda/src/putil/load_prc_file.cxx

@@ -16,7 +16,7 @@
 #include "configVariableManager.h"
 #include "virtualFileSystem.h"
 #include "config_express.h"
-#include "config_util.h"
+#include "config_putil.h"
 #include "hashVal.h"
 
 /**

panda/src/putil/loaderOptions.cxx

@@ -12,7 +12,7 @@
  */
 
 #include "loaderOptions.h"
-#include "config_util.h"
+#include "config_putil.h"
 #include "indent.h"
 
 /**
@@ -25,7 +25,7 @@ LoaderOptions(int flags) :
   _texture_num_views(0),
   _auto_texture_scale(ATS_unspecified)
 {
-  // Shadowing the variables in config_util for static init ordering issues.
+  // Shadowing the variables in config_putil for static init ordering issues.
   static ConfigVariableBool *preload_textures;
   static ConfigVariableBool *preload_simple_textures;
   static ConfigVariableBool *compressed_textures;

panda/src/putil/mouseButton.cxx

@@ -129,7 +129,7 @@ is_mouse_button(ButtonHandle button) {
 
 /**
  * This is intended to be called only once, by the static initialization
- * performed in config_util.cxx.
+ * performed in config_putil.cxx.
  */
 void MouseButton::
 init_mouse_buttons() {

panda/src/putil/p3putil_composite1.cxx

@@ -17,7 +17,7 @@
 #include "callbackObject.cxx"
 #include "clockObject.cxx"
 #include "colorSpace.cxx"
-#include "config_util.cxx"
+#include "config_putil.cxx"
 #include "configurable.cxx"
 #include "copyOnWriteObject.cxx"
 #include "copyOnWritePointer.cxx"

panda/src/putil/pythonCallbackObject.cxx

@@ -18,7 +18,7 @@
 #include "py_panda.h"
 #include "pythonThread.h"
 #include "callbackData.h"
-#include "config_util.h"
+#include "config_putil.h"
 
 TypeHandle PythonCallbackObject::_type_handle;
 

panda/src/putil/simpleHashMap.h

@@ -16,7 +16,7 @@
 
 #include "pandabase.h"
 #include "pvector.h"
-#include "config_util.h"
+#include "config_putil.h"
 
 /**
  * Entry in the SimpleHashMap.

panda/src/putil/test_filename.cxx

@@ -12,7 +12,7 @@
  */
 
 #include "filename.h"
-#include "config_util.h"
+#include "config_putil.h"
 
 #include "dSearchPath.h"
 

panda/src/putil/weakKeyHashMap.h

@@ -16,7 +16,7 @@
 
 #include "pandabase.h"
 #include "pvector.h"
-#include "config_util.h"
+#include "config_putil.h"
 #include "weakPointerTo.h"
 
 /**

panda/src/speedtree/speedTreeNode.cxx

@@ -15,7 +15,7 @@
 #include "speedTreeNode.h"
 #include "stBasicTerrain.h"
 #include "virtualFileSystem.h"
-#include "config_util.h"
+#include "config_putil.h"
 #include "cullTraverser.h"
 #include "cullableObject.h"
 #include "cullHandler.h"

panda/src/text/dynamicTextFont.cxx

@@ -28,7 +28,7 @@
 #endif
 
 #include "config_text.h"
-#include "config_util.h"
+#include "config_putil.h"
 #include "config_express.h"
 #include "virtualFileSystem.h"
 #include "geomVertexData.h"

panda/src/text/fontPool.cxx

@@ -14,7 +14,7 @@
 #include "fontPool.h"
 #include "staticTextFont.h"
 #include "dynamicTextFont.h"
-#include "config_util.h"
+#include "config_putil.h"
 #include "config_express.h"
 #include "virtualFileSystem.h"
 #include "nodePath.h"

panda/src/tinydisplay/tinyOsxGraphicsWindow.mm

@@ -26,7 +26,7 @@
 #include "throw_event.h"
 #include "pnmImage.h"
 #include "virtualFileSystem.h"
-#include "config_util.h"
+#include "config_putil.h"
 
 #include <ApplicationServices/ApplicationServices.h>
 

panda/src/windisplay/winGraphicsWindow.cxx

@@ -19,7 +19,7 @@
 #include "keyboardButton.h"
 #include "mouseButton.h"
 #include "clockObject.h"
-#include "config_util.h"
+#include "config_putil.h"
 #include "throw_event.h"
 #include "nativeWindowHandle.h"
 

pandatool/src/bam/eggToBam.cxx

@@ -13,7 +13,7 @@
 
 #include "eggToBam.h"
 
-#include "config_util.h"
+#include "config_putil.h"
 #include "bamFile.h"
 #include "load_egg_file.h"
 #include "config_egg2pg.h"

pandatool/src/bam/ptsToBam.cxx

@@ -13,7 +13,7 @@
 
 #include "ptsToBam.h"
 
-#include "config_util.h"
+#include "config_putil.h"
 #include "geomPoints.h"
 #include "bamFile.h"
 #include "pandaNode.h"

pandatool/src/converter/somethingToEggConverter.h

@@ -17,7 +17,7 @@
 #include "pandatoolbase.h"
 
 #include "filename.h"
-#include "config_util.h"  // for get_model_path()
+#include "config_putil.h"  // for get_model_path()
 #include "animationConvert.h"
 #include "pathReplace.h"
 #include "pointerTo.h"

pandatool/src/egg-palettize/txaFileFilter.cxx

@@ -20,7 +20,7 @@
 #include "dconfig.h"
 #include "configVariableFilename.h"
 #include "virtualFileSystem.h"
-#include "config_util.h"
+#include "config_putil.h"
 
 NotifyCategoryDeclNoExport(txafile);
 NotifyCategoryDef(txafile, "");

pandatool/src/eggbase/eggReader.cxx

@@ -14,7 +14,7 @@
 #include "eggReader.h"
 
 #include "pnmImage.h"
-#include "config_util.h"
+#include "config_putil.h"
 #include "eggTextureCollection.h"
 #include "eggGroup.h"
 #include "eggGroupNode.h"

pandatool/src/eggbase/somethingToEgg.cxx

@@ -14,7 +14,7 @@
 #include "somethingToEgg.h"
 #include "somethingToEggConverter.h"
 
-#include "config_util.h"
+#include "config_putil.h"
 
 /**
  * The first parameter to the constructor should be the one-word name of the

pandatool/src/flt/fltTexture.cxx

@@ -16,7 +16,7 @@
 #include "fltRecordWriter.h"
 #include "fltHeader.h"
 #include "pathReplace.h"
-#include "config_util.h"
+#include "config_putil.h"
 
 TypeHandle FltTexture::_type_handle;
 

pandatool/src/maxegg/maxToEggConverter.cxx

@@ -25,7 +25,7 @@
  */
 
 #include "maxEgg.h"
-#include "config_util.h"
+#include "config_putil.h"
 
 /**
  *

pandatool/src/mayaprogs/mayaPview.cxx

@@ -19,7 +19,7 @@
 #include "mayaToEggConverter.h"
 #include "eggData.h"
 #include "load_egg_file.h"
-#include "config_util.h"
+#include "config_putil.h"
 #include "config_chan.h"
 #include "config_gobj.h"
 #include "textNode.h"

pandatool/src/pandatoolbase/pathReplace.cxx

@@ -12,7 +12,7 @@
  */
 
 #include "pathReplace.h"
-#include "config_util.h"
+#include "config_putil.h"
 #include "config_pandatoolbase.h"
 #include "indent.h"
 #include "virtualFileSystem.h"

pandatool/src/ptloader/loaderFileTypePandatool.cxx

@@ -15,7 +15,7 @@
 #include "config_ptloader.h"
 #include "somethingToEggConverter.h"
 #include "eggToSomethingConverter.h"
-#include "config_util.h"
+#include "config_putil.h"
 #include "load_egg_file.h"
 #include "save_egg_file.h"
 #include "eggData.h"