RomanNum3ral
/
open_toontown_panda3d
mirror of https://github.com/open-toontown/panda3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

general: Fully qualify header references into the std namespace 

Closes #341
This commit is contained in:
Sam Edwards 2018-06-06 00:02:28 -06:00 committed by rdb
parent 4754ba524c
commit 7790f8429d
1637 changed files with 7601 additions and 7604 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
contrib/src/ai/aiBehaviors.h
View File

@ -28,8 +28,8 @@ class PathFollow;
class PathFind;
class ObstacleAvoidance;
typedef list<Flee, allocator<Flee> > ListFlee;
typedef list<Evade, allocator<Evade> > ListEvade;
typedef std::list<Flee, std::allocator<Flee> > ListFlee;
typedef std::list<Evade, std::allocator<Evade> > ListEvade;
/**
* This class implements all the steering behaviors of the AI framework, such
@ -113,21 +113,21 @@ public:
~AIBehaviors();
bool is_on(_behavior_type bt);
bool is_on(string ai_type); // special cases for pathfollow and pathfinding
bool is_on(std::string ai_type); // special cases for pathfollow and pathfinding
bool is_off(_behavior_type bt);
bool is_off(string ai_type); // special cases for pathfollow and pathfinding
void turn_on(string ai_type);
void turn_off(string ai_type);
bool is_off(std::string ai_type); // special cases for pathfollow and pathfinding
void turn_on(std::string ai_type);
void turn_off(std::string ai_type);
bool is_conflict();
void accumulate_force(string force_type, LVecBase3 force);
void accumulate_force(std::string force_type, LVecBase3 force);
LVecBase3 calculate_prioritized();
void flock_activate();
LVecBase3 do_flock();
int char_to_int(string ai_type);
int char_to_int(std::string ai_type);
PUBLISHED:
void seek(NodePath target_object, float seek_wt = 1.0);
@ -150,21 +150,21 @@ PUBLISHED:
void path_follow(float follow_wt);
void add_to_path(LVecBase3 pos);
void start_follow(string type = "normal");
void start_follow(std::string type = "normal");
// should have different function names.
void init_path_find(const char* navmesh_filename);
void path_find_to(LVecBase3 pos, string type = "normal");
void path_find_to(NodePath target, string type = "normal");
void path_find_to(LVecBase3 pos, std::string type = "normal");
void path_find_to(NodePath target, std::string type = "normal");
void add_static_obstacle(NodePath obstacle);
void add_dynamic_obstacle(NodePath obstacle);
void remove_ai(string ai_type);
void pause_ai(string ai_type);
void resume_ai(string ai_type);
void remove_ai(std::string ai_type);
void pause_ai(std::string ai_type);
void resume_ai(std::string ai_type);
string behavior_status(string ai_type);
std::string behavior_status(std::string ai_type);
};
#endif

4
contrib/src/ai/aiCharacter.h
View File

@ -32,7 +32,7 @@ class EXPCL_PANDAAI AICharacter : public ReferenceCount {
double _max_force;
LVecBase3 _velocity;
LVecBase3 _steering_force;
string _name;
std::string _name;
double _movt_force;
unsigned int _ai_char_flock_id;
AIWorld *_world;
@ -63,7 +63,7 @@ PUBLISHED:
// This function is used to enable or disable the guides for path finding.
void set_pf_guide(bool pf_guide);
explicit AICharacter(string model_name, NodePath model_np, double mass, double movt_force, double max_force);
explicit AICharacter(std::string model_name, NodePath model_np, double mass, double movt_force, double max_force);
~AICharacter();
};

4
contrib/src/ai/aiWorld.h
View File

@ -37,14 +37,14 @@ class EXPCL_PANDAAI AIWorld {
std::vector<NodePath> _obstacles;
typedef std::vector<Flock*> FlockPool;
FlockPool _flock_pool;
void remove_ai_char_from_flock(string name);
void remove_ai_char_from_flock(std::string name);
PUBLISHED:
AIWorld(NodePath render);
~AIWorld();
void add_ai_char(AICharacter *ai_ch);
void remove_ai_char(string name);
void remove_ai_char(std::string name);
void add_flock(Flock *flock);
void flock_off(unsigned int flock_id);

4
contrib/src/ai/pathFind.h
View File

@ -56,8 +56,8 @@ public:
void clear_previous_obstacles();
void set_path_find(const char* navmesh_filename);
void path_find(LVecBase3 pos, string type = "normal");
void path_find(NodePath target, string type = "normal");
void path_find(LVecBase3 pos, std::string type = "normal");
void path_find(NodePath target, std::string type = "normal");
void add_obstacle_to_mesh(NodePath obstacle);
void dynamic_avoid(NodePath obstacle);
};

6
contrib/src/ai/pathFollow.h
View File

@ -13,18 +13,18 @@ class EXPCL_PANDAAI PathFollow {
public:
AICharacter *_ai_char;
float _follow_weight;
vector<LVecBase3> _path;
std::vector<LVecBase3> _path;
int _curr_path_waypoint;
bool _start;
NodePath _dummy;
string _type;
std::string _type;
ClockObject *_myClock;
float _time;
PathFollow(AICharacter *ai_ch, float follow_wt);
~PathFollow();
void add_to_path(LVecBase3 pos);
void start(string type);
void start(std::string type);
void do_follow();
bool check_if_possible();
};

2
contrib/src/rplight/gpuCommand.I
View File

@ -74,7 +74,7 @@ inline float GPUCommand::convert_int_to_float(int v) const {
*/
inline void GPUCommand::push_float(float v) {
if (_current_index >= GPU_COMMAND_ENTRIES) {
gpucommand_cat.error() << "Out of bounds! Exceeded command size of " << GPU_COMMAND_ENTRIES << endl;
gpucommand_cat.error() << "Out of bounds! Exceeded command size of " << GPU_COMMAND_ENTRIES << std::endl;
return;
}
_data[_current_index++] = v;

2
contrib/src/rplight/gpuCommand.h
View File

@ -73,7 +73,7 @@ PUBLISHED:
inline static bool get_uses_integer_packing();
void write_to(const PTA_uchar &dest, size_t command_index);
void write(ostream &out) const;
void write(std::ostream &out) const;
private:

2
contrib/src/rplight/pointerSlotStorage.h
View File

@ -203,7 +203,7 @@ public:
nassertv(slot >= 0 && slot < SIZE);
nassertv(_data[slot] == nullptr); // Slot already taken!
nassertv(ptr != nullptr); // nullptr passed as argument!
_max_index = max(_max_index, (int)slot);
_max_index = std::max(_max_index, (int)slot);
_data[slot] = ptr;
_num_entries++;
}

2
contrib/src/rplight/rpLight.I
View File

