diff --git a/panda/src/chan/animBundle.I b/panda/src/chan/animBundle.I index b017bd397c..d368f35355 100644 --- a/panda/src/chan/animBundle.I +++ b/panda/src/chan/animBundle.I @@ -34,7 +34,7 @@ AnimBundle(const string &name, float fps, int num_frames) : AnimGroup(name) { // Description: //////////////////////////////////////////////////////////////////// INLINE AnimBundle:: -AnimBundle(void) { +AnimBundle() { } //////////////////////////////////////////////////////////////////// diff --git a/panda/src/chan/animBundle.cxx b/panda/src/chan/animBundle.cxx index fc48f254b3..cd7a9850e6 100644 --- a/panda/src/chan/animBundle.cxx +++ b/panda/src/chan/animBundle.cxx @@ -91,7 +91,7 @@ make_AnimBundle(const FactoryParams ¶ms) // Description: Factory method to generate a AnimBundle object //////////////////////////////////////////////////////////////////// void AnimBundle:: -register_with_read_factory(void) +register_with_read_factory() { BamReader::get_factory()->register_factory(get_class_type(), make_AnimBundle); } diff --git a/panda/src/chan/animBundle.h b/panda/src/chan/animBundle.h index ace7112c68..c15a819dbd 100644 --- a/panda/src/chan/animBundle.h +++ b/panda/src/chan/animBundle.h @@ -42,13 +42,13 @@ PUBLISHED: virtual void output(ostream &out) const; protected: - INLINE AnimBundle(void); + INLINE AnimBundle(); float _fps; int _num_frames; public: - static void register_with_read_factory(void); + static void register_with_read_factory(); virtual void write_datagram(BamWriter* manager, Datagram &me); static TypedWritable *make_AnimBundle(const FactoryParams ¶ms); diff --git a/panda/src/chan/animChannelMatrixXfmTable.h b/panda/src/chan/animChannelMatrixXfmTable.h index 87dabafeac..a01d4a7e32 100644 --- a/panda/src/chan/animChannelMatrixXfmTable.h +++ b/panda/src/chan/animChannelMatrixXfmTable.h @@ -71,7 +71,7 @@ protected: CPTA_float _tables[num_matrix_components]; public: - static void register_with_read_factory(void); + static void register_with_read_factory(); virtual void write_datagram(BamWriter* manager, Datagram &me); static TypedWritable *make_AnimChannelMatrixXfmTable(const FactoryParams ¶ms); diff --git a/panda/src/chan/animChannelScalarTable.cxx b/panda/src/chan/animChannelScalarTable.cxx index d3e516e6a3..e7b2dc6aae 100644 --- a/panda/src/chan/animChannelScalarTable.cxx +++ b/panda/src/chan/animChannelScalarTable.cxx @@ -46,7 +46,7 @@ AnimChannelScalarTable(AnimGroup *parent, const string &name) // Description: //////////////////////////////////////////////////////////////////// AnimChannelScalarTable:: -AnimChannelScalarTable(void){ +AnimChannelScalarTable(){ } //////////////////////////////////////////////////////////////////// @@ -330,7 +330,7 @@ make_AnimChannelScalarTable(const FactoryParams ¶ms) // Description: Factory method to generate a AnimChannelScalarTable object //////////////////////////////////////////////////////////////////// void AnimChannelScalarTable:: -register_with_read_factory(void) +register_with_read_factory() { BamReader::get_factory()->register_factory(get_class_type(), make_AnimChannelScalarTable); } diff --git a/panda/src/chan/animChannelScalarTable.h b/panda/src/chan/animChannelScalarTable.h index 1b5d791938..2c8c618d2a 100644 --- a/panda/src/chan/animChannelScalarTable.h +++ b/panda/src/chan/animChannelScalarTable.h @@ -49,11 +49,11 @@ public: virtual void write(ostream &out, int indent_level) const; protected: - AnimChannelScalarTable(void); + AnimChannelScalarTable(); CPTA_float _table; public: - static void register_with_read_factory(void); + static void register_with_read_factory(); virtual void write_datagram(BamWriter* manager, Datagram &me); static TypedWritable *make_AnimChannelScalarTable(const FactoryParams ¶ms); diff --git a/panda/src/chan/animGroup.cxx b/panda/src/chan/animGroup.cxx index 3ace070f5a..eb0de75beb 100644 --- a/panda/src/chan/animGroup.cxx +++ b/panda/src/chan/animGroup.cxx @@ -366,7 +366,7 @@ make_AnimGroup(const FactoryParams ¶ms) // Description: Factory method to generate a AnimGroup object //////////////////////////////////////////////////////////////////// void AnimGroup:: -register_with_read_factory(void) +register_with_read_factory() { BamReader::get_factory()->register_factory(get_class_type(), make_AnimGroup); } diff --git a/panda/src/chan/animGroup.h b/panda/src/chan/animGroup.h index 063a5ea63c..2d69f513f0 100644 --- a/panda/src/chan/animGroup.h +++ b/panda/src/chan/animGroup.h @@ -74,7 +74,7 @@ protected: AnimBundle *_root; public: - static void register_with_read_factory(void); + static void register_with_read_factory(); virtual void write_datagram(BamWriter* manager, Datagram &me); virtual int complete_pointers(TypedWritable **p_list, BamReader *manager); diff --git a/panda/src/chan/movingPart.I b/panda/src/chan/movingPart.I index 1048b0a4ca..4a20e32808 100644 --- a/panda/src/chan/movingPart.I +++ b/panda/src/chan/movingPart.I @@ -68,7 +68,7 @@ MovingPart(PartGroup *parent, const string &name, //////////////////////////////////////////////////////////////////// template INLINE MovingPart:: -MovingPart(void) { +MovingPart() { } //////////////////////////////////////////////////////////////////// diff --git a/panda/src/chan/movingPart.h b/panda/src/chan/movingPart.h index 6fac503543..dffeddc9ac 100644 --- a/panda/src/chan/movingPart.h +++ b/panda/src/chan/movingPart.h @@ -54,7 +54,7 @@ public: INLINE virtual void write_datagram(BamWriter* manager, Datagram &me); protected: - INLINE MovingPart(void); + INLINE MovingPart(); INLINE void fillin(DatagramIterator& scan, BamReader* manager); public: diff --git a/panda/src/chan/movingPartBase.cxx b/panda/src/chan/movingPartBase.cxx index 18e14ddb08..016b6f2845 100644 --- a/panda/src/chan/movingPartBase.cxx +++ b/panda/src/chan/movingPartBase.cxx @@ -42,7 +42,7 @@ MovingPartBase(PartGroup *parent, const string &name) // Description: //////////////////////////////////////////////////////////////////// MovingPartBase:: -MovingPartBase(void){ +MovingPartBase(){ } //////////////////////////////////////////////////////////////////// diff --git a/panda/src/chan/movingPartBase.h b/panda/src/chan/movingPartBase.h index 6ac1cbd98a..32c51b4f25 100644 --- a/panda/src/chan/movingPartBase.h +++ b/panda/src/chan/movingPartBase.h @@ -61,7 +61,7 @@ public: bool parent_changed); protected: - MovingPartBase(void); + MovingPartBase(); virtual void pick_channel_index(plist &holes, int &next) const; virtual void bind_hierarchy(AnimGroup *anim, int channel_index); diff --git a/panda/src/chan/movingPartMatrix.I b/panda/src/chan/movingPartMatrix.I index 0c80c356e3..19362109ab 100644 --- a/panda/src/chan/movingPartMatrix.I +++ b/panda/src/chan/movingPartMatrix.I @@ -46,5 +46,5 @@ MovingPartMatrix(PartGroup *parent, const string &name, // Description: //////////////////////////////////////////////////////////////////// INLINE MovingPartMatrix:: -MovingPartMatrix(void) { +MovingPartMatrix() { } diff --git a/panda/src/chan/movingPartMatrix.cxx b/panda/src/chan/movingPartMatrix.cxx index 10ba282cdf..9f2e33bc08 100644 --- a/panda/src/chan/movingPartMatrix.cxx +++ b/panda/src/chan/movingPartMatrix.cxx @@ -165,7 +165,7 @@ make_MovingPartMatrix(const FactoryParams ¶ms) // Description: Factory method to generate a MovingPartMatrix object //////////////////////////////////////////////////////////////////// void MovingPartMatrix:: -register_with_read_factory(void) +register_with_read_factory() { BamReader::get_factory()->register_factory(get_class_type(), make_MovingPartMatrix); } diff --git a/panda/src/chan/movingPartMatrix.h b/panda/src/chan/movingPartMatrix.h index 75918bcafd..0178e6e3ee 100644 --- a/panda/src/chan/movingPartMatrix.h +++ b/panda/src/chan/movingPartMatrix.h @@ -45,10 +45,10 @@ public: virtual void get_blend_value(const PartBundle *root); protected: - INLINE MovingPartMatrix(void); + INLINE MovingPartMatrix(); public: - static void register_with_read_factory(void); + static void register_with_read_factory(); static TypedWritable *make_MovingPartMatrix(const FactoryParams ¶ms); diff --git a/panda/src/chan/movingPartScalar.I b/panda/src/chan/movingPartScalar.I index 06f98e1deb..c6175bfda5 100644 --- a/panda/src/chan/movingPartScalar.I +++ b/panda/src/chan/movingPartScalar.I @@ -46,5 +46,5 @@ MovingPartScalar(PartGroup *parent, const string &name, // Description: //////////////////////////////////////////////////////////////////// INLINE MovingPartScalar:: -MovingPartScalar(void){ +MovingPartScalar(){ } diff --git a/panda/src/chan/movingPartScalar.cxx b/panda/src/chan/movingPartScalar.cxx index 27906f72cb..f0b713196d 100644 --- a/panda/src/chan/movingPartScalar.cxx +++ b/panda/src/chan/movingPartScalar.cxx @@ -116,7 +116,7 @@ make_MovingPartScalar(const FactoryParams ¶ms) // Description: Factory method to generate a MovingPartScalar object //////////////////////////////////////////////////////////////////// void MovingPartScalar:: -register_with_read_factory(void) +register_with_read_factory() { BamReader::get_factory()->register_factory(get_class_type(), make_MovingPartScalar); } diff --git a/panda/src/chan/movingPartScalar.h b/panda/src/chan/movingPartScalar.h index c818b79bee..68901976fc 100644 --- a/panda/src/chan/movingPartScalar.h +++ b/panda/src/chan/movingPartScalar.h @@ -44,10 +44,10 @@ public: virtual void get_blend_value(const PartBundle *root); protected: - INLINE MovingPartScalar(void); + INLINE MovingPartScalar(); public: - static void register_with_read_factory(void); + static void register_with_read_factory(); static TypedWritable *make_MovingPartScalar(const FactoryParams ¶ms); diff --git a/panda/src/chan/partBundle.cxx b/panda/src/chan/partBundle.cxx index 8c5cb009f6..f36dd9d7ff 100644 --- a/panda/src/chan/partBundle.cxx +++ b/panda/src/chan/partBundle.cxx @@ -462,7 +462,7 @@ make_PartBundle(const FactoryParams ¶ms) // Description: Factory method to generate a PartBundle object //////////////////////////////////////////////////////////////////// void PartBundle:: -register_with_read_factory(void) +register_with_read_factory() { BamReader::get_factory()->register_factory(get_class_type(), make_PartBundle); } diff --git a/panda/src/chan/partBundle.h b/panda/src/chan/partBundle.h index c128598fb4..511eebaa29 100644 --- a/panda/src/chan/partBundle.h +++ b/panda/src/chan/partBundle.h @@ -141,7 +141,7 @@ protected: bool _anim_changed; public: - static void register_with_read_factory(void); + static void register_with_read_factory(); virtual void finalize(BamReader *manager); static TypedWritable *make_PartBundle(const FactoryParams ¶ms); diff --git a/panda/src/chan/partGroup.cxx b/panda/src/chan/partGroup.cxx index 67fb72c735..649743236e 100644 --- a/panda/src/chan/partGroup.cxx +++ b/panda/src/chan/partGroup.cxx @@ -551,7 +551,7 @@ make_PartGroup(const FactoryParams ¶ms) // Description: Factory method to generate a PartGroup object //////////////////////////////////////////////////////////////////// void PartGroup:: -register_with_read_factory(void) +register_with_read_factory() { BamReader::get_factory()->register_factory(get_class_type(), make_PartGroup); } diff --git a/panda/src/chan/partGroup.h b/panda/src/chan/partGroup.h index 89ed002417..ed791137df 100644 --- a/panda/src/chan/partGroup.h +++ b/panda/src/chan/partGroup.h @@ -97,7 +97,7 @@ protected: Children _children; public: - static void register_with_read_factory(void); + static void register_with_read_factory(); virtual void write_datagram(BamWriter* manager, Datagram &me); virtual int complete_pointers(TypedWritable **p_list, BamReader *manager); diff --git a/panda/src/char/characterJoint.cxx b/panda/src/char/characterJoint.cxx index 67acbb33dc..986274b825 100644 --- a/panda/src/char/characterJoint.cxx +++ b/panda/src/char/characterJoint.cxx @@ -396,7 +396,7 @@ make_CharacterJoint(const FactoryParams ¶ms) // Description: Factory method to generate a CharacterJoint object //////////////////////////////////////////////////////////////////// void CharacterJoint:: -register_with_read_factory(void) +register_with_read_factory() { BamReader::get_factory()->register_factory(get_class_type(), make_CharacterJoint); } diff --git a/panda/src/char/characterJoint.h b/panda/src/char/characterJoint.h index d8dee00c3b..ef348c593f 100644 --- a/panda/src/char/characterJoint.h +++ b/panda/src/char/characterJoint.h @@ -69,7 +69,7 @@ private: VertexTransforms _vertex_transforms; public: - static void register_with_read_factory(void); + static void register_with_read_factory(); virtual void write_datagram(BamWriter* manager, Datagram &me); virtual int complete_pointers(TypedWritable **p_list, BamReader *manager); diff --git a/panda/src/char/characterJointBundle.cxx b/panda/src/char/characterJointBundle.cxx index 5130337ee5..dc82407ffb 100644 --- a/panda/src/char/characterJointBundle.cxx +++ b/panda/src/char/characterJointBundle.cxx @@ -68,7 +68,7 @@ make_CharacterJointBundle(const FactoryParams ¶ms) // Description: Factory method to generate a CharacterJointBundle object //////////////////////////////////////////////////////////////////// void CharacterJointBundle:: -register_with_read_factory(void) +register_with_read_factory() { BamReader::get_factory()->register_factory(get_class_type(), make_CharacterJointBundle); } diff --git a/panda/src/char/characterJointBundle.h b/panda/src/char/characterJointBundle.h index d17ccb3e39..f739d82bfa 100644 --- a/panda/src/char/characterJointBundle.h +++ b/panda/src/char/characterJointBundle.h @@ -45,7 +45,7 @@ PUBLISHED: public: virtual PartGroup *make_copy() const; - static void register_with_read_factory(void); + static void register_with_read_factory(); static TypedWritable *make_CharacterJointBundle(const FactoryParams ¶ms); diff --git a/panda/src/char/characterSlider.cxx b/panda/src/char/characterSlider.cxx index a4b18fce6f..5d9482712e 100644 --- a/panda/src/char/characterSlider.cxx +++ b/panda/src/char/characterSlider.cxx @@ -122,7 +122,7 @@ make_CharacterSlider(const FactoryParams ¶ms) // Description: Factory method to generate a CharacterSlider object //////////////////////////////////////////////////////////////////// void CharacterSlider:: -register_with_read_factory(void) +register_with_read_factory() { BamReader::get_factory()->register_factory(get_class_type(), make_CharacterSlider); } diff --git a/panda/src/collide/collisionNode.h b/panda/src/collide/collisionNode.h index c3604f073a..b4eb5e4304 100644 --- a/panda/src/collide/collisionNode.h +++ b/panda/src/collide/collisionNode.h @@ -98,15 +98,15 @@ protected: void fillin(DatagramIterator &scan, BamReader *manager); public: - static TypeHandle get_class_type(void) { + static TypeHandle get_class_type() { return _type_handle; } - static void init_type(void) { + static void init_type() { PandaNode::init_type(); register_type(_type_handle, "CollisionNode", PandaNode::get_class_type()); } - virtual TypeHandle get_type(void) const { + virtual TypeHandle get_type() const { return get_class_type(); } virtual TypeHandle force_init_type() {init_type(); return get_class_type();} diff --git a/panda/src/collide/collisionPlane.cxx b/panda/src/collide/collisionPlane.cxx index 4c192071de..1ba808865c 100644 --- a/panda/src/collide/collisionPlane.cxx +++ b/panda/src/collide/collisionPlane.cxx @@ -406,7 +406,7 @@ make_CollisionPlane(const FactoryParams ¶ms) // Description: Factory method to generate a CollisionPlane object //////////////////////////////////////////////////////////////////// void CollisionPlane:: -register_with_read_factory(void) +register_with_read_factory() { BamReader::get_factory()->register_factory(get_class_type(), make_CollisionPlane); } diff --git a/panda/src/collide/collisionPlane.h b/panda/src/collide/collisionPlane.h index 7ae0cb47ce..8c6fa923bc 100644 --- a/panda/src/collide/collisionPlane.h +++ b/panda/src/collide/collisionPlane.h @@ -72,7 +72,7 @@ private: Planef _plane; public: - static void register_with_read_factory(void); + static void register_with_read_factory(); virtual void write_datagram(BamWriter* manager, Datagram &me); static TypedWritable *make_CollisionPlane(const FactoryParams ¶ms); diff --git a/panda/src/collide/collisionPolygon.h b/panda/src/collide/collisionPolygon.h index c68ef25e44..7fa2e4f7e9 100644 --- a/panda/src/collide/collisionPolygon.h +++ b/panda/src/collide/collisionPolygon.h @@ -119,7 +119,7 @@ private: LMatrix4f _to_2d_mat; public: - static void register_with_read_factory(void); + static void register_with_read_factory(); virtual void write_datagram(BamWriter* manager, Datagram &me); static TypedWritable *make_CollisionPolygon(const FactoryParams ¶ms); diff --git a/panda/src/display/graphicsStateGuardian.I b/panda/src/display/graphicsStateGuardian.I index 77d5a880c2..6952de5be0 100644 --- a/panda/src/display/graphicsStateGuardian.I +++ b/panda/src/display/graphicsStateGuardian.I @@ -717,7 +717,7 @@ set_transform(const TransformState *transform) { // a call to prepare_display_region(). //////////////////////////////////////////////////////////////////// INLINE const DisplayRegion *GraphicsStateGuardian:: -get_current_display_region(void) const { +get_current_display_region() const { return _current_display_region; } diff --git a/panda/src/display/graphicsStateGuardian.h b/panda/src/display/graphicsStateGuardian.h index 64959ad3be..fac7b05353 100644 --- a/panda/src/display/graphicsStateGuardian.h +++ b/panda/src/display/graphicsStateGuardian.h @@ -212,7 +212,7 @@ public: RenderBuffer get_render_buffer(int buffer_type); - INLINE const DisplayRegion *get_current_display_region(void) const; + INLINE const DisplayRegion *get_current_display_region() const; INLINE const Lens *get_current_lens() const; INLINE DisplayRegionStack push_display_region(const DisplayRegion *dr); diff --git a/panda/src/doc/particle_system_parameters.txt b/panda/src/doc/particle_system_parameters.txt index 17beec4975..297d3ca39c 100644 --- a/panda/src/doc/particle_system_parameters.txt +++ b/panda/src/doc/particle_system_parameters.txt @@ -32,7 +32,7 @@ Particle Systems CLASS: ParticleSystem Particle systems have the following methods: - void render(void); // renders the particle system's particles* + void render(); // renders the particle system's particles* void update(float dt); // updates the state of the particle system for "dt" seconds of elapsed time* *NOTE: render() and update() should not be called for a particle system that is attached to a @@ -360,7 +360,7 @@ systems can be attached to a single ParticleSystemManager. Particle system managers have the following methods: void attach_particlesystem(ParticleSystem *ps); // attach a particle system to this manager void remove_particlesystem(ParticleSystem *ps); // un-attach a particle system from this manager - void clear(void); // un-attach all particle systems from this manager + void clear(); // un-attach all particle systems from this manager void do_particles(float dt); // update all attached particle systems for "dt" seconds of elapsed time Particle system managers have the following parameter: diff --git a/panda/src/downloader/asyncUtility.I b/panda/src/downloader/asyncUtility.I index 297185c7bf..952e3a5b46 100644 --- a/panda/src/downloader/asyncUtility.I +++ b/panda/src/downloader/asyncUtility.I @@ -32,6 +32,6 @@ set_frequency(float frequency) { // Description: //////////////////////////////////////////////////////////////////// INLINE float AsyncUtility:: -get_frequency(void) const { +get_frequency() const { return _frequency; } diff --git a/panda/src/downloader/asyncUtility.cxx b/panda/src/downloader/asyncUtility.cxx index 858d2d30fe..5e200cbbcf 100644 --- a/panda/src/downloader/asyncUtility.cxx +++ b/panda/src/downloader/asyncUtility.cxx @@ -66,7 +66,7 @@ AsyncUtility:: // Description: //////////////////////////////////////////////////////////////////// void AsyncUtility:: -create_thread(void) { +create_thread() { #ifdef OLD_HAVE_IPC if (_threaded == false && _threads_enabled == true) { downloader_cat.debug() @@ -83,7 +83,7 @@ create_thread(void) { // Description: //////////////////////////////////////////////////////////////////// void AsyncUtility:: -destroy_thread(void) { +destroy_thread() { #ifdef OLD_HAVE_IPC if (_threaded == false) return; @@ -130,7 +130,7 @@ st_callback(void *arg) { // forever for a request to show up, and then serves it. //////////////////////////////////////////////////////////////////// void AsyncUtility:: -callback(void) { +callback() { #ifdef OLD_HAVE_IPC while (process_request()) { // Sleep until a signal arrives @@ -147,7 +147,7 @@ callback(void) { // Description: //////////////////////////////////////////////////////////////////// void AsyncUtility:: -nap(void) const { +nap() const { #ifdef OLD_HAVE_IPC #ifdef WIN32 _sleep((DWORD)(1000 * _frequency)); diff --git a/panda/src/downloader/asyncUtility.h b/panda/src/downloader/asyncUtility.h index a007b05eae..1bda0be9ff 100644 --- a/panda/src/downloader/asyncUtility.h +++ b/panda/src/downloader/asyncUtility.h @@ -39,20 +39,20 @@ class EXPCL_PANDAEXPRESS AsyncUtility { PUBLISHED: INLINE void set_frequency(float frequency); - INLINE float get_frequency(void) const; + INLINE float get_frequency() const; - void create_thread(void); + void create_thread(); public: AsyncUtility(float frequency = 0.2); - virtual ~AsyncUtility(void); + virtual ~AsyncUtility(); protected: - void destroy_thread(void); + void destroy_thread(); static void* st_callback(void *arg); - void callback(void); - virtual bool process_request(void) = 0; - void nap(void) const; + void callback(); + virtual bool process_request() = 0; + void nap() const; protected: int _next_token; diff --git a/panda/src/downloader/bioStreamBuf.h b/panda/src/downloader/bioStreamBuf.h index 43cae6d08b..04090a0235 100644 --- a/panda/src/downloader/bioStreamBuf.h +++ b/panda/src/downloader/bioStreamBuf.h @@ -44,8 +44,8 @@ public: protected: virtual int overflow(int c); - virtual int sync(void); - virtual int underflow(void); + virtual int sync(); + virtual int underflow(); private: size_t write_chars(const char *start, size_t length); diff --git a/panda/src/downloader/chunkedStreamBuf.h b/panda/src/downloader/chunkedStreamBuf.h index 64606a1127..ce8ca9611e 100644 --- a/panda/src/downloader/chunkedStreamBuf.h +++ b/panda/src/downloader/chunkedStreamBuf.h @@ -43,7 +43,7 @@ public: void close_read(); protected: - virtual int underflow(void); + virtual int underflow(); private: size_t read_chars(char *start, size_t length); diff --git a/panda/src/downloader/decompressor.h b/panda/src/downloader/decompressor.h index f1f4c4f73d..180ad905d0 100644 --- a/panda/src/downloader/decompressor.h +++ b/panda/src/downloader/decompressor.h @@ -48,7 +48,7 @@ PUBLISHED: float get_progress() const; private: - void cleanup(void); + void cleanup(); Filename _source_filename; diff --git a/panda/src/downloader/downloadDb.I b/panda/src/downloader/downloadDb.I index 3b0c8b72a7..94c3faff0e 100644 --- a/panda/src/downloader/downloadDb.I +++ b/panda/src/downloader/downloadDb.I @@ -23,7 +23,7 @@ // Description: //////////////////////////////////////////////////////////////////// INLINE int DownloadDb:: -get_client_num_multifiles(void) const { +get_client_num_multifiles() const { return _client_db.get_num_multifiles(); } @@ -33,7 +33,7 @@ get_client_num_multifiles(void) const { // Description: //////////////////////////////////////////////////////////////////// INLINE int DownloadDb:: -get_server_num_multifiles(void) const { +get_server_num_multifiles() const { return _server_db.get_num_multifiles(); } diff --git a/panda/src/downloader/downloadDb.cxx b/panda/src/downloader/downloadDb.cxx index eec4c5195a..6f600a5778 100644 --- a/panda/src/downloader/downloadDb.cxx +++ b/panda/src/downloader/downloadDb.cxx @@ -89,7 +89,7 @@ DownloadDb(Filename &server_file, Filename &client_file) { // Description: Primarily used for testing. //////////////////////////////////////////////////////////////////// DownloadDb:: -DownloadDb(void) { +DownloadDb() { _client_db = Db(); _server_db = Db(); } @@ -100,7 +100,7 @@ DownloadDb(void) { // Description: //////////////////////////////////////////////////////////////////// DownloadDb:: -~DownloadDb(void) { +~DownloadDb() { if (downloader_cat.is_debug()) downloader_cat.debug() << "DownloadDb destructor called" << endl; @@ -394,7 +394,7 @@ write_db(Filename &file, Db db, bool want_server_info) { // new clean server db //////////////////////////////////////////////////////////////////// void DownloadDb:: -create_new_server_db(void) { +create_new_server_db() { _server_db = Db(); } @@ -449,7 +449,7 @@ server_add_file(string mfname, string fname) { // Description: //////////////////////////////////////////////////////////////////// DownloadDb::MultifileRecord:: -MultifileRecord(void) { +MultifileRecord() { _name = ""; _phase = 0; _size = 0; @@ -499,7 +499,7 @@ write(ostream &out) const { // Description: //////////////////////////////////////////////////////////////////// int DownloadDb::MultifileRecord:: -get_num_files(void) const { +get_num_files() const { return _file_records.size(); } @@ -578,7 +578,7 @@ add_file_record(PT(FileRecord) fr) { // Description: //////////////////////////////////////////////////////////////////// DownloadDb::Db:: -Db(void) { +Db() { // The head is a magic number and the number of multifiles in the db _header_length = sizeof(_magic_number) + sizeof(PN_int32); } @@ -604,7 +604,7 @@ write(ostream &out) const { // Description: //////////////////////////////////////////////////////////////////// int DownloadDb::Db:: -get_num_multifiles(void) const { +get_num_multifiles() const { return _mfile_records.size(); } @@ -1030,7 +1030,7 @@ write_header(ostream &write_stream) { // Description: //////////////////////////////////////////////////////////////////// DownloadDb::FileRecord:: -FileRecord(void) { +FileRecord() { _name = ""; } diff --git a/panda/src/downloader/downloadDb.h b/panda/src/downloader/downloadDb.h index 1766247db2..ca8a3aded7 100644 --- a/panda/src/downloader/downloadDb.h +++ b/panda/src/downloader/downloadDb.h @@ -81,10 +81,10 @@ PUBLISHED: Status_extracted = 3 }; - DownloadDb(void); + DownloadDb(); DownloadDb(Ramfile &server_file, Filename &client_file); DownloadDb(Filename &server_file, Filename &client_file); - ~DownloadDb(void); + ~DownloadDb(); void output(ostream &out) const; void write(ostream &out) const; @@ -94,8 +94,8 @@ PUBLISHED: bool write_client_db(Filename &file); bool write_server_db(Filename &file); - INLINE int get_client_num_multifiles(void) const; - INLINE int get_server_num_multifiles(void) const; + INLINE int get_client_num_multifiles() const; + INLINE int get_server_num_multifiles() const; INLINE string get_client_multifile_name(int index) const; INLINE string get_server_multifile_name(int index) const; @@ -143,7 +143,7 @@ public: class EXPCL_PANDAEXPRESS FileRecord : public ReferenceCount { public: - FileRecord(void); + FileRecord(); FileRecord(string name); void write(ostream &out) const; string _name; @@ -153,10 +153,10 @@ public: class EXPCL_PANDAEXPRESS MultifileRecord : public ReferenceCount { public: - MultifileRecord(void); + MultifileRecord(); MultifileRecord(string name, Phase phase, int size, int status); void write(ostream &out) const; - int get_num_files(void) const; + int get_num_files() const; string get_file_name(int index) const; bool file_exists(string fname) const; PT(FileRecord) get_file_record_named(string fname) const; @@ -174,9 +174,9 @@ public: class EXPCL_PANDAEXPRESS Db { public: - Db(void); + Db(); void write(ostream &out) const; - int get_num_multifiles(void) const; + int get_num_multifiles() const; string get_multifile_name(int index) const; bool multifile_exists(string mfname) const; PT(MultifileRecord) get_multifile_record_named(string mfname) const; diff --git a/panda/src/downloader/extractor.h b/panda/src/downloader/extractor.h index d38be27ca0..f91b5fa1cc 100644 --- a/panda/src/downloader/extractor.h +++ b/panda/src/downloader/extractor.h @@ -53,7 +53,7 @@ PUBLISHED: int request_all_subfiles(); int step(); - float get_progress(void) const; + float get_progress() const; bool run(); diff --git a/panda/src/downloader/identityStreamBuf.h b/panda/src/downloader/identityStreamBuf.h index b1a43362a0..8b146179d5 100644 --- a/panda/src/downloader/identityStreamBuf.h +++ b/panda/src/downloader/identityStreamBuf.h @@ -43,7 +43,7 @@ public: void close_read(); protected: - virtual int underflow(void); + virtual int underflow(); private: size_t read_chars(char *start, size_t length); diff --git a/panda/src/downloader/patcher.I b/panda/src/downloader/patcher.I index c9989b8e38..8071039d3a 100644 --- a/panda/src/downloader/patcher.I +++ b/panda/src/downloader/patcher.I @@ -22,7 +22,7 @@ // Description: //////////////////////////////////////////////////////////////////// INLINE float Patcher:: -get_progress(void) const { +get_progress() const { if(_patchfile) { return _patchfile->get_progress(); } diff --git a/panda/src/downloader/patcher.cxx b/panda/src/downloader/patcher.cxx index 88075642fa..ba34612954 100644 --- a/panda/src/downloader/patcher.cxx +++ b/panda/src/downloader/patcher.cxx @@ -30,7 +30,7 @@ // Description: //////////////////////////////////////////////////////////////////// Patcher:: -Patcher(void) { +Patcher() { PT(Buffer) buffer = new Buffer(patcher_buffer_size); init(buffer); } @@ -65,7 +65,7 @@ init(PT(Buffer) buffer) { // Description: //////////////////////////////////////////////////////////////////// Patcher:: -~Patcher(void) { +~Patcher() { delete _patchfile; } @@ -85,7 +85,7 @@ initiate(Filename &patch, Filename &infile) { // Description: //////////////////////////////////////////////////////////////////// int Patcher:: -run(void) { +run() { return _patchfile->run(); } diff --git a/panda/src/downloader/patcher.h b/panda/src/downloader/patcher.h index 3912889be6..56d4106a63 100644 --- a/panda/src/downloader/patcher.h +++ b/panda/src/downloader/patcher.h @@ -33,14 +33,14 @@ //////////////////////////////////////////////////////////////////// class EXPCL_PANDAEXPRESS Patcher { PUBLISHED: - Patcher(void); + Patcher(); Patcher(PT(Buffer) buffer); - virtual ~Patcher(void); + virtual ~Patcher(); int initiate(Filename &patch, Filename &infile); - int run(void); + int run(); - INLINE float get_progress(void) const; + INLINE float get_progress() const; private: void init(PT(Buffer) buffer); diff --git a/panda/src/dxgsg7/dxGraphicsStateGuardian7.cxx b/panda/src/dxgsg7/dxGraphicsStateGuardian7.cxx index 4fb258e02b..8ccd62c04b 100644 --- a/panda/src/dxgsg7/dxGraphicsStateGuardian7.cxx +++ b/panda/src/dxgsg7/dxGraphicsStateGuardian7.cxx @@ -327,7 +327,7 @@ set_context(DXScreenData *pNewContextData) { // recreate dx objects without modifying gsg state, other than clearing state cache void DXGraphicsStateGuardian7:: -free_dxgsg_objects(void) { +free_dxgsg_objects() { ULONG refcnt; free_pointers(); @@ -3512,7 +3512,7 @@ framebuffer_copy_to_ram(Texture *tex, int z, const DisplayRegion *dr, tex->setup_2d_texture(w, h, Texture::T_unsigned_byte, Texture::F_rgb); - (void) ConvertDDSurftoPixBuf(tex,((_cur_read_pixel_buffer & RenderBuffer::T_back) ? _pScrn->pddsBack : _pScrn->pddsPrimary)); + () ConvertDDSurftoPixBuf(tex,((_cur_read_pixel_buffer & RenderBuffer::T_back) ? _pScrn->pddsBack : _pScrn->pddsPrimary)); nassertr(tex->has_ram_image(), false); return true; @@ -4562,15 +4562,15 @@ free_pointers() { #endif } -TypeHandle DXGraphicsStateGuardian7::get_type(void) const { +TypeHandle DXGraphicsStateGuardian7::get_type() const { return get_class_type(); } -TypeHandle DXGraphicsStateGuardian7::get_class_type(void) { +TypeHandle DXGraphicsStateGuardian7::get_class_type() { return _type_handle; } -void DXGraphicsStateGuardian7::init_type(void) { +void DXGraphicsStateGuardian7::init_type() { GraphicsStateGuardian::init_type(); register_type(_type_handle, "DXGraphicsStateGuardian7", GraphicsStateGuardian::get_class_type()); @@ -4816,7 +4816,7 @@ bool recreate_tex_callback(TextureContext *tc,void *void_dxgsg7_ptr) { } // release all textures and vertex/index buffers -HRESULT DXGraphicsStateGuardian7::DeleteAllVideoSurfaces(void) { +HRESULT DXGraphicsStateGuardian7::DeleteAllVideoSurfaces() { // BUGBUG: need to handle vertexbuffer handling here // cant access template in libpanda.dll directly due to vc++ limitations, use traverser to get around it @@ -4828,7 +4828,7 @@ HRESULT DXGraphicsStateGuardian7::DeleteAllVideoSurfaces(void) { } // recreate all textures and vertex/index buffers -HRESULT DXGraphicsStateGuardian7::RecreateAllVideoSurfaces(void) { +HRESULT DXGraphicsStateGuardian7::RecreateAllVideoSurfaces() { // BUGBUG: need to handle vertexbuffer handling here // cant access template in libpanda.dll directly due to vc++ limitations, use traverser to get around it @@ -4839,7 +4839,7 @@ HRESULT DXGraphicsStateGuardian7::RecreateAllVideoSurfaces(void) { return S_OK; } -HRESULT DXGraphicsStateGuardian7::RestoreAllVideoSurfaces(void) { +HRESULT DXGraphicsStateGuardian7::RestoreAllVideoSurfaces() { // BUGBUG: this should also restore vertex buffer contents when they are implemented // You will need to destroy and recreate // optimized vertex buffers however, restoring is not enough. @@ -4867,7 +4867,7 @@ HRESULT DXGraphicsStateGuardian7::RestoreAllVideoSurfaces(void) { // Access: // Description: Repaint primary buffer from back buffer //////////////////////////////////////////////////////////////////// -void DXGraphicsStateGuardian7::show_frame(void) { +void DXGraphicsStateGuardian7::show_frame() { if(_pScrn->pddsPrimary==NULL) return; @@ -4929,7 +4929,7 @@ support_overlay_window(bool flag) { // Access: // Description: Repaint primary buffer from back buffer //////////////////////////////////////////////////////////////////// -void DXGraphicsStateGuardian7::show_full_screen_frame(void) { +void DXGraphicsStateGuardian7::show_full_screen_frame() { HRESULT hr; // Flip the front and back buffers, to make what we just rendered @@ -4974,7 +4974,7 @@ void DXGraphicsStateGuardian7::show_full_screen_frame(void) { // Description: Repaint primary buffer from back buffer (windowed // mode only) //////////////////////////////////////////////////////////////////// -void DXGraphicsStateGuardian7::show_windowed_frame(void) { +void DXGraphicsStateGuardian7::show_windowed_frame() { HRESULT hr; DX_DECLARE_CLEAN(DDBLTFX, bltfx); diff --git a/panda/src/dxgsg7/dxGraphicsStateGuardian7.h b/panda/src/dxgsg7/dxGraphicsStateGuardian7.h index 94cdbaded0..653fa99e1b 100644 --- a/panda/src/dxgsg7/dxGraphicsStateGuardian7.h +++ b/panda/src/dxgsg7/dxGraphicsStateGuardian7.h @@ -124,7 +124,7 @@ public: virtual void end_scene(); virtual void end_frame(); - virtual bool wants_texcoords(void) const; + virtual bool wants_texcoords() const; virtual void set_color_clear_value(const Colorf& value); @@ -150,7 +150,7 @@ protected: virtual void set_blend_mode(); void free_pointers(); // free local internal buffers - void free_dxgsg_objects(void); // free the DirectX objects we create + void free_dxgsg_objects(); // free the DirectX objects we create void set_draw_buffer(const RenderBuffer &rb); void set_read_buffer(const RenderBuffer &rb); @@ -177,9 +177,9 @@ protected: D3DVECTOR *pCenter, float fRadius, DWORD wNumRings, DWORD wNumSections, float sx, float sy, float sz, DWORD *pNumVertices,DWORD *pNumIndices,DWORD fvfFlags,DWORD dwVertSize); - HRESULT RestoreAllVideoSurfaces(void); - HRESULT RecreateAllVideoSurfaces(void); - HRESULT DeleteAllVideoSurfaces(void); + HRESULT RestoreAllVideoSurfaces(); + HRESULT RecreateAllVideoSurfaces(); + HRESULT DeleteAllVideoSurfaces(); /* INLINE void enable_multisample_alpha_one(bool val); @@ -321,14 +321,14 @@ public: static GraphicsStateGuardian* make_DXGraphicsStateGuardian(const FactoryParams ¶ms); - static TypeHandle get_class_type(void); - static void init_type(void); - virtual TypeHandle get_type(void) const; + static TypeHandle get_class_type(); + static void init_type(); + virtual TypeHandle get_type() const; virtual TypeHandle force_init_type() {init_type(); return get_class_type();} // INLINE void Set_HDC(HDC hdc) { _front_hdc = hdc; } void adjust_view_rect(int x, int y); INLINE void SetDXReady(bool stat) { _dx_ready = stat; } - INLINE bool GetDXReady(void) { return _dx_ready;} + INLINE bool GetDXReady() { return _dx_ready;} void DXGraphicsStateGuardian7::SetTextureBlendMode(TextureStage::Mode TexBlendMode,bool bJustEnable); void dx_cleanup(bool bRestoreDisplayMode,bool bAtExitFnCalled); @@ -351,7 +351,7 @@ public: LPDIRECT3D7 d3d, LPDIRECT3DDEVICE7 d3dDevice, RECT viewrect); */ - void dx_init(void); + void dx_init(); friend HRESULT CALLBACK EnumTexFmtsCallback( LPDDPIXELFORMAT pddpf, VOID* param ); diff --git a/panda/src/dxgsg7/dxTextureContext7.cxx b/panda/src/dxgsg7/dxTextureContext7.cxx index 50b00c27b7..5cfcc07218 100644 --- a/panda/src/dxgsg7/dxTextureContext7.cxx +++ b/panda/src/dxgsg7/dxTextureContext7.cxx @@ -1657,7 +1657,7 @@ downsample_image(uchar *source, int num_pixels, int component_width) { } HRESULT DXTextureContext7:: -FillDDSurfTexturePixels(void) { +FillDDSurfTexturePixels() { CPTA_uchar orig_image = _texture->get_ram_image(); if (orig_image.empty()) { diff --git a/panda/src/dxgsg7/dxTextureContext7.h b/panda/src/dxgsg7/dxTextureContext7.h index 11ddf0b1f4..eab6f50b79 100644 --- a/panda/src/dxgsg7/dxTextureContext7.h +++ b/panda/src/dxgsg7/dxTextureContext7.h @@ -51,8 +51,8 @@ public: DWORD _PixBufConversionType; // enum ConversionType // must be public since called from global callback fns - void DeleteTexture(void); - HRESULT FillDDSurfTexturePixels(void); + void DeleteTexture(); + HRESULT FillDDSurfTexturePixels(); protected: unsigned int get_bits_per_pixel(Texture::Format format, int *alphbits); diff --git a/panda/src/dxgsg7/wdxGraphicsWindow7.cxx b/panda/src/dxgsg7/wdxGraphicsWindow7.cxx index c3078122b2..6ef22e5156 100644 --- a/panda/src/dxgsg7/wdxGraphicsWindow7.cxx +++ b/panda/src/dxgsg7/wdxGraphicsWindow7.cxx @@ -135,7 +135,7 @@ wdxGraphicsWindow7:: } void wdxGraphicsWindow7:: -make_current(void) { +make_current() { PStatTimer timer(_make_current_pcollector); DXGraphicsStateGuardian7 *dxgsg; @@ -158,7 +158,7 @@ make_current(void) { // opened, or false if there was a problem. //////////////////////////////////////////////////////////////////// bool wdxGraphicsWindow7:: -open_window(void) { +open_window() { if (!choose_device(0, NULL)) { wdxdisplay7_cat.error() << "Unable to find suitable rendering device.\n"; diff --git a/panda/src/dxgsg7/wdxGraphicsWindow7.h b/panda/src/dxgsg7/wdxGraphicsWindow7.h index bc6f698fb7..33349dcb91 100644 --- a/panda/src/dxgsg7/wdxGraphicsWindow7.h +++ b/panda/src/dxgsg7/wdxGraphicsWindow7.h @@ -47,8 +47,8 @@ public: virtual ~wdxGraphicsWindow7(); virtual void end_flip(); //virtual bool begin_frame(); - virtual void make_current(void); - virtual bool open_window(void); + virtual void make_current(); + virtual bool open_window(); protected: virtual void fullscreen_restored(WindowProperties &properties); diff --git a/panda/src/dxgsg8/dxGraphicsDevice8.h b/panda/src/dxgsg8/dxGraphicsDevice8.h index 22cb8cd3c5..b755620419 100755 --- a/panda/src/dxgsg8/dxGraphicsDevice8.h +++ b/panda/src/dxgsg8/dxGraphicsDevice8.h @@ -44,9 +44,9 @@ public: #if 0 protected: - static TypeHandle get_class_type(void); - static void init_type(void); - virtual TypeHandle get_type(void) const; + static TypeHandle get_class_type(); + static void init_type(); + virtual TypeHandle get_type() const; virtual TypeHandle force_init_type() {init_type(); return get_class_type();} #endif }; diff --git a/panda/src/dxgsg8/dxGraphicsStateGuardian8.h b/panda/src/dxgsg8/dxGraphicsStateGuardian8.h index 7fe7fd0533..0d233cbf2e 100644 --- a/panda/src/dxgsg8/dxGraphicsStateGuardian8.h +++ b/panda/src/dxgsg8/dxGraphicsStateGuardian8.h @@ -131,7 +131,7 @@ protected: virtual void set_blend_mode(); void free_nondx_resources(); - void free_d3d_device(void); + void free_d3d_device(); void set_draw_buffer(const RenderBuffer &rb); void set_read_buffer(const RenderBuffer &rb); diff --git a/panda/src/dxgsg8/dxInput8.cxx b/panda/src/dxgsg8/dxInput8.cxx index 6b669ba95d..8e5aebce64 100644 --- a/panda/src/dxgsg8/dxInput8.cxx +++ b/panda/src/dxgsg8/dxInput8.cxx @@ -59,7 +59,7 @@ DInput8Info::~DInput8Info() { } } -bool DInput8Info::InitDirectInput(void) { +bool DInput8Info::InitDirectInput() { HRESULT hr; // assumes dx8 exists diff --git a/panda/src/dxgsg8/dxInput8.h b/panda/src/dxgsg8/dxInput8.h index d77992cb4b..f2a9a62b6c 100644 --- a/panda/src/dxgsg8/dxInput8.h +++ b/panda/src/dxgsg8/dxInput8.h @@ -26,9 +26,9 @@ typedef vector DI_DeviceObjInfos; class DInput8Info { public: - DInput8Info(void); - ~DInput8Info(void); - bool InitDirectInput(void); + DInput8Info(); + ~DInput8Info(); + bool InitDirectInput(); bool CreateJoystickOrPad(HWND _window); bool ReadJoystick(int devnum, DIJOYSTATE2 &js); diff --git a/panda/src/dxgsg8/dxgsg8base.h b/panda/src/dxgsg8/dxgsg8base.h index 5dbb17a54f..da858dbe6e 100644 --- a/panda/src/dxgsg8/dxgsg8base.h +++ b/panda/src/dxgsg8/dxgsg8base.h @@ -211,7 +211,7 @@ struct DXScreenData { //utility stuff extern pmap g_D3DFORMATmap; -extern void Init_D3DFORMAT_map(void); +extern void Init_D3DFORMAT_map(); extern const char *D3DFormatStr(D3DFORMAT fmt); #endif diff --git a/panda/src/dxgsg8/wdxGraphicsPipe8.cxx b/panda/src/dxgsg8/wdxGraphicsPipe8.cxx index a74e78f74e..3eb3e45b12 100644 --- a/panda/src/dxgsg8/wdxGraphicsPipe8.cxx +++ b/panda/src/dxgsg8/wdxGraphicsPipe8.cxx @@ -772,7 +772,7 @@ make_gsg(const FrameBufferProperties &properties, pmap g_D3DFORMATmap; -void Init_D3DFORMAT_map(void) { +void Init_D3DFORMAT_map() { if (g_D3DFORMATmap.size() != 0) return; diff --git a/panda/src/dxgsg9/d3dfont9.h b/panda/src/dxgsg9/d3dfont9.h index abea6bcb9e..a94e3dcced 100755 --- a/panda/src/dxgsg9/d3dfont9.h +++ b/panda/src/dxgsg9/d3dfont9.h @@ -98,9 +98,9 @@ public: // Initializing and destroying device-dependent objects HRESULT InitDeviceObjects(LPDIRECT3DDEVICE9 pd3dDevice); - HRESULT RestoreDeviceObjects(void); - HRESULT InvalidateDeviceObjects(void); - HRESULT DeleteDeviceObjects(void); + HRESULT RestoreDeviceObjects(); + HRESULT InvalidateDeviceObjects(); + HRESULT DeleteDeviceObjects(); // Constructor / destructor CD3DFont( TCHAR* strFontName, DWORD dwHeight, DWORD dwFlags=0L ); diff --git a/panda/src/dxgsg9/dxGraphicsDevice9.h b/panda/src/dxgsg9/dxGraphicsDevice9.h index cd3d260cea..12d5138664 100755 --- a/panda/src/dxgsg9/dxGraphicsDevice9.h +++ b/panda/src/dxgsg9/dxGraphicsDevice9.h @@ -44,9 +44,9 @@ public: #if 0 protected: - static TypeHandle get_class_type(void); - static void init_type(void); - virtual TypeHandle get_type(void) const; + static TypeHandle get_class_type(); + static void init_type(); + virtual TypeHandle get_type() const; virtual TypeHandle force_init_type() {init_type(); return get_class_type();} #endif }; diff --git a/panda/src/dxgsg9/dxGraphicsStateGuardian9.cxx b/panda/src/dxgsg9/dxGraphicsStateGuardian9.cxx index 447acdfe51..1ec76ae762 100755 --- a/panda/src/dxgsg9/dxGraphicsStateGuardian9.cxx +++ b/panda/src/dxgsg9/dxGraphicsStateGuardian9.cxx @@ -149,7 +149,7 @@ void INLINE TestDrawPrimFailure(DP_Type dptype,HRESULT hr,IDirect3DDevice9 *pD3D #endif void DXGraphicsStateGuardian9:: -reset_panda_gsg(void) { +reset_panda_gsg() { GraphicsStateGuardian::reset(); _auto_rescale_normal = false; @@ -244,7 +244,7 @@ reset() { // setup up for re-calling dx_init(), this is not the final exit cleanup routine (see dx_cleanup) void DXGraphicsStateGuardian9:: -free_d3d_device(void) { +free_d3d_device() { // dont want a full reset of gsg, just a state clear set_state(RenderState::make_empty()); // want gsg to pass all state settings through @@ -286,7 +286,7 @@ free_nondx_resources() { // set up. //////////////////////////////////////////////////////////////////// void DXGraphicsStateGuardian9:: -dx_init(void) { +dx_init() { HRESULT hr; // make sure gsg passes all current state down to us @@ -2900,7 +2900,7 @@ framebuffer_copy_to_ram(Texture *tex, int z, const DisplayRegion *dr, const Rend return false; } - (void) ConvertD3DSurftoPixBuf(SrcCopyRect,pD3DSurf,tex); + () ConvertD3DSurftoPixBuf(SrcCopyRect,pD3DSurf,tex); RELEASE(pD3DSurf,dxgsg9,"pD3DSurf",RELEASE_ONCE); @@ -3935,15 +3935,15 @@ set_blend_mode() { enable_blend(false); } -TypeHandle DXGraphicsStateGuardian9::get_type(void) const { +TypeHandle DXGraphicsStateGuardian9::get_type() const { return get_class_type(); } -TypeHandle DXGraphicsStateGuardian9::get_class_type(void) { +TypeHandle DXGraphicsStateGuardian9::get_class_type() { return _type_handle; } -void DXGraphicsStateGuardian9::init_type(void) { +void DXGraphicsStateGuardian9::init_type() { GraphicsStateGuardian::init_type(); register_type(_type_handle, "DXGraphicsStateGuardian9", GraphicsStateGuardian::get_class_type()); @@ -4068,7 +4068,7 @@ bool recreate_tex_callback(TextureContext *tc,void *void_dxgsg_ptr) { } // release all textures and vertex/index buffers -HRESULT DXGraphicsStateGuardian9::DeleteAllDeviceObjects(void) { +HRESULT DXGraphicsStateGuardian9::DeleteAllDeviceObjects() { // BUGBUG: need to release any vertexbuffers here // cant access template in libpanda.dll directly due to vc++ limitations, use traverser to get around it @@ -4087,7 +4087,7 @@ HRESULT DXGraphicsStateGuardian9::DeleteAllDeviceObjects(void) { } // recreate all textures and vertex/index buffers -HRESULT DXGraphicsStateGuardian9::RecreateAllDeviceObjects(void) { +HRESULT DXGraphicsStateGuardian9::RecreateAllDeviceObjects() { // BUGBUG: need to handle vertexbuffer handling here // cant access template in libpanda.dll directly due to vc++ limitations, use traverser to get around it @@ -4098,7 +4098,7 @@ HRESULT DXGraphicsStateGuardian9::RecreateAllDeviceObjects(void) { return S_OK; } -HRESULT DXGraphicsStateGuardian9::ReleaseAllDeviceObjects(void) { +HRESULT DXGraphicsStateGuardian9::ReleaseAllDeviceObjects() { // release any D3DPOOL_DEFAULT objects here (currently none) return S_OK; } diff --git a/panda/src/dxgsg9/dxGraphicsStateGuardian9.h b/panda/src/dxgsg9/dxGraphicsStateGuardian9.h index 2cd1172673..ec0f78c778 100755 --- a/panda/src/dxgsg9/dxGraphicsStateGuardian9.h +++ b/panda/src/dxgsg9/dxGraphicsStateGuardian9.h @@ -128,7 +128,7 @@ public: virtual void end_scene(); virtual void end_frame(); - virtual bool wants_texcoords(void) const; + virtual bool wants_texcoords() const; virtual void set_color_clear_value(const Colorf& value); @@ -151,7 +151,7 @@ protected: virtual void set_blend_mode(); void free_nondx_resources(); // free local internal buffers - void free_d3d_device(void); + void free_d3d_device(); void set_draw_buffer(const RenderBuffer &rb); void set_read_buffer(const RenderBuffer &rb); @@ -175,9 +175,9 @@ protected: D3DXVECTOR3 *pCenter, float fRadius, DWORD wNumRings, DWORD wNumSections, float sx, float sy, float sz, DWORD *pNumVertices,DWORD *pNumTris,DWORD fvfFlags,DWORD dwVertSize); - HRESULT ReleaseAllDeviceObjects(void); - HRESULT RecreateAllDeviceObjects(void); - HRESULT DeleteAllDeviceObjects(void); + HRESULT ReleaseAllDeviceObjects(); + HRESULT RecreateAllDeviceObjects(); + HRESULT DeleteAllDeviceObjects(); /* INLINE void enable_multisample_alpha_one(bool val); @@ -323,23 +323,23 @@ public: void set_context(DXScreenData *pNewContextData); void set_render_target(); - static TypeHandle get_class_type(void); - static void init_type(void); - virtual TypeHandle get_type(void) const; + static TypeHandle get_class_type(); + static void init_type(); + virtual TypeHandle get_type() const; virtual TypeHandle force_init_type() {init_type(); return get_class_type();} INLINE void SetDXReady(bool status) { _bDXisReady = status; } - INLINE bool GetDXReady(void) { return _bDXisReady;} + INLINE bool GetDXReady() { return _bDXisReady;} void DXGraphicsStateGuardian9::SetTextureBlendMode(TextureStage::Mode TexBlendMode,bool bJustEnable); void dx_cleanup(bool bRestoreDisplayMode,bool bAtExitFnCalled); - void reset_panda_gsg(void); + void reset_panda_gsg(); HRESULT reset_d3d_device(D3DPRESENT_PARAMETERS *pPresParams, DXScreenData **pScrn=NULL); #define DO_REACTIVATE_WINDOW true bool CheckCooperativeLevel(bool bDoReactivateWindow = false); void show_frame(bool bNoNewFrameDrawn = false); - void dx_init(void); + void dx_init(); void support_overlay_window(bool flag); diff --git a/panda/src/dxgsg9/dxInput9.cxx b/panda/src/dxgsg9/dxInput9.cxx index 23cef5aac1..40b0c9e303 100755 --- a/panda/src/dxgsg9/dxInput9.cxx +++ b/panda/src/dxgsg9/dxInput9.cxx @@ -59,7 +59,7 @@ DInput9Info::~DInput9Info() { } } -bool DInput9Info::InitDirectInput(void) { +bool DInput9Info::InitDirectInput() { HRESULT hr; // assumes dx9 exists diff --git a/panda/src/dxgsg9/dxInput9.h b/panda/src/dxgsg9/dxInput9.h index 38fc4e9e77..cd7d14a546 100755 --- a/panda/src/dxgsg9/dxInput9.h +++ b/panda/src/dxgsg9/dxInput9.h @@ -26,9 +26,9 @@ typedef vector DI_DeviceObjInfos; class DInput9Info { public: - DInput9Info(void); - ~DInput9Info(void); - bool InitDirectInput(void); + DInput9Info(); + ~DInput9Info(); + bool InitDirectInput(); bool CreateJoystickOrPad(HWND hWnd); bool ReadJoystick(int devnum, DIJOYSTATE2 &js); diff --git a/panda/src/dxgsg9/dxTextureContext9.cxx b/panda/src/dxgsg9/dxTextureContext9.cxx index 51c7abb882..d61d060155 100755 --- a/panda/src/dxgsg9/dxTextureContext9.cxx +++ b/panda/src/dxgsg9/dxTextureContext9.cxx @@ -930,7 +930,7 @@ IDirect3DTexture9 *DXTextureContext9::CreateTexture(DXScreenData &scrn) { } HRESULT DXTextureContext9:: -FillDDSurfTexturePixels(void) { +FillDDSurfTexturePixels() { HRESULT hr=E_FAIL; assert(IS_VALID_PTR(_texture)); diff --git a/panda/src/dxgsg9/dxTextureContext9.h b/panda/src/dxgsg9/dxTextureContext9.h index e1b7fab65e..80d4cdcb43 100755 --- a/panda/src/dxgsg9/dxTextureContext9.h +++ b/panda/src/dxgsg9/dxTextureContext9.h @@ -50,8 +50,8 @@ public: #endif // must be public since called from global callback fns - void DeleteTexture(void); - HRESULT FillDDSurfTexturePixels(void); + void DeleteTexture(); + HRESULT FillDDSurfTexturePixels(); protected: unsigned int get_bits_per_pixel(Texture::Format format, int *alphbits); diff --git a/panda/src/dxgsg9/dxgsg9base.h b/panda/src/dxgsg9/dxgsg9base.h index d3e9752be5..1f3a811e4b 100755 --- a/panda/src/dxgsg9/dxgsg9base.h +++ b/panda/src/dxgsg9/dxgsg9base.h @@ -215,7 +215,7 @@ typedef struct { //utility stuff extern map g_D3DFORMATmap; -extern void Init_D3DFORMAT_map(void); +extern void Init_D3DFORMAT_map(); extern const char *D3DFormatStr(D3DFORMAT fmt); #endif diff --git a/panda/src/dxgsg9/wdxGraphicsPipe9.cxx b/panda/src/dxgsg9/wdxGraphicsPipe9.cxx index 5a7e744498..2bf5819869 100755 --- a/panda/src/dxgsg9/wdxGraphicsPipe9.cxx +++ b/panda/src/dxgsg9/wdxGraphicsPipe9.cxx @@ -876,7 +876,7 @@ make_gsg(const FrameBufferProperties &properties, map g_D3DFORMATmap; -void Init_D3DFORMAT_map(void) { +void Init_D3DFORMAT_map() { if(g_D3DFORMATmap.size()!=0) return; diff --git a/panda/src/dxgsg9/wdxGraphicsWindow9.cxx b/panda/src/dxgsg9/wdxGraphicsWindow9.cxx index f1a6d2382f..6f30d67448 100755 --- a/panda/src/dxgsg9/wdxGraphicsWindow9.cxx +++ b/panda/src/dxgsg9/wdxGraphicsWindow9.cxx @@ -95,7 +95,7 @@ wdxGraphicsWindow9:: } void wdxGraphicsWindow9:: -make_current(void) { +make_current() { PStatTimer timer(_make_current_pcollector); DXGraphicsStateGuardian9 *dxgsg; @@ -115,7 +115,7 @@ make_current(void) { /* BUGBUG: need to reinstate these methods ASAP. they were incorrectly moved from the GraphicsWindow to the GSG apps need to know the framebuffer format so they can create texture/rendertgt with same fmt int wdxGraphicsWindow9:: -get_depth_bitwidth(void) { +get_depth_bitwidth() { assert(_dxgsg!=NULL); if(_dxgsg->scrn.PresParams.EnableAutoDepthStencil) return _dxgsg->scrn.depth_buffer_bitdepth; @@ -906,7 +906,7 @@ create_screen_buffers_and_device(DXScreenData &Display, bool force_16bpp_zbuffer // Returns true if successful, false on failure. //////////////////////////////////////////////////////////////////// bool wdxGraphicsWindow9:: -choose_device(void) { +choose_device() { HRESULT hr; wdxGraphicsPipe9 *dxpipe; @@ -1003,7 +1003,7 @@ choose_device(void) { /* primary init sequence of old method, still need to integrate multi-window functionality -void wdxGraphicsWindow9Group::initWindowGroup(void) { +void wdxGraphicsWindow9Group::initWindowGroup() { HRESULT hr; assert(_windows.size()>0); @@ -1740,7 +1740,7 @@ reset_window(bool swapchain) { // opened, or false if there was a problem. //////////////////////////////////////////////////////////////////// bool wdxGraphicsWindow9:: -open_window(void) { +open_window() { PT(DXGraphicsDevice9) dxdev; DXGraphicsStateGuardian9 *dxgsg; DCAST_INTO_R(dxgsg,_gsg,false); @@ -1813,6 +1813,6 @@ open_window(void) { bool wdxGraphicsWindow9:: handle_mouse_motion(int x, int y) { - (void) WinGraphicsWindow::handle_mouse_motion(x,y); + () WinGraphicsWindow::handle_mouse_motion(x,y); return false; } diff --git a/panda/src/dxgsg9/wdxGraphicsWindow9.h b/panda/src/dxgsg9/wdxGraphicsWindow9.h index 3143e2a656..8aaf5211b4 100755 --- a/panda/src/dxgsg9/wdxGraphicsWindow9.h +++ b/panda/src/dxgsg9/wdxGraphicsWindow9.h @@ -42,8 +42,8 @@ public: wdxGraphicsWindow9(GraphicsPipe *pipe, GraphicsStateGuardian *gsg, const string &name); virtual ~wdxGraphicsWindow9(); - virtual bool open_window(void); - virtual void close_window(void); + virtual bool open_window(); + virtual void close_window(); virtual void reset_window(bool swapchain); virtual int verify_window_sizes(int numsizes, int *dimen); @@ -64,7 +64,7 @@ private: bool create_screen_buffers_and_device(DXScreenData &Display, bool force_16bpp_zbuffer); - bool choose_device(void); + bool choose_device(); bool search_for_device(wdxGraphicsPipe9 *dxpipe, DXDeviceInfo *device_info); // void set_coop_levels_and_display_modes(); @@ -100,7 +100,7 @@ public: return get_class_type(); } virtual TypeHandle force_init_type() {init_type(); return get_class_type();} - virtual void make_current(void); + virtual void make_current(); private: static TypeHandle _type_handle; diff --git a/panda/src/effects/lensFlareNode.I b/panda/src/effects/lensFlareNode.I index 0d16059896..cd6435f0a2 100644 --- a/panda/src/effects/lensFlareNode.I +++ b/panda/src/effects/lensFlareNode.I @@ -22,7 +22,7 @@ // Description: //////////////////////////////////////////////////////////////////// INLINE LensFlareNode:: -LensFlareNode(void) : +LensFlareNode() : _global_scale(1), _texel_scale(0.1), _blind_fall_off(45), _flare_fall_off(5) { _blind = (Texture *)NULL; diff --git a/panda/src/effects/lensFlareNode.cxx b/panda/src/effects/lensFlareNode.cxx index 5c8104c875..165a7d600b 100644 --- a/panda/src/effects/lensFlareNode.cxx +++ b/panda/src/effects/lensFlareNode.cxx @@ -573,7 +573,7 @@ register_with_read_factory() { // Description: //////////////////////////////////////////////////////////////////// LensFlareNode:: -LensFlareNode(void) : +LensFlareNode() : _global_scale(1), _next_switch(-1), _sparkle_fps(0.2), _texel_scale(0.1), _inv_sparkle_fps(5), _exp_scale(15) { diff --git a/panda/src/effects/lensFlareNode.h b/panda/src/effects/lensFlareNode.h index a6b1b01683..678cecc3bc 100644 --- a/panda/src/effects/lensFlareNode.h +++ b/panda/src/effects/lensFlareNode.h @@ -37,7 +37,7 @@ class ClockObject; class EXPCL_PANDAFX LensFlareNode : public Node { PUBLISHED: - INLINE LensFlareNode(void); + INLINE LensFlareNode(); void add_flare(PT(Texture) flare, PTA_float scales, PTA_float offsets, PTA_float angle_scales, PTA_Colorf colors); diff --git a/panda/src/egg/eggData.cxx b/panda/src/egg/eggData.cxx index 79b5f001ad..00305226ca 100644 --- a/panda/src/egg/eggData.cxx +++ b/panda/src/egg/eggData.cxx @@ -30,7 +30,7 @@ #include "dSearchPath.h" #include "virtualFileSystem.h" -extern int eggyyparse(void); +extern int eggyyparse(); #include "parserDefs.h" #include "lexerDefs.h" diff --git a/panda/src/egg/eggNode.cxx b/panda/src/egg/eggNode.cxx index e6b5d46840..63f87f77b9 100644 --- a/panda/src/egg/eggNode.cxx +++ b/panda/src/egg/eggNode.cxx @@ -24,7 +24,7 @@ #include -extern int eggyyparse(void); +extern int eggyyparse(); #include "parserDefs.h" #include "lexerDefs.h" diff --git a/panda/src/express/buffer.I b/panda/src/express/buffer.I index 2d8ec6afe8..cb280e2ade 100644 --- a/panda/src/express/buffer.I +++ b/panda/src/express/buffer.I @@ -22,6 +22,6 @@ // Description: //////////////////////////////////////////////////////////////////// INLINE int Buffer:: -get_length(void) const { +get_length() const { return _length; } diff --git a/panda/src/express/buffer.h b/panda/src/express/buffer.h index 96cb9a6a97..786bfcc352 100644 --- a/panda/src/express/buffer.h +++ b/panda/src/express/buffer.h @@ -33,7 +33,7 @@ public: ~Buffer(); PUBLISHED: - INLINE int get_length(void) const; + INLINE int get_length() const; #ifndef CPPPARSER // hidden from interrogate diff --git a/panda/src/express/datagramGenerator.I b/panda/src/express/datagramGenerator.I index c39df065ad..36d4186cdc 100644 --- a/panda/src/express/datagramGenerator.I +++ b/panda/src/express/datagramGenerator.I @@ -24,6 +24,6 @@ // the definition of an interface //////////////////////////////////////////////////////////////////// -INLINE DatagramGenerator::DatagramGenerator(void){ +INLINE DatagramGenerator::DatagramGenerator(){ } diff --git a/panda/src/express/datagramSink.I b/panda/src/express/datagramSink.I index 612cf38a5a..7c58747795 100644 --- a/panda/src/express/datagramSink.I +++ b/panda/src/express/datagramSink.I @@ -24,5 +24,5 @@ // the definition of an interface //////////////////////////////////////////////////////////////////// -INLINE DatagramSink::DatagramSink(void){ +INLINE DatagramSink::DatagramSink(){ } diff --git a/panda/src/express/datagramSink.cxx b/panda/src/express/datagramSink.cxx index 7093777504..9651df16da 100644 --- a/panda/src/express/datagramSink.cxx +++ b/panda/src/express/datagramSink.cxx @@ -24,5 +24,5 @@ // Description: Does nothing since this is class is just // the definition of an interface //////////////////////////////////////////////////////////////////// -DatagramSink::~DatagramSink(void){ +DatagramSink::~DatagramSink(){ } diff --git a/panda/src/express/datagramSink.h b/panda/src/express/datagramSink.h index d82a87d6ce..a76a9e5281 100644 --- a/panda/src/express/datagramSink.h +++ b/panda/src/express/datagramSink.h @@ -31,8 +31,8 @@ //////////////////////////////////////////////////////////////////// class EXPCL_PANDAEXPRESS DatagramSink { public: - INLINE DatagramSink(void); - virtual ~DatagramSink(void); + INLINE DatagramSink(); + virtual ~DatagramSink(); virtual bool put_datagram(const Datagram &data) = 0; virtual bool is_error() = 0; diff --git a/panda/src/express/encryptStreamBuf.h b/panda/src/express/encryptStreamBuf.h index 6e63c1f59c..1eb8da4a11 100644 --- a/panda/src/express/encryptStreamBuf.h +++ b/panda/src/express/encryptStreamBuf.h @@ -53,8 +53,8 @@ public: protected: virtual int overflow(int c); - virtual int sync(void); - virtual int underflow(void); + virtual int sync(); + virtual int underflow(); private: size_t read_chars(char *start, size_t length); diff --git a/panda/src/express/error_utils.cxx b/panda/src/express/error_utils.cxx index 6fcd5b627b..6397beb760 100644 --- a/panda/src/express/error_utils.cxx +++ b/panda/src/express/error_utils.cxx @@ -158,7 +158,7 @@ string error_to_text(ErrorUtilCode err) { // Description: //////////////////////////////////////////////////////////////////// int -get_write_error(void) { +get_write_error() { #ifndef WIN32 return EU_error_abort; #else @@ -195,7 +195,7 @@ get_write_error(void) { // Function: handle_socket_error // Description: //////////////////////////////////////////////////////////////////// -string handle_socket_error(void) { +string handle_socket_error() { #ifndef WIN32 return string(strerror(errno)); #else @@ -255,7 +255,7 @@ string handle_socket_error(void) { // Description: //////////////////////////////////////////////////////////////////// int -get_network_error(void) { +get_network_error() { #ifndef WIN32 return EU_error_abort; #else diff --git a/panda/src/express/error_utils.h b/panda/src/express/error_utils.h index 63491764d4..e3fb2cd859 100644 --- a/panda/src/express/error_utils.h +++ b/panda/src/express/error_utils.h @@ -80,11 +80,11 @@ enum ErrorUtilCode { }; EXPCL_PANDAEXPRESS string error_to_text(ErrorUtilCode err); -EXPCL_PANDAEXPRESS int get_write_error(void); +EXPCL_PANDAEXPRESS int get_write_error(); #ifdef HAVE_NET -EXPCL_PANDAEXPRESS string handle_socket_error(void); -EXPCL_PANDAEXPRESS int get_network_error(void); +EXPCL_PANDAEXPRESS string handle_socket_error(); +EXPCL_PANDAEXPRESS int get_network_error(); #endif END_PUBLISH diff --git a/panda/src/express/patchfile.I b/panda/src/express/patchfile.I index 8a811ef11d..8195ae7f1b 100644 --- a/panda/src/express/patchfile.I +++ b/panda/src/express/patchfile.I @@ -24,7 +24,7 @@ // Description: //////////////////////////////////////////////////////////////////// INLINE float Patchfile:: -get_progress(void) const { +get_progress() const { if (false == _initiated) { express_cat.warning() << "Patchfile::get_progress() - Patch has not been initiated" << endl; diff --git a/panda/src/express/patchfile.cxx b/panda/src/express/patchfile.cxx index 7d6faa8c39..cd1e0532b2 100644 --- a/panda/src/express/patchfile.cxx +++ b/panda/src/express/patchfile.cxx @@ -107,7 +107,7 @@ const PN_uint32 Patchfile::_HASH_MASK = (PN_uint32(1) << Patchfile::_HASH_BITS) // Description: //////////////////////////////////////////////////////////////////// Patchfile:: -Patchfile(void) { +Patchfile() { PT(Buffer) buffer = new Buffer(patchfile_buffer_size); init(buffer); } @@ -144,7 +144,7 @@ init(PT(Buffer) buffer) { // Description: //////////////////////////////////////////////////////////////////// Patchfile:: -~Patchfile(void) { +~Patchfile() { if (true == _initiated) cleanup(); } @@ -155,7 +155,7 @@ Patchfile:: // Description: //////////////////////////////////////////////////////////////////// void Patchfile:: -cleanup(void) { +cleanup() { if (false == _initiated) { express_cat.error() << "Patchfile::cleanup() - Patching has not been initiated" @@ -268,7 +268,7 @@ read_header(const Filename &patch_file) { // Description: Perform one buffer's worth of patching //////////////////////////////////////////////////////////////////// int Patchfile:: -run(void) { +run() { // Now patch the file using the given buffer int buflen; int bytes_read; diff --git a/panda/src/express/patchfile.h b/panda/src/express/patchfile.h index 9b0576a3be..550f438ecf 100644 --- a/panda/src/express/patchfile.h +++ b/panda/src/express/patchfile.h @@ -53,19 +53,19 @@ PUBLISHED: }; */ - Patchfile(void); + Patchfile(); Patchfile(PT(Buffer) buffer); - ~Patchfile(void); + ~Patchfile(); bool build(Filename file_orig, Filename file_new, Filename patch_name); int read_header(const Filename &patch_file); int initiate(const Filename &patch_file, const Filename &file); - int run(void); + int run(); bool apply(Filename &patch_file, Filename &file); - INLINE float get_progress(void) const; + INLINE float get_progress() const; INLINE void set_footprint_length(int length); INLINE int get_footprint_length(); @@ -78,7 +78,7 @@ PUBLISHED: private: int internal_read_header(const Filename &patch_file); void init(PT(Buffer) buffer); - void cleanup(void); + void cleanup(); private: // stuff for the build operation diff --git a/panda/src/express/subStreamBuf.h b/panda/src/express/subStreamBuf.h index ad91f5f3f4..7b050f8c45 100644 --- a/panda/src/express/subStreamBuf.h +++ b/panda/src/express/subStreamBuf.h @@ -38,8 +38,8 @@ public: protected: virtual int overflow(int c); - virtual int sync(void); - virtual int underflow(void); + virtual int sync(); + virtual int underflow(); private: istream *_source; diff --git a/panda/src/express/test_types.cxx b/panda/src/express/test_types.cxx index ce0bde78ce..9738a24cc4 100644 --- a/panda/src/express/test_types.cxx +++ b/panda/src/express/test_types.cxx @@ -45,7 +45,7 @@ public: virtual TypeHandle get_type() const { return get_class_type(); } - virtual TypeHandle force_init_type(void) { + virtual TypeHandle force_init_type() { init_type(); return get_class_type(); } @@ -74,7 +74,7 @@ public: virtual TypeHandle get_type() const { return get_class_type(); } - virtual TypeHandle force_init_type(void) { + virtual TypeHandle force_init_type() { init_type(); return get_class_type(); } @@ -101,7 +101,7 @@ public: static void init_type() { register_type(_type_handle, "TheOtherThingie"); } - virtual TypeHandle force_init_type(void) { + virtual TypeHandle force_init_type() { init_type(); return get_class_type(); } @@ -137,7 +137,7 @@ public: virtual TypeHandle get_type() const { return get_class_type(); } - virtual TypeHandle force_init_type(void) { + virtual TypeHandle force_init_type() { init_type(); return get_class_type(); } diff --git a/panda/src/express/zStreamBuf.h b/panda/src/express/zStreamBuf.h index 4f0c70df7a..fcfe1c8f32 100644 --- a/panda/src/express/zStreamBuf.h +++ b/panda/src/express/zStreamBuf.h @@ -44,8 +44,8 @@ public: protected: virtual int overflow(int c); - virtual int sync(void); - virtual int underflow(void); + virtual int sync(); + virtual int underflow(); private: size_t read_chars(char *start, size_t length); diff --git a/panda/src/glstuff/glGraphicsStateGuardian_src.h b/panda/src/glstuff/glGraphicsStateGuardian_src.h index 1b96b4f8a2..2d5a17a0ac 100644 --- a/panda/src/glstuff/glGraphicsStateGuardian_src.h +++ b/panda/src/glstuff/glGraphicsStateGuardian_src.h @@ -150,13 +150,13 @@ public: virtual void bind_light(Spotlight *light_obj, const NodePath &light, int light_id); - virtual bool wants_texcoords(void) const; + virtual bool wants_texcoords() const; void print_gfx_visual(); //For those interested in what the guardian thinks is the current //enabled/disable GL State compared to what GL says it is - void dump_state(void); + void dump_state(); const float *get_light_color(Light *light) const; diff --git a/panda/src/glstuff/glShaderContext_src.I b/panda/src/glstuff/glShaderContext_src.I index 3bc5b181cd..247c91e58b 100755 --- a/panda/src/glstuff/glShaderContext_src.I +++ b/panda/src/glstuff/glShaderContext_src.I @@ -31,7 +31,7 @@ bind(ShaderMode *m) { // Description: xyz //////////////////////////////////////////////////////////////////// INLINE void CLP(ShaderContext):: -unbind(void) { +unbind() { } //////////////////////////////////////////////////////////////////// diff --git a/panda/src/glstuff/glShaderContext_src.cxx b/panda/src/glstuff/glShaderContext_src.cxx index 0481b9d88c..41c3bc773b 100755 --- a/panda/src/glstuff/glShaderContext_src.cxx +++ b/panda/src/glstuff/glShaderContext_src.cxx @@ -38,6 +38,6 @@ CLP(ShaderContext)(Shader *s) : ShaderContext(s) { // Description: xyz //////////////////////////////////////////////////////////////////// CLP(ShaderContext):: -~CLP(ShaderContext)(void) { +~CLP(ShaderContext)() { } diff --git a/panda/src/glstuff/glShaderContext_src.h b/panda/src/glstuff/glShaderContext_src.h index 3a42bc8db5..eefa33d54b 100755 --- a/panda/src/glstuff/glShaderContext_src.h +++ b/panda/src/glstuff/glShaderContext_src.h @@ -27,10 +27,10 @@ class EXPCL_GL CLP(ShaderContext): public ShaderContext { public: CLP(ShaderContext)(Shader *shader); - ~CLP(ShaderContext)(void); + ~CLP(ShaderContext)(); INLINE void bind(ShaderMode *mode); - INLINE void unbind(void); + INLINE void unbind(); INLINE void rebind(ShaderMode *oldmode, ShaderMode *newmode); public: diff --git a/panda/src/glxdisplay/glxext.h b/panda/src/glxdisplay/glxext.h index c246eff813..65bac4d2b8 100644 --- a/panda/src/glxdisplay/glxext.h +++ b/panda/src/glxdisplay/glxext.h @@ -301,11 +301,11 @@ extern "C" { on my redhat 8.0 box). So we work around this by typedeffing it explicitly; and we use #define in case it is already typedeffed. */ #define __GLXextFuncPtr panda__GLXextFuncPtr -typedef void (*__GLXextFuncPtr)(void); +typedef void (*__GLXextFuncPtr)(); /* #ifndef GLX_ARB_get_proc_address -typedef void (*__GLXextFuncPtr)(void); +typedef void (*__GLXextFuncPtr)(); #endif */ @@ -358,8 +358,8 @@ extern void glXDestroyPbuffer (Display *, GLXPbuffer); extern void glXQueryDrawable (Display *, GLXDrawable, int, unsigned int *); extern GLXContext glXCreateNewContext (Display *, GLXFBConfig, int, GLXContext, Bool); extern Bool glXMakeContextCurrent (Display *, GLXDrawable, GLXDrawable, GLXContext); -extern GLXDrawable glXGetCurrentReadDrawable (void); -extern Display * glXGetCurrentDisplay (void); +extern GLXDrawable glXGetCurrentReadDrawable (); +extern Display * glXGetCurrentDisplay (); extern int glXQueryContext (Display *, GLXContext, int, int *); extern void glXSelectEvent (Display *, GLXDrawable, unsigned long); extern void glXGetSelectedEvent (Display *, GLXDrawable, unsigned long *); @@ -379,8 +379,8 @@ typedef void (* PFNGLXDESTROYPBUFFERPROC) (Display *dpy, GLXPbuffer pbuf); typedef void (* PFNGLXQUERYDRAWABLEPROC) (Display *dpy, GLXDrawable draw, int attribute, unsigned int *value); typedef GLXContext (* PFNGLXCREATENEWCONTEXTPROC) (Display *dpy, GLXFBConfig config, int render_type, GLXContext share_list, Bool direct); typedef Bool (* PFNGLXMAKECONTEXTCURRENTPROC) (Display *dpy, GLXDrawable draw, GLXDrawable read, GLXContext ctx); -typedef GLXDrawable (* PFNGLXGETCURRENTREADDRAWABLEPROC) (void); -typedef Display * (* PFNGLXGETCURRENTDISPLAYPROC) (void); +typedef GLXDrawable (* PFNGLXGETCURRENTREADDRAWABLEPROC) (); +typedef Display * (* PFNGLXGETCURRENTDISPLAYPROC) (); typedef int (* PFNGLXQUERYCONTEXTPROC) (Display *dpy, GLXContext ctx, int attribute, int *value); typedef void (* PFNGLXSELECTEVENTPROC) (Display *dpy, GLXDrawable draw, unsigned long event_mask); typedef void (* PFNGLXGETSELECTEDEVENTPROC) (Display *dpy, GLXDrawable draw, unsigned long *event_mask); @@ -436,10 +436,10 @@ typedef int (* PFNGLXWAITVIDEOSYNCSGIPROC) (int divisor, int remainder, unsigned #define GLX_SGI_make_current_read 1 #ifdef GLX_GLXEXT_PROTOTYPES extern Bool glXMakeCurrentReadSGI (Display *, GLXDrawable, GLXDrawable, GLXContext); -extern GLXDrawable glXGetCurrentReadDrawableSGI (void); +extern GLXDrawable glXGetCurrentReadDrawableSGI (); #endif /* GLX_GLXEXT_PROTOTYPES */ typedef Bool (* PFNGLXMAKECURRENTREADSGIPROC) (Display *dpy, GLXDrawable draw, GLXDrawable read, GLXContext ctx); -typedef GLXDrawable (* PFNGLXGETCURRENTREADDRAWABLESGIPROC) (void); +typedef GLXDrawable (* PFNGLXGETCURRENTREADDRAWABLESGIPROC) (); #endif #ifndef GLX_SGIX_video_source @@ -461,13 +461,13 @@ typedef void (* PFNGLXDESTROYGLXVIDEOSOURCESGIXPROC) (Display *dpy, GLXVideoSour #ifndef GLX_EXT_import_context #define GLX_EXT_import_context 1 #ifdef GLX_GLXEXT_PROTOTYPES -extern Display * glXGetCurrentDisplayEXT (void); +extern Display * glXGetCurrentDisplayEXT (); extern int glXQueryContextInfoEXT (Display *, GLXContext, int, int *); extern GLXContextID glXGetContextIDEXT (const GLXContext); extern GLXContext glXImportContextEXT (Display *, GLXContextID); extern void glXFreeContextEXT (Display *, GLXContext); #endif /* GLX_GLXEXT_PROTOTYPES */ -typedef Display * (* PFNGLXGETCURRENTDISPLAYEXTPROC) (void); +typedef Display * (* PFNGLXGETCURRENTDISPLAYEXTPROC) (); typedef int (* PFNGLXQUERYCONTEXTINFOEXTPROC) (Display *dpy, GLXContext context, int attribute, int *value); typedef GLXContextID (* PFNGLXGETCONTEXTIDEXTPROC) (const GLXContext context); typedef GLXContext (* PFNGLXIMPORTCONTEXTEXTPROC) (Display *dpy, GLXContextID contextID); diff --git a/panda/src/gobj/shader.I b/panda/src/gobj/shader.I index 01f847653b..e62b81bff0 100755 --- a/panda/src/gobj/shader.I +++ b/panda/src/gobj/shader.I @@ -22,7 +22,7 @@ // Description: Return the shader's text. //////////////////////////////////////////////////////////////////// INLINE const string &Shader:: -get_text(void) { +get_text() { return _text; } @@ -32,7 +32,7 @@ get_text(void) { // Description: Return the shader's filename, or null string. //////////////////////////////////////////////////////////////////// INLINE const Filename &Shader:: -get_file(void) { +get_file() { return _file; } diff --git a/panda/src/gobj/shader.cxx b/panda/src/gobj/shader.cxx index 6f6f6e4da4..481f937489 100755 --- a/panda/src/gobj/shader.cxx +++ b/panda/src/gobj/shader.cxx @@ -48,7 +48,7 @@ Shader:: // Description: Set a 'parse pointer' to the beginning of the shader. //////////////////////////////////////////////////////////////////// void Shader:: -parse_init(void) { +parse_init() { _parse = 0; } @@ -121,7 +121,7 @@ parse_rest(string &result) { // the shader. //////////////////////////////////////////////////////////////////// bool Shader:: -parse_eof(void) { +parse_eof() { return (int)_text.size() == _parse; } diff --git a/panda/src/gobj/shader.h b/panda/src/gobj/shader.h index 205cade2c9..fbc95ef610 100755 --- a/panda/src/gobj/shader.h +++ b/panda/src/gobj/shader.h @@ -51,24 +51,24 @@ class EXPCL_PANDA Shader: public TypedWritableReferenceCount { PUBLISHED: Shader(const string &text, const string &file); - ~Shader(void); + ~Shader(); - INLINE const string &get_text(void); - INLINE const Filename &get_file(void); + INLINE const string &get_text(); + INLINE const Filename &get_file(); void prepare(PreparedGraphicsObjects *prepared_objects); bool release(PreparedGraphicsObjects *prepared_objects); int release_all(); PUBLISHED: - void parse_init(void); + void parse_init(); void parse_line(string &result, bool rt, bool lt); void parse_upto(string &result, string pattern, bool include); void parse_rest(string &result); - bool parse_eof(void); + bool parse_eof(); public: - INLINE int arg_count(void); + INLINE int arg_count(); int arg_index(const string &id); string _text; @@ -79,7 +79,7 @@ public: typedef pmap Contexts; Contexts _contexts; - static void register_with_read_factory(void); + static void register_with_read_factory(); friend class ShaderContext; friend class PreparedGraphicsObjects; @@ -88,7 +88,7 @@ public: GraphicsStateGuardianBase *gsg); private: - void parse(void); + void parse(); void clear_prepared(PreparedGraphicsObjects *prepared_objects); public: diff --git a/panda/src/gobj/texture.h b/panda/src/gobj/texture.h index f9b59690ea..571bab11e0 100644 --- a/panda/src/gobj/texture.h +++ b/panda/src/gobj/texture.h @@ -336,7 +336,7 @@ private: // Datagram stuff public: - static void register_with_read_factory(void); + static void register_with_read_factory(); virtual void write_datagram(BamWriter* manager, Datagram &me); static TypedWritable *make_Texture(const FactoryParams ¶ms); diff --git a/panda/src/gsgbase/graphicsStateGuardianBase.h b/panda/src/gsgbase/graphicsStateGuardianBase.h index 39d1cb69d3..c78c594484 100644 --- a/panda/src/gsgbase/graphicsStateGuardianBase.h +++ b/panda/src/gsgbase/graphicsStateGuardianBase.h @@ -124,9 +124,9 @@ public: // These functions will be queried by the GeomIssuer to determine if // it should issue normals, texcoords, and/or colors, based on the // GSG's current state. - virtual bool wants_normals(void) const=0; - virtual bool wants_texcoords(void) const=0; - virtual bool wants_colors(void) const=0; + virtual bool wants_normals() const=0; + virtual bool wants_texcoords() const=0; + virtual bool wants_colors() const=0; // These are some general interface functions; they're defined here // mainly to make it easy to call these from code in some directory diff --git a/panda/src/helix/HxAdviseSink.h b/panda/src/helix/HxAdviseSink.h index 4dfee41645..fdf16670c2 100644 --- a/panda/src/helix/HxAdviseSink.h +++ b/panda/src/helix/HxAdviseSink.h @@ -77,7 +77,7 @@ class HxAdviseSink : public IHXClientAdviseSink { ~HxAdviseSink(); HX_RESULT dump_reg_tree(const char* tree_name ); void get_statistics (char* registry_key); - void get_all_statistics (void); + void get_all_statistics (); // Private Member variables LONG32 _ref_count; diff --git a/panda/src/lerp/lerp.cxx b/panda/src/lerp/lerp.cxx index 4eae0a4b7d..cfab99121f 100644 --- a/panda/src/lerp/lerp.cxx +++ b/panda/src/lerp/lerp.cxx @@ -52,7 +52,7 @@ Lerp::Lerp(const Lerp& c) : _blend(c._blend), _func(c._func), _event(c._event), _startt(c._startt), _endt(c._endt), _delta(c._delta), _t(c._t) {} -Lerp::~Lerp(void) {} +Lerp::~Lerp() {} Lerp& Lerp::operator=(const Lerp& c) { _blend = c._blend; @@ -65,7 +65,7 @@ Lerp& Lerp::operator=(const Lerp& c) { return *this; } -void Lerp::step(void) { +void Lerp::step() { _t += _delta; if (is_done()) { (*_func)(1.0); @@ -83,7 +83,7 @@ void Lerp::set_step_size(float delta) { _delta = delta; } -float Lerp::get_step_size(void) const { +float Lerp::get_step_size() const { return _delta; } @@ -94,15 +94,15 @@ void Lerp::set_t(float t) { (*_func)(x); } -float Lerp::get_t(void) const { +float Lerp::get_t() const { return _t; } -bool Lerp::is_done(void) const { +bool Lerp::is_done() const { return (_t >= _endt); } -LerpFunctor* Lerp::get_functor(void) const { +LerpFunctor* Lerp::get_functor() const { return _func; } @@ -110,7 +110,7 @@ void Lerp::set_end_event(const std::string& event) { _event = event; } -std::string Lerp::get_end_event(void) const { +std::string Lerp::get_end_event() const { return _event; } @@ -132,7 +132,7 @@ AutonomousLerp::AutonomousLerp(const AutonomousLerp& c) : _blend(c._blend), _endt(c._endt), _t(c._t) {} -AutonomousLerp::~AutonomousLerp(void) {} +AutonomousLerp::~AutonomousLerp() {} AutonomousLerp& AutonomousLerp::operator=(const AutonomousLerp& c) { _blend = c._blend; @@ -145,24 +145,24 @@ AutonomousLerp& AutonomousLerp::operator=(const AutonomousLerp& c) { return *this; } -void AutonomousLerp::start(void) { +void AutonomousLerp::start() { _t = _startt; _handler->add_hook("NewFrame", handle_event, this); } -void AutonomousLerp::stop(void) { +void AutonomousLerp::stop() { _handler->remove_hook("NewFrame", handle_event, this); } -void AutonomousLerp::resume(void) { +void AutonomousLerp::resume() { _handler->add_hook("NewFrame", handle_event, this); } -bool AutonomousLerp::is_done(void) const { +bool AutonomousLerp::is_done() const { return (_t >= _endt); } -LerpFunctor* AutonomousLerp::get_functor(void) const { +LerpFunctor* AutonomousLerp::get_functor() const { return _func; } @@ -173,7 +173,7 @@ void AutonomousLerp::set_t(float t) { (*_func)(x); } -float AutonomousLerp::get_t(void) const { +float AutonomousLerp::get_t() const { return _t; } @@ -181,11 +181,11 @@ void AutonomousLerp::set_end_event(const std::string& event) { _event = event; } -std::string AutonomousLerp::get_end_event(void) const { +std::string AutonomousLerp::get_end_event() const { return _event; } -void AutonomousLerp::step(void) { +void AutonomousLerp::step() { // Probably broken because it does not set the final value when t // exceeds end_t. see fixed Lerp::step() above if (is_done()) { diff --git a/panda/src/lerp/lerp.h b/panda/src/lerp/lerp.h index 64232762e9..d6fb112d0d 100644 --- a/panda/src/lerp/lerp.h +++ b/panda/src/lerp/lerp.h @@ -83,7 +83,7 @@ private: float _endt; float _t; - virtual void step(void); + virtual void step(); static void handle_event(CPT(Event), void*); PUBLISHED: diff --git a/panda/src/lerp/lerpblend.cxx b/panda/src/lerp/lerpblend.cxx index 09dde25686..d9f52d5833 100644 --- a/panda/src/lerp/lerpblend.cxx +++ b/panda/src/lerp/lerpblend.cxx @@ -26,7 +26,7 @@ TypeHandle NoBlendType::_type_handle; LerpBlendType::LerpBlendType(const LerpBlendType&) {} -LerpBlendType::~LerpBlendType(void) {} +LerpBlendType::~LerpBlendType() {} LerpBlendType& LerpBlendType::operator=(const LerpBlendType&) { return *this; @@ -40,7 +40,7 @@ EaseInBlendType::EaseInBlendType(const EaseInBlendType& c) : LerpBlendType(c) { } -EaseInBlendType::~EaseInBlendType(void) {} +EaseInBlendType::~EaseInBlendType() {} EaseInBlendType& EaseInBlendType::operator=(const EaseInBlendType& c) { LerpBlendType::operator=(c); @@ -55,7 +55,7 @@ float EaseInBlendType::operator()(float t) { EaseOutBlendType::EaseOutBlendType(const EaseOutBlendType& c) : LerpBlendType(c) {} -EaseOutBlendType::~EaseOutBlendType(void) {} +EaseOutBlendType::~EaseOutBlendType() {} EaseOutBlendType& EaseOutBlendType::operator=(const EaseOutBlendType& c) { LerpBlendType::operator=(c); @@ -69,7 +69,7 @@ float EaseOutBlendType::operator()(float t) { EaseInOutBlendType::EaseInOutBlendType(const EaseInOutBlendType& c) : LerpBlendType(c) {} -EaseInOutBlendType::~EaseInOutBlendType(void) {} +EaseInOutBlendType::~EaseInOutBlendType() {} EaseInOutBlendType& EaseInOutBlendType::operator=(const EaseInOutBlendType& c) { @@ -84,7 +84,7 @@ float EaseInOutBlendType::operator()(float t) { NoBlendType::NoBlendType(const NoBlendType& c) : LerpBlendType(c) {} -NoBlendType::~NoBlendType(void) {} +NoBlendType::~NoBlendType() {} NoBlendType& NoBlendType::operator=(const NoBlendType& c) { LerpBlendType::operator=(c); diff --git a/panda/src/lerp/lerpblend.h b/panda/src/lerp/lerpblend.h index d5ccc64759..ec7f768dab 100644 --- a/panda/src/lerp/lerpblend.h +++ b/panda/src/lerp/lerpblend.h @@ -24,8 +24,8 @@ class EXPCL_PANDA LerpBlendType : public TypedReferenceCount { PUBLISHED: - LerpBlendType(void) {} - virtual ~LerpBlendType(void); + LerpBlendType() {} + virtual ~LerpBlendType(); virtual float operator()(float) = 0; public: @@ -33,18 +33,18 @@ public: LerpBlendType& operator=(const LerpBlendType&); public: // now for typehandle stuff - static TypeHandle get_class_type(void) { + static TypeHandle get_class_type() { return _type_handle; } - static void init_type(void) { + static void init_type() { TypedReferenceCount::init_type(); register_type(_type_handle, "LerpBlendType", TypedReferenceCount::get_class_type()); } - virtual TypeHandle get_type(void) const { + virtual TypeHandle get_type() const { return get_class_type(); } - virtual TypeHandle force_init_type(void) { + virtual TypeHandle force_init_type() { init_type(); return get_class_type(); } @@ -54,8 +54,8 @@ private: class EXPCL_PANDA EaseInBlendType : public LerpBlendType { PUBLISHED: - EaseInBlendType(void) {} - virtual ~EaseInBlendType(void); + EaseInBlendType() {} + virtual ~EaseInBlendType(); virtual float operator()(float); public: @@ -63,18 +63,18 @@ public: EaseInBlendType& operator=(const EaseInBlendType&); public: // now for typehandle stuff - static TypeHandle get_class_type(void) { + static TypeHandle get_class_type() { return _type_handle; } - static void init_type(void) { + static void init_type() { TypedReferenceCount::init_type(); register_type(_type_handle, "EaseInBlendType", LerpBlendType::get_class_type()); } - virtual TypeHandle get_type(void) const { + virtual TypeHandle get_type() const { return get_class_type(); } - virtual TypeHandle force_init_type(void) { + virtual TypeHandle force_init_type() { init_type(); return get_class_type(); } @@ -84,8 +84,8 @@ private: class EXPCL_PANDA EaseOutBlendType : public LerpBlendType { PUBLISHED: - EaseOutBlendType(void) {} - virtual ~EaseOutBlendType(void); + EaseOutBlendType() {} + virtual ~EaseOutBlendType(); virtual float operator()(float); public: @@ -93,18 +93,18 @@ public: EaseOutBlendType& operator=(const EaseOutBlendType&); public: // now for typehandle stuff - static TypeHandle get_class_type(void) { + static TypeHandle get_class_type() { return _type_handle; } - static void init_type(void) { + static void init_type() { TypedReferenceCount::init_type(); register_type(_type_handle, "EaseOutBlendType", LerpBlendType::get_class_type()); } - virtual TypeHandle get_type(void) const { + virtual TypeHandle get_type() const { return get_class_type(); } - virtual TypeHandle force_init_type(void) { + virtual TypeHandle force_init_type() { init_type(); return get_class_type(); } @@ -114,26 +114,26 @@ private: class EXPCL_PANDA EaseInOutBlendType : public LerpBlendType { PUBLISHED: - EaseInOutBlendType(void) {} - virtual ~EaseInOutBlendType(void); + EaseInOutBlendType() {} + virtual ~EaseInOutBlendType(); virtual float operator()(float); public: EaseInOutBlendType(const EaseInOutBlendType&); EaseInOutBlendType& operator=(const EaseInOutBlendType&); public: // now for typehandle stuff - static TypeHandle get_class_type(void) { + static TypeHandle get_class_type() { return _type_handle; } - static void init_type(void) { + static void init_type() { TypedReferenceCount::init_type(); register_type(_type_handle, "EaseInOutBlendType", LerpBlendType::get_class_type()); } - virtual TypeHandle get_type(void) const { + virtual TypeHandle get_type() const { return get_class_type(); } - virtual TypeHandle force_init_type(void) { + virtual TypeHandle force_init_type() { init_type(); return get_class_type(); } @@ -143,26 +143,26 @@ private: class EXPCL_PANDA NoBlendType : public LerpBlendType { PUBLISHED: - NoBlendType(void) {} - virtual ~NoBlendType(void); + NoBlendType() {} + virtual ~NoBlendType(); virtual float operator()(float); public: NoBlendType(const NoBlendType&); NoBlendType& operator=(const NoBlendType&); public: // now for typehandle stuff - static TypeHandle get_class_type(void) { + static TypeHandle get_class_type() { return _type_handle; } - static void init_type(void) { + static void init_type() { TypedReferenceCount::init_type(); register_type(_type_handle, "NoBlendType", LerpBlendType::get_class_type()); } - virtual TypeHandle get_type(void) const { + virtual TypeHandle get_type() const { return get_class_type(); } - virtual TypeHandle force_init_type(void) { + virtual TypeHandle force_init_type() { init_type(); return get_class_type(); } diff --git a/panda/src/lerp/lerpchans.h b/panda/src/lerp/lerpchans.h index 1e94b4628c..4a0fc72d0e 100644 --- a/panda/src/lerp/lerpchans.h +++ b/panda/src/lerp/lerpchans.h @@ -41,9 +41,9 @@ public: } INLINE LerpChannelRange(const LerpChannelRange& c) : _low(c._low), _high(c._high) {} - INLINE ~LerpChannelRange(void) {} - INLINE float GetLow(void) { return _low; } - INLINE float GetHigh(void) { return _high; } + INLINE ~LerpChannelRange() {} + INLINE float GetLow() { return _low; } + INLINE float GetHigh() { return _high; } INLINE void SetLow(float l) { if (l > _high) { _low = _high; diff --git a/panda/src/lerp/lerpfunctor.cxx b/panda/src/lerp/lerpfunctor.cxx index 0a3ecb93b4..3d60fa3860 100644 --- a/panda/src/lerp/lerpfunctor.cxx +++ b/panda/src/lerp/lerpfunctor.cxx @@ -25,7 +25,7 @@ LerpFunctor::LerpFunctor(const LerpFunctor&) { } -LerpFunctor::~LerpFunctor(void) +LerpFunctor::~LerpFunctor() { } @@ -40,7 +40,7 @@ void LerpFunctor::operator()(float) { MultiLerpFunctor::MultiLerpFunctor(const MultiLerpFunctor& c) : LerpFunctor(c), _funcs(c._funcs) {} -MultiLerpFunctor::~MultiLerpFunctor(void) {} +MultiLerpFunctor::~MultiLerpFunctor() {} MultiLerpFunctor& MultiLerpFunctor::operator=(const MultiLerpFunctor& c) { _funcs = c._funcs; diff --git a/panda/src/lerp/lerpfunctor.h b/panda/src/lerp/lerpfunctor.h index c1c04532ca..6959b5c77d 100644 --- a/panda/src/lerp/lerpfunctor.h +++ b/panda/src/lerp/lerpfunctor.h @@ -24,27 +24,27 @@ class EXPCL_PANDA LerpFunctor : public TypedReferenceCount { public: - LerpFunctor(void) {} + LerpFunctor() {} LerpFunctor(const LerpFunctor&); - virtual ~LerpFunctor(void); + virtual ~LerpFunctor(); LerpFunctor& operator=(const LerpFunctor&); virtual void operator()(float) = 0; PUBLISHED: - static TypeHandle get_class_type(void) { + static TypeHandle get_class_type() { return _type_handle; } public: - static void init_type(void) { + static void init_type() { TypedReferenceCount::init_type(); register_type(_type_handle, "LerpFunctor", TypedReferenceCount::get_class_type()); } - virtual TypeHandle get_type(void) const { + virtual TypeHandle get_type() const { return get_class_type(); } - virtual TypeHandle force_init_type(void) { + virtual TypeHandle force_init_type() { init_type(); return get_class_type(); } @@ -64,7 +64,7 @@ protected: {} SimpleLerpFunctor(const SimpleLerpFunctor&); public: - virtual ~SimpleLerpFunctor(void); + virtual ~SimpleLerpFunctor(); SimpleLerpFunctor& operator=(const SimpleLerpFunctor&); virtual void operator()(float); @@ -74,20 +74,20 @@ PUBLISHED: INLINE const value &get_end() const { return _end; } public: - static TypeHandle get_class_type(void) { + static TypeHandle get_class_type() { return _type_handle; } - static void init_type(void) { + static void init_type() { LerpFunctor::init_type(); do_init_type(value); ostringstream os; os << "SimpleLerpFunctor<" << get_type_handle(value).get_name() << ">"; register_type(_type_handle, os.str(), LerpFunctor::get_class_type()); } - virtual TypeHandle get_type(void) const { + virtual TypeHandle get_type() const { return get_class_type(); } - virtual TypeHandle force_init_type(void) { + virtual TypeHandle force_init_type() { init_type(); return get_class_type(); } @@ -109,17 +109,17 @@ protected: public: SimpleQueryLerpFunctor(value start, value end) : SimpleLerpFunctor(start, end) {} - virtual ~SimpleQueryLerpFunctor(void); + virtual ~SimpleQueryLerpFunctor(); SimpleQueryLerpFunctor& operator=(const SimpleQueryLerpFunctor&); virtual void operator()(float); PUBLISHED: - value get_value(void); + value get_value(); - static TypeHandle get_class_type(void) { + static TypeHandle get_class_type() { return _type_handle; } public: - static void init_type(void) { + static void init_type() { SimpleLerpFunctor::init_type(); ostringstream os; os << "SimpleQueryLerpFunctor<" << get_type_handle(value).get_name() @@ -127,10 +127,10 @@ public: register_type(_type_handle, os.str(), SimpleLerpFunctor::get_class_type()); } - virtual TypeHandle get_type(void) const { + virtual TypeHandle get_type() const { return get_class_type(); } - virtual TypeHandle force_init_type(void) { + virtual TypeHandle force_init_type() { init_type(); return get_class_type(); } @@ -199,29 +199,29 @@ private: typedef phash_set< PT(LerpFunctor) > Functors; Functors _funcs; public: - MultiLerpFunctor(void) {} + MultiLerpFunctor() {} MultiLerpFunctor(const MultiLerpFunctor&); - virtual ~MultiLerpFunctor(void); + virtual ~MultiLerpFunctor(); MultiLerpFunctor& operator=(const MultiLerpFunctor&); virtual void operator()(float); void add_functor(LerpFunctor*); void remove_functor(LerpFunctor*); PUBLISHED: - static TypeHandle get_class_type(void) { + static TypeHandle get_class_type() { return _type_handle; } public: - static void init_type(void) { + static void init_type() { LerpFunctor::init_type(); register_type(_type_handle, "MultiLerpFunctor", LerpFunctor::get_class_type()); } - virtual TypeHandle get_type(void) const { + virtual TypeHandle get_type() const { return get_class_type(); } - virtual TypeHandle force_init_type(void) { + virtual TypeHandle force_init_type() { init_type(); return get_class_type(); } @@ -239,7 +239,7 @@ SimpleLerpFunctor::SimpleLerpFunctor(const SimpleLerpFunctor& c) {} template -SimpleLerpFunctor::~SimpleLerpFunctor(void) +SimpleLerpFunctor::~SimpleLerpFunctor() { } @@ -269,7 +269,7 @@ SimpleQueryLerpFunctor::SimpleQueryLerpFunctor(const SimpleQueryLerpFunct */ template -SimpleQueryLerpFunctor::~SimpleQueryLerpFunctor(void) +SimpleQueryLerpFunctor::~SimpleQueryLerpFunctor() { } @@ -287,7 +287,7 @@ void SimpleQueryLerpFunctor::operator()(float t) { } template -value SimpleQueryLerpFunctor::get_value(void) { +value SimpleQueryLerpFunctor::get_value() { return _save; } diff --git a/panda/src/mathutil/frustum_src.I b/panda/src/mathutil/frustum_src.I index 9836ad7754..5137ac6dae 100644 --- a/panda/src/mathutil/frustum_src.I +++ b/panda/src/mathutil/frustum_src.I @@ -36,7 +36,7 @@ FLOATNAME(Frustum)() { // Access: // Description: Sets up a two-dimensional orthographic frustum //////////////////////////////////////////////////////////////////// -INLINE_MATHUTIL void FLOATNAME(Frustum)::make_ortho_2D(void) { +INLINE_MATHUTIL void FLOATNAME(Frustum)::make_ortho_2D() { make_ortho(-1.0f, 1.0f); } diff --git a/panda/src/mathutil/frustum_src.h b/panda/src/mathutil/frustum_src.h index 506349eabf..803457c022 100644 --- a/panda/src/mathutil/frustum_src.h +++ b/panda/src/mathutil/frustum_src.h @@ -24,7 +24,7 @@ class EXPCL_PANDA FLOATNAME(Frustum) { PUBLISHED: INLINE_MATHUTIL FLOATNAME(Frustum)(); - INLINE_MATHUTIL void make_ortho_2D(void); + INLINE_MATHUTIL void make_ortho_2D(); INLINE_MATHUTIL void make_ortho_2D(FLOATTYPE l, FLOATTYPE r, FLOATTYPE t, FLOATTYPE b); INLINE_MATHUTIL void make_ortho(FLOATTYPE fnear, FLOATTYPE ffar); diff --git a/panda/src/particlesystem/colorInterpolationManager.I b/panda/src/particlesystem/colorInterpolationManager.I index 7c63cbf360..3eb6973f2d 100755 --- a/panda/src/particlesystem/colorInterpolationManager.I +++ b/panda/src/particlesystem/colorInterpolationManager.I @@ -25,7 +25,7 @@ //////////////////////////////////////////////////////////////////// INLINE Colorf ColorInterpolationFunctionConstant:: -get_color_a(void) const { +get_color_a() const { return _c_a; } @@ -47,7 +47,7 @@ set_color_a(const Colorf c) { //////////////////////////////////////////////////////////////////// INLINE Colorf ColorInterpolationFunctionLinear:: -get_color_b(void) const { +get_color_b() const { return _c_b; } @@ -69,7 +69,7 @@ set_color_b(const Colorf c) { //////////////////////////////////////////////////////////////////// INLINE float ColorInterpolationFunctionStepwave:: -get_width_a(void) const { +get_width_a() const { return _w_a; } @@ -80,7 +80,7 @@ get_width_a(void) const { //////////////////////////////////////////////////////////////////// INLINE float ColorInterpolationFunctionStepwave:: -get_width_b(void) const { +get_width_b() const { return _w_b; } @@ -115,7 +115,7 @@ set_width_b(const float w) { //////////////////////////////////////////////////////////////////// INLINE float ColorInterpolationFunctionSinusoid:: -get_period(void) const { +get_period() const { return _period; } @@ -139,7 +139,7 @@ set_period(const float p) { //////////////////////////////////////////////////////////////////// INLINE TypedReferenceCount* ColorInterpolationSegment:: -get_function(void) const { +get_function() const { return _color_inter_func; } @@ -152,7 +152,7 @@ get_function(void) const { //////////////////////////////////////////////////////////////////// INLINE float ColorInterpolationSegment:: -get_time_begin(void) const { +get_time_begin() const { return _t_begin; } @@ -165,7 +165,7 @@ get_time_begin(void) const { //////////////////////////////////////////////////////////////////// INLINE float ColorInterpolationSegment:: -get_time_end(void) const { +get_time_end() const { return _t_end; } @@ -176,7 +176,7 @@ get_time_end(void) const { //////////////////////////////////////////////////////////////////// INLINE bool ColorInterpolationSegment:: -is_enabled(void) const { +is_enabled() const { return _enabled; } @@ -188,7 +188,7 @@ is_enabled(void) const { //////////////////////////////////////////////////////////////////// INLINE int ColorInterpolationSegment:: -get_id(void) const { +get_id() const { return _id; } @@ -268,7 +268,7 @@ get_segment(const int seg_id) { //////////////////////////////////////////////////////////////////// INLINE string ColorInterpolationManager:: -get_segment_id_list(void) { +get_segment_id_list() { pvector::iterator iter; ostringstream output; diff --git a/panda/src/particlesystem/colorInterpolationManager.cxx b/panda/src/particlesystem/colorInterpolationManager.cxx index 4ec599c87a..42d0bac26d 100755 --- a/panda/src/particlesystem/colorInterpolationManager.cxx +++ b/panda/src/particlesystem/colorInterpolationManager.cxx @@ -31,7 +31,7 @@ TypeHandle ColorInterpolationFunctionSinusoid::_type_handle; //////////////////////////////////////////////////////////////////// ColorInterpolationFunction:: -ColorInterpolationFunction(void) { +ColorInterpolationFunction() { } //////////////////////////////////////////////////////////////////// @@ -41,7 +41,7 @@ ColorInterpolationFunction(void) { //////////////////////////////////////////////////////////////////// ColorInterpolationFunction:: -~ColorInterpolationFunction(void) { +~ColorInterpolationFunction() { } //////////////////////////////////////////////////////////////////// @@ -51,7 +51,7 @@ ColorInterpolationFunction:: //////////////////////////////////////////////////////////////////// ColorInterpolationFunctionConstant:: -ColorInterpolationFunctionConstant(void) : +ColorInterpolationFunctionConstant() : _c_a(1.0f,1.0f,1.0f,1.0f) { } @@ -84,7 +84,7 @@ interpolate(const float t) const { //////////////////////////////////////////////////////////////////// ColorInterpolationFunctionLinear:: -ColorInterpolationFunctionLinear(void) : +ColorInterpolationFunctionLinear() : _c_b(1.0f,1.0f,1.0f,1.0f) { } @@ -119,7 +119,7 @@ interpolate(const float t) const { //////////////////////////////////////////////////////////////////// ColorInterpolationFunctionStepwave:: -ColorInterpolationFunctionStepwave(void) : +ColorInterpolationFunctionStepwave() : _w_a(0.5f), _w_b(0.5f) { } @@ -161,7 +161,7 @@ interpolate(const float t) const { //////////////////////////////////////////////////////////////////// ColorInterpolationFunctionSinusoid:: -ColorInterpolationFunctionSinusoid(void) : +ColorInterpolationFunctionSinusoid() : _period(1.0f) { } @@ -235,7 +235,7 @@ ColorInterpolationSegment(const ColorInterpolationSegment ©) : //////////////////////////////////////////////////////////////////// ColorInterpolationSegment:: -~ColorInterpolationSegment(void) { +~ColorInterpolationSegment() { } //////////////////////////////////////////////////////////////////// @@ -259,7 +259,7 @@ interpolateColor(const float t) const { //////////////////////////////////////////////////////////////////// ColorInterpolationManager:: -ColorInterpolationManager(void) : +ColorInterpolationManager() : _default_color(Colorf(1.0f,1.0f,1.0f,1.0f)), _id_generator(0) { } @@ -296,7 +296,7 @@ ColorInterpolationManager(const ColorInterpolationManager& copy) : //////////////////////////////////////////////////////////////////// ColorInterpolationManager:: -~ColorInterpolationManager(void) { +~ColorInterpolationManager() { } //////////////////////////////////////////////////////////////////// @@ -394,7 +394,7 @@ clear_segment(const int seg_id) { //////////////////////////////////////////////////////////////////// void ColorInterpolationManager:: -clear_to_initial(void) { +clear_to_initial() { _i_segs.clear(); _id_generator = 0; } diff --git a/panda/src/particlesystem/colorInterpolationManager.h b/panda/src/particlesystem/colorInterpolationManager.h index aa6026b134..d2bb603920 100755 --- a/panda/src/particlesystem/colorInterpolationManager.h +++ b/panda/src/particlesystem/colorInterpolationManager.h @@ -32,11 +32,11 @@ class ColorInterpolationFunction : public TypedReferenceCount { PUBLISHED: -// virtual string get_type(void); +// virtual string get_type(); public: - ColorInterpolationFunction(void); - virtual ~ColorInterpolationFunction(void); + ColorInterpolationFunction(); + virtual ~ColorInterpolationFunction(); virtual Colorf interpolate(const float t = 0) const = 0; @@ -67,17 +67,17 @@ private: class ColorInterpolationFunctionConstant : public ColorInterpolationFunction { PUBLISHED: - INLINE Colorf get_color_a(void) const; + INLINE Colorf get_color_a() const; INLINE void set_color_a(const Colorf c); public: - ColorInterpolationFunctionConstant(void); + ColorInterpolationFunctionConstant(); ColorInterpolationFunctionConstant(const Colorf color_a); protected: virtual Colorf interpolate(const float t = 0) const; - // virtual string get_type(void); + // virtual string get_type(); Colorf _c_a; @@ -108,17 +108,17 @@ private: class ColorInterpolationFunctionLinear : public ColorInterpolationFunctionConstant { PUBLISHED: - INLINE Colorf get_color_b(void) const; + INLINE Colorf get_color_b() const; INLINE void set_color_b(const Colorf c); public: - ColorInterpolationFunctionLinear(void); + ColorInterpolationFunctionLinear(); ColorInterpolationFunctionLinear(const Colorf color_a, const Colorf color_b); protected: Colorf interpolate(const float t = 0) const; - // virtual string get_type(void); + // virtual string get_type(); Colorf _c_b; @@ -152,19 +152,19 @@ private: class ColorInterpolationFunctionStepwave : public ColorInterpolationFunctionLinear { PUBLISHED: - INLINE float get_width_a(void) const; - INLINE float get_width_b(void) const; + INLINE float get_width_a() const; + INLINE float get_width_b() const; INLINE void set_width_a(const float w); INLINE void set_width_b(const float w); public: - ColorInterpolationFunctionStepwave(void); + ColorInterpolationFunctionStepwave(); ColorInterpolationFunctionStepwave(const Colorf color_a, const Colorf color_b, const float width_a, const float width_b); protected: Colorf interpolate(const float t = 0) const; - // virtual string get_type(void); + // virtual string get_type(); float _w_a; float _w_b; @@ -200,17 +200,17 @@ private: class ColorInterpolationFunctionSinusoid : public ColorInterpolationFunctionLinear { PUBLISHED: - INLINE float get_period(void) const; + INLINE float get_period() const; INLINE void set_period(const float p); public: - ColorInterpolationFunctionSinusoid(void); + ColorInterpolationFunctionSinusoid(); ColorInterpolationFunctionSinusoid(const Colorf color_a, const Colorf color_b, const float period); protected: Colorf interpolate(const float t = 0) const; - // virtual string get_type(void); + // virtual string get_type(); float _period; @@ -245,14 +245,14 @@ class ColorInterpolationSegment : public ReferenceCount { PUBLISHED: ColorInterpolationSegment(ColorInterpolationFunction* function, const float &time_begin, const float &time_end, const int id); ColorInterpolationSegment(const ColorInterpolationSegment &s); - virtual ~ColorInterpolationSegment(void); + virtual ~ColorInterpolationSegment(); - // INLINE ColorInterpolationFunction* get_function(void) const; - INLINE TypedReferenceCount* get_function(void) const; - INLINE float get_time_begin(void) const; - INLINE float get_time_end(void) const; - INLINE int get_id(void) const; - INLINE bool is_enabled(void) const; + // INLINE ColorInterpolationFunction* get_function() const; + INLINE TypedReferenceCount* get_function() const; + INLINE float get_time_begin() const; + INLINE float get_time_end() const; + INLINE int get_id() const; + INLINE bool is_enabled() const; INLINE void set_function(ColorInterpolationFunction* function); INLINE void set_time_begin(const float time); @@ -282,10 +282,10 @@ protected: class ColorInterpolationManager : public ReferenceCount { PUBLISHED: -ColorInterpolationManager(void); +ColorInterpolationManager(); ColorInterpolationManager(const Colorf &c); ColorInterpolationManager(const ColorInterpolationManager& copy); - virtual ~ColorInterpolationManager(void); + virtual ~ColorInterpolationManager(); int add_constant(const float time_begin = 0.0f, const float time_end = 1.0f, const Colorf color = Colorf(1.0f,1.0f,1.0f,1.0f)); int add_linear(const float time_begin = 0.0f, const float time_end = 1.0f, const Colorf color_a = Colorf(1.0f,0.0f,0.0f,1.0f), const Colorf color_b = Colorf(0.0f,1.0f,0.0f,1.0f)); @@ -298,9 +298,9 @@ ColorInterpolationManager(void); static ColorInterpolationFunctionSinusoid* downcast_function_to_sinusoid(ColorInterpolationFunction* f); */ INLINE ColorInterpolationSegment* get_segment(const int seg_id); - INLINE string get_segment_id_list(void); + INLINE string get_segment_id_list(); void clear_segment(const int seg_id); - void clear_to_initial(void); + void clear_to_initial(); public: Colorf generateColor(const float interpolated_time); diff --git a/panda/src/particlesystem/discEmitter.I b/panda/src/particlesystem/discEmitter.I index 6547a3f5ac..80e6cc0f96 100644 --- a/panda/src/particlesystem/discEmitter.I +++ b/panda/src/particlesystem/discEmitter.I @@ -89,7 +89,7 @@ set_cubic_lerping(bool clerp) { //////////////////////////////////////////////////////////////////// INLINE float DiscEmitter:: -get_radius(void) const { +get_radius() const { return _radius; } @@ -100,7 +100,7 @@ get_radius(void) const { //////////////////////////////////////////////////////////////////// INLINE float DiscEmitter:: -get_outer_angle(void) const { +get_outer_angle() const { return _outer_aoe; } @@ -111,7 +111,7 @@ get_outer_angle(void) const { //////////////////////////////////////////////////////////////////// INLINE float DiscEmitter:: -get_inner_angle(void) const { +get_inner_angle() const { return _inner_aoe; } @@ -122,7 +122,7 @@ get_inner_angle(void) const { //////////////////////////////////////////////////////////////////// INLINE float DiscEmitter:: -get_outer_magnitude(void) const { +get_outer_magnitude() const { return _outer_magnitude; } @@ -133,7 +133,7 @@ get_outer_magnitude(void) const { //////////////////////////////////////////////////////////////////// INLINE float DiscEmitter:: -get_inner_magnitude(void) const { +get_inner_magnitude() const { return _inner_magnitude; } @@ -144,6 +144,6 @@ get_inner_magnitude(void) const { //////////////////////////////////////////////////////////////////// INLINE bool DiscEmitter:: -get_cubic_lerping(void) const { +get_cubic_lerping() const { return _cubic_lerping; } diff --git a/panda/src/particlesystem/orientedParticleFactory.cxx b/panda/src/particlesystem/orientedParticleFactory.cxx index ac5e300654..154c4f4181 100644 --- a/panda/src/particlesystem/orientedParticleFactory.cxx +++ b/panda/src/particlesystem/orientedParticleFactory.cxx @@ -25,7 +25,7 @@ // Description : Constructor //////////////////////////////////////////////////////////////////// OrientedParticleFactory:: -OrientedParticleFactory(void) : +OrientedParticleFactory() : BaseParticleFactory() { } @@ -47,7 +47,7 @@ OrientedParticleFactory(const OrientedParticleFactory ©) : // Description : destructor //////////////////////////////////////////////////////////////////// OrientedParticleFactory:: -~OrientedParticleFactory(void) { +~OrientedParticleFactory() { } //////////////////////////////////////////////////////////////////// @@ -66,7 +66,7 @@ populate_child_particle(BaseParticle *bp) const { // Description : child particle generation function //////////////////////////////////////////////////////////////////// BaseParticle *OrientedParticleFactory:: -alloc_particle(void) const { +alloc_particle() const { return new OrientedParticle; } diff --git a/panda/src/particlesystem/particleSystem.cxx b/panda/src/particlesystem/particleSystem.cxx index f00f5c1062..1811cd8908 100644 --- a/panda/src/particlesystem/particleSystem.cxx +++ b/panda/src/particlesystem/particleSystem.cxx @@ -117,7 +117,7 @@ ParticleSystem(const ParticleSystem& copy) : // Description : You get the ankles and I'll get the wrists. //////////////////////////////////////////////////////////////////// ParticleSystem:: -~ParticleSystem(void) { +~ParticleSystem() { set_pool_size(0); if (!_template_system_flag) { @@ -135,7 +135,7 @@ ParticleSystem:: // resets an element from the particle pool. //////////////////////////////////////////////////////////////////// bool ParticleSystem:: -birth_particle(void) { +birth_particle() { int pool_index; // make sure there's room for a new particle diff --git a/panda/src/particlesystem/particleSystemManager.I b/panda/src/particlesystem/particleSystemManager.I index dfeb658ff7..461dc14b34 100644 --- a/panda/src/particlesystem/particleSystemManager.I +++ b/panda/src/particlesystem/particleSystemManager.I @@ -32,7 +32,7 @@ set_frame_stepping(int every_nth_frame) { //////////////////////////////////////////////////////////////////// INLINE int ParticleSystemManager:: -get_frame_stepping(void) const { +get_frame_stepping() const { return _nth_frame; } @@ -57,6 +57,6 @@ attach_particlesystem(ParticleSystem *ps) { //////////////////////////////////////////////////////////////////// INLINE void ParticleSystemManager:: -clear(void) { +clear() { _ps_list.erase(_ps_list.begin(), _ps_list.end()); } diff --git a/panda/src/particlesystem/sphereVolumeEmitter.I b/panda/src/particlesystem/sphereVolumeEmitter.I index c6d9ccfc95..a603fdfd1d 100644 --- a/panda/src/particlesystem/sphereVolumeEmitter.I +++ b/panda/src/particlesystem/sphereVolumeEmitter.I @@ -36,6 +36,6 @@ set_radius(float r) { //////////////////////////////////////////////////////////////////// INLINE float SphereVolumeEmitter:: -get_radius(void) const { +get_radius() const { return _radius; } diff --git a/panda/src/particlesystem/spriteParticleRenderer.h b/panda/src/particlesystem/spriteParticleRenderer.h index 1556d1c095..7869e44bc7 100644 --- a/panda/src/particlesystem/spriteParticleRenderer.h +++ b/panda/src/particlesystem/spriteParticleRenderer.h @@ -111,7 +111,7 @@ PUBLISHED: return _source_node; } - int get_num_frames(void) const { + int get_num_frames() const { return textures.size(); } diff --git a/panda/src/particlesystem/tangentRingEmitter.I b/panda/src/particlesystem/tangentRingEmitter.I index 31649816c9..75310a8fcb 100644 --- a/panda/src/particlesystem/tangentRingEmitter.I +++ b/panda/src/particlesystem/tangentRingEmitter.I @@ -39,7 +39,7 @@ set_radius_spread(float spread) { // Access : public //////////////////////////////////////////////////////////////////// INLINE float TangentRingEmitter:: -get_radius(void) const { +get_radius() const { return _radius; } @@ -48,6 +48,6 @@ get_radius(void) const { // Access : public //////////////////////////////////////////////////////////////////// INLINE float TangentRingEmitter:: -get_radius_spread(void) const { +get_radius_spread() const { return _radius_spread; } diff --git a/panda/src/pgraph/loader.h b/panda/src/pgraph/loader.h index 8db00ad3f8..c57859955d 100644 --- a/panda/src/pgraph/loader.h +++ b/panda/src/pgraph/loader.h @@ -81,7 +81,7 @@ private: static void load_file_types(); static bool _file_types_loaded; - virtual bool process_request(void); + virtual bool process_request(); PT(PandaNode) load_file(const Filename &filename, bool search) const; typedef TokenBoard LoaderTokenBoard; diff --git a/panda/src/pgraph/lodNode.I b/panda/src/pgraph/lodNode.I index 56f8e7e3f5..e535053e7d 100644 --- a/panda/src/pgraph/lodNode.I +++ b/panda/src/pgraph/lodNode.I @@ -204,7 +204,7 @@ set_switch(int index, float in, float out) { // children. See add_switch(). //////////////////////////////////////////////////////////////////// INLINE void LODNode:: -clear_switches(void) { +clear_switches() { CDWriter cdata(_cycler); cdata->_switch_vector.clear(); cdata->_lowest = 0; diff --git a/panda/src/pgraph/lodNode.h b/panda/src/pgraph/lodNode.h index c10bb96076..8a01bf5992 100644 --- a/panda/src/pgraph/lodNode.h +++ b/panda/src/pgraph/lodNode.h @@ -55,7 +55,7 @@ PUBLISHED: INLINE void add_switch(float in, float out); INLINE bool set_switch(int index, float in, float out); - INLINE void clear_switches(void); + INLINE void clear_switches(); INLINE int get_num_switches() const; INLINE float get_in(int index) const; diff --git a/panda/src/pgraph/modelNode.h b/panda/src/pgraph/modelNode.h index e93b771b60..eee5e1bc59 100644 --- a/panda/src/pgraph/modelNode.h +++ b/panda/src/pgraph/modelNode.h @@ -86,7 +86,7 @@ public: register_type(_type_handle, "ModelNode", PandaNode::get_class_type()); } - virtual TypeHandle get_type(void) const { + virtual TypeHandle get_type() const { return get_class_type(); } virtual TypeHandle force_init_type() {init_type(); return get_class_type();} diff --git a/panda/src/pgraph/modelRoot.h b/panda/src/pgraph/modelRoot.h index 418c2edd2d..ccb3cce86c 100644 --- a/panda/src/pgraph/modelRoot.h +++ b/panda/src/pgraph/modelRoot.h @@ -59,7 +59,7 @@ public: register_type(_type_handle, "ModelRoot", ModelNode::get_class_type()); } - virtual TypeHandle get_type(void) const { + virtual TypeHandle get_type() const { return get_class_type(); } virtual TypeHandle force_init_type() {init_type(); return get_class_type();} diff --git a/panda/src/pgraph/nodePathLerps.cxx b/panda/src/pgraph/nodePathLerps.cxx index c1d96cd83b..1bfbe96929 100644 --- a/panda/src/pgraph/nodePathLerps.cxx +++ b/panda/src/pgraph/nodePathLerps.cxx @@ -31,7 +31,7 @@ TypeHandle ColorScaleLerpFunctor::_type_handle; PosLerpFunctor::PosLerpFunctor(const PosLerpFunctor& c) : LPoint3fLerpFunctor(c), _node_path(c._node_path) {} -PosLerpFunctor::~PosLerpFunctor(void) +PosLerpFunctor::~PosLerpFunctor() { } @@ -51,7 +51,7 @@ void PosLerpFunctor::operator()(float t) { HprLerpFunctor::HprLerpFunctor(const HprLerpFunctor& c) : LVecBase3fLerpFunctor(c), _node_path(c._node_path) {} -void HprLerpFunctor::take_shortest(void) { +void HprLerpFunctor::take_shortest() { // so long as these are actually degrees for (int i=0; i!=3; ++i) if (this->_diff_cache[i] < -180.) @@ -61,7 +61,7 @@ void HprLerpFunctor::take_shortest(void) { this->_diff_cache = this->_end - this->_start; } -void HprLerpFunctor::take_longest(void) { +void HprLerpFunctor::take_longest() { // so long as these are actually degrees for (int i=0; i!=3; ++i) if ((this->_diff_cache[i] < 0.) && (this->_diff_cache[i] > -180.)) @@ -71,7 +71,7 @@ void HprLerpFunctor::take_longest(void) { this->_diff_cache = this->_end - this->_start; } -HprLerpFunctor::~HprLerpFunctor(void) +HprLerpFunctor::~HprLerpFunctor() { } @@ -91,7 +91,7 @@ void HprLerpFunctor::operator()(float t) { ScaleLerpFunctor::ScaleLerpFunctor(const ScaleLerpFunctor& c) : LVecBase3fLerpFunctor(c), _node_path(c._node_path) {} -ScaleLerpFunctor::~ScaleLerpFunctor(void) +ScaleLerpFunctor::~ScaleLerpFunctor() { } @@ -111,7 +111,7 @@ void ScaleLerpFunctor::operator()(float t) { ColorLerpFunctor::ColorLerpFunctor(const ColorLerpFunctor& c) : LVecBase4fLerpFunctor(c), _node_path(c._node_path) {} -ColorLerpFunctor::~ColorLerpFunctor(void) +ColorLerpFunctor::~ColorLerpFunctor() { } @@ -129,7 +129,7 @@ void ColorLerpFunctor::operator()(float t) { PosHprLerpFunctor::PosHprLerpFunctor(const PosHprLerpFunctor& c) : LerpFunctor(c), _node_path(c._node_path) {} -void PosHprLerpFunctor::take_shortest(void) { +void PosHprLerpFunctor::take_shortest() { // so long as these are actually degrees for (int i=0; i!=3; ++i) if (this->_hdiff_cache[i] < -180.) @@ -139,7 +139,7 @@ void PosHprLerpFunctor::take_shortest(void) { this->_hdiff_cache = this->_hend - this->_hstart; } -void PosHprLerpFunctor::take_longest(void) { +void PosHprLerpFunctor::take_longest() { // so long as these are actually degrees for (int i=0; i!=3; ++i) if ((this->_hdiff_cache[i] < 0.) && (this->_hdiff_cache[i] > -180.)) @@ -149,7 +149,7 @@ void PosHprLerpFunctor::take_longest(void) { this->_hdiff_cache = this->_hend - this->_hstart; } -PosHprLerpFunctor::~PosHprLerpFunctor(void) +PosHprLerpFunctor::~PosHprLerpFunctor() { } @@ -177,7 +177,7 @@ void PosHprLerpFunctor::operator()(float t) { HprScaleLerpFunctor::HprScaleLerpFunctor(const HprScaleLerpFunctor& c) : LerpFunctor(c), _node_path(c._node_path) {} -void HprScaleLerpFunctor::take_shortest(void) { +void HprScaleLerpFunctor::take_shortest() { // so long as these are actually degrees for (int i=0; i!=3; ++i) if (this->_hdiff_cache[i] < -180.) @@ -187,7 +187,7 @@ void HprScaleLerpFunctor::take_shortest(void) { this->_hdiff_cache = this->_hend - this->_hstart; } -void HprScaleLerpFunctor::take_longest(void) { +void HprScaleLerpFunctor::take_longest() { // so long as these are actually degrees for (int i=0; i!=3; ++i) if ((this->_hdiff_cache[i] < 0.) && (this->_hdiff_cache[i] > -180.)) @@ -197,7 +197,7 @@ void HprScaleLerpFunctor::take_longest(void) { this->_hdiff_cache = this->_hend - this->_hstart; } -HprScaleLerpFunctor::~HprScaleLerpFunctor(void) +HprScaleLerpFunctor::~HprScaleLerpFunctor() { } @@ -226,7 +226,7 @@ void HprScaleLerpFunctor::operator()(float t) { PosHprScaleLerpFunctor::PosHprScaleLerpFunctor(const PosHprScaleLerpFunctor& c) : LerpFunctor(c), _node_path(c._node_path) {} -void PosHprScaleLerpFunctor::take_shortest(void) { +void PosHprScaleLerpFunctor::take_shortest() { // so long as these are actually degrees for (int i=0; i!=3; ++i) if (this->_hdiff_cache[i] < -180.) @@ -236,7 +236,7 @@ void PosHprScaleLerpFunctor::take_shortest(void) { this->_hdiff_cache = this->_hend - this->_hstart; } -void PosHprScaleLerpFunctor::take_longest(void) { +void PosHprScaleLerpFunctor::take_longest() { // so long as these are actually degrees for (int i=0; i!=3; ++i) if ((this->_hdiff_cache[i] < 0.) && (this->_hdiff_cache[i] > -180.)) @@ -246,7 +246,7 @@ void PosHprScaleLerpFunctor::take_longest(void) { this->_hdiff_cache = this->_hend - this->_hstart; } -PosHprScaleLerpFunctor::~PosHprScaleLerpFunctor(void) +PosHprScaleLerpFunctor::~PosHprScaleLerpFunctor() { } @@ -279,7 +279,7 @@ void PosHprScaleLerpFunctor::operator()(float t) { ColorScaleLerpFunctor::ColorScaleLerpFunctor(const ColorScaleLerpFunctor& c) : LVecBase4fLerpFunctor(c), _node_path(c._node_path) {} -ColorScaleLerpFunctor::~ColorScaleLerpFunctor(void) +ColorScaleLerpFunctor::~ColorScaleLerpFunctor() { } diff --git a/panda/src/pgraph/nodePathLerps.h b/panda/src/pgraph/nodePathLerps.h index 3682679764..f0c7f96364 100644 --- a/panda/src/pgraph/nodePathLerps.h +++ b/panda/src/pgraph/nodePathLerps.h @@ -51,24 +51,24 @@ PUBLISHED: public: PosLerpFunctor(const PosLerpFunctor&); - virtual ~PosLerpFunctor(void); + virtual ~PosLerpFunctor(); PosLerpFunctor& operator=(const PosLerpFunctor&); virtual void operator()(float); public: // now for typehandle stuff - static TypeHandle get_class_type(void) { + static TypeHandle get_class_type() { return _type_handle; } - static void init_type(void) { + static void init_type() { LPoint3fLerpFunctor::init_type(); register_type(_type_handle, "PosLerpFunctor", LPoint3fLerpFunctor::get_class_type()); } - virtual TypeHandle get_type(void) const { + virtual TypeHandle get_type() const { return get_class_type(); } - virtual TypeHandle force_init_type(void) { + virtual TypeHandle force_init_type() { init_type(); return get_class_type(); } @@ -102,29 +102,29 @@ PUBLISHED: float ez, NodePath wrt) : LVecBase3fLerpFunctor(LVecBase3f(sx, sy, sz), LVecBase3f(ex, ey, ez)), _node_path(np), _is_wrt(true), _wrt_path(wrt) {} - void take_shortest(void); - void take_longest(void); + void take_shortest(); + void take_longest(); public: HprLerpFunctor(const HprLerpFunctor&); - virtual ~HprLerpFunctor(void); + virtual ~HprLerpFunctor(); HprLerpFunctor& operator=(const HprLerpFunctor&); virtual void operator()(float); public: // now for typehandle stuff - static TypeHandle get_class_type(void) { + static TypeHandle get_class_type() { return _type_handle; } - static void init_type(void) { + static void init_type() { LVecBase3fLerpFunctor::init_type(); register_type(_type_handle, "HprLerpFunctor", LVecBase3fLerpFunctor::get_class_type()); } - virtual TypeHandle get_type(void) const { + virtual TypeHandle get_type() const { return get_class_type(); } - virtual TypeHandle force_init_type(void) { + virtual TypeHandle force_init_type() { init_type(); return get_class_type(); } @@ -159,24 +159,24 @@ PUBLISHED: public: ScaleLerpFunctor(const ScaleLerpFunctor&); - virtual ~ScaleLerpFunctor(void); + virtual ~ScaleLerpFunctor(); ScaleLerpFunctor& operator=(const ScaleLerpFunctor&); virtual void operator()(float); public: // now for typehandle stuff - static TypeHandle get_class_type(void) { + static TypeHandle get_class_type() { return _type_handle; } - static void init_type(void) { + static void init_type() { LVecBase3fLerpFunctor::init_type(); register_type(_type_handle, "ScaleLerpFunctor", LVecBase3fLerpFunctor::get_class_type()); } - virtual TypeHandle get_type(void) const { + virtual TypeHandle get_type() const { return get_class_type(); } - virtual TypeHandle force_init_type(void) { + virtual TypeHandle force_init_type() { init_type(); return get_class_type(); } @@ -210,24 +210,24 @@ PUBLISHED: public: ColorLerpFunctor(const ColorLerpFunctor&); - virtual ~ColorLerpFunctor(void); + virtual ~ColorLerpFunctor(); ColorLerpFunctor& operator=(const ColorLerpFunctor&); virtual void operator()(float); public: // now for typehandle stuff - static TypeHandle get_class_type(void) { + static TypeHandle get_class_type() { return _type_handle; } - static void init_type(void) { + static void init_type() { LVecBase4fLerpFunctor::init_type(); register_type(_type_handle, "ColorLerpFunctor", LVecBase4fLerpFunctor::get_class_type()); } - virtual TypeHandle get_type(void) const { + virtual TypeHandle get_type() const { return get_class_type(); } - virtual TypeHandle force_init_type(void) { + virtual TypeHandle force_init_type() { init_type(); return get_class_type(); } @@ -277,29 +277,29 @@ PUBLISHED: _pend(pex, pey, pez), _pdiff_cache(_pend-_pstart), _hstart(hsx, hsy, hsz), _hend(hex, hey, hez), _hdiff_cache(_hend - _hstart), _is_wrt(true), _wrt_path(wrt) {} - void take_shortest(void); - void take_longest(void); + void take_shortest(); + void take_longest(); public: PosHprLerpFunctor(const PosHprLerpFunctor&); - virtual ~PosHprLerpFunctor(void); + virtual ~PosHprLerpFunctor(); PosHprLerpFunctor& operator=(const PosHprLerpFunctor&); virtual void operator()(float); public: // now for typehandle stuff - static TypeHandle get_class_type(void) { + static TypeHandle get_class_type() { return _type_handle; } - static void init_type(void) { + static void init_type() { LerpFunctor::init_type(); register_type(_type_handle, "PosHprLerpFunctor", LerpFunctor::get_class_type()); } - virtual TypeHandle get_type(void) const { + virtual TypeHandle get_type() const { return get_class_type(); } - virtual TypeHandle force_init_type(void) { + virtual TypeHandle force_init_type() { init_type(); return get_class_type(); } @@ -354,29 +354,29 @@ PUBLISHED: _hdiff_cache(_hend-_hstart), _sstart(ssx, ssy, ssz), _send(sex, sey, sez), _sdiff_cache(_send-_sstart), _is_wrt(true), _wrt_path(wrt) {} - void take_shortest(void); - void take_longest(void); + void take_shortest(); + void take_longest(); public: HprScaleLerpFunctor(const HprScaleLerpFunctor&); - virtual ~HprScaleLerpFunctor(void); + virtual ~HprScaleLerpFunctor(); HprScaleLerpFunctor& operator=(const HprScaleLerpFunctor&); virtual void operator()(float); public: // now for typehandle stuff - static TypeHandle get_class_type(void) { + static TypeHandle get_class_type() { return _type_handle; } - static void init_type(void) { + static void init_type() { LerpFunctor::init_type(); register_type(_type_handle, "HprScaleLerpFunctor", LerpFunctor::get_class_type()); } - virtual TypeHandle get_type(void) const { + virtual TypeHandle get_type() const { return get_class_type(); } - virtual TypeHandle force_init_type(void) { + virtual TypeHandle force_init_type() { init_type(); return get_class_type(); } @@ -439,29 +439,29 @@ PUBLISHED: _hdiff_cache(_hend-_hstart), _sstart(ssx, ssy, ssz), _send(sex, sey, sez), _sdiff_cache(_send-_sstart), _is_wrt(true), _wrt_path(wrt) {} - void take_shortest(void); - void take_longest(void); + void take_shortest(); + void take_longest(); public: PosHprScaleLerpFunctor(const PosHprScaleLerpFunctor&); - virtual ~PosHprScaleLerpFunctor(void); + virtual ~PosHprScaleLerpFunctor(); PosHprScaleLerpFunctor& operator=(const PosHprScaleLerpFunctor&); virtual void operator()(float); public: // now for typehandle stuff - static TypeHandle get_class_type(void) { + static TypeHandle get_class_type() { return _type_handle; } - static void init_type(void) { + static void init_type() { LerpFunctor::init_type(); register_type(_type_handle, "PosHprScaleLerpFunctor", LerpFunctor::get_class_type()); } - virtual TypeHandle get_type(void) const { + virtual TypeHandle get_type() const { return get_class_type(); } - virtual TypeHandle force_init_type(void) { + virtual TypeHandle force_init_type() { init_type(); return get_class_type(); } @@ -495,24 +495,24 @@ PUBLISHED: public: ColorScaleLerpFunctor(const ColorScaleLerpFunctor&); - virtual ~ColorScaleLerpFunctor(void); + virtual ~ColorScaleLerpFunctor(); ColorScaleLerpFunctor& operator=(const ColorScaleLerpFunctor&); virtual void operator()(float); public: // now for typehandle stuff - static TypeHandle get_class_type(void) { + static TypeHandle get_class_type() { return _type_handle; } - static void init_type(void) { + static void init_type() { LVecBase4fLerpFunctor::init_type(); register_type(_type_handle, "ColorScaleLerpFunctor", LVecBase4fLerpFunctor::get_class_type()); } - virtual TypeHandle get_type(void) const { + virtual TypeHandle get_type() const { return get_class_type(); } - virtual TypeHandle force_init_type(void) { + virtual TypeHandle force_init_type() { init_type(); return get_class_type(); } diff --git a/panda/src/pgraph/portalNode.h b/panda/src/pgraph/portalNode.h index 1861c39b8b..cef25e0795 100755 --- a/panda/src/pgraph/portalNode.h +++ b/panda/src/pgraph/portalNode.h @@ -118,15 +118,15 @@ protected: void fillin(DatagramIterator &scan, BamReader *manager); public: - static TypeHandle get_class_type(void) { + static TypeHandle get_class_type() { return _type_handle; } - static void init_type(void) { + static void init_type() { PandaNode::init_type(); register_type(_type_handle, "PortalNode", PandaNode::get_class_type()); } - virtual TypeHandle get_type(void) const { + virtual TypeHandle get_type() const { return get_class_type(); } virtual TypeHandle force_init_type() {init_type(); return get_class_type();} diff --git a/panda/src/pgraph/shaderAttrib.I b/panda/src/pgraph/shaderAttrib.I index 04d9f4992a..154766634b 100755 --- a/panda/src/pgraph/shaderAttrib.I +++ b/panda/src/pgraph/shaderAttrib.I @@ -23,7 +23,7 @@ // Description: xyz //////////////////////////////////////////////////////////////////// INLINE ShaderAttrib:: -ShaderAttrib(void) { +ShaderAttrib() { } //////////////////////////////////////////////////////////////////// diff --git a/panda/src/pgraph/shaderAttrib.h b/panda/src/pgraph/shaderAttrib.h index cf787c69b1..7553cfc8b8 100755 --- a/panda/src/pgraph/shaderAttrib.h +++ b/panda/src/pgraph/shaderAttrib.h @@ -39,7 +39,7 @@ class EXPCL_PANDA ShaderAttrib: public RenderAttrib { private: - INLINE ShaderAttrib(void); + INLINE ShaderAttrib(); PUBLISHED: static CPT(RenderAttrib) make(ShaderMode *sm); diff --git a/panda/src/pgraph/shaderMode.I b/panda/src/pgraph/shaderMode.I index 00156d52ce..568c2a96cd 100755 --- a/panda/src/pgraph/shaderMode.I +++ b/panda/src/pgraph/shaderMode.I @@ -22,7 +22,7 @@ // Description: initialize a shader arg storage structure. //////////////////////////////////////////////////////////////////// INLINE ShaderModeArg:: -ShaderModeArg(void) { +ShaderModeArg() { _type = SAT_INVALID; } @@ -32,7 +32,7 @@ ShaderModeArg(void) { // Description: delete a shader arg storage structure. //////////////////////////////////////////////////////////////////// INLINE ShaderModeArg:: -~ShaderModeArg(void) { +~ShaderModeArg() { } //////////////////////////////////////////////////////////////////// @@ -41,7 +41,7 @@ INLINE ShaderModeArg:: // Description: Return the Shader associated with this shader mode. //////////////////////////////////////////////////////////////////// INLINE Shader *ShaderMode:: -get_shader(void) { +get_shader() { return _shader; } diff --git a/panda/src/pgraph/shaderMode.h b/panda/src/pgraph/shaderMode.h index 20a872ede0..c7685970b2 100755 --- a/panda/src/pgraph/shaderMode.h +++ b/panda/src/pgraph/shaderMode.h @@ -41,8 +41,8 @@ public: SAT_NODEPATH, }; - INLINE ShaderModeArg(void); - INLINE ~ShaderModeArg(void); + INLINE ShaderModeArg(); + INLINE ~ShaderModeArg(); int _type; NodePath _nvalue; @@ -72,7 +72,7 @@ PUBLISHED: ~ShaderMode(); - INLINE Shader *get_shader(void); + INLINE Shader *get_shader(); // Overloaded set_param to be used based on your param type void set_param(const string &pname, Texture *t); @@ -86,7 +86,7 @@ PUBLISHED: void set_param(const string &pname, LVector3d p3d); void set_param(const string &pname, LVector4d p4d); - static void register_with_read_factory(void); + static void register_with_read_factory(); private: ShaderModeArg *mod_param(const string &pname, int kind); diff --git a/panda/src/physics/config_physics.h b/panda/src/physics/config_physics.h index 65d8cf4d58..95d43c200e 100644 --- a/panda/src/physics/config_physics.h +++ b/panda/src/physics/config_physics.h @@ -57,11 +57,11 @@ extern EXPCL_PANDAPHYSICS void init_libphysics(); // Release build: #undef PHYSICS_DEBUG - #define physics_spam(msg) ((void)0) - #define physics_debug(msg) ((void)0) - #define physics_info(msg) ((void)0) - #define physics_warning(msg) ((void)0) - #define physics_error(msg) ((void)0) + #define physics_spam(msg) (()0) + #define physics_debug(msg) (()0) + #define physics_info(msg) (()0) + #define physics_warning(msg) (()0) + #define physics_error(msg) (()0) #endif //] #define audio_error(msg) \ diff --git a/panda/src/physics/forceNode.I b/panda/src/physics/forceNode.I index 1a62185cac..2c911e7412 100644 --- a/panda/src/physics/forceNode.I +++ b/panda/src/physics/forceNode.I @@ -21,7 +21,7 @@ // Access : public //////////////////////////////////////////////////////////////////// INLINE void ForceNode:: -clear(void) { +clear() { _forces.erase(_forces.begin(), _forces.end()); } diff --git a/panda/src/physics/linearCylinderVortexForce.I b/panda/src/physics/linearCylinderVortexForce.I index 18efac79bd..24274460c0 100644 --- a/panda/src/physics/linearCylinderVortexForce.I +++ b/panda/src/physics/linearCylinderVortexForce.I @@ -48,7 +48,7 @@ set_coef(float coef) { // Access : public //////////////////////////////////////////////////////////////////// INLINE float LinearCylinderVortexForce:: -get_radius(void) const { +get_radius() const { return _radius; } @@ -57,7 +57,7 @@ get_radius(void) const { // Access : public //////////////////////////////////////////////////////////////////// INLINE float LinearCylinderVortexForce:: -get_length(void) const { +get_length() const { return _length; } @@ -66,6 +66,6 @@ get_length(void) const { // Access : public //////////////////////////////////////////////////////////////////// INLINE float LinearCylinderVortexForce:: -get_coef(void) const { +get_coef() const { return _coef; } diff --git a/panda/src/physics/linearCylinderVortexForce.cxx b/panda/src/physics/linearCylinderVortexForce.cxx index 2fa0901965..d690b25d88 100644 --- a/panda/src/physics/linearCylinderVortexForce.cxx +++ b/panda/src/physics/linearCylinderVortexForce.cxx @@ -62,7 +62,7 @@ LinearCylinderVortexForce:: // Description : child copier //////////////////////////////////////////////////////////////////// LinearForce *LinearCylinderVortexForce:: -make_copy(void) { +make_copy() { return new LinearCylinderVortexForce(*this); } diff --git a/panda/src/physics/linearDistanceForce.I b/panda/src/physics/linearDistanceForce.I index 8775bb7746..3c044426a2 100644 --- a/panda/src/physics/linearDistanceForce.I +++ b/panda/src/physics/linearDistanceForce.I @@ -52,7 +52,7 @@ set_force_center(const LPoint3f& p) { // Description : falloff_type query //////////////////////////////////////////////////////////////////// INLINE LinearDistanceForce::FalloffType LinearDistanceForce:: -get_falloff_type(void) const { +get_falloff_type() const { return _falloff; } @@ -62,7 +62,7 @@ get_falloff_type(void) const { // Description : radius query //////////////////////////////////////////////////////////////////// INLINE float LinearDistanceForce:: -get_radius(void) const { +get_radius() const { return _radius; } @@ -72,7 +72,7 @@ get_radius(void) const { // Description : force_center query //////////////////////////////////////////////////////////////////// INLINE LPoint3f LinearDistanceForce:: -get_force_center(void) const { +get_force_center() const { return _force_center; } @@ -82,7 +82,7 @@ get_force_center(void) const { // Description : calculate the term based on falloff //////////////////////////////////////////////////////////////////// INLINE float LinearDistanceForce:: -get_scalar_term(void) const { +get_scalar_term() const { float r = _radius; if (_falloff == FT_ONE_OVER_R_SQUARED) r = r * r; diff --git a/panda/src/physics/linearDistanceForce.cxx b/panda/src/physics/linearDistanceForce.cxx index be592c79d4..fd06ed76b0 100644 --- a/panda/src/physics/linearDistanceForce.cxx +++ b/panda/src/physics/linearDistanceForce.cxx @@ -51,7 +51,7 @@ LinearDistanceForce(const LinearDistanceForce ©) : // Description : destructor //////////////////////////////////////////////////////////////////// LinearDistanceForce:: -~LinearDistanceForce(void) { +~LinearDistanceForce() { } //////////////////////////////////////////////////////////////////// diff --git a/panda/src/physics/linearNoiseForce.cxx b/panda/src/physics/linearNoiseForce.cxx index 1a26b59a64..25a37d69f5 100644 --- a/panda/src/physics/linearNoiseForce.cxx +++ b/panda/src/physics/linearNoiseForce.cxx @@ -39,7 +39,7 @@ TypeHandle LinearNoiseForce::_type_handle; // lattice. //////////////////////////////////////////////////////////////////// void LinearNoiseForce:: -init_noise_tables(void) { +init_noise_tables() { // since this is a repeatable noise function, we always want // to init with the same seed. srand(_random_seed); @@ -93,7 +93,7 @@ LinearNoiseForce:: // Description : copier //////////////////////////////////////////////////////////////////// LinearForce *LinearNoiseForce:: -make_copy(void) { +make_copy() { return new LinearNoiseForce(*this); } diff --git a/panda/src/physics/linearRandomForce.I b/panda/src/physics/linearRandomForce.I index fa2f26d490..c4c0ea9338 100644 --- a/panda/src/physics/linearRandomForce.I +++ b/panda/src/physics/linearRandomForce.I @@ -22,7 +22,7 @@ // Description : generates a random unit vector //////////////////////////////////////////////////////////////////// INLINE LVector3f LinearRandomForce:: -random_unit_vector(void) { +random_unit_vector() { float z, r, theta; z = 1.0f - (2.0f * bounded_rand()); diff --git a/panda/src/physics/linearSourceForce.cxx b/panda/src/physics/linearSourceForce.cxx index 52c2d0cd52..2736b23ff6 100644 --- a/panda/src/physics/linearSourceForce.cxx +++ b/panda/src/physics/linearSourceForce.cxx @@ -67,7 +67,7 @@ LinearSourceForce:: // Description : copier //////////////////////////////////////////////////////////////////// LinearForce *LinearSourceForce:: -make_copy(void) { +make_copy() { return new LinearSourceForce(*this); } diff --git a/panda/src/physics/linearUserDefinedForce.h b/panda/src/physics/linearUserDefinedForce.h index 6327969961..97e6886fb2 100644 --- a/panda/src/physics/linearUserDefinedForce.h +++ b/panda/src/physics/linearUserDefinedForce.h @@ -37,7 +37,7 @@ PUBLISHED: float a = 1.0f, bool md = false); LinearUserDefinedForce(const LinearUserDefinedForce ©); - virtual ~LinearUserDefinedForce(void); + virtual ~LinearUserDefinedForce(); INLINE void set_proc(LVector3f (*proc)(const PhysicsObject *)); @@ -48,18 +48,18 @@ private: LVector3f (*_proc)(const PhysicsObject *po); virtual LVector3f get_child_vector(const PhysicsObject *po); - virtual LinearForce *make_copy(void); + virtual LinearForce *make_copy(); public: - static TypeHandle get_class_type(void) { + static TypeHandle get_class_type() { return _type_handle; } - static void init_type(void) { + static void init_type() { LinearForce::init_type(); register_type(_type_handle, "LinearUserDefinedForce", LinearForce::get_class_type()); } - virtual TypeHandle get_type(void) const { + virtual TypeHandle get_type() const { return get_class_type(); } virtual TypeHandle force_init_type() {init_type(); return get_class_type();} diff --git a/panda/src/physics/physicalNode.I b/panda/src/physics/physicalNode.I index e41cfd00a9..db3237567f 100644 --- a/panda/src/physics/physicalNode.I +++ b/panda/src/physics/physicalNode.I @@ -21,7 +21,7 @@ // Access : public //////////////////////////////////////////////////////////////////// INLINE void PhysicalNode:: -clear(void) { +clear() { _physicals.erase(_physicals.begin(), _physicals.end()); } @@ -41,7 +41,7 @@ get_physical(int index) const { // Access : public //////////////////////////////////////////////////////////////////// INLINE int PhysicalNode:: -get_num_physicals(void) const { +get_num_physicals() const { return _physicals.size(); } diff --git a/panda/src/physics/physicsObject.cxx b/panda/src/physics/physicsObject.cxx index d26b626fa5..a81df36d20 100644 --- a/panda/src/physics/physicsObject.cxx +++ b/panda/src/physics/physicsObject.cxx @@ -29,7 +29,7 @@ TypeHandle PhysicsObject::_type_handle; // Description : Default Constructor //////////////////////////////////////////////////////////////////// PhysicsObject:: -PhysicsObject(void) : +PhysicsObject() : _terminal_velocity(_default_terminal_velocity), _mass(1.0f), _process_me(false), diff --git a/panda/src/pnmimage/pnmFileType.h b/panda/src/pnmimage/pnmFileType.h index 2e0f8de211..2925a3c260 100644 --- a/panda/src/pnmimage/pnmFileType.h +++ b/panda/src/pnmimage/pnmFileType.h @@ -67,7 +67,7 @@ private: // The TypedWritable interface follows. public: - static void register_with_read_factory(void); + static void register_with_read_factory(); virtual void write_datagram(BamWriter *writer, Datagram &datagram); protected: diff --git a/panda/src/pnmimagetypes/pnmFileTypeJPG.h b/panda/src/pnmimagetypes/pnmFileTypeJPG.h index 7a152248b5..fa44cbf949 100644 --- a/panda/src/pnmimagetypes/pnmFileTypeJPG.h +++ b/panda/src/pnmimagetypes/pnmFileTypeJPG.h @@ -70,7 +70,7 @@ public: class Reader : public PNMReader { public: Reader(PNMFileType *type, istream *file, bool owns_file, string magic_number); - ~Reader(void); + ~Reader(); virtual int read_data(xel *array, xelval *alpha); diff --git a/panda/src/putil/bamReader.cxx b/panda/src/putil/bamReader.cxx index d606915772..eeb08e0644 100644 --- a/panda/src/putil/bamReader.cxx +++ b/panda/src/putil/bamReader.cxx @@ -178,7 +178,7 @@ get_aux_data(const string &name) const { // to the directory containing the BAM. //////////////////////////////////////////////////////////////////// const Filename &BamReader:: -get_filename(void) const { +get_filename() const { return _filename; } diff --git a/panda/src/putil/configurable.h b/panda/src/putil/configurable.h index 07eb46fa8f..1cda4d6adf 100644 --- a/panda/src/putil/configurable.h +++ b/panda/src/putil/configurable.h @@ -54,8 +54,8 @@ public: } } - INLINE bool is_dirty(void) const { return _dirty; } - INLINE void make_dirty(void) { _dirty = true; } + INLINE bool is_dirty() const { return _dirty; } + INLINE void make_dirty() { _dirty = true; } private: diff --git a/panda/src/putil/test_bam.cxx b/panda/src/putil/test_bam.cxx index b332a6f621..ccb2bc4940 100644 --- a/panda/src/putil/test_bam.cxx +++ b/panda/src/putil/test_bam.cxx @@ -90,7 +90,7 @@ complete_pointers(TypedWritable **p_list, BamReader *) } void Person:: -print_relationships(void){ +print_relationships(){ nout << "My name is " << _name << endl; if (_bro != NULL) nout << "My brother is " << _bro->name() << endl; @@ -148,7 +148,7 @@ setDaughter(Child* daughter) void Parent:: -print_relationships(void){ +print_relationships(){ Person::print_relationships(); if (_son != NULL) nout << "My son is " << _son->name() << endl; @@ -209,7 +209,7 @@ setMother(Parent* mom) } void Child:: -print_relationships(void){ +print_relationships(){ Person::print_relationships(); if (_dad != NULL) nout << "My dad is " << _dad->name() << endl; diff --git a/panda/src/putil/test_bam.h b/panda/src/putil/test_bam.h index b1228ce5d0..fd9fdea7ac 100644 --- a/panda/src/putil/test_bam.h +++ b/panda/src/putil/test_bam.h @@ -50,17 +50,17 @@ public: void setBrother(Person* bro) {if (bro->isMale()) _bro = bro;} void setSister(Person* sis) {if (!sis->isMale()) _sis = sis;} - bool isMale(void) {return myGender == MALE;} + bool isMale() {return myGender == MALE;} - void print_relationships(void); - string name(void) {return _name;} + void print_relationships(); + string name() {return _name;} private: Person *_bro, *_sis; sex myGender; string _name; public: - Person(void) {} + Person() {} Person(const string &name, const sex Gender) : _name(name), myGender(Gender), _bro((Person*)NULL), _sis((Person*)NULL) { @@ -79,7 +79,7 @@ public: virtual TypeHandle get_type() const { return get_class_type(); } - virtual TypeHandle force_init_type(void) { + virtual TypeHandle force_init_type() { init_type(); return get_class_type(); } @@ -101,13 +101,13 @@ public: void setSon(Child*); void setDaughter(Child*); - void print_relationships(void); + void print_relationships(); private: Child *_son, *_daughter; public: - Parent(void) {} + Parent() {} Parent(const string &name, const sex Gender) : Person(name, Gender) { } @@ -125,7 +125,7 @@ public: virtual TypeHandle get_type() const { return get_class_type(); } - virtual TypeHandle force_init_type(void) { + virtual TypeHandle force_init_type() { init_type(); return get_class_type(); } @@ -147,13 +147,13 @@ public: void setFather(Parent*); void setMother(Parent*); - void print_relationships(void); + void print_relationships(); private: Parent *_dad, *_mom; public: - Child(void) {} + Child() {} Child(const string &name, const sex Gender) : Person(name, Gender) { } @@ -170,7 +170,7 @@ public: virtual TypeHandle get_type() const { return get_class_type(); } - virtual TypeHandle force_init_type(void) { + virtual TypeHandle force_init_type() { init_type(); return get_class_type(); } diff --git a/panda/src/putil/typedWritable.C.template b/panda/src/putil/typedWritable.C.template index e18d64078b..53cc650bba 100644 --- a/panda/src/putil/typedWritable.C.template +++ b/panda/src/putil/typedWritable.C.template @@ -51,7 +51,7 @@ complete_pointers(vector_typedWriteable &p_list, BamReader *manager) // that have to be performed by this object are performed //////////////////////////////////////////////////////////////////// void Generic:: -finalize(void) +finalize() { } @@ -80,7 +80,7 @@ make_Generic(const FactoryParams ¶ms) // Description: Factory method to generate a Generic object //////////////////////////////////////////////////////////////////// void Generic:: -register_with_read_factory(void) +register_with_read_factory() { BamReader::get_factory()->register_factory(get_class_type(), make_Generic); } diff --git a/panda/src/putil/typedWritable.h b/panda/src/putil/typedWritable.h index 8474a2d839..a26eb22cb1 100644 --- a/panda/src/putil/typedWritable.h +++ b/panda/src/putil/typedWritable.h @@ -77,7 +77,7 @@ public: virtual TypeHandle get_type() const { return get_class_type(); } - virtual TypeHandle force_init_type(void) { + virtual TypeHandle force_init_type() { init_type(); return get_class_type(); } diff --git a/panda/src/putil/typedWritable.h.template b/panda/src/putil/typedWritable.h.template index de9cd2bceb..9d6ed2200d 100644 --- a/panda/src/putil/typedWritable.h.template +++ b/panda/src/putil/typedWritable.h.template @@ -5,11 +5,11 @@ class BamReader; //FOR H FILES public: - static void register_with_read_factory(void); + static void register_with_read_factory(); virtual void write_datagram(BamWriter* manager, Datagram &me); virtual int complete_pointers(vector_typedWriteable &p_list, BamReader *manager); - virtual void finalize(void); + virtual void finalize(); static TypedWriteable *make_Generic(const FactoryParams ¶ms); diff --git a/panda/src/putil/writableConfigurable.h b/panda/src/putil/writableConfigurable.h index 2d0cbb45dc..4a379fe350 100644 --- a/panda/src/putil/writableConfigurable.h +++ b/panda/src/putil/writableConfigurable.h @@ -61,8 +61,8 @@ public: } } - INLINE bool is_dirty(void) const { return _dirty; } - INLINE void make_dirty(void) { _dirty = true; } + INLINE bool is_dirty() const { return _dirty; } + INLINE void make_dirty() { _dirty = true; } private: bool _dirty; diff --git a/panda/src/putil/writableParam.I b/panda/src/putil/writableParam.I index 1ff9d0ca22..d5c3164b16 100644 --- a/panda/src/putil/writableParam.I +++ b/panda/src/putil/writableParam.I @@ -45,7 +45,7 @@ WritableParam(const WritableParam ©) : // Description: //////////////////////////////////////////////////////////////////// INLINE WritableParam:: -~WritableParam(void) { +~WritableParam() { } //////////////////////////////////////////////////////////////////// @@ -65,7 +65,7 @@ operator = (const WritableParam &) { // Description: //////////////////////////////////////////////////////////////////// INLINE const Datagram& WritableParam:: -get_datagram(void) { +get_datagram() { return _packet; } diff --git a/panda/src/putil/writableParam.h b/panda/src/putil/writableParam.h index 3830ae2529..412a60be96 100644 --- a/panda/src/putil/writableParam.h +++ b/panda/src/putil/writableParam.h @@ -35,7 +35,7 @@ //////////////////////////////////////////////////////////////////// class EXPCL_PANDA WritableParam : public FactoryParam { public: - INLINE const Datagram &get_datagram(void); + INLINE const Datagram &get_datagram(); private: const Datagram &_packet; diff --git a/panda/src/tform/mouseWatcher.I b/panda/src/tform/mouseWatcher.I index 24303d5a83..04c6c2fe24 100644 --- a/panda/src/tform/mouseWatcher.I +++ b/panda/src/tform/mouseWatcher.I @@ -379,7 +379,7 @@ set_extra_handler(EventHandler *eh) { // can be dealt with much sooner. //////////////////////////////////////////////////////////////////// INLINE EventHandler *MouseWatcher:: -get_extra_handler(void) const { +get_extra_handler() const { return _eh; } diff --git a/panda/src/tform/mouseWatcher.h b/panda/src/tform/mouseWatcher.h index da5037efaf..d336c09417 100644 --- a/panda/src/tform/mouseWatcher.h +++ b/panda/src/tform/mouseWatcher.h @@ -99,7 +99,7 @@ PUBLISHED: INLINE void clear_geometry(); INLINE void set_extra_handler(EventHandler *eh); - INLINE EventHandler *get_extra_handler(void) const; + INLINE EventHandler *get_extra_handler() const; INLINE void set_modifier_buttons(const ModifierButtons &mods); INLINE ModifierButtons get_modifier_buttons() const; diff --git a/panda/src/windisplay/winGraphicsWindow.h b/panda/src/windisplay/winGraphicsWindow.h index 6bb3baf960..abe7f59303 100644 --- a/panda/src/windisplay/winGraphicsWindow.h +++ b/panda/src/windisplay/winGraphicsWindow.h @@ -56,7 +56,7 @@ public: virtual LONG window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam); static LONG WINAPI static_window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam); virtual bool handle_mouse_motion(int x, int y); - virtual void handle_mouse_exit(void); + virtual void handle_mouse_exit(); INLINE HWND get_ime_hwnd();