From 196cfd7d16c2e511e6af57c23b4ddd6350399646 Mon Sep 17 00:00:00 2001 From: David Rose Date: Mon, 25 Jun 2001 17:00:50 +0000 Subject: [PATCH] vector -> pvector, etc. --- pandatool/src/bam/bamInfo.h | 4 ++-- pandatool/src/cvscopy/cvsCopy.h | 2 +- pandatool/src/cvscopy/cvsSourceDirectory.h | 4 ++-- pandatool/src/cvscopy/cvsSourceTree.h | 8 ++++---- pandatool/src/egg-mkfont/charBitmap.h | 6 +++--- pandatool/src/egg-mkfont/charLayout.h | 4 ++-- pandatool/src/egg-mkfont/eggMakeFont.h | 2 +- pandatool/src/egg-mkfont/fontFile.h | 2 +- pandatool/src/egg-mkfont/pkFontFile.h | 2 +- pandatool/src/egg-palettize/eggFile.h | 6 +++--- pandatool/src/egg-palettize/filenameUnifier.h | 4 ++-- pandatool/src/egg-palettize/paletteGroup.h | 14 ++++++------- pandatool/src/egg-palettize/paletteGroups.h | 4 ++-- pandatool/src/egg-palettize/paletteImage.h | 4 ++-- pandatool/src/egg-palettize/palettePage.h | 4 ++-- pandatool/src/egg-palettize/palettizer.h | 18 ++++++++--------- pandatool/src/egg-palettize/textureImage.h | 14 ++++++------- .../src/egg-palettize/textureMemoryCounter.h | 8 ++++---- .../src/egg-palettize/texturePlacement.h | 4 ++-- pandatool/src/egg-palettize/txaFile.h | 4 ++-- pandatool/src/egg-palettize/txaLine.h | 6 +++--- pandatool/src/eggbase/eggMultiBase.h | 2 +- .../src/eggcharbase/eggCharacterCollection.h | 12 +++++------ pandatool/src/eggcharbase/eggCharacterData.h | 6 +++--- pandatool/src/eggcharbase/eggComponentData.h | 2 +- pandatool/src/eggcharbase/eggJointData.h | 2 +- pandatool/src/eggcharbase/eggJointPointer.h | 2 +- pandatool/src/eggprogs/eggTopstrip.h | 2 +- pandatool/src/flt/fltBead.h | 2 +- pandatool/src/flt/fltCurve.h | 2 +- pandatool/src/flt/fltHeader.h | 20 +++++++++---------- pandatool/src/flt/fltLocalVertexPool.h | 2 +- pandatool/src/flt/fltRecord.h | 2 +- pandatool/src/flt/fltRecordWriter.h | 2 +- pandatool/src/flt/fltTexture.h | 4 ++-- pandatool/src/flt/fltVertexList.h | 2 +- pandatool/src/fltegg/fltToEggConverter.h | 4 ++-- pandatool/src/fltegg/fltToEggLevelState.h | 2 +- pandatool/src/fltprogs/fltCopy.h | 6 +++--- pandatool/src/gtk-stats/gtkStatsMonitor.h | 4 ++-- pandatool/src/gtk-stats/gtkStatsPianoRoll.h | 4 ++-- pandatool/src/gtk-stats/gtkStatsStripChart.h | 4 ++-- pandatool/src/lwo/lwoDiscontinuousVertexMap.h | 4 ++-- pandatool/src/lwo/lwoGroupChunk.h | 4 ++-- pandatool/src/lwo/lwoPoints.h | 2 +- pandatool/src/lwo/lwoPolygonTags.h | 2 +- pandatool/src/lwo/lwoPolygons.h | 2 +- pandatool/src/lwo/lwoVertexMap.h | 2 +- pandatool/src/lwoegg/cLwoPoints.h | 4 ++-- pandatool/src/lwoegg/cLwoPolygons.h | 6 +++--- pandatool/src/lwoegg/cLwoSurface.h | 2 +- pandatool/src/lwoegg/lwoToEggConverter.h | 14 ++++++------- pandatool/src/maya/mayaFile.h | 2 +- pandatool/src/maya/mayaShaders.h | 4 ++-- pandatool/src/progbase/programBase.h | 14 ++++++------- pandatool/src/pstatserver/pStatClientData.h | 6 +++--- pandatool/src/pstatserver/pStatGraph.h | 4 ++-- pandatool/src/pstatserver/pStatMonitor.h | 8 ++++---- pandatool/src/pstatserver/pStatPianoRoll.h | 6 +++--- pandatool/src/pstatserver/pStatServer.h | 10 +++++----- pandatool/src/pstatserver/pStatStripChart.h | 6 +++--- pandatool/src/pstatserver/pStatThreadData.h | 4 ++-- pandatool/src/pstatserver/pStatView.h | 2 +- pandatool/src/pstatserver/pStatViewLevel.h | 4 ++-- pandatool/src/softprogs/softCVS.h | 10 +++++----- 65 files changed, 167 insertions(+), 167 deletions(-) diff --git a/pandatool/src/bam/bamInfo.h b/pandatool/src/bam/bamInfo.h index 3dd3f954b0..8c2c96e6db 100644 --- a/pandatool/src/bam/bamInfo.h +++ b/pandatool/src/bam/bamInfo.h @@ -26,7 +26,7 @@ #include #include -#include +#include "pvector.h" class TypedWritable; @@ -49,7 +49,7 @@ private: void describe_general_object(TypedWritable *object); void list_hierarchy(Node *node, int indent_level); - typedef vector Filenames; + typedef pvector Filenames; Filenames _filenames; bool _ls; diff --git a/pandatool/src/cvscopy/cvsCopy.h b/pandatool/src/cvscopy/cvsCopy.h index 13808dca56..49c8f0d437 100644 --- a/pandatool/src/cvscopy/cvsCopy.h +++ b/pandatool/src/cvscopy/cvsCopy.h @@ -81,7 +81,7 @@ protected: CVSSourceDirectory *_model_dir; CVSSourceDirectory *_map_dir; - typedef map CopiedFiles; + typedef pmap CopiedFiles; CopiedFiles _copied_files; }; diff --git a/pandatool/src/cvscopy/cvsSourceDirectory.h b/pandatool/src/cvscopy/cvsSourceDirectory.h index dd8df31f4c..cd8f5d6e97 100644 --- a/pandatool/src/cvscopy/cvsSourceDirectory.h +++ b/pandatool/src/cvscopy/cvsSourceDirectory.h @@ -22,7 +22,7 @@ #include #include -#include +#include "pvector.h" class CVSSourceTree; @@ -59,7 +59,7 @@ private: string _dirname; int _depth; - typedef vector Children; + typedef pvector Children; Children _children; }; diff --git a/pandatool/src/cvscopy/cvsSourceTree.h b/pandatool/src/cvscopy/cvsSourceTree.h index a5d92e33bf..368566533a 100644 --- a/pandatool/src/cvscopy/cvsSourceTree.h +++ b/pandatool/src/cvscopy/cvsSourceTree.h @@ -21,8 +21,8 @@ #include -#include -#include +#include "pvector.h" +#include "pmap.h" class CVSSourceDirectory; @@ -58,7 +58,7 @@ public: void add_file(const string &filename, CVSSourceDirectory *dir); private: - typedef vector Directories; + typedef pvector Directories; CVSSourceDirectory * prompt_user(const string &filename, CVSSourceDirectory *suggested_dir, @@ -81,7 +81,7 @@ private: string _path; CVSSourceDirectory *_root; - typedef map Filenames; + typedef pmap Filenames; Filenames _filenames; static bool _got_start_fullpath; diff --git a/pandatool/src/egg-mkfont/charBitmap.h b/pandatool/src/egg-mkfont/charBitmap.h index d74719666a..2c45f63c73 100644 --- a/pandatool/src/egg-mkfont/charBitmap.h +++ b/pandatool/src/egg-mkfont/charBitmap.h @@ -22,7 +22,7 @@ #include -#include +#include "pvector.h" //////////////////////////////////////////////////////////////////// // Class : CharBitmap @@ -32,8 +32,8 @@ //////////////////////////////////////////////////////////////////// class CharBitmap { public: - typedef vector Row; - typedef vector Block; + typedef pvector Row; + typedef pvector Block; CharBitmap(int character, int width, int height, int hoff, int voff, double dx, double dy); diff --git a/pandatool/src/egg-mkfont/charLayout.h b/pandatool/src/egg-mkfont/charLayout.h index 30a651e23e..4d733fb9af 100644 --- a/pandatool/src/egg-mkfont/charLayout.h +++ b/pandatool/src/egg-mkfont/charLayout.h @@ -23,7 +23,7 @@ #include "charPlacement.h" -#include +#include "pvector.h" class CharPlacement; @@ -40,7 +40,7 @@ public: bool place_character(const CharBitmap *bm); - typedef vector Placements; + typedef pvector Placements; Placements _placements; int _working_xsize, _working_ysize; diff --git a/pandatool/src/egg-mkfont/eggMakeFont.h b/pandatool/src/egg-mkfont/eggMakeFont.h index d04ae8fc4b..b78042c6ad 100644 --- a/pandatool/src/egg-mkfont/eggMakeFont.h +++ b/pandatool/src/egg-mkfont/eggMakeFont.h @@ -91,7 +91,7 @@ private: double _small_caps_scale; FontFile *_font; - typedef map EggDefs; + typedef pmap EggDefs; EggDefs _egg_defs; CharLayout _layout; diff --git a/pandatool/src/egg-mkfont/fontFile.h b/pandatool/src/egg-mkfont/fontFile.h index b67713050a..5398fc380c 100644 --- a/pandatool/src/egg-mkfont/fontFile.h +++ b/pandatool/src/egg-mkfont/fontFile.h @@ -56,7 +56,7 @@ protected: double _vppp; double _hppp; - typedef vector Chars; + typedef pvector Chars; Chars _chars; }; diff --git a/pandatool/src/egg-mkfont/pkFontFile.h b/pandatool/src/egg-mkfont/pkFontFile.h index 9f690d56e2..64a83752c6 100644 --- a/pandatool/src/egg-mkfont/pkFontFile.h +++ b/pandatool/src/egg-mkfont/pkFontFile.h @@ -58,7 +58,7 @@ private: bool _extract_all; string _extract_only; - vector _pk; + pvector _pk; }; #endif diff --git a/pandatool/src/egg-palettize/eggFile.h b/pandatool/src/egg-palettize/eggFile.h index 6789c81d6c..a95b6e81ee 100644 --- a/pandatool/src/egg-palettize/eggFile.h +++ b/pandatool/src/egg-palettize/eggFile.h @@ -28,7 +28,7 @@ #include #include -#include +#include "pset.h" class SourceTextureImage; class EggData; @@ -51,7 +51,7 @@ public: const Filename &dest_filename); void scan_textures(); - void get_textures(set &result) const; + void get_textures(pset &result) const; void pre_txa_file(); void match_txa_groups(const PaletteGroups &groups); @@ -85,7 +85,7 @@ private: Filename _source_filename; Filename _dest_filename; - typedef vector Textures; + typedef pvector Textures; Textures _textures; bool _first_txa_match; diff --git a/pandatool/src/egg-palettize/filenameUnifier.h b/pandatool/src/egg-palettize/filenameUnifier.h index 156e76c9fe..a604b903ea 100644 --- a/pandatool/src/egg-palettize/filenameUnifier.h +++ b/pandatool/src/egg-palettize/filenameUnifier.h @@ -23,7 +23,7 @@ #include -#include +#include "pmap.h" //////////////////////////////////////////////////////////////////// // Class : FilenameUnifier @@ -52,7 +52,7 @@ private: static Filename _txa_dir; static Filename _rel_dirname; - typedef map CanonicalFilenames; + typedef pmap CanonicalFilenames; static CanonicalFilenames _canonical_filenames; }; diff --git a/pandatool/src/egg-palettize/paletteGroup.h b/pandatool/src/egg-palettize/paletteGroup.h index 9ff5a5e1e4..7777285594 100644 --- a/pandatool/src/egg-palettize/paletteGroup.h +++ b/pandatool/src/egg-palettize/paletteGroup.h @@ -27,8 +27,8 @@ #include #include -#include -#include +#include "pset.h" +#include "pvector.h" class EggFile; class TexturePlacement; @@ -59,8 +59,8 @@ public: void group_with(PaletteGroup *other); const PaletteGroups &get_groups() const; - void get_placements(vector &placements) const; - void get_complete_placements(vector &placements) const; + void get_placements(pvector &placements) const; + void get_complete_placements(pvector &placements) const; void reset_dependency_level(); void set_dependency_level(int level); @@ -97,10 +97,10 @@ private: int _dependency_order; int _dirname_order; - typedef set Placements; + typedef pset Placements; Placements _placements; - typedef map Pages; + typedef pmap Pages; Pages _pages; @@ -121,7 +121,7 @@ private: // don't use them otherwise. int _num_placements; int _num_pages; - vector _load_pages; + pvector _load_pages; public: static TypeHandle get_class_type() { diff --git a/pandatool/src/egg-palettize/paletteGroups.h b/pandatool/src/egg-palettize/paletteGroups.h index 0ce7890afd..8bba98232d 100644 --- a/pandatool/src/egg-palettize/paletteGroups.h +++ b/pandatool/src/egg-palettize/paletteGroups.h @@ -23,7 +23,7 @@ #include -#include +#include "pset.h" class PaletteGroup; @@ -35,7 +35,7 @@ class PaletteGroup; //////////////////////////////////////////////////////////////////// class PaletteGroups : public TypedWritable { private: - typedef set Groups; + typedef pset Groups; public: #ifndef WIN32_VC diff --git a/pandatool/src/egg-palettize/paletteImage.h b/pandatool/src/egg-palettize/paletteImage.h index 813f354942..a31632659d 100644 --- a/pandatool/src/egg-palettize/paletteImage.h +++ b/pandatool/src/egg-palettize/paletteImage.h @@ -86,10 +86,10 @@ private: int _x_size, _y_size; }; - typedef vector ClearedRegions; + typedef pvector ClearedRegions; ClearedRegions _cleared_regions; - typedef vector Placements; + typedef pvector Placements; Placements _placements; PalettePage *_page; diff --git a/pandatool/src/egg-palettize/palettePage.h b/pandatool/src/egg-palettize/palettePage.h index 9507775872..897b263cb0 100644 --- a/pandatool/src/egg-palettize/palettePage.h +++ b/pandatool/src/egg-palettize/palettePage.h @@ -63,10 +63,10 @@ private: PaletteGroup *_group; TextureProperties _properties; - typedef vector Assigned; + typedef pvector Assigned; Assigned _assigned; - typedef vector Images; + typedef pvector Images; Images _images; // The TypedWritable interface follows. diff --git a/pandatool/src/egg-palettize/palettizer.h b/pandatool/src/egg-palettize/palettizer.h index 9fa862e430..399cbd09bb 100644 --- a/pandatool/src/egg-palettize/palettizer.h +++ b/pandatool/src/egg-palettize/palettizer.h @@ -25,9 +25,9 @@ #include -#include -#include -#include +#include "pvector.h" +#include "pset.h" +#include "pmap.h" class PNMFileType; class EggFile; @@ -112,23 +112,23 @@ public: PNMFileType *_shadow_alpha_type; private: - typedef vector Placements; + typedef pvector Placements; void compute_statistics(ostream &out, int indent_level, const Placements &placements) const; - typedef map EggFiles; + typedef pmap EggFiles; EggFiles _egg_files; - typedef vector CommandLineEggs; + typedef pvector CommandLineEggs; CommandLineEggs _command_line_eggs; - typedef set CommandLineTextures; + typedef pset CommandLineTextures; CommandLineTextures _command_line_textures; - typedef map Groups; + typedef pmap Groups; Groups _groups; - typedef map Textures; + typedef pmap Textures; Textures _textures; diff --git a/pandatool/src/egg-palettize/textureImage.h b/pandatool/src/egg-palettize/textureImage.h index d03d25b1ca..18e2ea9808 100644 --- a/pandatool/src/egg-palettize/textureImage.h +++ b/pandatool/src/egg-palettize/textureImage.h @@ -29,8 +29,8 @@ #include #include -#include -#include +#include "pmap.h" +#include "pset.h" class SourceTextureImage; class DestTextureImage; @@ -88,10 +88,10 @@ public: void write_scale_info(ostream &out, int indent_level = 0); private: - typedef set EggFiles; - typedef vector WorkingEggs; - typedef map Sources; - typedef map Dests; + typedef pset EggFiles; + typedef pvector WorkingEggs; + typedef pmap Sources; + typedef pmap Dests; static int compute_egg_count(PaletteGroup *group, const WorkingEggs &egg_files); @@ -121,7 +121,7 @@ private: EggFiles _egg_files; - typedef map Placement; + typedef pmap Placement; Placement _placement; Sources _sources; diff --git a/pandatool/src/egg-palettize/textureMemoryCounter.h b/pandatool/src/egg-palettize/textureMemoryCounter.h index 09083dbaf9..342671858a 100644 --- a/pandatool/src/egg-palettize/textureMemoryCounter.h +++ b/pandatool/src/egg-palettize/textureMemoryCounter.h @@ -27,8 +27,8 @@ class TextureImage; class DestTextureImage; class TexturePlacement; -#include -#include +#include "pmap.h" +#include "pset.h" //////////////////////////////////////////////////////////////////// // Class : TextureMemoryCounter @@ -64,10 +64,10 @@ private: int _duplicate_bytes; int _coverage_bytes; - typedef map Textures; + typedef pmap Textures; Textures _textures; - typedef set Palettes; + typedef pset Palettes; Palettes _palettes; }; diff --git a/pandatool/src/egg-palettize/texturePlacement.h b/pandatool/src/egg-palettize/texturePlacement.h index 6e9b5b5318..327fc41576 100644 --- a/pandatool/src/egg-palettize/texturePlacement.h +++ b/pandatool/src/egg-palettize/texturePlacement.h @@ -27,7 +27,7 @@ #include #include -#include +#include "pset.h" class TextureImage; class DestTextureImage; @@ -112,7 +112,7 @@ private: TexturePosition _placed; OmitReason _omit_reason; - typedef set References; + typedef pset References; References _references; // The TypedWritable interface follows. diff --git a/pandatool/src/egg-palettize/txaFile.h b/pandatool/src/egg-palettize/txaFile.h index 5b39396768..9036dbd0b4 100644 --- a/pandatool/src/egg-palettize/txaFile.h +++ b/pandatool/src/egg-palettize/txaFile.h @@ -26,7 +26,7 @@ #include #include -#include +#include "pvector.h" //////////////////////////////////////////////////////////////////// // Class : TxaFile @@ -56,7 +56,7 @@ private: bool parse_remap_line(const vector_string &words); bool parse_remapchar_line(const vector_string &words); - typedef vector Lines; + typedef pvector Lines; Lines _lines; }; diff --git a/pandatool/src/egg-palettize/txaLine.h b/pandatool/src/egg-palettize/txaLine.h index 6fb0f5cfb2..48dcb30021 100644 --- a/pandatool/src/egg-palettize/txaLine.h +++ b/pandatool/src/egg-palettize/txaLine.h @@ -26,7 +26,7 @@ #include #include -#include +#include "pvector.h" class PNMFileType; class EggFile; @@ -51,7 +51,7 @@ public: void output(ostream &out) const; private: - typedef vector Patterns; + typedef pvector Patterns; Patterns _texture_patterns; Patterns _egg_patterns; @@ -82,7 +82,7 @@ private: KW_cont }; - typedef vector Keywords; + typedef pvector Keywords; Keywords _keywords; PaletteGroups _palette_groups; diff --git a/pandatool/src/eggbase/eggMultiBase.h b/pandatool/src/eggbase/eggMultiBase.h index 87648f67e7..e0fac817e3 100644 --- a/pandatool/src/eggbase/eggMultiBase.h +++ b/pandatool/src/eggbase/eggMultiBase.h @@ -50,7 +50,7 @@ protected: bool _got_coordinate_system; CoordinateSystem _coordinate_system; - typedef vector Eggs; + typedef pvector Eggs; Eggs _eggs; bool _force_complete; diff --git a/pandatool/src/eggcharbase/eggCharacterCollection.h b/pandatool/src/eggcharbase/eggCharacterCollection.h index f4fa703aad..a0c912b6d7 100644 --- a/pandatool/src/eggcharbase/eggCharacterCollection.h +++ b/pandatool/src/eggcharbase/eggCharacterCollection.h @@ -66,15 +66,15 @@ public: class EggInfo { public: PT(EggData) _egg; - typedef vector Models; + typedef pvector Models; Models _models; int _first_model_index; }; - typedef vector Eggs; + typedef pvector Eggs; Eggs _eggs; - typedef vector Characters; + typedef pvector Characters; Characters _characters; Characters _characters_by_model_index; @@ -92,9 +92,9 @@ private: void add_morph_back_pointers(EggAttributes *attrib, EggObject *egg_object, int model_index, EggCharacterData *char_data); - typedef vector EggNodeList; - typedef map TopEggNodes; - typedef map TopEggNodesByName; + typedef pvector EggNodeList; + typedef pmap TopEggNodes; + typedef pmap TopEggNodesByName; TopEggNodesByName _top_egg_nodes; int _next_model_index; diff --git a/pandatool/src/eggcharbase/eggCharacterData.h b/pandatool/src/eggcharbase/eggCharacterData.h index 0bb7c75288..cad8263cd1 100644 --- a/pandatool/src/eggcharbase/eggCharacterData.h +++ b/pandatool/src/eggcharbase/eggCharacterData.h @@ -27,7 +27,7 @@ #include #include -#include +#include "pmap.h" class EggCharacterCollection; class EggSliderData; @@ -82,13 +82,13 @@ protected: int _model_index; PT(EggNode) _model_root; }; - typedef vector Models; + typedef pvector Models; Models _models; EggCharacterCollection *_collection; EggJointData *_root_joint; - typedef map Sliders; + typedef pmap Sliders; Sliders _sliders; }; diff --git a/pandatool/src/eggcharbase/eggComponentData.h b/pandatool/src/eggcharbase/eggComponentData.h index df2f53e05b..37c1f53c4e 100644 --- a/pandatool/src/eggcharbase/eggComponentData.h +++ b/pandatool/src/eggcharbase/eggComponentData.h @@ -57,7 +57,7 @@ protected: // This points back to all the egg structures that reference this // particular table or slider. - typedef vector BackPointers; + typedef pvector BackPointers; BackPointers _back_pointers; diff --git a/pandatool/src/eggcharbase/eggJointData.h b/pandatool/src/eggcharbase/eggJointData.h index 9a8ee99571..16fcad6923 100644 --- a/pandatool/src/eggcharbase/eggJointData.h +++ b/pandatool/src/eggcharbase/eggJointData.h @@ -53,7 +53,7 @@ public: virtual void write(ostream &out, int indent_level = 0) const; protected: - typedef vector Children; + typedef pvector Children; Children _children; EggJointData *_parent; diff --git a/pandatool/src/eggcharbase/eggJointPointer.h b/pandatool/src/eggcharbase/eggJointPointer.h index 0f3d673fb3..ff8c74b678 100644 --- a/pandatool/src/eggcharbase/eggJointPointer.h +++ b/pandatool/src/eggcharbase/eggJointPointer.h @@ -48,7 +48,7 @@ public: virtual void optimize(); protected: - typedef vector RebuildFrames; + typedef pvector RebuildFrames; RebuildFrames _rebuild_frames; public: diff --git a/pandatool/src/eggprogs/eggTopstrip.h b/pandatool/src/eggprogs/eggTopstrip.h index 12a3f6463a..ec8be40ca5 100644 --- a/pandatool/src/eggprogs/eggTopstrip.h +++ b/pandatool/src/eggprogs/eggTopstrip.h @@ -24,7 +24,7 @@ #include #include -#include +#include "pvector.h" class EggJointData; class EggJointPointer; diff --git a/pandatool/src/flt/fltBead.h b/pandatool/src/flt/fltBead.h index 58170b9f57..d5fa955b83 100644 --- a/pandatool/src/flt/fltBead.h +++ b/pandatool/src/flt/fltBead.h @@ -68,7 +68,7 @@ private: bool _has_transform; LMatrix4d _transform; - typedef vector Transforms; + typedef pvector Transforms; Transforms _transform_steps; int _replicate_count; diff --git a/pandatool/src/flt/fltCurve.h b/pandatool/src/flt/fltCurve.h index 1c0c796b54..4802912cc5 100644 --- a/pandatool/src/flt/fltCurve.h +++ b/pandatool/src/flt/fltCurve.h @@ -40,7 +40,7 @@ public: CT_bezier = 6 }; - typedef vector ControlPoints; + typedef pvector ControlPoints; CurveType _curve_type; ControlPoints _control_points; diff --git a/pandatool/src/flt/fltHeader.h b/pandatool/src/flt/fltHeader.h index f7d9d3a108..9e0bc27b09 100644 --- a/pandatool/src/flt/fltHeader.h +++ b/pandatool/src/flt/fltHeader.h @@ -240,18 +240,18 @@ private: // Instance subtrees. These are standalone subtrees, which may be // referenced by various points in the hierarchy, stored by instance // ID number. - typedef map Instances; + typedef pmap Instances; Instances _instances; // Support for the vertex palette. int update_vertex_lookups(); - typedef vector Vertices; - typedef set UniqueVertices; + typedef pvector Vertices; + typedef pset UniqueVertices; - typedef map VerticesByOffset; - typedef map OffsetsByVertex; + typedef pmap VerticesByOffset; + typedef pmap OffsetsByVertex; Vertices _vertices; UniqueVertices _unique_vertices; @@ -267,26 +267,26 @@ private: // Support for the color palette. bool _got_color_palette; - typedef vector Colors; - typedef map ColorNames; + typedef pvector Colors; + typedef pmap ColorNames; Colors _colors; ColorNames _color_names; // Support for the material palette. bool _got_14_material_palette; - typedef map Materials; + typedef pmap Materials; Materials _materials; // Support for the texture palette. AttrUpdate _auto_attr_update; - typedef map Textures; + typedef pmap Textures; Textures _textures; // Support for the light source palette. - typedef map LightSources; + typedef pmap LightSources; LightSources _light_sources; diff --git a/pandatool/src/flt/fltLocalVertexPool.h b/pandatool/src/flt/fltLocalVertexPool.h index e366ec2b5f..2721344fb3 100644 --- a/pandatool/src/flt/fltLocalVertexPool.h +++ b/pandatool/src/flt/fltLocalVertexPool.h @@ -53,7 +53,7 @@ public: AM_has_uv_7 = 0x00100000 }; - typedef vector Vertices; + typedef pvector Vertices; Vertices _vertices; public: diff --git a/pandatool/src/flt/fltRecord.h b/pandatool/src/flt/fltRecord.h index 215c386776..93f93f5cf0 100644 --- a/pandatool/src/flt/fltRecord.h +++ b/pandatool/src/flt/fltRecord.h @@ -94,7 +94,7 @@ protected: FltHeader *_header; private: - typedef vector Records; + typedef pvector Records; Records _children; Records _subfaces; Records _extensions; diff --git a/pandatool/src/flt/fltRecordWriter.h b/pandatool/src/flt/fltRecordWriter.h index 0f525d1b95..03a74c37dd 100644 --- a/pandatool/src/flt/fltRecordWriter.h +++ b/pandatool/src/flt/fltRecordWriter.h @@ -55,7 +55,7 @@ private: Datagram _datagram; FltOpcode _opcode; - typedef set Instances; + typedef pset Instances; Instances _instances_written; }; diff --git a/pandatool/src/flt/fltTexture.h b/pandatool/src/flt/fltTexture.h index 32e149ad80..4c27a784b3 100644 --- a/pandatool/src/flt/fltTexture.h +++ b/pandatool/src/flt/fltTexture.h @@ -156,7 +156,7 @@ public: LPoint2d _real_earth; }; - typedef vector GeospecificControlPoints; + typedef pvector GeospecificControlPoints; struct SubtextureDef { string _name; @@ -165,7 +165,7 @@ public: int _right; int _top; }; - typedef vector SubtextureDefs; + typedef pvector SubtextureDefs; int _num_texels_u; int _num_texels_v; diff --git a/pandatool/src/flt/fltVertexList.h b/pandatool/src/flt/fltVertexList.h index 7a1243f63d..8ea756c117 100644 --- a/pandatool/src/flt/fltVertexList.h +++ b/pandatool/src/flt/fltVertexList.h @@ -48,7 +48,7 @@ protected: virtual bool build_record(FltRecordWriter &writer) const; private: - typedef vector Vertices; + typedef pvector Vertices; Vertices _vertices; public: diff --git a/pandatool/src/fltegg/fltToEggConverter.h b/pandatool/src/fltegg/fltToEggConverter.h index d55c763e8b..84c59a404e 100644 --- a/pandatool/src/fltegg/fltToEggConverter.h +++ b/pandatool/src/fltegg/fltToEggConverter.h @@ -70,7 +70,7 @@ public: private: void cleanup(); - typedef vector< PT_EggVertex > EggVertices; + typedef pvector< PT_EggVertex > EggVertices; void convert_record(const FltRecord *flt_record, FltToEggLevelState &state); void dispatch_record(const FltRecord *flt_record, FltToEggLevelState &state); @@ -102,7 +102,7 @@ private: PT(EggVertexPool) _main_egg_vpool; - typedef map Textures; + typedef pmap Textures; Textures _textures; }; diff --git a/pandatool/src/fltegg/fltToEggLevelState.h b/pandatool/src/fltegg/fltToEggLevelState.h index e347b80e29..9491c0c1b9 100644 --- a/pandatool/src/fltegg/fltToEggLevelState.h +++ b/pandatool/src/fltegg/fltToEggLevelState.h @@ -56,7 +56,7 @@ private: EggGroup *_plain; }; - typedef map Parents; + typedef pmap Parents; Parents _parents; }; diff --git a/pandatool/src/fltprogs/fltCopy.h b/pandatool/src/fltprogs/fltCopy.h index cbf78f7ee3..8b67eb62fb 100644 --- a/pandatool/src/fltprogs/fltCopy.h +++ b/pandatool/src/fltprogs/fltCopy.h @@ -26,7 +26,7 @@ #include #include -#include +#include "pset.h" class FltRecord; class FltTexture; @@ -68,8 +68,8 @@ private: bool new_file); - typedef set Refs; - typedef set Textures; + typedef pset Refs; + typedef pset Textures; void scan_flt(FltRecord *record, Refs &refs, Textures &textures); diff --git a/pandatool/src/gtk-stats/gtkStatsMonitor.h b/pandatool/src/gtk-stats/gtkStatsMonitor.h index d716e1b0ff..b14dbf53b9 100644 --- a/pandatool/src/gtk-stats/gtkStatsMonitor.h +++ b/pandatool/src/gtk-stats/gtkStatsMonitor.h @@ -24,7 +24,7 @@ #include #include -#include +#include "pset.h" class GtkStatsWindow; @@ -58,7 +58,7 @@ public: void add_window(GtkStatsWindow *window); void remove_window(GtkStatsWindow *window); - typedef set Windows; + typedef pset Windows; Windows _windows; bool _destructing; diff --git a/pandatool/src/gtk-stats/gtkStatsPianoRoll.h b/pandatool/src/gtk-stats/gtkStatsPianoRoll.h index 49723ca884..21108c443c 100644 --- a/pandatool/src/gtk-stats/gtkStatsPianoRoll.h +++ b/pandatool/src/gtk-stats/gtkStatsPianoRoll.h @@ -27,7 +27,7 @@ #include #include -#include +#include "pmap.h" class PStatView; class GtkStatsGuide; @@ -74,7 +74,7 @@ private: Gdk_GC _light_gc; // Table of graphics contexts for our various collectors. - typedef map GCs; + typedef pmap GCs; GCs _gcs; // Table of Y-positions for each of our rows, measured from the diff --git a/pandatool/src/gtk-stats/gtkStatsStripChart.h b/pandatool/src/gtk-stats/gtkStatsStripChart.h index f6fbc53d8a..4b795e8cd0 100644 --- a/pandatool/src/gtk-stats/gtkStatsStripChart.h +++ b/pandatool/src/gtk-stats/gtkStatsStripChart.h @@ -27,7 +27,7 @@ #include #include -#include +#include "pmap.h" class PStatView; class GtkStatsGuide; @@ -83,7 +83,7 @@ private: Gdk_GC _light_gc; // Table of graphics contexts for our various collectors. - typedef map GCs; + typedef pmap GCs; GCs _gcs; Gtk::Alignment *_label_align; diff --git a/pandatool/src/lwo/lwoDiscontinuousVertexMap.h b/pandatool/src/lwo/lwoDiscontinuousVertexMap.h index 5ee5e01f6c..7934492405 100644 --- a/pandatool/src/lwo/lwoDiscontinuousVertexMap.h +++ b/pandatool/src/lwo/lwoDiscontinuousVertexMap.h @@ -45,8 +45,8 @@ public: virtual void write(ostream &out, int indent_level = 0) const; private: - typedef map VMap; - typedef map VMad; + typedef pmap VMap; + typedef pmap VMad; VMad _vmad; public: diff --git a/pandatool/src/lwo/lwoGroupChunk.h b/pandatool/src/lwo/lwoGroupChunk.h index 3b6278928d..305c0e82db 100644 --- a/pandatool/src/lwo/lwoGroupChunk.h +++ b/pandatool/src/lwo/lwoGroupChunk.h @@ -26,7 +26,7 @@ #include -#include +#include "pvector.h" //////////////////////////////////////////////////////////////////// // Class : LwoGroupChunk @@ -43,7 +43,7 @@ protected: bool read_subchunks_iff(IffInputFile *in, size_t stop_at); void write_chunks(ostream &out, int indent_level) const; - typedef vector< PT(IffChunk) > Chunks; + typedef pvector< PT(IffChunk) > Chunks; Chunks _chunks; public: diff --git a/pandatool/src/lwo/lwoPoints.h b/pandatool/src/lwo/lwoPoints.h index 8b52dac6bb..e95ccd97cd 100644 --- a/pandatool/src/lwo/lwoPoints.h +++ b/pandatool/src/lwo/lwoPoints.h @@ -40,7 +40,7 @@ public: virtual void write(ostream &out, int indent_level = 0) const; private: - typedef vector Points; + typedef pvector Points; Points _points; public: diff --git a/pandatool/src/lwo/lwoPolygonTags.h b/pandatool/src/lwo/lwoPolygonTags.h index cf7662a829..08359bd2c6 100644 --- a/pandatool/src/lwo/lwoPolygonTags.h +++ b/pandatool/src/lwo/lwoPolygonTags.h @@ -42,7 +42,7 @@ public: virtual void write(ostream &out, int indent_level = 0) const; private: - typedef map TMap; + typedef pmap TMap; TMap _tmap; public: diff --git a/pandatool/src/lwo/lwoPolygons.h b/pandatool/src/lwo/lwoPolygons.h index 7844a310cd..dcbacde51b 100644 --- a/pandatool/src/lwo/lwoPolygons.h +++ b/pandatool/src/lwo/lwoPolygons.h @@ -68,7 +68,7 @@ public: virtual void write(ostream &out, int indent_level = 0) const; private: - typedef vector< PT(Polygon) > Polygons; + typedef pvector< PT(Polygon) > Polygons; Polygons _polygons; public: diff --git a/pandatool/src/lwo/lwoVertexMap.h b/pandatool/src/lwo/lwoVertexMap.h index 4998f3efaf..2bce86ec62 100644 --- a/pandatool/src/lwo/lwoVertexMap.h +++ b/pandatool/src/lwo/lwoVertexMap.h @@ -45,7 +45,7 @@ public: virtual void write(ostream &out, int indent_level = 0) const; private: - typedef map VMap; + typedef pmap VMap; VMap _vmap; public: diff --git a/pandatool/src/lwoegg/cLwoPoints.h b/pandatool/src/lwoegg/cLwoPoints.h index 72ba252256..2e8d99ee37 100644 --- a/pandatool/src/lwoegg/cLwoPoints.h +++ b/pandatool/src/lwoegg/cLwoPoints.h @@ -25,7 +25,7 @@ #include #include -#include +#include "pmap.h" class LwoToEggConverter; class LwoVertexMap; @@ -55,7 +55,7 @@ public: // A number of vertex maps of different types may be associated, but // we only care about some of the types here. - typedef map VMap; + typedef pmap VMap; VMap _txuv; VMap _pick; }; diff --git a/pandatool/src/lwoegg/cLwoPolygons.h b/pandatool/src/lwoegg/cLwoPolygons.h index eaa0f056a9..465bf75e90 100644 --- a/pandatool/src/lwoegg/cLwoPolygons.h +++ b/pandatool/src/lwoegg/cLwoPolygons.h @@ -25,7 +25,7 @@ #include #include -#include +#include "pmap.h" class LwoToEggConverter; class CLwoPoints; @@ -61,14 +61,14 @@ public: PT(EggGroup) _egg_group; const LwoTags *_tags; - typedef map PTags; + typedef pmap PTags; PTags _ptags; const LwoPolygonTags *_surf_ptags; // There might be named maps associated with the polygons to bring a // per-polygon mapping to the UV's. - typedef map VMad; + typedef pmap VMad; VMad _txuv; private: diff --git a/pandatool/src/lwoegg/cLwoSurface.h b/pandatool/src/lwoegg/cLwoSurface.h index 2eb5d8c2a1..49e6ae5dd4 100644 --- a/pandatool/src/lwoegg/cLwoSurface.h +++ b/pandatool/src/lwoegg/cLwoSurface.h @@ -31,7 +31,7 @@ #include #include -#include +#include "pmap.h" class LwoToEggConverter; class LwoSurfaceBlock; diff --git a/pandatool/src/lwoegg/lwoToEggConverter.h b/pandatool/src/lwoegg/lwoToEggConverter.h index 4382b481ec..2ca16ed8fa 100644 --- a/pandatool/src/lwoegg/lwoToEggConverter.h +++ b/pandatool/src/lwoegg/lwoToEggConverter.h @@ -25,8 +25,8 @@ #include #include -#include -#include +#include "pvector.h" +#include "pmap.h" class CLwoLayer; class CLwoClip; @@ -77,19 +77,19 @@ private: CPT(LwoHeader) _lwo_header; CLwoLayer *_generic_layer; - typedef vector Layers; + typedef pvector Layers; Layers _layers; - typedef vector Clips; + typedef pvector Clips; Clips _clips; - typedef vector Points; + typedef pvector Points; Points _points; - typedef vector Polygons; + typedef pvector Polygons; Polygons _polygons; - typedef map Surfaces; + typedef pmap Surfaces; Surfaces _surfaces; }; diff --git a/pandatool/src/maya/mayaFile.h b/pandatool/src/maya/mayaFile.h index a17b1c0d17..70975a288d 100644 --- a/pandatool/src/maya/mayaFile.h +++ b/pandatool/src/maya/mayaFile.h @@ -63,7 +63,7 @@ private: EggGroup *get_egg_group(const string &name, EggData &data); - typedef map Groups; + typedef pmap Groups; Groups _groups; public: diff --git a/pandatool/src/maya/mayaShaders.h b/pandatool/src/maya/mayaShaders.h index 018dfb68c3..66f2326c7c 100644 --- a/pandatool/src/maya/mayaShaders.h +++ b/pandatool/src/maya/mayaShaders.h @@ -21,7 +21,7 @@ #include -#include +#include "pmap.h" #include class MayaShader; @@ -34,7 +34,7 @@ public: protected: - typedef map Shaders; + typedef pmap Shaders; Shaders _shaders; }; diff --git a/pandatool/src/progbase/programBase.h b/pandatool/src/progbase/programBase.h index e2b069ab69..efe8624a4e 100644 --- a/pandatool/src/progbase/programBase.h +++ b/pandatool/src/progbase/programBase.h @@ -26,9 +26,9 @@ #include #include -#include -#include -#include +#include "pvector.h" +#include "pdeque.h" +#include "pmap.h" //////////////////////////////////////////////////////////////////// // Class : ProgramBase @@ -51,7 +51,7 @@ public: virtual void parse_command_line(int argc, char *argv[]); - typedef deque Args; + typedef pdeque Args; Filename _program_name; Args _program_args; @@ -129,14 +129,14 @@ private: typedef vector_string Runlines; Runlines _runlines; - typedef map OptionsByName; - typedef vector OptionsByIndex; + typedef pmap OptionsByName; + typedef pvector OptionsByIndex; OptionsByName _options_by_name; OptionsByIndex _options_by_index; int _next_sequence; bool _sorted_options; - typedef map GotOptions; + typedef pmap GotOptions; GotOptions _got_options; bool _last_newline; diff --git a/pandatool/src/pstatserver/pStatClientData.h b/pandatool/src/pstatserver/pStatClientData.h index 87b0e5a967..c61aa6d68b 100644 --- a/pandatool/src/pstatserver/pStatClientData.h +++ b/pandatool/src/pstatserver/pStatClientData.h @@ -27,7 +27,7 @@ #include #include -#include +#include "pvector.h" class PStatReader; @@ -80,7 +80,7 @@ private: bool _is_level; }; - typedef vector Collectors; + typedef pvector Collectors; Collectors _collectors; class Thread { @@ -88,7 +88,7 @@ private: string _name; PT(PStatThreadData) _data; }; - typedef vector Threads; + typedef pvector Threads; Threads _threads; static PStatCollectorDef _null_collector; diff --git a/pandatool/src/pstatserver/pStatGraph.h b/pandatool/src/pstatserver/pStatGraph.h index ab1b5b7928..db174e96e8 100644 --- a/pandatool/src/pstatserver/pStatGraph.h +++ b/pandatool/src/pstatserver/pStatGraph.h @@ -27,7 +27,7 @@ #include #include -#include +#include "pmap.h" class PStatView; @@ -104,7 +104,7 @@ protected: typedef vector_int Labels; Labels _labels; - typedef vector GuideBars; + typedef pvector GuideBars; GuideBars _guide_bars; int _guide_bar_units; string _unit_name; diff --git a/pandatool/src/pstatserver/pStatMonitor.h b/pandatool/src/pstatserver/pStatMonitor.h index 5acb39678f..fc4f31c0f8 100644 --- a/pandatool/src/pstatserver/pStatMonitor.h +++ b/pandatool/src/pstatserver/pStatMonitor.h @@ -28,7 +28,7 @@ #include #include -#include +#include "pmap.h" class PStatCollectorDef; @@ -101,12 +101,12 @@ private: string _client_hostname; string _client_progname; - typedef map Views; + typedef pmap Views; Views _views; - typedef map LevelViews; + typedef pmap LevelViews; LevelViews _level_views; - typedef map Colors; + typedef pmap Colors; Colors _colors; }; diff --git a/pandatool/src/pstatserver/pStatPianoRoll.h b/pandatool/src/pstatserver/pStatPianoRoll.h index 2d39d072c8..8cdeddd001 100644 --- a/pandatool/src/pstatserver/pStatPianoRoll.h +++ b/pandatool/src/pstatserver/pStatPianoRoll.h @@ -28,7 +28,7 @@ #include #include -#include +#include "pmap.h" class PStatFrameData; @@ -83,7 +83,7 @@ private: float _start; float _end; }; - typedef vector ColorBars; + typedef pvector ColorBars; class BarBuilder { public: @@ -96,7 +96,7 @@ private: ColorBars _color_bars; }; - typedef map PageData; + typedef pmap PageData; PageData _page_data; int _current_frame; }; diff --git a/pandatool/src/pstatserver/pStatServer.h b/pandatool/src/pstatserver/pStatServer.h index 58b325aa9b..50a21cfbf0 100644 --- a/pandatool/src/pstatserver/pStatServer.h +++ b/pandatool/src/pstatserver/pStatServer.h @@ -25,8 +25,8 @@ #include -#include -#include +#include "pmap.h" +#include "pdeque.h" class PStatReader; @@ -68,13 +68,13 @@ private: PStatListener *_listener; - typedef map Readers; + typedef pmap Readers; Readers _readers; - typedef vector LostReaders; + typedef pvector LostReaders; LostReaders _lost_readers; LostReaders _removed_readers; - typedef deque Ports; + typedef pdeque Ports; Ports _available_udp_ports; int _next_udp_port; }; diff --git a/pandatool/src/pstatserver/pStatStripChart.h b/pandatool/src/pstatserver/pStatStripChart.h index e23d9cac52..f036de2043 100644 --- a/pandatool/src/pstatserver/pStatStripChart.h +++ b/pandatool/src/pstatserver/pStatStripChart.h @@ -28,7 +28,7 @@ #include #include -#include +#include "pmap.h" class PStatView; @@ -78,8 +78,8 @@ protected: int _collector_index; float _net_value; }; - typedef vector FrameData; - typedef map Data; + typedef pvector FrameData; + typedef pmap Data; const FrameData &get_frame_data(int frame_number); diff --git a/pandatool/src/pstatserver/pStatThreadData.h b/pandatool/src/pstatserver/pStatThreadData.h index 3d8bb918fe..e94498b115 100644 --- a/pandatool/src/pstatserver/pStatThreadData.h +++ b/pandatool/src/pstatserver/pStatThreadData.h @@ -23,7 +23,7 @@ #include -#include +#include "pdeque.h" class PStatCollectorDef; class PStatFrameData; @@ -71,7 +71,7 @@ public: private: const PStatClientData *_client_data; - typedef deque Frames; + typedef pdeque Frames; Frames _frames; int _first_frame_number; float _history; diff --git a/pandatool/src/pstatserver/pStatView.h b/pandatool/src/pstatserver/pStatView.h index 475c35afaf..15bbe334c6 100644 --- a/pandatool/src/pstatserver/pStatView.h +++ b/pandatool/src/pstatserver/pStatView.h @@ -72,7 +72,7 @@ private: bool _show_level; bool _all_collectors_known; - typedef map Levels; + typedef pmap Levels; Levels _levels; int _level_index; diff --git a/pandatool/src/pstatserver/pStatViewLevel.h b/pandatool/src/pstatserver/pStatViewLevel.h index 58540382dd..8b59dc6fde 100644 --- a/pandatool/src/pstatserver/pStatViewLevel.h +++ b/pandatool/src/pstatserver/pStatViewLevel.h @@ -21,7 +21,7 @@ #include -#include +#include "pvector.h" class PStatClientData; @@ -50,7 +50,7 @@ private: float _value_alone; PStatViewLevel *_parent; - typedef vector Children; + typedef pvector Children; Children _children; friend class PStatView; diff --git a/pandatool/src/softprogs/softCVS.h b/pandatool/src/softprogs/softCVS.h index 1ba0a9d735..358a0fcd05 100644 --- a/pandatool/src/softprogs/softCVS.h +++ b/pandatool/src/softprogs/softCVS.h @@ -27,8 +27,8 @@ #include #include -#include -#include +#include "pvector.h" +#include "pset.h" //////////////////////////////////////////////////////////////////// // Class : SoftCVS @@ -43,8 +43,8 @@ public: void run(); private: - typedef vector SceneFiles; - typedef multiset ElementFiles; + typedef pvector SceneFiles; + typedef pmultipset ElementFiles; void traverse_root(); void traverse_subdir(const Filename &directory); @@ -54,7 +54,7 @@ private: void remove_unused_elements(); bool rename_file(SceneFiles::iterator begin, SceneFiles::iterator end); - bool scan_cvs(const string &dirname, set &cvs_elements); + bool scan_cvs(const string &dirname, pset &cvs_elements); void scan_scene_file(istream &in);