@ -278,7 +278,7 @@ inline RPLight::LightType RPLight::get_light_type() const {
*/
inline void RPLight::set_casts_shadows(bool flag) {
if (has_slot()) {
cerr << "Light is already attached, can not call set_casts_shadows!" << endl;
std::cerr << "Light is already attached, can not call set_casts_shadows!" << std::endl;
return;
}
_casts_shadows = flag;

2
contrib/src/rplight/rpLight.h
View File

@ -122,7 +122,7 @@ protected:
LightType _light_type;
float _near_plane;
vector<ShadowSource*> _shadow_sources;
std::vector<ShadowSource*> _shadow_sources;
};
#include "rpLight.I"

2
contrib/src/rplight/shadowAtlas.I
View File

@ -118,7 +118,7 @@ inline int ShadowAtlas::get_required_tiles(size_t resolution) const {
if (resolution % _tile_size != 0) {
shadowatlas_cat.error() << "Resolution " << resolution << " is not a multiple "
<< "of the shadow atlas tile size (" << _tile_size << ")!" << endl;
<< "of the shadow atlas tile size (" << _tile_size << ")!" << std::endl;
return 1;
}
return resolution / _tile_size;

4
contrib/src/rplight/shadowManager.I
View File

@ -52,7 +52,7 @@ inline void ShadowManager::set_max_updates(size_t max_updates) {
nassertv(max_updates >= 0);
nassertv(_atlas == nullptr); // ShadowManager was already initialized
if (max_updates == 0) {
shadowmanager_cat.warning() << "max_updates set to 0, no shadows will be updated." << endl;
shadowmanager_cat.warning() << "max_updates set to 0, no shadows will be updated." << std::endl;
}
_max_updates = max_updates;
}
@ -170,7 +170,7 @@ inline bool ShadowManager::add_update(const ShadowSource* source) {
if (_queued_updates.size() >= _max_updates) {
if (shadowmanager_cat.is_debug()) {
shadowmanager_cat.debug() << "cannot update source, out of update slots" << endl;
shadowmanager_cat.debug() << "cannot update source, out of update slots" << std::endl;
}
return false;
}

10
contrib/src/rplight/tagStateManager.I
View File

@ -35,7 +35,7 @@
* @param source Camera which will be used to render shadows
*/
inline void TagStateManager::
register_camera(const string& name, Camera* source) {
register_camera(const std::string& name, Camera* source) {
ContainerList::iterator entry = _containers.find(name);
nassertv(entry != _containers.end());
register_camera(entry->second, source);
@ -49,7 +49,7 @@ register_camera(const string& name, Camera* source) {
* @param source Camera to unregister
*/
inline void TagStateManager::
unregister_camera(const string& name, Camera* source) {
unregister_camera(const std::string& name, Camera* source) {
ContainerList::iterator entry = _containers.find(name);
nassertv(entry != _containers.end());
unregister_camera(entry->second, source);
@ -67,8 +67,8 @@ unregister_camera(const string& name, Camera* source) {
* @param sort Determines the sort with which the shader will be applied.
*/
inline void TagStateManager::
apply_state(const string& state, NodePath np, Shader* shader,
const string &name, int sort) {
apply_state(const std::string& state, NodePath np, Shader* shader,
const std::string &name, int sort) {
ContainerList::iterator entry = _containers.find(state);
nassertv(entry != _containers.end());
apply_state(entry->second, np, shader, name, sort);
@ -83,7 +83,7 @@ apply_state(const string& state, NodePath np, Shader* shader,
* @return Bit mask of the render pass
*/
inline BitMask32 TagStateManager::
get_mask(const string &container_name) {
get_mask(const std::string &container_name) {
if (container_name == "gbuffer") {
return BitMask32::bit(1);
}

20
contrib/src/rplight/tagStateManager.h
View File

@ -52,36 +52,36 @@ PUBLISHED:
TagStateManager(NodePath main_cam_node);
~TagStateManager();
inline void apply_state(const string& state, NodePath np, Shader* shader, const string &name, int sort);
inline void apply_state(const std::string& state, NodePath np, Shader* shader, const std::string &name, int sort);
void cleanup_states();
inline void register_camera(const string& state, Camera* source);
inline void unregister_camera(const string& state, Camera* source);
inline BitMask32 get_mask(const string &container_name);
inline void register_camera(const std::string& state, Camera* source);
inline void unregister_camera(const std::string& state, Camera* source);
inline BitMask32 get_mask(const std::string &container_name);
private:
typedef vector<Camera*> CameraList;
typedef pmap<string, CPT(RenderState)> TagStateList;
typedef std::vector<Camera*> CameraList;
typedef pmap<std::string, CPT(RenderState)> TagStateList;
struct StateContainer {
CameraList cameras;
TagStateList tag_states;
string tag_name;
std::string tag_name;
BitMask32 mask;
bool write_color;
StateContainer() {};
StateContainer(const string &tag_name, size_t mask, bool write_color)
StateContainer(const std::string &tag_name, size_t mask, bool write_color)
: tag_name(tag_name), mask(BitMask32::bit(mask)), write_color(write_color) {};
};
void apply_state(StateContainer& container, NodePath np, Shader* shader,
const string& name, int sort);
const std::string& name, int sort);
void cleanup_container_states(StateContainer& container);
void register_camera(StateContainer &container, Camera* source);
void unregister_camera(StateContainer &container, Camera* source);
typedef pmap<string, StateContainer> ContainerList;
typedef pmap<std::string, StateContainer> ContainerList;
ContainerList _containers;
NodePath _main_cam_node;

8
direct/src/dcparser/dcArrayParameter.h
View File

@ -46,14 +46,14 @@ public:
virtual DCPackerInterface *get_nested_field(int n) const;
virtual bool validate_num_nested_fields(int num_nested_fields) const;
virtual void output_instance(ostream &out, bool brief, const string &prename,
const string &name, const string &postname) const;
virtual void output_instance(std::ostream &out, bool brief, const std::string &prename,
const std::string &name, const std::string &postname) const;
virtual void generate_hash(HashGenerator &hashgen) const;
virtual void pack_string(DCPackData &pack_data, const string &value,
virtual void pack_string(DCPackData &pack_data, const std::string &value,
bool &pack_error, bool &range_error) const;
virtual bool pack_default_value(DCPackData &pack_data, bool &pack_error) const;
virtual void unpack_string(const char *data, size_t length, size_t &p,
string &value, bool &pack_error, bool &range_error) const;
std::string &value, bool &pack_error, bool &range_error) const;
protected:
virtual bool do_check_match(const DCPackerInterface *other) const;

12
direct/src/dcparser/dcAtomicField.h
View File

@ -29,7 +29,7 @@
*/
class DCAtomicField : public DCField {
public:
DCAtomicField(const string &name, DCClass *dclass, bool bogus_field);
DCAtomicField(const std::string &name, DCClass *dclass, bool bogus_field);
virtual ~DCAtomicField();
PUBLISHED:
@ -40,17 +40,17 @@ PUBLISHED:
DCParameter *get_element(int n) const;
// These five methods are deprecated and will be removed soon.
string get_element_default(int n) const;
std::string get_element_default(int n) const;
bool has_element_default(int n) const;
string get_element_name(int n) const;
std::string get_element_name(int n) const;
DCSubatomicType get_element_type(int n) const;
int get_element_divisor(int n) const;
public:
void add_element(DCParameter *element);
virtual void output(ostream &out, bool brief) const;
virtual void write(ostream &out, bool brief, int indent_level) const;
virtual void output(std::ostream &out, bool brief) const;
virtual void write(std::ostream &out, bool brief, int indent_level) const;
virtual void generate_hash(HashGenerator &hashgen) const;
virtual DCPackerInterface *get_nested_field(int n) const;
@ -60,7 +60,7 @@ protected:
virtual bool do_check_match_atomic_field(const DCAtomicField *other) const;
private:
void output_element(ostream &out, bool brief, DCParameter *element) const;
void output_element(std::ostream &out, bool brief, DCParameter *element) const;
typedef pvector<DCParameter *> Elements;
Elements _elements;

2
direct/src/dcparser/dcClass.I
View File

@ -22,7 +22,7 @@ get_dc_file() const {
/**
* Returns the name of this class.
*/
INLINE const string &DCClass::
INLINE const std::string &DCClass::
get_name() const {
return _name;
}

34
direct/src/dcparser/dcClass.h
View File

@ -43,7 +43,7 @@ class DCParameter;
*/
class DCClass : public DCDeclaration {
public:
DCClass(DCFile *dc_file, const string &name,
DCClass(DCFile *dc_file, const std::string &name,
bool is_struct, bool bogus_class);
~DCClass();
@ -53,7 +53,7 @@ PUBLISHED:
INLINE DCFile *get_dc_file() const;
INLINE const string &get_name() const;
INLINE const std::string &get_name() const;
INLINE int get_number() const;
int get_num_parents() const;
@ -65,7 +65,7 @@ PUBLISHED:
int get_num_fields() const;
DCField *get_field(int n) const;
DCField *get_field_by_name(const string &name) const;
DCField *get_field_by_name(const std::string &name) const;
DCField *get_field_by_index(int index_number) const;
int get_num_inherited_fields() const;
@ -78,7 +78,7 @@ PUBLISHED:
INLINE void start_generate();
INLINE void stop_generate();
virtual void output(ostream &out) const;
virtual void output(std::ostream &out) const;
#ifdef HAVE_PYTHON
bool has_class_def() const;
@ -94,9 +94,9 @@ PUBLISHED:
void receive_update_all_required(PyObject *distobj, DatagramIterator &di) const;
void receive_update_other(PyObject *distobj, DatagramIterator &di) const;
void direct_update(PyObject *distobj, const string &field_name,
const string &value_blob);
void direct_update(PyObject *distobj, const string &field_name,
void direct_update(PyObject *distobj, const std::string &field_name,
const std::string &value_blob);
void direct_update(PyObject *distobj, const std::string &field_name,
const Datagram &datagram);
bool pack_required_field(Datagram &datagram, PyObject *distobj,
const DCField *field) const;
@ -105,11 +105,11 @@ PUBLISHED:
Datagram client_format_update(const string &field_name,
Datagram client_format_update(const std::string &field_name,
DOID_TYPE do_id, PyObject *args) const;
Datagram ai_format_update(const string &field_name, DOID_TYPE do_id,
Datagram ai_format_update(const std::string &field_name, DOID_TYPE do_id,
CHANNEL_TYPE to_id, CHANNEL_TYPE from_id, PyObject *args) const;
Datagram ai_format_update_msg_type(const string &field_name, DOID_TYPE do_id,
Datagram ai_format_update_msg_type(const std::string &field_name, DOID_TYPE do_id,
CHANNEL_TYPE to_id, CHANNEL_TYPE from_id, int msg_type, PyObject *args) const;
Datagram ai_format_generate(PyObject *distobj, DOID_TYPE do_id, ZONEID_TYPE parent_id, ZONEID_TYPE zone_id,
CHANNEL_TYPE district_channel_id, CHANNEL_TYPE from_channel_id,
@ -120,10 +120,10 @@ PUBLISHED:
#endif
public:
virtual void output(ostream &out, bool brief) const;
virtual void write(ostream &out, bool brief, int indent_level) const;
void output_instance(ostream &out, bool brief, const string &prename,
const string &name, const string &postname) const;
virtual void output(std::ostream &out, bool brief) const;
virtual void write(std::ostream &out, bool brief, int indent_level) const;
void output_instance(std::ostream &out, bool brief, const std::string &prename,
const std::string &name, const std::string &postname) const;
void generate_hash(HashGenerator &hashgen) const;
void clear_inherited_fields();
void rebuild_inherited_fields();
@ -133,7 +133,7 @@ public:
void set_number(int number);
private:
void shadow_inherited_field(const string &name);
void shadow_inherited_field(const std::string &name);
#ifdef WITHIN_PANDA
PStatCollector _class_update_pcollector;
@ -144,7 +144,7 @@ private:
DCFile *_dc_file;
string _name;
std::string _name;
bool _is_struct;
bool _bogus_class;
int _number;
@ -157,7 +157,7 @@ private:
typedef pvector<DCField *> Fields;
Fields _fields, _inherited_fields;
typedef pmap<string, DCField *> FieldsByName;
typedef pmap<std::string, DCField *> FieldsByName;
FieldsByName _fields_by_name;
typedef pmap<int, DCField *> FieldsByIndex;

4
direct/src/dcparser/dcClassParameter.h
View File

@ -39,8 +39,8 @@ PUBLISHED:
public:
virtual DCPackerInterface *get_nested_field(int n) const;
virtual void output_instance(ostream &out, bool brief, const string &prename,
const string &name, const string &postname) const;
virtual void output_instance(std::ostream &out, bool brief, const std::string &prename,
const std::string &name, const std::string &postname) const;
virtual void generate_hash(HashGenerator &hashgen) const;
protected:

10
direct/src/dcparser/dcDeclaration.h
View File

@ -36,15 +36,15 @@ PUBLISHED:
virtual DCSwitch *as_switch();
virtual const DCSwitch *as_switch() const;
virtual void output(ostream &out) const;
void write(ostream &out, int indent_level) const;
virtual void output(std::ostream &out) const;
void write(std::ostream &out, int indent_level) const;
public:
virtual void output(ostream &out, bool brief) const=0;
virtual void write(ostream &out, bool brief, int indent_level) const=0;
virtual void output(std::ostream &out, bool brief) const=0;
virtual void write(std::ostream &out, bool brief, int indent_level) const=0;
};
INLINE ostream &operator << (ostream &out, const DCDeclaration &decl) {
INLINE std::ostream &operator << (std::ostream &out, const DCDeclaration &decl) {
decl.output(out);
return out;
}

8
direct/src/dcparser/dcField.I
View File

@ -42,7 +42,7 @@ has_default_value() const {
* explicitly set (e.g. has_default_value() returns true), returns that
* value; otherwise, returns an implicit default for the field.
*/
INLINE const string &DCField::
INLINE const std::string &DCField::
get_default_value() const {
if (_default_value_stale) {
((DCField *)this)->refresh_default_value();
@ -138,7 +138,7 @@ is_airecv() const {
* Write a string representation of this instance to <out>.
*/
INLINE void DCField::
output(ostream &out) const {
output(std::ostream &out) const {
output(out, true);
}
@ -146,7 +146,7 @@ output(ostream &out) const {
* Write a string representation of this instance to <out>.
*/
INLINE void DCField::
write(ostream &out, int indent_level) const {
write(std::ostream &out, int indent_level) const {
write(out, false, indent_level);
}
@ -172,7 +172,7 @@ set_class(DCClass *dclass) {
* Establishes a default value for this field.
*/
INLINE void DCField::
set_default_value(const string &default_value) {
set_default_value(const std::string &default_value) {
_default_value = default_value;
_has_default_value = true;
_default_value_stale = false;

28
direct/src/dcparser/dcField.h
View File

@ -37,7 +37,7 @@ class HashGenerator;
class DCField : public DCPackerInterface, public DCKeywordList {
public:
DCField();
DCField(const string &name, DCClass *dclass);
DCField(const std::string &name, DCClass *dclass);
virtual ~DCField();
PUBLISHED:
@ -53,13 +53,13 @@ PUBLISHED:
virtual DCParameter *as_parameter();
virtual const DCParameter *as_parameter() const;
string format_data(const string &packed_data, bool show_field_names = true);
string parse_string(const string &formatted_string);
std::string format_data(const std::string &packed_data, bool show_field_names = true);
std::string parse_string(const std::string &formatted_string);
bool validate_ranges(const string &packed_data) const;
bool validate_ranges(const std::string &packed_data) const;
INLINE bool has_default_value() const;
INLINE const string &get_default_value() const;
INLINE const std::string &get_default_value() const;
INLINE bool is_bogus_field() const;
@ -73,8 +73,8 @@ PUBLISHED:
INLINE bool is_ownrecv() const;
INLINE bool is_airecv() const;
INLINE void output(ostream &out) const;
INLINE void write(ostream &out, int indent_level) const;
INLINE void output(std::ostream &out) const;
INLINE void write(std::ostream &out, int indent_level) const;
#ifdef HAVE_PYTHON
bool pack_args(DCPacker &packer, PyObject *sequence) const;
@ -90,18 +90,18 @@ PUBLISHED:
#endif
public:
virtual void output(ostream &out, bool brief) const=0;
virtual void write(ostream &out, bool brief, int indent_level) const=0;
virtual void output(std::ostream &out, bool brief) const=0;
virtual void write(std::ostream &out, bool brief, int indent_level) const=0;
virtual void generate_hash(HashGenerator &hashgen) const;
virtual bool pack_default_value(DCPackData &pack_data, bool &pack_error) const;
virtual void set_name(const string &name);
virtual void set_name(const std::string &name);
INLINE void set_number(int number);
INLINE void set_class(DCClass *dclass);
INLINE void set_default_value(const string &default_value);
INLINE void set_default_value(const std::string &default_value);
#ifdef HAVE_PYTHON
static string get_pystr(PyObject *value);
static std::string get_pystr(PyObject *value);
#endif
protected:
@ -115,14 +115,14 @@ protected:
bool _bogus_field;
private:
string _default_value;
std::string _default_value;
#ifdef WITHIN_PANDA
PStatCollector _field_update_pcollector;
#endif
};
INLINE ostream &operator << (ostream &out, const DCField &field) {
INLINE std::ostream &operator << (std::ostream &out, const DCField &field) {
field.output(out);
return out;
}

30
direct/src/dcparser/dcFile.h
View File

@ -41,32 +41,32 @@ PUBLISHED:
#endif
bool read(Filename filename);
bool read(istream &in, const string &filename = string());
bool read(std::istream &in, const std::string &filename = std::string());
bool write(Filename filename, bool brief) const;
bool write(ostream &out, bool brief) const;
bool write(std::ostream &out, bool brief) const;
int get_num_classes() const;
DCClass *get_class(int n) const;
DCClass *get_class_by_name(const string &name) const;
DCSwitch *get_switch_by_name(const string &name) const;
DCClass *get_class_by_name(const std::string &name) const;
DCSwitch *get_switch_by_name(const std::string &name) const;
DCField *get_field_by_index(int index_number) const;
INLINE bool all_objects_valid() const;
int get_num_import_modules() const;
string get_import_module(int n) const;
std::string get_import_module(int n) const;
int get_num_import_symbols(int n) const;
string get_import_symbol(int n, int i) const;
std::string get_import_symbol(int n, int i) const;
int get_num_typedefs() const;
DCTypedef *get_typedef(int n) const;
DCTypedef *get_typedef_by_name(const string &name) const;
DCTypedef *get_typedef_by_name(const std::string &name) const;
int get_num_keywords() const;
const DCKeyword *get_keyword(int n) const;
const DCKeyword *get_keyword_by_name(const string &name) const;
const DCKeyword *get_keyword_by_name(const std::string &name) const;
unsigned long get_hash() const;
@ -74,10 +74,10 @@ public:
void generate_hash(HashGenerator &hashgen) const;
bool add_class(DCClass *dclass);
bool add_switch(DCSwitch *dswitch);
void add_import_module(const string &import_module);
void add_import_symbol(const string &import_symbol);
void add_import_module(const std::string &import_module);
void add_import_symbol(const std::string &import_symbol);
bool add_typedef(DCTypedef *dtypedef);
bool add_keyword(const string &name);
bool add_keyword(const std::string &name);
void add_thing_to_delete(DCDeclaration *decl);
void set_new_index_number(DCField *field);
@ -91,13 +91,13 @@ private:
typedef pvector<DCClass *> Classes;
Classes _classes;
typedef pmap<string, DCDeclaration *> ThingsByName;
typedef pmap<std::string, DCDeclaration *> ThingsByName;
ThingsByName _things_by_name;
typedef pvector<string> ImportSymbols;
typedef pvector<std::string> ImportSymbols;
class Import {
public:
string _module;
std::string _module;
ImportSymbols _symbols;
};
@ -107,7 +107,7 @@ private:
typedef pvector<DCTypedef *> Typedefs;
Typedefs _typedefs;
typedef pmap<string, DCTypedef *> TypedefsByName;
typedef pmap<std::string, DCTypedef *> TypedefsByName;
TypedefsByName _typedefs_by_name;
DCKeywordList _keywords;

10
direct/src/dcparser/dcKeyword.h
View File

@ -27,22 +27,22 @@ class HashGenerator;
*/
class DCKeyword : public DCDeclaration {
public:
DCKeyword(const string &name, int historical_flag = ~0);
DCKeyword(const std::string &name, int historical_flag = ~0);
virtual ~DCKeyword();
PUBLISHED:
const string &get_name() const;
const std::string &get_name() const;
public:
int get_historical_flag() const;
void clear_historical_flag();
virtual void output(ostream &out, bool brief) const;
virtual void write(ostream &out, bool brief, int indent_level) const;
virtual void output(std::ostream &out, bool brief) const;
virtual void write(std::ostream &out, bool brief, int indent_level) const;
void generate_hash(HashGenerator &hashgen) const;
private:
const string _name;
const std::string _name;
// This flag is only kept for historical reasons, so we can preserve the
// file's hash code if no new flags are in use.

8
direct/src/dcparser/dcKeywordList.h
View File

@ -31,11 +31,11 @@ public:
~DCKeywordList();
PUBLISHED:
bool has_keyword(const string &name) const;
bool has_keyword(const std::string &name) const;
bool has_keyword(const DCKeyword *keyword) const;
int get_num_keywords() const;
const DCKeyword *get_keyword(int n) const;
const DCKeyword *get_keyword_by_name(const string &name) const;
const DCKeyword *get_keyword_by_name(const std::string &name) const;
bool compare_keywords(const DCKeywordList &other) const;
@ -45,14 +45,14 @@ public:
bool add_keyword(const DCKeyword *keyword);
void clear_keywords();
void output_keywords(ostream &out) const;
void output_keywords(std::ostream &out) const;
void generate_hash(HashGenerator &hashgen) const;
private:
typedef pvector<const DCKeyword *> Keywords;
Keywords _keywords;
typedef pmap<string, const DCKeyword *> KeywordsByName;
typedef pmap<std::string, const DCKeyword *> KeywordsByName;
KeywordsByName _keywords_by_name;
int _flags;

6
direct/src/dcparser/dcLexerDefs.h
View File

@ -16,14 +16,14 @@
#include "dcbase.h"
void dc_init_lexer(istream &in, const string &filename);
void dc_init_lexer(std::istream &in, const std::string &filename);
void dc_start_parameter_value();
void dc_start_parameter_description();
int dc_error_count();
int dc_warning_count();
void dcyyerror(const string &msg);
void dcyywarning(const string &msg);
void dcyyerror(const std::string &msg);
void dcyywarning(const std::string &msg);
int dcyylex();

6
direct/src/dcparser/dcMolecularField.h
View File

@ -27,7 +27,7 @@ class DCParameter;
*/
class DCMolecularField : public DCField {
public:
DCMolecularField(const string &name, DCClass *dclass);
DCMolecularField(const std::string &name, DCClass *dclass);
PUBLISHED:
virtual DCMolecularField *as_molecular_field();
@ -39,8 +39,8 @@ PUBLISHED:
public:
void add_atomic(DCAtomicField *atomic);
virtual void output(ostream &out, bool brief) const;
virtual void write(ostream &out, bool brief, int indent_level) const;
virtual void output(std::ostream &out, bool brief) const;
virtual void write(std::ostream &out, bool brief, int indent_level) const;
virtual void generate_hash(HashGenerator &hashgen) const;
virtual DCPackerInterface *get_nested_field(int n) const;

14
direct/src/dcparser/dcNumericRange.I
View File

@ -125,7 +125,7 @@ generate_hash(HashGenerator &hashgen) const {
*/
template <class NUM>
void DCNumericRange<NUM>::
output(ostream &out, Number divisor) const {
output(std::ostream &out, Number divisor) const {
if (!_ranges.empty()) {
typename Ranges::const_iterator ri;
ri = _ranges.begin();
@ -145,7 +145,7 @@ output(ostream &out, Number divisor) const {
*/
template <class NUM>
void DCNumericRange<NUM>::
output_char(ostream &out, Number divisor) const {
output_char(std::ostream &out, Number divisor) const {
if (divisor != 1) {
output(out, divisor);
@ -248,7 +248,7 @@ get_max(int n) const {
*/
template <class NUM>
INLINE void DCNumericRange<NUM>::
output_minmax(ostream &out, Number divisor, const MinMax &range) const {
output_minmax(std::ostream &out, Number divisor, const MinMax &range) const {
if (divisor == 1) {
if (range._min == range._max) {
out << range._min;
@ -271,12 +271,12 @@ output_minmax(ostream &out, Number divisor, const MinMax &range) const {
*/
template <class NUM>
INLINE void DCNumericRange<NUM>::
output_minmax_char(ostream &out, const MinMax &range) const {
output_minmax_char(std::ostream &out, const MinMax &range) const {
if (range._min == range._max) {
DCPacker::enquote_string(out, '\'', string(1, range._min));
DCPacker::enquote_string(out, '\'', std::string(1, range._min));
} else {
DCPacker::enquote_string(out, '\'', string(1, range._min));
DCPacker::enquote_string(out, '\'', std::string(1, range._min));
out << "-";
DCPacker::enquote_string(out, '\'', string(1, range._max));
DCPacker::enquote_string(out, '\'', std::string(1, range._max));
}
}

8
direct/src/dcparser/dcNumericRange.h
View File

@ -40,8 +40,8 @@ public:
void generate_hash(HashGenerator &hashgen) const;
void output(ostream &out, Number divisor = 1) const;
void output_char(ostream &out, Number divisor = 1) const;
void output(std::ostream &out, Number divisor = 1) const;
void output_char(std::ostream &out, Number divisor = 1) const;
public:
INLINE void clear();
@ -60,8 +60,8 @@ private:
Number _min;
Number _max;
};
INLINE void output_minmax(ostream &out, Number divisor, const MinMax &range) const;
INLINE void output_minmax_char(ostream &out, const MinMax &range) const;
INLINE void output_minmax(std::ostream &out, Number divisor, const MinMax &range) const;
INLINE void output_minmax_char(std::ostream &out, const MinMax &range) const;
typedef pvector<MinMax> Ranges;
Ranges _ranges;

4
direct/src/dcparser/dcPackData.I
View File

@ -89,9 +89,9 @@ get_rewrite_pointer(size_t position, size_t size) {
/**
* Returns the data buffer as a string. Also see get_data().
*/
INLINE string DCPackData::
INLINE std::string DCPackData::
get_string() const {
return string(_buffer, _used_length);
return std::string(_buffer, _used_length);
}
/**

2
direct/src/dcparser/dcPackData.h
View File

@ -34,7 +34,7 @@ public:
INLINE char *get_rewrite_pointer(size_t position, size_t size);
PUBLISHED:
INLINE string get_string() const;
INLINE std::string get_string() const;
INLINE size_t get_length() const;
public:
INLINE const char *get_data() const;

38
direct/src/dcparser/dcPacker.I
View File

@ -123,10 +123,10 @@ get_pack_type() const {
* Returns the name of the current field, if it has a name, or the empty
* string if the field does not have a name or there is no current field.
*/
INLINE string DCPacker::
INLINE std::string DCPacker::
get_current_field_name() const {
if (_current_field == nullptr) {
return string();
return std::string();
} else {
return _current_field->get_name();
}
@ -206,7 +206,7 @@ pack_uint64(uint64_t value) {
* Packs the indicated numeric or string value into the stream.
*/
INLINE void DCPacker::
pack_string(const string &value) {
pack_string(const std::string &value) {
nassertv(_mode == M_pack || _mode == M_repack);
if (_current_field == nullptr) {
_pack_error = true;
@ -221,7 +221,7 @@ pack_string(const string &value) {
* packed field element, or a whole group of field elements at once.
*/
INLINE void DCPacker::
pack_literal_value(const string &value) {
pack_literal_value(const std::string &value) {
nassertv(_mode == M_pack || _mode == M_repack);
if (_current_field == nullptr) {
_pack_error = true;
@ -329,9 +329,9 @@ unpack_uint64() {
/**
* Unpacks the current numeric or string value from the stream.
*/
INLINE string DCPacker::
INLINE std::string DCPacker::
unpack_string() {
string value;
std::string value;
nassertr(_mode == M_unpack, value);
if (_current_field == nullptr) {
_pack_error = true;
@ -349,12 +349,12 @@ unpack_string() {
* Returns the literal string that represents the packed value of the current
* field, and advances the field pointer.
*/
INLINE string DCPacker::
INLINE std::string DCPacker::
unpack_literal_value() {
size_t start = _unpack_p;
unpack_skip();
nassertr(_unpack_p >= start, string());
return string(_unpack_data + start, _unpack_p - start);
nassertr(_unpack_p >= start, std::string());
return std::string(_unpack_data + start, _unpack_p - start);
}
/**
@ -441,7 +441,7 @@ unpack_uint64(uint64_t &value) {
* Unpacks the current numeric or string value from the stream.
*/
INLINE void DCPacker::
unpack_string(string &value) {
unpack_string(std::string &value) {
nassertv(_mode == M_unpack);
if (_current_field == nullptr) {
_pack_error = true;
@ -458,7 +458,7 @@ unpack_string(string &value) {
* field, and advances the field pointer.
*/
INLINE void DCPacker::
unpack_literal_value(string &value) {
unpack_literal_value(std::string &value) {
size_t start = _unpack_p;
unpack_skip();
nassertv(_unpack_p >= start);
@ -536,7 +536,7 @@ get_length() const {
/**
* Returns the packed data buffer as a string. Also see get_data().
*/
INLINE string DCPacker::
INLINE std::string DCPacker::
get_string() const {
return _pack_data.get_string();
}
@ -556,16 +556,16 @@ get_unpack_length() const {
* unpacking; it is separate from the pack data returned by get_string(),
* which is filled during packing. Also see get_unpack_data().
*/
INLINE string DCPacker::
INLINE std::string DCPacker::
get_unpack_string() const {
return string(_unpack_data, _unpack_length);
return std::string(_unpack_data, _unpack_length);
}
/**
* Copies the packed data into the indicated string. Also see get_data().
*/
INLINE void DCPacker::
get_string(string &data) const {
get_string(std::string &data) const {
data.assign(_pack_data.get_data(), _pack_data.get_length());
}
@ -722,7 +722,7 @@ raw_pack_float64(double value) {
* Packs the data into the buffer between packing sessions.
*/
INLINE void DCPacker::
raw_pack_string(const string &value) {
raw_pack_string(const std::string &value) {
nassertv(_mode == M_idle);
DCPackerInterface::do_pack_uint16(_pack_data.get_write_pointer(2), value.length());
_pack_data.append_data(value.data(), value.length());
@ -863,9 +863,9 @@ raw_unpack_float64() {
/**
* Unpacks the data from the buffer between unpacking sessions.
*/
INLINE string DCPacker::
INLINE std::string DCPacker::
raw_unpack_string() {
string value;
std::string value;
raw_unpack_string(value);
return value;
}
@ -958,7 +958,7 @@ raw_unpack_float64(double &value) {
* Unpacks the data from the buffer between unpacking sessions.
*/
INLINE void DCPacker::
raw_unpack_string(string &value) {
raw_unpack_string(std::string &value) {
nassertv(_mode == M_idle && _unpack_data != nullptr);
unsigned int string_length = raw_unpack_uint16();

42
direct/src/dcparser/dcPacker.h
View File

@ -41,7 +41,7 @@ PUBLISHED:
void begin_pack(const DCPackerInterface *root);
bool end_pack();
void set_unpack_data(const string &data);
void set_unpack_data(const std::string &data);
public:
void set_unpack_data(const char *unpack_data, size_t unpack_length,
bool owns_unpack_data);
@ -53,7 +53,7 @@ PUBLISHED:
void begin_repack(const DCPackerInterface *root);
bool end_repack();
bool seek(const string &field_name);
bool seek(const std::string &field_name);
bool seek(int seek_index);
INLINE bool has_nested_fields() const;
@ -64,7 +64,7 @@ PUBLISHED:
INLINE const DCPackerInterface *get_current_field() const;
INLINE const DCSwitchParameter *get_last_switch() const;
INLINE DCPackType get_pack_type() const;
INLINE string get_current_field_name() const;
INLINE std::string get_current_field_name() const;
void push();
void pop();
@ -74,8 +74,8 @@ PUBLISHED:
INLINE void pack_uint(unsigned int value);
INLINE void pack_int64(int64_t value);
INLINE void pack_uint64(uint64_t value);
INLINE void pack_string(const string &value);
INLINE void pack_literal_value(const string &value);
INLINE void pack_string(const std::string &value);
INLINE void pack_literal_value(const std::string &value);
void pack_default_value();
INLINE double unpack_double();
@ -83,8 +83,8 @@ PUBLISHED:
INLINE unsigned int unpack_uint();
INLINE int64_t unpack_int64();
INLINE uint64_t unpack_uint64();
INLINE string unpack_string();
INLINE string unpack_literal_value();
INLINE std::string unpack_string();
INLINE std::string unpack_literal_value();
void unpack_validate();
void unpack_skip();
@ -96,8 +96,8 @@ public:
INLINE void unpack_uint(unsigned int &value);
INLINE void unpack_int64(int64_t &value);
INLINE void unpack_uint64(uint64_t &value);
INLINE void unpack_string(string &value);
INLINE void unpack_literal_value(string &value);
INLINE void unpack_string(std::string &value);
INLINE void unpack_literal_value(std::string &value);
PUBLISHED:
@ -106,10 +106,10 @@ PUBLISHED:
PyObject *unpack_object();
#endif
bool parse_and_pack(const string &formatted_object);
bool parse_and_pack(istream &in);
string unpack_and_format(bool show_field_names = true);
void unpack_and_format(ostream &out, bool show_field_names = true);
bool parse_and_pack(const std::string &formatted_object);
bool parse_and_pack(std::istream &in);
std::string unpack_and_format(bool show_field_names = true);
void unpack_and_format(std::ostream &out, bool show_field_names = true);
INLINE bool had_parse_error() const;
INLINE bool had_pack_error() const;
@ -118,11 +118,11 @@ PUBLISHED:
INLINE size_t get_num_unpacked_bytes() const;
INLINE size_t get_length() const;
INLINE string get_string() const;
INLINE std::string get_string() const;
INLINE size_t get_unpack_length() const;
INLINE string get_unpack_string() const;
INLINE std::string get_unpack_string() const;
public:
INLINE void get_string(string &data) const;
INLINE void get_string(std::string &data) const;
INLINE const char *get_data() const;
INLINE char *take_data();
@ -147,7 +147,7 @@ PUBLISHED:
INLINE void raw_pack_uint32(unsigned int value);
INLINE void raw_pack_uint64(uint64_t value);
INLINE void raw_pack_float64(double value);
INLINE void raw_pack_string(const string &value);
INLINE void raw_pack_string(const std::string &value);
// this is a hack to allw me to get in and out of 32bit Mode Faster need to
// agree with channel_type in dcbase.h
@ -164,7 +164,7 @@ PUBLISHED:
INLINE unsigned int raw_unpack_uint32();
INLINE uint64_t raw_unpack_uint64();
INLINE double raw_unpack_float64();
INLINE string raw_unpack_string();
INLINE std::string raw_unpack_string();
public:
INLINE void raw_unpack_int8(int &value);
@ -176,11 +176,11 @@ public:
INLINE void raw_unpack_uint32(unsigned int &value);
INLINE void raw_unpack_uint64(uint64_t &value);
INLINE void raw_unpack_float64(double &value);
INLINE void raw_unpack_string(string &value);
INLINE void raw_unpack_string(std::string &value);
public:
static void enquote_string(ostream &out, char quote_mark, const string &str);
static void output_hex_string(ostream &out, const string &str);
static void enquote_string(std::ostream &out, char quote_mark, const std::string &str);
static void output_hex_string(std::ostream &out, const std::string &str);
private:
INLINE void advance();

2
direct/src/dcparser/dcPackerCatalog.I
View File

@ -52,7 +52,7 @@ get_entry(int n) const {
* get_entry().
*/
int DCPackerCatalog::LiveCatalog::
find_entry_by_name(const string &name) const {
find_entry_by_name(const std::string &name) const {
return _catalog->find_entry_by_name(name);
}

14
direct/src/dcparser/dcPackerCatalog.h
View File

@ -37,7 +37,7 @@ public:
// and its relationship to its parent.
class Entry {
public:
string _name;
std::string _name;
const DCPackerInterface *_field;
const DCPackerInterface *_parent;
int _field_index;
@ -58,7 +58,7 @@ public:
INLINE int get_num_entries() const;
INLINE const Entry &get_entry(int n) const;
INLINE int find_entry_by_name(const string &name) const;
INLINE int find_entry_by_name(const std::string &name) const;
INLINE int find_entry_by_field(const DCPackerInterface *field) const;
private:
@ -71,17 +71,17 @@ public:
INLINE int get_num_entries() const;
INLINE const Entry &get_entry(int n) const;
int find_entry_by_name(const string &name) const;
int find_entry_by_name(const std::string &name) const;
int find_entry_by_field(const DCPackerInterface *field) const;
const LiveCatalog *get_live_catalog(const char *data, size_t length) const;
void release_live_catalog(const LiveCatalog *live_catalog) const;
private:
void add_entry(const string &name, const DCPackerInterface *field,
void add_entry(const std::string &name, const DCPackerInterface *field,
const DCPackerInterface *parent, int field_index);
void r_fill_catalog(const string &name_prefix, const DCPackerInterface *field,
void r_fill_catalog(const std::string &name_prefix, const DCPackerInterface *field,
const DCPackerInterface *parent, int field_index);
void r_fill_live_catalog(LiveCatalog *live_catalog, DCPacker &packer,
const DCSwitchParameter *&last_switch) const;
@ -96,7 +96,7 @@ private:
typedef pvector<Entry> Entries;
Entries _entries;
typedef pmap<string, int> EntriesByName;
typedef pmap<std::string, int> EntriesByName;
EntriesByName _entries_by_name;
typedef pmap<const DCPackerInterface *, int> EntriesByField;
@ -105,7 +105,7 @@ private:
typedef pmap<const DCPackerInterface *, DCPackerCatalog *> SwitchCatalogs;
SwitchCatalogs _switch_catalogs;
typedef pmap<const DCSwitchParameter *, string> SwitchPrefixes;
typedef pmap<const DCSwitchParameter *, std::string> SwitchPrefixes;
SwitchPrefixes _switch_prefixes;
friend class DCPackerInterface;

2
direct/src/dcparser/dcPackerInterface.I
View File

@ -14,7 +14,7 @@
/**
* Returns the name of this field, or empty string if the field is unnamed.
*/
INLINE const string &DCPackerInterface::
INLINE const std::string &DCPackerInterface::
get_name() const {
return _name;
}

16
direct/src/dcparser/dcPackerInterface.h
View File

@ -66,13 +66,13 @@ END_PUBLISH
*/
class DCPackerInterface {
public:
DCPackerInterface(const string &name = string());
DCPackerInterface(const std::string &name = std::string());
DCPackerInterface(const DCPackerInterface &copy);
virtual ~DCPackerInterface();
PUBLISHED:
INLINE const string &get_name() const;
int find_seek_index(const string &name) const;
INLINE const std::string &get_name() const;
int find_seek_index(const std::string &name) const;
virtual DCField *as_field();
virtual const DCField *as_field() const;
@ -82,10 +82,10 @@ PUBLISHED:
virtual const DCClassParameter *as_class_parameter() const;
INLINE bool check_match(const DCPackerInterface *other) const;
bool check_match(const string &description, DCFile *dcfile = nullptr) const;
bool check_match(const std::string &description, DCFile *dcfile = nullptr) const;
public:
virtual void set_name(const string &name);
virtual void set_name(const std::string &name);
INLINE bool has_fixed_byte_size() const;
INLINE size_t get_fixed_byte_size() const;
INLINE bool has_fixed_structure() const;
@ -111,7 +111,7 @@ public:
bool &pack_error, bool &range_error) const;
virtual void pack_uint64(DCPackData &pack_data, uint64_t value,
bool &pack_error, bool &range_error) const;
virtual void pack_string(DCPackData &pack_data, const string &value,
virtual void pack_string(DCPackData &pack_data, const std::string &value,
bool &pack_error, bool &range_error) const;
virtual bool pack_default_value(DCPackData &pack_data, bool &pack_error) const;
@ -126,7 +126,7 @@ public:
virtual void unpack_uint64(const char *data, size_t length, size_t &p,
uint64_t &value, bool &pack_error, bool &range_error) const;
virtual void unpack_string(const char *data, size_t length, size_t &p,
string &value, bool &pack_error, bool &range_error) const;
std::string &value, bool &pack_error, bool &range_error) const;
virtual bool unpack_validate(const char *data, size_t length, size_t &p,
bool &pack_error, bool &range_error) const;
virtual bool unpack_skip(const char *data, size_t length, size_t &p,
@ -184,7 +184,7 @@ private:
void make_catalog();
protected:
string _name;
std::string _name;
bool _has_fixed_byte_size;
size_t _fixed_byte_size;
bool _has_fixed_structure;

24
direct/src/dcparser/dcParameter.h
View File

@ -60,18 +60,18 @@ public:
void set_typedef(const DCTypedef *dtypedef);
virtual DCParameter *append_array_specification(const DCUnsignedIntRange &size);
virtual void output(ostream &out, bool brief) const;
virtual void write(ostream &out, bool brief, int indent_level) const;
virtual void output_instance(ostream &out, bool brief, const string &prename,
const string &name, const string &postname) const=0;
virtual void write_instance(ostream &out, bool brief, int indent_level,
const string &prename, const string &name,
const string &postname) const;
void output_typedef_name(ostream &out, bool brief, const string &prename,
const string &name, const string &postname) const;
void write_typedef_name(ostream &out, bool brief, int indent_level,
const string &prename, const string &name,
const string &postname) const;
virtual void output(std::ostream &out, bool brief) const;
virtual void write(std::ostream &out, bool brief, int indent_level) const;
virtual void output_instance(std::ostream &out, bool brief, const std::string &prename,
const std::string &name, const std::string &postname) const=0;
virtual void write_instance(std::ostream &out, bool brief, int indent_level,
const std::string &prename, const std::string &name,
const std::string &postname) const;
void output_typedef_name(std::ostream &out, bool brief, const std::string &prename,
const std::string &name, const std::string &postname) const;
void write_typedef_name(std::ostream &out, bool brief, int indent_level,
const std::string &prename, const std::string &name,
const std::string &postname) const;
virtual void generate_hash(HashGenerator &hashgen) const;
private:

8
direct/src/dcparser/dcParserDefs.h
View File

@ -26,10 +26,10 @@ class DCParameter;
class DCKeyword;
class DCPacker;
void dc_init_parser(istream &in, const string &filename, DCFile &file);
void dc_init_parser_parameter_value(istream &in, const string &filename,
void dc_init_parser(std::istream &in, const std::string &filename, DCFile &file);
void dc_init_parser_parameter_value(std::istream &in, const std::string &filename,
DCPacker &packer);
void dc_init_parser_parameter_description(istream &in, const string &filename,
void dc_init_parser_parameter_description(std::istream &in, const std::string &filename,
DCFile *file);
DCField *dc_get_parameter_description();
void dc_cleanup_parser();
@ -60,7 +60,7 @@ public:
DCParameter *parameter;
const DCKeyword *keyword;
} u;
string str;
std::string str;
};
// The yacc-generated code expects to use the symbol 'YYSTYPE' to refer to the

8
direct/src/dcparser/dcSimpleParameter.h
View File

@ -60,7 +60,7 @@ public:
bool &pack_error, bool &range_error) const;
virtual void pack_uint64(DCPackData &pack_data, uint64_t value,
bool &pack_error, bool &range_error) const;
virtual void pack_string(DCPackData &pack_data, const string &value,
virtual void pack_string(DCPackData &pack_data, const std::string &value,
bool &pack_error, bool &range_error) const;
virtual bool pack_default_value(DCPackData &pack_data, bool &pack_error) const;
@ -75,14 +75,14 @@ public:
virtual void unpack_uint64(const char *data, size_t length, size_t &p,
uint64_t &value, bool &pack_error, bool &range_error) const;
virtual void unpack_string(const char *data, size_t length, size_t &p,
string &value, bool &pack_error, bool &range_error) const;
std::string &value, bool &pack_error, bool &range_error) const;
virtual bool unpack_validate(const char *data, size_t length, size_t &p,
bool &pack_error, bool &range_error) const;
virtual bool unpack_skip(const char *data, size_t length, size_t &p,
bool &pack_error) const;
virtual void output_instance(ostream &out, bool brief, const string &prename,
const string &name, const string &postname) const;
virtual void output_instance(std::ostream &out, bool brief, const std::string &prename,
const std::string &name, const std::string &postname) const;
virtual void generate_hash(HashGenerator &hashgen) const;
protected:

2
direct/src/dcparser/dcSubatomicType.h
View File

@ -60,6 +60,6 @@ enum DCSubatomicType {
};
END_PUBLISH
ostream &operator << (ostream &out, DCSubatomicType type);
std::ostream &operator << (std::ostream &out, DCSubatomicType type);
#endif

42
direct/src/dcparser/dcSwitch.h
View File

@ -29,29 +29,29 @@ class DCField;
*/
class DCSwitch : public DCDeclaration {
public:
DCSwitch(const string &name, DCField *key_parameter);
DCSwitch(const std::string &name, DCField *key_parameter);
virtual ~DCSwitch();
PUBLISHED:
virtual DCSwitch *as_switch();
virtual const DCSwitch *as_switch() const;
const string &get_name() const;
const std::string &get_name() const;
DCField *get_key_parameter() const;
int get_num_cases() const;
int get_case_by_value(const string &case_value) const;
int get_case_by_value(const std::string &case_value) const;
DCPackerInterface *get_case(int n) const;
DCPackerInterface *get_default_case() const;
string get_value(int case_index) const;
std::string get_value(int case_index) const;
int get_num_fields(int case_index) const;
DCField *get_field(int case_index, int n) const;
DCField *get_field_by_name(int case_index, const string &name) const;
DCField *get_field_by_name(int case_index, const std::string &name) const;
public:
bool is_field_valid() const;
int add_case(const string &value);
int add_case(const std::string &value);
void add_invalid_case();
bool add_default();
bool add_field(DCField *field);
@ -59,13 +59,13 @@ public:
const DCPackerInterface *apply_switch(const char *value_data, size_t length) const;
virtual void output(ostream &out, bool brief) const;
virtual void write(ostream &out, bool brief, int indent_level) const;
void output_instance(ostream &out, bool brief, const string &prename,
const string &name, const string &postname) const;
void write_instance(ostream &out, bool brief, int indent_level,
const string &prename, const string &name,
const string &postname) const;
virtual void output(std::ostream &out, bool brief) const;
virtual void write(std::ostream &out, bool brief, int indent_level) const;
void output_instance(std::ostream &out, bool brief, const std::string &prename,
const std::string &name, const std::string &postname) const;
void write_instance(std::ostream &out, bool brief, int indent_level,
const std::string &prename, const std::string &name,
const std::string &postname) const;
virtual void generate_hash(HashGenerator &hashgen) const;
virtual bool pack_default_value(DCPackData &pack_data, bool &pack_error) const;
@ -73,19 +73,19 @@ public:
public:
typedef pvector<DCField *> Fields;
typedef pmap<string, DCField *> FieldsByName;
typedef pmap<std::string, DCField *> FieldsByName;
class SwitchFields : public DCPackerInterface {
public:
SwitchFields(const string &name);
SwitchFields(const std::string &name);
~SwitchFields();
virtual DCPackerInterface *get_nested_field(int n) const;
bool add_field(DCField *field);
bool do_check_match_switch_case(const SwitchFields *other) const;
void output(ostream &out, bool brief) const;
void write(ostream &out, bool brief, int indent_level) const;
void output(std::ostream &out, bool brief) const;
void write(std::ostream &out, bool brief, int indent_level) const;
protected:
virtual bool do_check_match(const DCPackerInterface *other) const;
@ -98,13 +98,13 @@ public:
class SwitchCase {
public:
SwitchCase(const string &value, SwitchFields *fields);
SwitchCase(const std::string &value, SwitchFields *fields);
~SwitchCase();
bool do_check_match_switch_case(const SwitchCase *other) const;
public:
string _value;
std::string _value;
SwitchFields *_fields;
};
@ -112,7 +112,7 @@ private:
SwitchFields *start_new_case();
private:
string _name;
std::string _name;
DCField *_key_parameter;
typedef pvector<SwitchCase *> Cases;
@ -137,7 +137,7 @@ private:
bool _fields_added;
// This map indexes into the _cases vector, above.
typedef pmap<string, int> CasesByValue;
typedef pmap<std::string, int> CasesByValue;
CasesByValue _cases_by_value;
};

10
direct/src/dcparser/dcSwitchParameter.h
View File

@ -41,11 +41,11 @@ public:
const DCPackerInterface *apply_switch(const char *value_data, size_t length) const;
virtual void output_instance(ostream &out, bool brief, const string &prename,
const string &name, const string &postname) const;
virtual void write_instance(ostream &out, bool brief, int indent_level,
const string &prename, const string &name,
const string &postname) const;
virtual void output_instance(std::ostream &out, bool brief, const std::string &prename,
const std::string &name, const std::string &postname) const;
virtual void write_instance(std::ostream &out, bool brief, int indent_level,
const std::string &prename, const std::string &name,
const std::string &postname) const;
virtual void generate_hash(HashGenerator &hashgen) const;
virtual bool pack_default_value(DCPackData &pack_data, bool &pack_error) const;

10
direct/src/dcparser/dcTypedef.h
View File

@ -26,13 +26,13 @@ class DCParameter;
class DCTypedef : public DCDeclaration {
public:
DCTypedef(DCParameter *parameter, bool implicit = false);
DCTypedef(const string &name);
DCTypedef(const std::string &name);
virtual ~DCTypedef();
PUBLISHED:
int get_number() const;
const string &get_name() const;
string get_description() const;
const std::string &get_name() const;
std::string get_description() const;
bool is_bogus_typedef() const;
bool is_implicit_typedef() const;
@ -41,8 +41,8 @@ public:
DCParameter *make_new_parameter() const;
void set_number(int number);
virtual void output(ostream &out, bool brief) const;
virtual void write(ostream &out, bool brief, int indent_level) const;
virtual void output(std::ostream &out, bool brief) const;
virtual void write(std::ostream &out, bool brief, int indent_level) const;
private:
DCParameter *_parameter;

4
direct/src/dcparser/dcindent.h
View File

@ -29,8 +29,8 @@
* stream itself. Useful for indenting a series of lines of text by a given
* amount.
*/
ostream &
indent(ostream &out, int indent_level);
std::ostream &
indent(std::ostream &out, int indent_level);
#endif // WITHIN_PANDA

2
direct/src/dcparser/hashGenerator.h
View File

@ -25,7 +25,7 @@ public:
HashGenerator();
void add_int(int num);
void add_string(const string &str);
void add_string(const std::string &str);
unsigned long get_hash() const;

2
direct/src/dcparser/primeNumberGenerator.h
View File

@ -22,7 +22,7 @@
#include "vector_int.h"
#else
typedef vector<int> vector_int;
typedef std::vector<int> vector_int;
#endif
/**

4
direct/src/deadrec/smoothMover.h
View File

@ -137,8 +137,8 @@ PUBLISHED:
INLINE void set_default_to_standing_still(bool flag);
INLINE bool get_default_to_standing_still();
void output(ostream &out) const;
void write(ostream &out) const;
void output(std::ostream &out) const;
void write(std::ostream &out) const;
private:
void set_smooth_pos(const LPoint3 &pos, const LVecBase3 &hpr,

20
direct/src/directd/directd.h
View File

@ -73,7 +73,7 @@ PUBLISHED:
* one command, you should use connect_to(), send_command(), and
* disconnect_from().
*/
int client_ready(const string& server_host, int port, const string& cmd);
int client_ready(const std::string& server_host, int port, const std::string& cmd);
/**
* Tell the server to do the command cmd. cmd is one of the following:
@ -85,7 +85,7 @@ PUBLISHED:
* client_ready(), it prefixes "!" for you. A new connection will be created
* and closed.
*/
int tell_server(const string& server_host, int port, const string& cmd);
int tell_server(const std::string& server_host, int port, const std::string& cmd);
/**
* Call this function from the client after calling <count> client_ready()
@ -102,7 +102,7 @@ PUBLISHED:
* Call this function from the server when import ShowbaseGlobal is nearly
* finished.
*/
int server_ready(const string& client_host, int port);
int server_ready(const std::string& client_host, int port);
/**
* Call connect_to from client for each server. returns the port number of
@ -110,28 +110,28 @@ PUBLISHED:
* second argument). The return value can be used for the port arguemnt in
* disconnect_from().
*/
int connect_to(const string& server_host, int port);
int connect_to(const std::string& server_host, int port);
/**
* This is the counterpart to connect_to(). Pass the same server_host as for
* connect_to(), but pass the return value from connect_to() for the port, not
* the port passed to connect_to().
*/
void disconnect_from(const string& server_host, int port);
void disconnect_from(const std::string& server_host, int port);
/**
* Send the same command string to all current connections.
*/
void send_command(const string& cmd);
void send_command(const std::string& cmd);
protected:
void start_app(const string& cmd);
void start_app(const std::string& cmd);
void kill_app(int index);
void kill_all();
virtual void handle_command(const string& cmd);
virtual void handle_command(const std::string& cmd);
void handle_datagram(NetDatagram& datagram);
void send_one_message(const string& host_name,
int port, const string& message);
void send_one_message(const std::string& host_name,
int port, const std::string& message);
QueuedConnectionManager _cm;
QueuedConnectionReader _reader;

4
direct/src/directdServer/directdClient.h
View File

@ -21,8 +21,8 @@ public:
DirectDClient();
~DirectDClient();
void run_client(const string& host, int port);
void run_client(const std::string& host, int port);
protected:
void cli_command(const string& cmd);
void cli_command(const std::string& cmd);
};

4
direct/src/directdServer/directdServer.h
View File

@ -29,6 +29,6 @@ public:
void run_server(int port);
protected:
void read_command(string& cmd);
virtual void handle_command(const string& cmd);
void read_command(std::string& cmd);
virtual void handle_command(const std::string& cmd);
};

2
direct/src/distributed/cConnectionRepository.I
View File

@ -220,7 +220,7 @@ get_msg_type() const {
* Returns event string that will be thrown if the datagram reader queue
* overflows.
*/
INLINE const string &CConnectionRepository::
INLINE const std::string &CConnectionRepository::
get_overflow_event_name() {
return _overflow_event_name;
}

8
direct/src/distributed/cConnectionRepository.h
View File

@ -122,7 +122,7 @@ PUBLISHED:
// INLINE unsigned char get_sec_code() const;
BLOCKING INLINE unsigned int get_msg_type() const;
INLINE static const string &get_overflow_event_name();
INLINE static const std::string &get_overflow_event_name();
BLOCKING bool is_connected();
@ -161,7 +161,7 @@ private:
bool handle_update_field();
bool handle_update_field_owner();
void describe_message(ostream &out, const string &prefix,
void describe_message(std::ostream &out, const std::string &prefix,
const Datagram &dg) const;
private:
@ -205,11 +205,11 @@ private:
CHANNEL_TYPE _msg_sender;
unsigned int _msg_type;
static const string _overflow_event_name;
static const std::string _overflow_event_name;
bool _want_message_bundling;
unsigned int _bundling_msgs;
typedef std::vector< string > BundledMsgVector;
typedef std::vector< std::string > BundledMsgVector;
BundledMsgVector _bundle_msgs;
static PStatCollector _update_pcollector;

2
direct/src/distributed/cDistributedSmoothNodeBase.h
View File

@ -69,7 +69,7 @@ private:
INLINE void d_setSmPosHpr(PN_stdfloat x, PN_stdfloat y, PN_stdfloat z, PN_stdfloat h, PN_stdfloat p, PN_stdfloat r);
INLINE void d_setSmPosHprL(PN_stdfloat x, PN_stdfloat y, PN_stdfloat z, PN_stdfloat h, PN_stdfloat p, PN_stdfloat r, uint64_t l);
void begin_send_update(DCPacker &packer, const string &field_name);
void begin_send_update(DCPacker &packer, const std::string &field_name);
void finish_send_update(DCPacker &packer);
enum Flags {

4
direct/src/interval/cConstrainHprInterval.h
View File

@ -26,7 +26,7 @@
*/
class EXPCL_DIRECT_INTERVAL CConstrainHprInterval : public CConstraintInterval {
PUBLISHED:
explicit CConstrainHprInterval(const string &name, double duration,
explicit CConstrainHprInterval(const std::string &name, double duration,
const NodePath &node, const NodePath &target,
bool wrt, const LVecBase3 hprOffset=LVector3::zero());
@ -34,7 +34,7 @@ PUBLISHED:
INLINE const NodePath &get_target() const;
virtual void priv_step(double t);
virtual void output(ostream &out) const;
virtual void output(std::ostream &out) const;
private:
NodePath _node;

4
direct/src/interval/cConstrainPosHprInterval.h
View File

@ -26,7 +26,7 @@
*/
class EXPCL_DIRECT_INTERVAL CConstrainPosHprInterval : public CConstraintInterval {
PUBLISHED:
explicit CConstrainPosHprInterval(const string &name, double duration,
explicit CConstrainPosHprInterval(const std::string &name, double duration,
const NodePath &node, const NodePath &target,
bool wrt, const LVecBase3 posOffset=LVector3::zero(),
const LVecBase3 hprOffset=LVector3::zero());
@ -35,7 +35,7 @@ PUBLISHED:
INLINE const NodePath &get_target() const;
virtual void priv_step(double t);
virtual void output(ostream &out) const;
virtual void output(std::ostream &out) const;
private:
NodePath _node;

4
direct/src/interval/cConstrainPosInterval.h
View File

@ -25,7 +25,7 @@
*/
class EXPCL_DIRECT_INTERVAL CConstrainPosInterval : public CConstraintInterval {
PUBLISHED:
explicit CConstrainPosInterval(const string &name, double duration,
explicit CConstrainPosInterval(const std::string &name, double duration,
const NodePath &node, const NodePath &target,
bool wrt, const LVecBase3 posOffset=LVector3::zero());
@ -33,7 +33,7 @@ PUBLISHED:
INLINE const NodePath &get_target() const;
virtual void priv_step(double t);
virtual void output(ostream &out) const;
virtual void output(std::ostream &out) const;
private:
NodePath _node;

4
direct/src/interval/cConstrainTransformInterval.h
View File

@ -24,7 +24,7 @@
*/
class EXPCL_DIRECT_INTERVAL CConstrainTransformInterval : public CConstraintInterval {
PUBLISHED:
explicit CConstrainTransformInterval(const string &name, double duration,
explicit CConstrainTransformInterval(const std::string &name, double duration,
const NodePath &node,
const NodePath &target, bool wrt);
@ -32,7 +32,7 @@ PUBLISHED:
INLINE const NodePath &get_target() const;
virtual void priv_step(double t);
virtual void output(ostream &out) const;
virtual void output(std::ostream &out) const;
private:
NodePath _node;

2
direct/src/interval/cConstraintInterval.h
View File

@ -26,7 +26,7 @@ PUBLISHED:
bool bogus_variable;
public:
CConstraintInterval(const string &name, double duration);
CConstraintInterval(const std::string &name, double duration);
public:
static TypeHandle get_class_type() {

10
direct/src/interval/cInterval.I
View File

@ -14,7 +14,7 @@
/**
* Returns the interval's name.
*/
INLINE const string &CInterval::
INLINE const std::string &CInterval::
get_name() const {
return _name;
}
@ -64,7 +64,7 @@ is_stopped() const {
* own.
*/
INLINE void CInterval::
set_done_event(const string &event) {
set_done_event(const std::string &event) {
_done_event = event;
}
@ -73,7 +73,7 @@ set_done_event(const string &event) {
* state, whether it is explicitly finished or whether it gets there on its
* own.
*/
INLINE const string &CInterval::
INLINE const std::string &CInterval::
get_done_event() const {
return _done_event;
}
@ -219,8 +219,8 @@ check_started(TypeHandle type, const char *method_name) const {
}
}
INLINE ostream &
operator << (ostream &out, const CInterval &ival) {
INLINE std::ostream &
operator << (std::ostream &out, const CInterval &ival) {
ival.output(out);
return out;
}

22
direct/src/interval/cInterval.h
View File

@ -34,11 +34,11 @@ class CIntervalManager;
*/
class EXPCL_DIRECT_INTERVAL CInterval : public TypedReferenceCount {
public:
CInterval(const string &name, double duration, bool open_ended);
CInterval(const std::string &name, double duration, bool open_ended);
virtual ~CInterval();
PUBLISHED:
INLINE const string &get_name() const;
INLINE const std::string &get_name() const;
INLINE double get_duration() const;
INLINE bool get_open_ended() const;
@ -63,8 +63,8 @@ PUBLISHED:
INLINE State get_state() const;
INLINE bool is_stopped() const;
INLINE void set_done_event(const string &event);
INLINE const string &get_done_event() const;
INLINE void set_done_event(const std::string &event);
INLINE const std::string &get_done_event() const;
void set_t(double t);
INLINE double get_t() const;
@ -110,8 +110,8 @@ PUBLISHED:
virtual void priv_reverse_finalize();
virtual void priv_interrupt();
virtual void output(ostream &out) const;
virtual void write(ostream &out, int indent_level) const;
virtual void output(std::ostream &out) const;
virtual void write(std::ostream &out, int indent_level) const;
void setup_play(double start_time, double end_time, double play_rate,
bool do_loop);
@ -147,9 +147,9 @@ protected:
State _state;
double _curr_t;
string _name;
string _pname;
string _done_event;
std::string _name;
std::string _pname;
std::string _done_event;
double _duration;
bool _auto_pause;
@ -201,8 +201,8 @@ private:
friend class CMetaInterval;
};
INLINE ostream &operator << (ostream &out, const CInterval &ival);
EXPCL_DIRECT_INTERVAL ostream &operator << (ostream &out, CInterval::State state);
INLINE std::ostream &operator << (std::ostream &out, const CInterval &ival);
EXPCL_DIRECT_INTERVAL std::ostream &operator << (std::ostream &out, CInterval::State state);
#include "cInterval.I"

4
direct/src/interval/cIntervalManager.I
View File

@ -34,8 +34,8 @@ get_event_queue() const {
return _event_queue;
}
INLINE ostream &
operator << (ostream &out, const CIntervalManager &ival_mgr) {
INLINE std::ostream &
operator << (std::ostream &out, const CIntervalManager &ival_mgr) {
ival_mgr.output(out);
return out;
}

10
direct/src/interval/cIntervalManager.h
View File

@ -45,7 +45,7 @@ PUBLISHED:
INLINE EventQueue *get_event_queue() const;
int add_c_interval(CInterval *interval, bool external);
int find_c_interval(const string &name) const;
int find_c_interval(const std::string &name) const;
CInterval *get_c_interval(int index) const;
void remove_c_interval(int index);
@ -58,8 +58,8 @@ PUBLISHED:
int get_next_event();
int get_next_removal();
void output(ostream &out) const;
void write(ostream &out) const;
void output(std::ostream &out) const;
void write(std::ostream &out) const;
static CIntervalManager *get_global_ptr();
@ -79,7 +79,7 @@ private:
};
typedef pvector<IntervalDef> Intervals;
Intervals _intervals;
typedef pmap<string, int> NameIndex;
typedef pmap<std::string, int> NameIndex;
NameIndex _name_index;
typedef vector_int Removed;
Removed _removed;
@ -93,7 +93,7 @@ private:
static CIntervalManager *_global_ptr;
};
INLINE ostream &operator << (ostream &out, const CInterval &ival_mgr);
INLINE std::ostream &operator << (std::ostream &out, const CInterval &ival_mgr);
#include "cIntervalManager.I"

6
direct/src/interval/cLerpAnimEffectInterval.I
View File

@ -15,7 +15,7 @@
*
*/
INLINE CLerpAnimEffectInterval::
CLerpAnimEffectInterval(const string &name, double duration,
CLerpAnimEffectInterval(const std::string &name, double duration,
CLerpInterval::BlendType blend_type) :
CLerpInterval(name, duration, blend_type)
{
@ -30,7 +30,7 @@ CLerpAnimEffectInterval(const string &name, double duration,
* for output.
*/
INLINE void CLerpAnimEffectInterval::
add_control(AnimControl *control, const string &name,
add_control(AnimControl *control, const std::string &name,
float begin_effect, float end_effect) {
_controls.push_back(ControlDef(control, name, begin_effect, end_effect));
}
@ -39,7 +39,7 @@ add_control(AnimControl *control, const string &name,
*
*/
INLINE CLerpAnimEffectInterval::ControlDef::
ControlDef(AnimControl *control, const string &name,
ControlDef(AnimControl *control, const std::string &name,
float begin_effect, float end_effect) :
_control(control),
_name(name),

10
direct/src/interval/cLerpAnimEffectInterval.h
View File

@ -31,23 +31,23 @@
*/
class EXPCL_DIRECT_INTERVAL CLerpAnimEffectInterval : public CLerpInterval {
PUBLISHED:
INLINE explicit CLerpAnimEffectInterval(const string &name, double duration,
INLINE explicit CLerpAnimEffectInterval(const std::string &name, double duration,
BlendType blend_type);
INLINE void add_control(AnimControl *control, const string &name,
INLINE void add_control(AnimControl *control, const std::string &name,
float begin_effect, float end_effect);
virtual void priv_step(double t);
virtual void output(ostream &out) const;
virtual void output(std::ostream &out) const;
private:
class ControlDef {
public:
INLINE ControlDef(AnimControl *control, const string &name,
INLINE ControlDef(AnimControl *control, const std::string &name,
float begin_effect, float end_effect);
PT(AnimControl) _control;
string _name;
std::string _name;
float _begin_effect;
float _end_effect;
};

2
direct/src/interval/cLerpInterval.I
View File

@ -15,7 +15,7 @@
*
*/
INLINE CLerpInterval::
CLerpInterval(const string &name, double duration,
CLerpInterval(const std::string &name, double duration,
CLerpInterval::BlendType blend_type) :
CInterval(name, duration, true),
_blend_type(blend_type)

4
direct/src/interval/cLerpInterval.h
View File

@ -32,13 +32,13 @@ PUBLISHED:
};
public:
INLINE CLerpInterval(const string &name, double duration,
INLINE CLerpInterval(const std::string &name, double duration,
BlendType blend_type);
PUBLISHED:
INLINE BlendType get_blend_type() const;
static BlendType string_blend_type(const string &blend_type);
static BlendType string_blend_type(const std::string &blend_type);
protected:
double compute_delta(double t) const;

4
direct/src/interval/cLerpNodePathInterval.h
View File

@ -25,7 +25,7 @@
*/
class EXPCL_DIRECT_INTERVAL CLerpNodePathInterval : public CLerpInterval {
PUBLISHED:
explicit CLerpNodePathInterval(const string &name, double duration,
explicit CLerpNodePathInterval(const std::string &name, double duration,
BlendType blend_type, bool bake_in_start,
bool fluid,
const NodePath &node, const NodePath &other);
@ -68,7 +68,7 @@ PUBLISHED:
virtual void priv_reverse_initialize(double t);
virtual void priv_reverse_instant();
virtual void output(ostream &out) const;
virtual void output(std::ostream &out) const;
private:
void setup_slerp();

20
direct/src/interval/cMetaInterval.h
View File

@ -31,7 +31,7 @@
*/
class EXPCL_DIRECT_INTERVAL CMetaInterval : public CInterval {
PUBLISHED:
explicit CMetaInterval(const string &name);
explicit CMetaInterval(const std::string &name);
virtual ~CMetaInterval();
enum RelativeStart {
@ -44,20 +44,20 @@ PUBLISHED:
INLINE double get_precision() const;
void clear_intervals();
int push_level(const string &name,
int push_level(const std::string &name,
double rel_time, RelativeStart rel_to);
int add_c_interval(CInterval *c_interval,
double rel_time = 0.0f,
RelativeStart rel_to = RS_previous_end);
int add_ext_index(int ext_index, const string &name,
int add_ext_index(int ext_index, const std::string &name,
double duration, bool open_ended,
double rel_time, RelativeStart rel_to);
int pop_level(double duration = -1.0);
bool set_interval_start_time(const string &name, double rel_time,
bool set_interval_start_time(const std::string &name, double rel_time,
RelativeStart rel_to = RS_level_begin);
double get_interval_start_time(const string &name) const;
double get_interval_end_time(const string &name) const;
double get_interval_start_time(const std::string &name) const;
double get_interval_end_time(const std::string &name) const;
enum DefType {
DT_c_interval,
@ -86,8 +86,8 @@ PUBLISHED:
INLINE EventType get_event_type() const;
void pop_event();
virtual void write(ostream &out, int indent_level) const;
void timeline(ostream &out) const;
virtual void write(std::ostream &out, int indent_level) const;
void timeline(std::ostream &out) const;
protected:
virtual void do_recompute();
@ -98,7 +98,7 @@ private:
DefType _type;
PT(CInterval) _c_interval;
int _ext_index;
string _ext_name;
std::string _ext_name;
double _ext_duration;
bool _ext_open_ended;
double _rel_time;
@ -159,7 +159,7 @@ private:
int get_begin_time(const IntervalDef &def, int level_begin,
int previous_begin, int previous_end);
void write_event_desc(ostream &out, const IntervalDef &def,
void write_event_desc(std::ostream &out, const IntervalDef &def,
int &extra_indent_level) const;

2
direct/src/interval/hideInterval.h
View File

@ -23,7 +23,7 @@
*/
class EXPCL_DIRECT_INTERVAL HideInterval : public CInterval {
PUBLISHED:
explicit HideInterval(const NodePath &node, const string &name = string());
explicit HideInterval(const NodePath &node, const std::string &name = std::string());
virtual void priv_instant();
virtual void priv_reverse_instant();

2
direct/src/interval/showInterval.h
View File

@ -23,7 +23,7 @@
*/
class EXPCL_DIRECT_INTERVAL ShowInterval : public CInterval {
PUBLISHED:
explicit ShowInterval(const NodePath &node, const string &name = string());
explicit ShowInterval(const NodePath &node, const std::string &name = std::string());
virtual void priv_instant();
virtual void priv_reverse_instant();

4
direct/src/plugin/binaryXml.h
View File

@ -25,7 +25,7 @@ using namespace std;
// but this is a smidge more efficient and gives us more control.
void init_xml();
void write_xml(ostream &out, TiXmlDocument *doc, ostream &logfile);
TiXmlDocument *read_xml(istream &in, ostream &logfile);
void write_xml(std::ostream &out, TiXmlDocument *doc, std::ostream &logfile);
TiXmlDocument *read_xml(std::istream &in, std::ostream &logfile);
#endif

8
direct/src/plugin/fileSpec.I
View File

@ -15,7 +15,7 @@
* Returns the relative path to this file on disk, within the package root
* directory.
*/
inline const string &FileSpec::
inline const std::string &FileSpec::
get_filename() const {
return _filename;
}
@ -25,15 +25,15 @@ get_filename() const {
* directory.
*/
inline void FileSpec::
set_filename(const string &filename) {
set_filename(const std::string &filename) {
_filename = filename;
}
/**
* Returns the full path to this file on disk.
*/
inline string FileSpec::
get_pathname(const string &package_dir) const {
inline std::string FileSpec::
get_pathname(const std::string &package_dir) const {
return package_dir + "/" + _filename;
}

30
direct/src/plugin/fileSpec.h
View File

@ -33,39 +33,39 @@ public:
void load_xml(TiXmlElement *xelement);
void store_xml(TiXmlElement *xelement);
inline const string &get_filename() const;
inline void set_filename(const string &filename);
inline string get_pathname(const string &package_dir) const;
inline const std::string &get_filename() const;
inline void set_filename(const std::string &filename);
inline std::string get_pathname(const std::string &package_dir) const;
inline size_t get_size() const;
inline time_t get_timestamp() const;
inline bool has_hash() const;
bool quick_verify(const string &package_dir);
bool quick_verify_pathname(const string &pathname);
bool full_verify(const string &package_dir);
bool quick_verify(const std::string &package_dir);
bool quick_verify_pathname(const std::string &pathname);
bool full_verify(const std::string &package_dir);
inline const FileSpec *get_actual_file() const;
const FileSpec *force_get_actual_file(const string &pathname);
const FileSpec *force_get_actual_file(const std::string &pathname);
bool check_hash(const string &pathname) const;
bool read_hash(const string &pathname);
bool read_hash_stream(istream &in);
bool check_hash(const std::string &pathname) const;
bool read_hash(const std::string &pathname);
bool read_hash_stream(std::istream &in);
int compare_hash(const FileSpec &other) const;
void write(ostream &out) const;
void output_hash(ostream &out) const;
void write(std::ostream &out) const;
void output_hash(std::ostream &out) const;
private:
bool priv_check_hash(const string &pathname, void *stp);
bool priv_check_hash(const std::string &pathname, void *stp);
static inline int decode_hexdigit(char c);
static inline char encode_hexdigit(int c);
static bool decode_hex(unsigned char *dest, const char *source, size_t size);
static void encode_hex(char *dest, const unsigned char *source, size_t size);
static void stream_hex(ostream &out, const unsigned char *source, size_t size);
static void stream_hex(std::ostream &out, const unsigned char *source, size_t size);
enum { hash_size = 16 };
string _filename;
std::string _filename;
size_t _size;
time_t _timestamp;
unsigned char _hash[hash_size];

4
direct/src/plugin/find_root_dir.h
View File

@ -18,10 +18,10 @@
#include <iostream>
using namespace std;
string find_root_dir();
std::string find_root_dir();
#ifdef __APPLE__
string find_osx_root_dir();
std::string find_osx_root_dir();
#endif // __APPLE__
#endif

10
direct/src/plugin/handleStream.I
View File

@ -15,7 +15,7 @@
*
*/
inline HandleStream::
HandleStream() : iostream(&_buf) {
HandleStream() : std::iostream(&_buf) {
}
/**
@ -32,10 +32,10 @@ inline HandleStream::
*/
inline void HandleStream::
open_read(FHandle handle) {
clear((ios::iostate)0);
clear((std::ios::iostatetate)0);
_buf.open_read(handle);
if (!_buf.is_open_read()) {
clear(ios::failbit);
clear(std::ios::failbit);
}
}
@ -45,10 +45,10 @@ open_read(FHandle handle) {
*/
inline void HandleStream::
open_write(FHandle handle) {
clear((ios::iostate)0);
clear((std::ios::iostatetate)0);
_buf.open_write(handle);
if (!_buf.is_open_write()) {
clear(ios::failbit);
clear(std::ios::failbit);
}
}

2
direct/src/plugin/handleStream.h
View File

@ -21,7 +21,7 @@
* Windows' HANDLE objects, or Posix file descriptors. This is necessary to
* map low-level pipes into an iostream for tinyxml.
*/
class HandleStream : public iostream {
class HandleStream : public std::iostream {
public:
inline HandleStream();
inline ~HandleStream();

2
direct/src/plugin/handleStreamBuf.h
View File

@ -23,7 +23,7 @@ using namespace std;
/**
*
*/
class HandleStreamBuf : public streambuf {
class HandleStreamBuf : public std::streambuf {
public:
HandleStreamBuf();
virtual ~HandleStreamBuf();

26
direct/src/plugin/load_plugin.h
View File

@ -59,24 +59,24 @@ extern P3D_request_finish_func *P3D_request_finish_ptr;
extern P3D_instance_feed_url_stream_func *P3D_instance_feed_url_stream_ptr;
extern P3D_instance_handle_event_func *P3D_instance_handle_event_ptr;
string get_plugin_basename();
std::string get_plugin_basename();
bool
load_plugin(const string &p3d_plugin_filename,
const string &contents_filename, const string &host_url,
P3D_verify_contents verify_contents, const string &platform,
const string &log_directory, const string &log_basename,
load_plugin(const std::string &p3d_plugin_filename,
const std::string &contents_filename, const std::string &host_url,
P3D_verify_contents verify_contents, const std::string &platform,
const std::string &log_directory, const std::string &log_basename,
bool trusted_environment, bool console_environment,
const string &root_dir, const string &host_dir,
const string &start_dir, ostream &logfile);
const std::string &root_dir, const std::string &host_dir,
const std::string &start_dir, std::ostream &logfile);
bool
init_plugin(const string &contents_filename, const string &host_url,
P3D_verify_contents verify_contents, const string &platform,
const string &log_directory, const string &log_basename,
init_plugin(const std::string &contents_filename, const std::string &host_url,
P3D_verify_contents verify_contents, const std::string &platform,
const std::string &log_directory, const std::string &log_basename,
bool trusted_environment, bool console_environment,
const string &root_dir, const string &host_dir,
const string &start_dir, ostream &logfile);
const std::string &root_dir, const std::string &host_dir,
const std::string &start_dir, std::ostream &logfile);
void unload_plugin(ostream &logfile);
void unload_plugin(std::ostream &logfile);
bool is_plugin_loaded();
#endif

8
direct/src/plugin/mkdir_complete.h
View File

@ -18,12 +18,12 @@
#include <iostream>
using namespace std;
bool mkdir_complete(const string &dirname, ostream &logfile);
bool mkfile_complete(const string &dirname, ostream &logfile);
bool mkdir_complete(const std::string &dirname, std::ostream &logfile);
bool mkfile_complete(const std::string &dirname, std::ostream &logfile);
#ifdef _WIN32
bool mkdir_complete_w(const wstring &dirname, ostream &logfile);
bool mkfile_complete_w(const wstring &dirname, ostream &logfile);
bool mkdir_complete_w(const std::wstring &dirname, std::ostream &logfile);
bool mkfile_complete_w(const std::wstring &dirname, std::ostream &logfile);
#endif // _WIN32
#endif

8
direct/src/plugin/p3dAuthSession.h
View File

@ -56,13 +56,13 @@ private:
private:
P3DInstance *_inst;
string _start_dir;
std::string _start_dir;
// This information is passed to create_process().
P3DTemporaryFile *_cert_filename;
string _cert_dir;
string _p3dcert_exe;
string _env;
std::string _cert_dir;
std::string _p3dcert_exe;
std::string _env;
#ifdef _WIN32
HANDLE _p3dcert_handle;

2
direct/src/plugin/p3dBoolObject.h
View File

@ -29,7 +29,7 @@ public:
virtual P3D_object_type get_type();
virtual bool get_bool();
virtual int get_int();
virtual void make_string(string &value);
virtual void make_string(std::string &value);
private:
bool _value;

14
direct/src/plugin/p3dCert.h
View File

@ -50,9 +50,9 @@ class ViewCertDialog;
class AuthDialog : public Fl_Window {
public:
#ifdef _WIN32
AuthDialog(const wstring &cert_filename, const wstring &cert_dir);
AuthDialog(const std::wstring &cert_filename, const std::wstring &cert_dir);
#else
AuthDialog(const string &cert_filename, const string &cert_dir);
AuthDialog(const std::string &cert_filename, const std::string &cert_dir);
#endif
virtual ~AuthDialog();
@ -64,9 +64,9 @@ public:
private:
#ifdef _WIN32
void read_cert_file(const wstring &cert_filename);
void read_cert_file(const std::wstring &cert_filename);
#else
void read_cert_file(const string &cert_filename);
void read_cert_file(const std::string &cert_filename);
#endif
void get_friendly_name();
void verify_cert();
@ -81,9 +81,9 @@ public:
private:
#ifdef _WIN32
wstring _cert_dir;
std::wstring _cert_dir;
#else
string _cert_dir;
std::string _cert_dir;
#endif
X509 *_cert;
STACK_OF(X509) *_stack;
@ -92,7 +92,7 @@ private:
char _text[1024];
char _text_clean[2048];
string _friendly_name;
std::string _friendly_name;
int _verify_result;
};

10
direct/src/plugin/p3dCert_wx.h
View File

@ -48,8 +48,8 @@ public:
virtual bool OnCmdLineParsed(wxCmdLineParser &parser);
private:
string _cert_filename;
string _cert_dir;
std::string _cert_filename;
std::string _cert_dir;
};
/**
@ -62,7 +62,7 @@ private:
*/
class AuthDialog : public wxDialog {
public:
AuthDialog(const string &cert_filename, const string &cert_dir);
AuthDialog(const std::string &cert_filename, const std::string &cert_dir);
virtual ~AuthDialog();
void run_clicked(wxCommandEvent &event);
@ -72,7 +72,7 @@ public:
void approve_cert();
private:
void read_cert_file(const string &cert_filename);
void read_cert_file(const std::string &cert_filename);
void get_friendly_name();
void verify_cert();
int load_certificates_from_der_ram(X509_STORE *store,
@ -88,7 +88,7 @@ private:
// any class wishing to process wxWidgets events must use this macro
DECLARE_EVENT_TABLE()
string _cert_dir;
std::string _cert_dir;
X509 *_cert;
STACK_OF(X509) *_stack;

8
direct/src/plugin/p3dConcreteSequence.h
View File

@ -34,10 +34,10 @@ public:
virtual P3D_object_type get_type();
virtual bool get_bool();
virtual void make_string(string &value);
virtual void make_string(std::string &value);
virtual P3D_object *get_property(const string &property);
virtual bool set_property(const string &property, P3D_object *value);
virtual P3D_object *get_property(const std::string &property);
virtual bool set_property(const std::string &property, P3D_object *value);
virtual bool fill_xml(TiXmlElement *xvalue, P3DSession *session);
virtual P3D_object **get_object_array();
@ -49,7 +49,7 @@ public:
void append(P3D_object *value);
private:
typedef vector<P3D_object *> Elements;
typedef std::vector<P3D_object *> Elements;
Elements _elements;
};

12
direct/src/plugin/p3dConcreteStruct.h
View File

@ -32,19 +32,19 @@ public:
virtual P3D_object_type get_type();
virtual bool get_bool();
virtual void make_string(string &value);
virtual void make_string(std::string &value);
virtual P3D_object *get_property(const string &property);
virtual bool set_property(const string &property, P3D_object *value);
virtual P3D_object *get_property(const std::string &property);
virtual bool set_property(const std::string &property, P3D_object *value);
virtual bool has_method(const string &method_name);
virtual P3D_object *call(const string &method_name, bool needs_response,
virtual bool has_method(const std::string &method_name);
virtual P3D_object *call(const std::string &method_name, bool needs_response,
P3D_object *params[], int num_params);
virtual bool fill_xml(TiXmlElement *xvalue, P3DSession *session);
private:
typedef map<string, P3D_object *> Elements;
typedef std::map<std::string, P3D_object *> Elements;
Elements _elements;
};

2
direct/src/plugin/p3dDownload.I
View File

@ -14,7 +14,7 @@
/**
* Returns the URL that we are querying.
*/
const string &P3DDownload::
const std::string &P3DDownload::
get_url() const {
return _url;
}

6
direct/src/plugin/p3dDownload.h
View File

@ -32,8 +32,8 @@ public:
P3DDownload(const P3DDownload &copy);
virtual ~P3DDownload();
void set_url(const string &url);
inline const string &get_url() const;
void set_url(const std::string &url);
inline const std::string &get_url() const;
inline void set_instance(P3DInstance *instance);
inline P3DInstance *get_instance() const;
@ -78,7 +78,7 @@ protected:
private:
bool _canceled;
int _download_id;
string _url;
std::string _url;
P3DInstance *_instance;
};

2
direct/src/plugin/p3dFileDownload.I
View File

@ -14,7 +14,7 @@
/**
* Returns the filename that we are downloading into.
*/
const string &P3DFileDownload::
const std::string &P3DFileDownload::
get_filename() const {
return _filename;
}

6
direct/src/plugin/p3dFileDownload.h
View File

@ -28,8 +28,8 @@ public:
P3DFileDownload();
P3DFileDownload(const P3DFileDownload &copy);
bool set_filename(const string &filename);
inline const string &get_filename() const;
bool set_filename(const std::string &filename);
inline const std::string &get_filename() const;
protected:
virtual bool open_file();
@ -42,7 +42,7 @@ protected:
ofstream _file;
private:
string _filename;
std::string _filename;
};
#include "p3dFileDownload.I"

8
direct/src/plugin/p3dFileParams.I
View File

@ -14,7 +14,7 @@
/**
* Returns the filename that was passed to set_p3d_filename().
*/
inline const string &P3DFileParams::
inline const std::string &P3DFileParams::
get_p3d_filename() const {
return _p3d_filename;
}
@ -31,7 +31,7 @@ get_p3d_offset() const {
/**
* Returns the string that was passed to set_p3d_url().
*/
inline const string &P3DFileParams::
inline const std::string &P3DFileParams::
get_p3d_url() const {
return _p3d_url;
}
@ -47,7 +47,7 @@ get_num_tokens() const {
/**
* Returns the keyword of the nth token.
*/
inline const string &P3DFileParams::
inline const std::string &P3DFileParams::
get_token_keyword(int n) const {
assert(n >= 0 && n < (int)_tokens.size());
return _tokens[n]._keyword;
@ -56,7 +56,7 @@ get_token_keyword(int n) const {
/**
* Returns the value of the nth token.
*/
inline const string &P3DFileParams::
inline const std::string &P3DFileParams::
get_token_value(int n) const {
assert(n >= 0 && n < (int)_tokens.size());
return _tokens[n]._value;

30
direct/src/plugin/p3dFileParams.h
View File

@ -27,38 +27,38 @@ public:
P3DFileParams(const P3DFileParams &copy);
void operator = (const P3DFileParams &other);
void set_p3d_filename(const string &p3d_filename);
void set_p3d_filename(const std::string &p3d_filename);
void set_p3d_offset(const int &p3d_offset);
void set_p3d_url(const string &p3d_url);
void set_p3d_url(const std::string &p3d_url);
void set_tokens(const P3D_token tokens[], size_t num_tokens);
void set_token(const char *keyword, const char *value);
void set_args(int argc, const char *argv[]);
inline const string &get_p3d_filename() const;
inline const std::string &get_p3d_filename() const;
inline int get_p3d_offset() const;
inline const string &get_p3d_url() const;
string lookup_token(const string &keyword) const;
int lookup_token_int(const string &keyword) const;
bool has_token(const string &keyword) const;
inline const std::string &get_p3d_url() const;
std::string lookup_token(const std::string &keyword) const;
int lookup_token_int(const std::string &keyword) const;
bool has_token(const std::string &keyword) const;
inline int get_num_tokens() const;
inline const string &get_token_keyword(int n) const;
inline const string &get_token_value(int n) const;
inline const std::string &get_token_keyword(int n) const;
inline const std::string &get_token_value(int n) const;
TiXmlElement *make_xml();
private:
class Token {
public:
string _keyword;
string _value;
std::string _keyword;
std::string _value;
};
typedef vector<Token> Tokens;
typedef vector<string> Args;
typedef std::vector<Token> Tokens;
typedef std::vector<std::string> Args;
string _p3d_filename;
std::string _p3d_filename;
int _p3d_offset;
string _p3d_url;
std::string _p3d_url;
Tokens _tokens;
Args _args;
};

2
direct/src/plugin/p3dFloatObject.h
View File

@ -30,7 +30,7 @@ public:
virtual bool get_bool();
virtual int get_int();
virtual double get_float();
virtual void make_string(string &value);
virtual void make_string(std::string &value);
private:
double _value;

12
direct/src/plugin/p3dHost.I
View File

@ -26,7 +26,7 @@ has_host_dir() const {
* bootstrapped; if there is some danger of calling this early in the
* initialization process, you should check has_host_dir() first.
*/
inline const string &P3DHost::
inline const std::string &P3DHost::
get_host_dir() const {
assert(has_host_dir());
return _host_dir;
@ -36,7 +36,7 @@ get_host_dir() const {
* Returns the root URL of this particular host, as passed from the package
* file. This is a unique string that identifies each host.
*/
inline const string &P3DHost::
inline const std::string &P3DHost::
get_host_url() const {
return _host_url;
}
@ -48,7 +48,7 @@ get_host_url() const {
*
* Also see get_download_url_prefix().
*/
inline const string &P3DHost::
inline const std::string &P3DHost::
get_host_url_prefix() const {
return _host_url_prefix;
}
@ -58,7 +58,7 @@ get_host_url_prefix() const {
* the contents.xml file. This is often the same as get_host_url_prefix(),
* but it may be different in the case of an https server for contents.xml.
*/
inline const string &P3DHost::
inline const std::string &P3DHost::
get_download_url_prefix() const {
return _download_url_prefix;
}
@ -68,7 +68,7 @@ get_download_url_prefix() const {
* url if no descriptive name is provided. This will be available after
* read_contents_file() has been called.
*/
inline const string &P3DHost::
inline const std::string &P3DHost::
get_descriptive_name() const {
return _descriptive_name;
}
@ -101,6 +101,6 @@ get_contents_iseq() const {
* contents.xml file (as provided by the server), false otherwise.
*/
inline bool P3DHost::
check_contents_hash(const string &pathname) const {
check_contents_hash(const std::string &pathname) const {
return _contents_spec.check_hash(pathname);
}

84
direct/src/plugin/p3dHost.h
View File

@ -27,84 +27,84 @@ class P3DPackage;
*/
class P3DHost {
private:
P3DHost(const string &host_url, const string &host_dir = "");
P3DHost(const std::string &host_url, const std::string &host_dir = "");
~P3DHost();
public:
inline bool has_host_dir() const;
inline const string &get_host_dir() const;
inline const string &get_host_url() const;
inline const string &get_host_url_prefix() const;
inline const string &get_download_url_prefix() const;
inline const string &get_descriptive_name() const;
inline const std::string &get_host_dir() const;
inline const std::string &get_host_url() const;
inline const std::string &get_host_url_prefix() const;
inline const std::string &get_download_url_prefix() const;
inline const std::string &get_descriptive_name() const;
P3DHost *get_alt_host(const string &alt_host);
P3DHost *get_alt_host(const std::string &alt_host);
inline bool has_contents_file() const;
bool has_current_contents_file(P3DInstanceManager *inst_mgr) const;
inline int get_contents_iseq() const;
inline bool check_contents_hash(const string &pathname) const;
inline bool check_contents_hash(const std::string &pathname) const;
bool read_contents_file();
bool read_contents_file(const string &contents_filename, bool fresh_download);
bool read_contents_file(const std::string &contents_filename, bool fresh_download);
void read_xhost(TiXmlElement *xhost);
P3DPackage *get_package(const string &package_name,
const string &package_version,
const string &package_platform,
const string &package_seq,
const string &alt_host = "");
bool choose_suitable_platform(string &selected_platform,
P3DPackage *get_package(const std::string &package_name,
const std::string &package_version,
const std::string &package_platform,
const std::string &package_seq,
const std::string &alt_host = "");
bool choose_suitable_platform(std::string &selected_platform,
bool &per_platform,
const string &package_name,
const string &package_version,
const string &package_platform);
const std::string &package_name,
const std::string &package_version,
const std::string &package_platform);
bool get_package_desc_file(FileSpec &desc_file,
string &package_seq,
std::string &package_seq,
bool &package_solo,
const string &package_name,
const string &package_version,
const string &package_platform);
const std::string &package_name,
const std::string &package_version,
const std::string &package_platform);
void forget_package(P3DPackage *package, const string &alt_host = "");
void migrate_package_host(P3DPackage *package, const string &alt_host, P3DHost *new_host);
void forget_package(P3DPackage *package, const std::string &alt_host = "");
void migrate_package_host(P3DPackage *package, const std::string &alt_host, P3DHost *new_host);
void choose_random_mirrors(vector<string> &result, int num_mirrors);
void add_mirror(string mirror_url);
void choose_random_mirrors(std::vector<std::string> &result, int num_mirrors);
void add_mirror(std::string mirror_url);
void uninstall();
private:
void determine_host_dir(const string &host_dir_basename);
void determine_host_dir(const std::string &host_dir_basename);
static string standardize_filename(const string &filename);
static bool copy_file(const string &from_filename, const string &to_filename);
static bool save_xml_file(TiXmlDocument *doc, const string &to_filename);
static int compare_seq(const string &seq_a, const string &seq_b);
static std::string standardize_filename(const std::string &filename);
static bool copy_file(const std::string &from_filename, const std::string &to_filename);
static bool save_xml_file(TiXmlDocument *doc, const std::string &to_filename);
static int compare_seq(const std::string &seq_a, const std::string &seq_b);
static int compare_seq_int(const char *&num_a, const char *&num_b);
private:
string _host_dir;
string _host_url;
string _host_url_prefix;
string _download_url_prefix;
string _descriptive_name;
std::string _host_dir;
std::string _host_url;
std::string _host_url_prefix;
std::string _download_url_prefix;
std::string _descriptive_name;
TiXmlElement *_xcontents;
time_t _contents_expiration;
int _contents_iseq;
FileSpec _contents_spec;
typedef vector<string> Mirrors;
typedef std::vector<std::string> Mirrors;
Mirrors _mirrors;
typedef map<string, string> AltHosts;
typedef std::map<std::string, std::string> AltHosts;
AltHosts _alt_hosts;
typedef vector<P3DPackage *> PlatformPackages;
typedef map<string, PlatformPackages> PackageMap;
typedef map<string, PackageMap> Packages;
typedef std::vector<P3DPackage *> PlatformPackages;
typedef std::map<std::string, PlatformPackages> PackageMap;
typedef std::map<std::string, PackageMap> Packages;
Packages _packages;
typedef vector<P3DPackage *> FailedPackages;
typedef std::vector<P3DPackage *> FailedPackages;
FailedPackages _failed_packages;
friend class P3DInstanceManager;

4
direct/src/plugin/p3dInstance.I
View File

@ -42,7 +42,7 @@ get_instance_id() const {
* is guaranteed to be unique for each unique session required for different
* P3DInstances.
*/
inline const string &P3DInstance::
inline const std::string &P3DInstance::
get_session_key() const {
return _session_key;
}
@ -56,7 +56,7 @@ get_session_key() const {
* Presumably all of the platform-specific packages that are downloaded
* subsequently must be of the exact same platform.
*/
inline const string &P3DInstance::
inline const std::string &P3DInstance::
get_session_platform() const {
return _session_platform;
}

80
direct/src/plugin/p3dInstance.h
View File

@ -56,9 +56,9 @@ public:
~P3DInstance();
void cleanup();
void set_p3d_url(const string &p3d_url);
void set_p3d_filename(const string &p3d_filename, const int &p3d_offset = 0);
int make_p3d_stream(const string &p3d_url);
void set_p3d_url(const std::string &p3d_url);
void set_p3d_filename(const std::string &p3d_filename, const int &p3d_offset = 0);
int make_p3d_stream(const std::string &p3d_url);
inline const P3DFileParams &get_fparams() const;
void set_wparams(const P3DWindowParams &wparams);
@ -84,16 +84,16 @@ public:
bool handle_event(const P3D_event_data &event);
inline int get_instance_id() const;
inline const string &get_session_key() const;
const string &get_log_pathname() const;
inline const string &get_session_platform() const;
inline const std::string &get_session_key() const;
const std::string &get_log_pathname() const;
inline const std::string &get_session_platform() const;
inline P3DSession *get_session() const;
inline P3D_request_ready_func *get_request_ready_func() const;
void add_package(const string &name, const string &version,
const string &seq, P3DHost *host);
void add_package(const std::string &name, const std::string &version,
const std::string &seq, P3DHost *host);
void add_package(P3DPackage *package);
void remove_package(P3DPackage *package);
bool get_packages_info_ready() const;
@ -161,14 +161,14 @@ private:
IT_num_image_types, // Not a real value
};
void priv_set_p3d_filename(const string &p3d_filename, const int &p3d_offset = -1);
void determine_p3d_basename(const string &p3d_url);
void priv_set_p3d_filename(const std::string &p3d_filename, const int &p3d_offset = -1);
void determine_p3d_basename(const std::string &p3d_url);
bool check_matches_origin(const string &origin_match);
bool check_matches_origin_one(const string &origin_match);
bool check_matches_hostname(const string &orig, const string &match);
void separate_components(vector<string> &components, const string &str);
bool check_matches_component(const string &orig, const string &match);
bool check_matches_origin(const std::string &origin_match);
bool check_matches_origin_one(const std::string &origin_match);
bool check_matches_hostname(const std::string &orig, const std::string &match);
void separate_components(std::vector<std::string> &components, const std::string &str);
bool check_matches_component(const std::string &orig, const std::string &match);
void check_p3d_signature();
void mark_p3d_untrusted();
@ -176,15 +176,15 @@ private:
void scan_app_desc_file(TiXmlDocument *doc);
void add_panda3d_package();
void add_packages();
string find_alt_host_url(const string &host_url, const string &alt_host);
std::string find_alt_host_url(const std::string &host_url, const std::string &alt_host);
void get_host_info(P3DHost *host);
string get_start_dir_suffix() const;
std::string get_start_dir_suffix() const;
void send_browser_script_object();
P3D_request *make_p3d_request(TiXmlElement *xrequest);
void handle_notify_request(const string &message);
void handle_script_request(const string &operation, P3D_object *object,
const string &property_name, P3D_object *value,
void handle_notify_request(const std::string &message);
void handle_script_request(const std::string &operation, P3D_object *object,
const std::string &property_name, P3D_object *value,
bool needs_response, int unique_id);
void set_failed();
@ -201,7 +201,7 @@ private:
size_t received_data);
void report_package_progress(P3DPackage *package, double progress);
void report_package_done(P3DPackage *package, bool success);
void set_install_label(const string &install_label);
void set_install_label(const std::string &install_label);
void paint_window();
@ -217,7 +217,7 @@ private:
void add_carbon_modifier_flags(unsigned int &swb_flags, int modifiers);
void add_cocoa_modifier_flags(unsigned int &swb_flags, int modifiers);
void send_notify(const string &message);
void send_notify(const std::string &message);
#ifdef __APPLE__
void alloc_swbuffer();
@ -228,10 +228,10 @@ private:
P3D_request_ready_func *_func;
P3D_object *_dom_object;
P3DMainObject *_main_object;
string _p3d_basename;
string _origin_protocol;
string _origin_hostname;
string _origin_port;
std::string _p3d_basename;
std::string _origin_protocol;
std::string _origin_hostname;
std::string _origin_port;
// We need a list of previous time reports so we can average the predicted
// download time over the past few seconds.
@ -240,7 +240,7 @@ private:
double _total;
double _report_time;
};
typedef deque<TimeReport> TimeReports;
typedef std::deque<TimeReport> TimeReports;
TimeReports _time_reports;
double _total_time_reports;
@ -258,7 +258,7 @@ private:
bool _use_standard_image;
P3DTemporaryFile *_temp_filename;
string _filename;
std::string _filename;
P3DSplashWindow::ImagePlacement _image_placement;
};
ImageFile _image_files[IT_num_image_types];
@ -283,11 +283,11 @@ private:
P3DPackage *_p3dcert_package;
int _instance_id;
string _session_key;
string _log_basename;
string _session_platform;
string _prc_name;
string _start_dir;
std::string _session_key;
std::string _log_basename;
std::string _session_platform;
std::string _prc_name;
std::string _start_dir;
bool _hidden;
bool _matches_run_origin;
bool _matches_script_origin;
@ -301,14 +301,14 @@ private:
P3DSession *_session;
P3DAuthSession *_auth_session;
string _log_pathname;
std::string _log_pathname;
#ifdef __APPLE__
// On OSX, we have to get a copy of the framebuffer data back from the child
// process, and draw it to the window, here in the parent process. Crazy!
int _shared_fd;
size_t _shared_mmap_size;
string _shared_filename;
std::string _shared_filename;
SubprocessWindowBuffer *_swbuffer;
char *_reversed_buffer;
CFDataRef _buffer_data;
@ -323,7 +323,7 @@ private:
#endif // __APPLE__
P3DSplashWindow *_splash_window;
string _install_label;
std::string _install_label;
bool _instance_window_opened;
bool _instance_window_attached;
bool _stuff_to_download;
@ -341,7 +341,7 @@ private:
// for more than a couple of seconds.
bool _show_dl_instance_progress;
typedef vector<P3DPackage *> Packages;
typedef std::vector<P3DPackage *> Packages;
Packages _packages;
Packages _downloading_packages;
int _download_package_index;
@ -357,19 +357,19 @@ private:
// it's in the above vector also.
P3DPackage *_panda3d_package;
typedef map<int, P3DDownload *> Downloads;
typedef std::map<int, P3DDownload *> Downloads;
Downloads _downloads;
// The _raw_requests queue might be filled up by the read thread, so we
// protect it in a lock.
LOCK _request_lock;
typedef deque<TiXmlDocument *> RawRequests;
typedef std::deque<TiXmlDocument *> RawRequests;
RawRequests _raw_requests;
bool _requested_stop;
// The _baked_requests queue is only touched in the main thread; no lock
// needed.
typedef deque<P3D_request *> BakedRequests;
typedef std::deque<P3D_request *> BakedRequests;
BakedRequests _baked_requests;
friend class P3DSession;

24
direct/src/plugin/p3dInstanceManager.I
View File

@ -73,7 +73,7 @@ get_api_version() const {
* PANDA_PACKAGE_HOST_URL, but it might be set to something different by the
* -u parameter on the panda3d executable.
*/
inline const string &P3DInstanceManager::
inline const std::string &P3DInstanceManager::
get_host_url() const {
return _host_url;
}
@ -83,7 +83,7 @@ get_host_url() const {
* downloaded and installed. This must be a writable directory or nothing
* will work.
*/
inline const string &P3DInstanceManager::
inline const std::string &P3DInstanceManager::
get_root_dir() const {
return _root_dir;
}
@ -92,7 +92,7 @@ get_root_dir() const {
* Returns the directory that the .p3d file should be mounted to and run from.
* This is usually the "start" subdirectory of the root_dir.
*/
inline const string &P3DInstanceManager::
inline const std::string &P3DInstanceManager::
get_start_dir() const {
return _start_dir;
}
@ -102,7 +102,7 @@ get_start_dir() const {
* running. This string will be used to determine the appropriate packages to
* download.
*/
inline const string &P3DInstanceManager::
inline const std::string &P3DInstanceManager::
get_platform() const {
return _platform;
}
@ -112,7 +112,7 @@ get_platform() const {
* written. This filename will end with a slash, so that full pathnames may
* be made by concatenting directly with this string.
*/
inline const string &P3DInstanceManager::
inline const std::string &P3DInstanceManager::
get_temp_directory() const {
return _temp_directory;
}
@ -122,7 +122,7 @@ get_temp_directory() const {
* written. This filename will end with a slash, so that full pathnames may
* be made by concatenting directly with this string.
*/
inline const string &P3DInstanceManager::
inline const std::string &P3DInstanceManager::
get_log_directory() const {
return _log_directory;
}
@ -133,7 +133,7 @@ get_log_directory() const {
* different from the session log file(s), which represent the output from a
* particular Python session.
*/
inline const string &P3DInstanceManager::
inline const std::string &P3DInstanceManager::
get_log_pathname() const {
return _log_pathname;
}
@ -187,7 +187,7 @@ get_num_supported_platforms() const {
* environment will support, in order of preference--preferred platforms
* appear first in the list.
*/
inline const string &P3DInstanceManager::
inline const std::string &P3DInstanceManager::
get_supported_platform(int n) const {
return _supported_platforms.at(n);
}
@ -230,7 +230,7 @@ get_plugin_official_version() const {
* Returns the "distributor" reported by the plugin. This should represent
* the entity that built and hosted the plugin.
*/
inline const string &P3DInstanceManager::
inline const std::string &P3DInstanceManager::
get_plugin_distributor() const {
return _plugin_distributor;
}
@ -240,7 +240,7 @@ get_plugin_distributor() const {
* the plugin). This is for reporting purposes only; see get_host_url() for
* the URL to contact to actually download content.
*/
inline const string &P3DInstanceManager::
inline const std::string &P3DInstanceManager::
get_coreapi_host_url() const {
return _coreapi_host_url;
}
@ -261,7 +261,7 @@ get_coreapi_timestamp() const {
* not provide a number here. If provided, this will be a string of dot-
* separated integers.
*/
inline const string &P3DInstanceManager::
inline const std::string &P3DInstanceManager::
get_coreapi_set_ver() const {
return _coreapi_set_ver;
}
@ -269,7 +269,7 @@ get_coreapi_set_ver() const {
/**
* Returns the "super mirror" URL. See p3d_plugin.h.
*/
inline const string &P3DInstanceManager::
inline const std::string &P3DInstanceManager::
get_super_mirror() const {
return _super_mirror_url;
}

122
direct/src/plugin/p3dInstanceManager.h
View File

@ -47,17 +47,17 @@ private:
~P3DInstanceManager();
public:
bool initialize(int api_version, const string &contents_filename,
const string &host_url,
bool initialize(int api_version, const std::string &contents_filename,
const std::string &host_url,
P3D_verify_contents verify_contents,
const string &platform,
const string &log_directory,
const string &log_basename,
const std::string &platform,
const std::string &log_directory,
const std::string &log_basename,
bool trusted_environment,
bool console_environment,
const string &root_dir = "",
const string &host_dir = "",
const string &start_dir = "");
const std::string &root_dir = "",
const std::string &host_dir = "",
const std::string &start_dir = "");
inline bool is_initialized() const;
inline void reconsider_runtime_environment();
@ -65,35 +65,35 @@ public:
inline void reset_verify_contents();
inline int get_api_version() const;
inline const string &get_host_url() const;
inline const string &get_root_dir() const;
inline const string &get_start_dir() const;
inline const string &get_platform() const;
inline const string &get_temp_directory() const;
inline const string &get_log_directory() const;
inline const string &get_log_pathname() const;
inline const std::string &get_host_url() const;
inline const std::string &get_root_dir() const;
inline const std::string &get_start_dir() const;
inline const std::string &get_platform() const;
inline const std::string &get_temp_directory() const;
inline const std::string &get_log_directory() const;
inline const std::string &get_log_pathname() const;
inline bool get_trusted_environment() const;
inline bool get_console_environment() const;
inline int get_num_supported_platforms() const;
inline const string &get_supported_platform(int n) const;
inline const std::string &get_supported_platform(int n) const;
void set_plugin_version(int major, int minor, int sequence,
bool official, const string &distributor,
const string &coreapi_host_url,
bool official, const std::string &distributor,
const std::string &coreapi_host_url,
time_t coreapi_timestamp,
const string &coreapi_set_ver);
const std::string &coreapi_set_ver);
inline int get_plugin_major_version() const;
inline int get_plugin_minor_version() const;
inline int get_plugin_sequence_version() const;
inline bool get_plugin_official_version() const;
inline const string &get_plugin_distributor() const;
inline const string &get_coreapi_host_url() const;
inline const std::string &get_plugin_distributor() const;
inline const std::string &get_coreapi_host_url() const;
inline time_t get_coreapi_timestamp() const;
inline const string &get_coreapi_set_ver() const;
inline const std::string &get_coreapi_set_ver() const;
void set_super_mirror(const string &super_mirror_url);
inline const string &get_super_mirror() const;
void set_super_mirror(const std::string &super_mirror_url);
inline const std::string &get_super_mirror() const;
P3DInstance *
create_instance(P3D_request_ready_func *func,
@ -101,8 +101,8 @@ public:
int argc, const char *argv[], void *user_data);
bool set_p3d_filename(P3DInstance *inst, bool is_local,
const string &p3d_filename, const int &p3d_offset);
int make_p3d_stream(P3DInstance *inst, const string &p3d_url);
const std::string &p3d_filename, const int &p3d_offset);
int make_p3d_stream(P3DInstance *inst, const std::string &p3d_url);
bool start_instance(P3DInstance *inst);
void finish_instance(P3DInstance *inst);
P3DAuthSession *authorize_instance(P3DInstance *inst);
@ -112,7 +112,7 @@ public:
P3DInstance *check_request();
void wait_request(double timeout);
P3DHost *get_host(const string &host_url);
P3DHost *get_host(const std::string &host_url);
void forget_host(P3DHost *host);
inline int get_num_instances() const;
@ -126,13 +126,13 @@ public:
inline P3D_object *new_none_object();
inline P3D_object *new_bool_object(bool value);
string make_temp_filename(const string &extension);
void release_temp_filename(const string &filename);
std::string make_temp_filename(const std::string &extension);
void release_temp_filename(const std::string &filename);
bool find_cert(X509 *cert);
void read_certlist(P3DPackage *package);
string get_cert_dir(X509 *cert);
static string cert_to_der(X509 *cert);
std::string get_cert_dir(X509 *cert);
static std::string cert_to_der(X509 *cert);
void uninstall_all();
@ -140,19 +140,19 @@ public:
static void delete_global_ptr();
static inline char encode_hexdigit(int c);
static bool scan_directory(const string &dirname, vector<string> &contents);
static bool scan_directory_recursively(const string &dirname,
vector<string> &filename_contents,
vector<string> &dirname_contents,
const string &prefix = "");
static void delete_directory_recursively(const string &root_dir);
static bool remove_file_from_list(vector<string> &contents, const string &filename);
static bool scan_directory(const std::string &dirname, std::vector<std::string> &contents);
static bool scan_directory_recursively(const std::string &dirname,
std::vector<std::string> &filename_contents,
std::vector<std::string> &dirname_contents,
const std::string &prefix = "");
static void delete_directory_recursively(const std::string &root_dir);
static bool remove_file_from_list(std::vector<std::string> &contents, const std::string &filename);
static void append_safe_dir(string &root, const string &basename);
static void append_safe_dir(std::string &root, const std::string &basename);
private:
void create_runtime_environment();
static void append_safe_dir_component(string &root, const string &component);
static void append_safe_dir_component(std::string &root, const std::string &component);
private:
// The notify thread. This thread runs only for the purpose of generating
@ -168,30 +168,30 @@ private:
bool _is_initialized;
bool _created_runtime_environment;
int _api_version;
string _host_url;
string _root_dir;
string _host_dir;
string _start_dir;
string _certs_dir;
std::string _host_url;
std::string _root_dir;
std::string _host_dir;
std::string _start_dir;
std::string _certs_dir;
P3D_verify_contents _verify_contents;
string _platform;
string _log_directory;
string _log_basename;
string _log_pathname;
string _temp_directory;
std::string _platform;
std::string _log_directory;
std::string _log_basename;
std::string _log_pathname;
std::string _temp_directory;
bool _trusted_environment;
bool _console_environment;
int _plugin_major_version;
int _plugin_minor_version;
int _plugin_sequence_version;
bool _plugin_official_version;
string _plugin_distributor;
string _coreapi_host_url;
std::string _plugin_distributor;
std::string _coreapi_host_url;
time_t _coreapi_timestamp;
string _coreapi_set_ver;
string _super_mirror_url;
std::string _coreapi_set_ver;
std::string _super_mirror_url;
typedef vector<string> SupportedPlatforms;
typedef std::vector<std::string> SupportedPlatforms;
SupportedPlatforms _supported_platforms;
P3D_object *_undefined_object;
@ -199,20 +199,20 @@ private:
P3D_object *_true_object;
P3D_object *_false_object;
typedef set<string> ApprovedCerts;
typedef std::set<std::string> ApprovedCerts;
ApprovedCerts _approved_certs;
typedef set<P3DInstance *> Instances;
typedef std::set<P3DInstance *> Instances;
Instances _instances;
P3DAuthSession *_auth_session;
typedef map<string, P3DSession *> Sessions;
typedef std::map<std::string, P3DSession *> Sessions;
Sessions _sessions;
typedef map<string, P3DHost *> Hosts;
typedef std::map<std::string, P3DHost *> Hosts;
Hosts _hosts;
typedef set<string> TempFilenames;
typedef std::set<std::string> TempFilenames;
TempFilenames _temp_filenames;
int _next_temp_filename_counter;
@ -228,7 +228,7 @@ private:
THREAD _notify_thread;
// This queue of instances that need to send notifications is protected by
// _notify_ready's mutex.
typedef vector<P3DInstance *> NotifyInstances;
typedef std::vector<P3DInstance *> NotifyInstances;
NotifyInstances _notify_instances;
P3DConditionVar _notify_ready;

2
direct/src/plugin/p3dIntObject.h
View File

@ -29,7 +29,7 @@ public:
virtual P3D_object_type get_type();
virtual bool get_bool();
virtual int get_int();
virtual void make_string(string &value);
virtual void make_string(std::string &value);
private:
int _value;

Some files were not shown because too many files have changed in this diff Show More