plist=>p_list

pandatool/src/egg-palettize/eggFile.cxx

@@ -568,21 +568,21 @@ write_datagram(BamWriter *writer, Datagram &datagram) {
 //               number of pointers processed from the list.
 ////////////////////////////////////////////////////////////////////
 int EggFile::
-complete_pointers(vector_typedWritable &plist, BamReader *manager) {
-  nassertr((int)plist.size() >= _num_textures + 1, 0);
+complete_pointers(vector_typedWritable &p_list, BamReader *manager) {
+  nassertr((int)p_list.size() >= _num_textures + 1, 0);
   int index = 0;
 
   int i;
   _textures.reserve(_num_textures);
   for (i = 0; i < _num_textures; i++) {
     TextureReference *texture;
-    DCAST_INTO_R(texture, plist[index], index);
+    DCAST_INTO_R(texture, p_list[index], index);
     _textures.push_back(texture);
     index++;
   }
 
-  if (plist[index] != (TypedWritable *)NULL) {
-    DCAST_INTO_R(_default_group, plist[index], index);
+  if (p_list[index] != (TypedWritable *)NULL) {
+    DCAST_INTO_R(_default_group, p_list[index], index);
   }
   index++;
 

pandatool/src/egg-palettize/eggFile.h

@@ -100,7 +100,7 @@ private:
 public:
   static void register_with_read_factory();
   virtual void write_datagram(BamWriter *writer, Datagram &datagram);
-  virtual int complete_pointers(vector_typedWritable &plist,
+  virtual int complete_pointers(vector_typedWritable &p_list,
                                 BamReader *manager);
 
 protected:

pandatool/src/egg-palettize/paletteGroup.cxx

@@ -631,14 +631,14 @@ write_datagram(BamWriter *writer, Datagram &datagram) {
 //               number of pointers processed from the list.
 ////////////////////////////////////////////////////////////////////
 int PaletteGroup::
-complete_pointers(vector_typedWritable &plist, BamReader *manager) {
-  nassertr((int)plist.size() >= _num_placements + _num_pages, 0);
+complete_pointers(vector_typedWritable &p_list, BamReader *manager) {
+  nassertr((int)p_list.size() >= _num_placements + _num_pages, 0);
   int index = 0;
 
   int i;
   for (i = 0; i < _num_placements; i++) {
     TexturePlacement *placement;
-    DCAST_INTO_R(placement, plist[index], index);
+    DCAST_INTO_R(placement, p_list[index], index);
     index++;
     bool inserted = _placements.insert(placement).second;
     nassertr(inserted, index);
@@ -651,7 +651,7 @@ complete_pointers(vector_typedWritable &plist, BamReader *manager) {
   _load_pages.reserve(_num_pages);
   for (i = 0; i < _num_pages; i++) {
     PalettePage *page;
-    DCAST_INTO_R(page, plist[index], index);
+    DCAST_INTO_R(page, p_list[index], index);
     index++;
     _load_pages.push_back(page);
   }

pandatool/src/egg-palettize/paletteGroup.h

@@ -108,7 +108,7 @@ private:
 public:
   static void register_with_read_factory();
   virtual void write_datagram(BamWriter *writer, Datagram &datagram);
-  virtual int complete_pointers(vector_typedWritable &plist,
+  virtual int complete_pointers(vector_typedWritable &p_list,
                                 BamReader *manager);
   virtual void finalize();
 

pandatool/src/egg-palettize/paletteGroups.cxx

@@ -297,11 +297,11 @@ write_datagram(BamWriter *writer, Datagram &datagram) {
 //               number of pointers processed from the list.
 ////////////////////////////////////////////////////////////////////
 int PaletteGroups::
-complete_pointers(vector_typedWritable &plist, BamReader *manager) {
-  nassertr(_num_groups == (int)plist.size(), 0);
+complete_pointers(vector_typedWritable &p_list, BamReader *manager) {
+  nassertr(_num_groups == (int)p_list.size(), 0);
   for (int i = 0; i < _num_groups; i++) {
     PaletteGroup *group;
-    DCAST_INTO_R(group, plist[i], i);
+    DCAST_INTO_R(group, p_list[i], i);
     _groups.insert(group);
   }
   return 0;

pandatool/src/egg-palettize/paletteGroups.h

@@ -77,7 +77,7 @@ private:
 public:
   static void register_with_read_factory();
   virtual void write_datagram(BamWriter *writer, Datagram &datagram);
-  virtual int complete_pointers(vector_typedWritable &plist,
+  virtual int complete_pointers(vector_typedWritable &p_list,
                                 BamReader *manager);
 
 protected:

pandatool/src/egg-palettize/paletteImage.cxx

@@ -791,21 +791,21 @@ write_datagram(BamWriter *writer, Datagram &datagram) {
 //               number of pointers processed from the list.
 ////////////////////////////////////////////////////////////////////
 int PaletteImage::
-complete_pointers(vector_typedWritable &plist, BamReader *manager) {
-  nassertr((int)plist.size() >= _num_placements + 1, 0);
+complete_pointers(vector_typedWritable &p_list, BamReader *manager) {
+  nassertr((int)p_list.size() >= _num_placements + 1, 0);
   int index = 0;
 
   int i;
   _placements.reserve(_num_placements);
   for (i = 0; i < _num_placements; i++) {
     TexturePlacement *placement;
-    DCAST_INTO_R(placement, plist[index], index);
+    DCAST_INTO_R(placement, p_list[index], index);
     _placements.push_back(placement);
     index++;
   }
 
-  if (plist[index] != (TypedWritable *)NULL) {
-    DCAST_INTO_R(_page, plist[index], index);
+  if (p_list[index] != (TypedWritable *)NULL) {
+    DCAST_INTO_R(_page, p_list[index], index);
   }
   index++;
 

pandatool/src/egg-palettize/paletteImage.h

@@ -106,7 +106,7 @@ private:
 public:
   static void register_with_read_factory();
   virtual void write_datagram(BamWriter *writer, Datagram &datagram);
-  virtual int complete_pointers(vector_typedWritable &plist,
+  virtual int complete_pointers(vector_typedWritable &p_list,
                                 BamReader *manager);
 
 protected:

pandatool/src/egg-palettize/palettePage.cxx

@@ -294,12 +294,12 @@ write_datagram(BamWriter *writer, Datagram &datagram) {
 //               number of pointers processed from the list.
 ////////////////////////////////////////////////////////////////////
 int PalettePage::
-complete_pointers(vector_typedWritable &plist, BamReader *manager) {
-  nassertr((int)plist.size() >= 1 + _num_images, 0);
+complete_pointers(vector_typedWritable &p_list, BamReader *manager) {
+  nassertr((int)p_list.size() >= 1 + _num_images, 0);
   int index = 0;
 
-  if (plist[index] != (TypedWritable *)NULL) {
-    DCAST_INTO_R(_group, plist[index], index);
+  if (p_list[index] != (TypedWritable *)NULL) {
+    DCAST_INTO_R(_group, p_list[index], index);
   }
   index++;
 
@@ -307,7 +307,7 @@ complete_pointers(vector_typedWritable &plist, BamReader *manager) {
   _images.reserve(_num_images);
   for (i = 0; i < _num_images; i++) {
     PaletteImage *image;
-    DCAST_INTO_R(image, plist[index], index);
+    DCAST_INTO_R(image, p_list[index], index);
     _images.push_back(image);
     index++;
   }

pandatool/src/egg-palettize/palettePage.h

@@ -73,7 +73,7 @@ private:
 public:
   static void register_with_read_factory();
   virtual void write_datagram(BamWriter *writer, Datagram &datagram);
-  virtual int complete_pointers(vector_typedWritable &plist,
+  virtual int complete_pointers(vector_typedWritable &p_list,
                                 BamReader *manager);
 
 protected:

pandatool/src/egg-palettize/palettizer.cxx

@@ -903,48 +903,48 @@ write_datagram(BamWriter *writer, Datagram &datagram) {
 //               number of pointers processed from the list.
 ////////////////////////////////////////////////////////////////////
 int Palettizer::
-complete_pointers(vector_typedWritable &plist, BamReader *manager) {
-  nassertr((int)plist.size() >= 4 + _num_egg_files + _num_groups + _num_textures, 0);
+complete_pointers(vector_typedWritable &p_list, BamReader *manager) {
+  nassertr((int)p_list.size() >= 4 + _num_egg_files + _num_groups + _num_textures, 0);
   int index = 0;
 
-  if (plist[index] != (TypedWritable *)NULL) {
-    DCAST_INTO_R(_color_type, plist[index], index);
+  if (p_list[index] != (TypedWritable *)NULL) {
+    DCAST_INTO_R(_color_type, p_list[index], index);
   }
   index++;
 
-  if (plist[index] != (TypedWritable *)NULL) {
-    DCAST_INTO_R(_alpha_type, plist[index], index);
+  if (p_list[index] != (TypedWritable *)NULL) {
+    DCAST_INTO_R(_alpha_type, p_list[index], index);
   }
   index++;
 
-  if (plist[index] != (TypedWritable *)NULL) {
-    DCAST_INTO_R(_shadow_color_type, plist[index], index);
+  if (p_list[index] != (TypedWritable *)NULL) {
+    DCAST_INTO_R(_shadow_color_type, p_list[index], index);
   }
   index++;
 
-  if (plist[index] != (TypedWritable *)NULL) {
-    DCAST_INTO_R(_shadow_alpha_type, plist[index], index);
+  if (p_list[index] != (TypedWritable *)NULL) {
+    DCAST_INTO_R(_shadow_alpha_type, p_list[index], index);
   }
   index++;
 
   int i;
   for (i = 0; i < _num_egg_files; i++) {
     EggFile *egg_file;
-    DCAST_INTO_R(egg_file, plist[index], index);
+    DCAST_INTO_R(egg_file, p_list[index], index);
     _egg_files.insert(EggFiles::value_type(egg_file->get_name(), egg_file));
     index++;
   }
 
   for (i = 0; i < _num_groups; i++) {
     PaletteGroup *group;
-    DCAST_INTO_R(group, plist[index], index);
+    DCAST_INTO_R(group, p_list[index], index);
     _groups.insert(Groups::value_type(group->get_name(), group));
     index++;
   }
 
   for (i = 0; i < _num_textures; i++) {
     TextureImage *texture;
-    DCAST_INTO_R(texture, plist[index], index);
+    DCAST_INTO_R(texture, p_list[index], index);
     _textures.insert(Textures::value_type(texture->get_name(), texture));
     index++;
   }

pandatool/src/egg-palettize/palettizer.h

@@ -136,7 +136,7 @@ private:
 public:
   static void register_with_read_factory();
   virtual void write_datagram(BamWriter *writer, Datagram &datagram);
-  virtual int complete_pointers(vector_typedWritable &plist,
+  virtual int complete_pointers(vector_typedWritable &p_list,
                                 BamReader *manager);
 
 protected:

pandatool/src/egg-palettize/sourceTextureImage.cxx

@@ -201,10 +201,10 @@ write_datagram(BamWriter *writer, Datagram &datagram) {
 //               number of pointers processed from the list.
 ////////////////////////////////////////////////////////////////////
 int SourceTextureImage::
-complete_pointers(vector_typedWritable &plist, BamReader *manager) {
-  nassertr(plist.size() >= 1, 0);
+complete_pointers(vector_typedWritable &p_list, BamReader *manager) {
+  nassertr(p_list.size() >= 1, 0);
 
-  DCAST_INTO_R(_texture, plist[0], 0);
+  DCAST_INTO_R(_texture, p_list[0], 0);
   return 1;
 }
 

pandatool/src/egg-palettize/sourceTextureImage.h

@@ -56,7 +56,7 @@ private:
 public:
   static void register_with_read_factory();
   virtual void write_datagram(BamWriter *writer, Datagram &datagram);
-  virtual int complete_pointers(vector_typedWritable &plist,
+  virtual int complete_pointers(vector_typedWritable &p_list,
                                 BamReader *manager);
 
 protected:

pandatool/src/egg-palettize/textureImage.cxx

@@ -1133,24 +1133,24 @@ write_datagram(BamWriter *writer, Datagram &datagram) {
 //               number of pointers processed from the list.
 ////////////////////////////////////////////////////////////////////
 int TextureImage::
-complete_pointers(vector_typedWritable &plist, BamReader *manager) {
-  nassertr((int)plist.size() >= _num_placement * 2 + _num_sources + _num_dests, 0);
+complete_pointers(vector_typedWritable &p_list, BamReader *manager) {
+  nassertr((int)p_list.size() >= _num_placement * 2 + _num_sources + _num_dests, 0);
   int index = 0;
 
   int i;
   for (i = 0; i < _num_placement; i++) {
     PaletteGroup *group;
     TexturePlacement *placement;
-    DCAST_INTO_R(group, plist[index], index);
+    DCAST_INTO_R(group, p_list[index], index);
     index++;
-    DCAST_INTO_R(placement, plist[index], index);
+    DCAST_INTO_R(placement, p_list[index], index);
     index++;
     _placement.insert(Placement::value_type(group, placement));
   }
 
   for (i = 0; i < _num_sources; i++) {
     SourceTextureImage *source;
-    DCAST_INTO_R(source, plist[index], index);
+    DCAST_INTO_R(source, p_list[index], index);
     string key = get_source_key(source->get_filename(),
                                 source->get_alpha_filename());
 
@@ -1161,7 +1161,7 @@ complete_pointers(vector_typedWritable &plist, BamReader *manager) {
 
   for (i = 0; i < _num_dests; i++) {
     DestTextureImage *dest;
-    DCAST_INTO_R(dest, plist[index], index);
+    DCAST_INTO_R(dest, p_list[index], index);
     bool inserted = _dests.insert(Dests::value_type(dest->get_filename(), dest)).second;
     index++;
     nassertr(inserted, index);

pandatool/src/egg-palettize/textureImage.h

@@ -135,7 +135,7 @@ private:
 public:
   static void register_with_read_factory();
   virtual void write_datagram(BamWriter *writer, Datagram &datagram);
-  virtual int complete_pointers(vector_typedWritable &plist,
+  virtual int complete_pointers(vector_typedWritable &p_list,
                                 BamReader *manager);
 
 protected:

pandatool/src/egg-palettize/texturePlacement.cxx

@@ -962,32 +962,32 @@ write_datagram(BamWriter *writer, Datagram &datagram) {
 //               number of pointers processed from the list.
 ////////////////////////////////////////////////////////////////////
 int TexturePlacement::
-complete_pointers(vector_typedWritable &plist, BamReader *manager) {
-  nassertr((int)plist.size() >= 3 + _num_references, 0);
+complete_pointers(vector_typedWritable &p_list, BamReader *manager) {
+  nassertr((int)p_list.size() >= 3 + _num_references, 0);
   if (Palettizer::_read_pi_version >= 2) {
-    nassertr((int)plist.size() >= 4 + _num_references, 0);
+    nassertr((int)p_list.size() >= 4 + _num_references, 0);
   }
 
   int index = 0;
 
-  if (plist[index] != (TypedWritable *)NULL) {
-    DCAST_INTO_R(_texture, plist[index], index);
+  if (p_list[index] != (TypedWritable *)NULL) {
+    DCAST_INTO_R(_texture, p_list[index], index);
   }
   index++;
 
-  if (plist[index] != (TypedWritable *)NULL) {
-    DCAST_INTO_R(_group, plist[index], index);
+  if (p_list[index] != (TypedWritable *)NULL) {
+    DCAST_INTO_R(_group, p_list[index], index);
   }
   index++;
 
-  if (plist[index] != (TypedWritable *)NULL) {
-    DCAST_INTO_R(_image, plist[index], index);
+  if (p_list[index] != (TypedWritable *)NULL) {
+    DCAST_INTO_R(_image, p_list[index], index);
   }
   index++;
 
   if (Palettizer::_read_pi_version >= 2) {
-    if (plist[index] != (TypedWritable *)NULL) {
-      DCAST_INTO_R(_dest, plist[index], index);
+    if (p_list[index] != (TypedWritable *)NULL) {
+      DCAST_INTO_R(_dest, p_list[index], index);
     }
     index++;
   }
@@ -995,7 +995,7 @@ complete_pointers(vector_typedWritable &plist, BamReader *manager) {
   int i;
   for (i = 0; i < _num_references; i++) {
     TextureReference *reference;
-    DCAST_INTO_R(reference, plist[index], index);
+    DCAST_INTO_R(reference, p_list[index], index);
     _references.insert(reference);
     index++;
   }

pandatool/src/egg-palettize/texturePlacement.h

@@ -119,7 +119,7 @@ private:
 public:
   static void register_with_read_factory();
   virtual void write_datagram(BamWriter *writer, Datagram &datagram);
-  virtual int complete_pointers(vector_typedWritable &plist,
+  virtual int complete_pointers(vector_typedWritable &p_list,
                                 BamReader *manager);
 
 protected:

pandatool/src/egg-palettize/textureProperties.cxx

@@ -576,17 +576,17 @@ write_datagram(BamWriter *writer, Datagram &datagram) {
 //               number of pointers processed from the list.
 ////////////////////////////////////////////////////////////////////
 int TextureProperties::
-complete_pointers(vector_typedWritable &plist, BamReader *manager) {
-  nassertr(plist.size() >= 2, 0);
+complete_pointers(vector_typedWritable &p_list, BamReader *manager) {
+  nassertr(p_list.size() >= 2, 0);
   int index = 0;
 
-  if (plist[index] != (TypedWritable *)NULL) {
-    DCAST_INTO_R(_color_type, plist[index], index);
+  if (p_list[index] != (TypedWritable *)NULL) {
+    DCAST_INTO_R(_color_type, p_list[index], index);
   }
   index++;
 
-  if (plist[index] != (TypedWritable *)NULL) {
-    DCAST_INTO_R(_alpha_type, plist[index], index);
+  if (p_list[index] != (TypedWritable *)NULL) {
+    DCAST_INTO_R(_alpha_type, p_list[index], index);
   }
   index++;
 

pandatool/src/egg-palettize/textureProperties.h

@@ -75,7 +75,7 @@ private:
 public:
   static void register_with_read_factory();
   virtual void write_datagram(BamWriter *writer, Datagram &datagram);
-  virtual int complete_pointers(vector_typedWritable &plist,
+  virtual int complete_pointers(vector_typedWritable &p_list,
                                 BamReader *manager);
 
 protected:

pandatool/src/egg-palettize/textureReference.cxx

@@ -720,22 +720,22 @@ write_datagram(BamWriter *writer, Datagram &datagram) {
 //               number of pointers processed from the list.
 ////////////////////////////////////////////////////////////////////
 int TextureReference::
-complete_pointers(vector_typedWritable &plist, BamReader *manager) {
-  nassertr((int)plist.size() >= 3, 0);
+complete_pointers(vector_typedWritable &p_list, BamReader *manager) {
+  nassertr((int)p_list.size() >= 3, 0);
   int index = 0;
 
-  if (plist[index] != (TypedWritable *)NULL) {
-    DCAST_INTO_R(_egg_file, plist[index], index);
+  if (p_list[index] != (TypedWritable *)NULL) {
+    DCAST_INTO_R(_egg_file, p_list[index], index);
   }
   index++;
 
-  if (plist[index] != (TypedWritable *)NULL) {
-    DCAST_INTO_R(_source_texture, plist[index], index);
+  if (p_list[index] != (TypedWritable *)NULL) {
+    DCAST_INTO_R(_source_texture, p_list[index], index);
   }
   index++;
 
-  if (plist[index] != (TypedWritable *)NULL) {
-    DCAST_INTO_R(_placement, plist[index], index);
+  if (p_list[index] != (TypedWritable *)NULL) {
+    DCAST_INTO_R(_placement, p_list[index], index);
   }
   index++;
 

pandatool/src/egg-palettize/textureReference.h

@@ -105,7 +105,7 @@ private:
 public:
   static void register_with_read_factory();
   virtual void write_datagram(BamWriter *writer, Datagram &datagram);
-  virtual int complete_pointers(vector_typedWritable &plist,
+  virtual int complete_pointers(vector_typedWritable &p_list,
                                 BamReader *manager);
 
 protected: