Changed emit() to emitParticles() to avoid collision with Qt.

include/osgParticle/Emitter

@@ -27,8 +27,8 @@
 namespace osgParticle
 {
 
-    /**    An abstract base class for particle emitters.
-        Descendant classes must override the <CODE>emit()</CODE> method to generate new particles by
+    /** An abstract base class for particle emitters.
+        Descendant classes must override the <CODE>emitParticles()</CODE> method to generate new particles by
         calling the <CODE>ParticleSystem::createParticle()</CODE> method on the particle system associated
         to the emitter.
     */
@@ -63,7 +63,7 @@ namespace osgParticle
         
         inline void process(double dt);
         
-        virtual void emit(double dt) = 0;
+        virtual void emitParticles(double dt) = 0;
         
         bool _usedeftemp;
         Particle _ptemp;
@@ -94,7 +94,7 @@ namespace osgParticle
 
     inline void Emitter::process(double dt)
     {
-        emit(dt);
+        emitParticles(dt);
     }
 
 

include/osgParticle/ModularEmitter

@@ -86,7 +86,7 @@ namespace osgParticle
         virtual ~ModularEmitter() {}
         ModularEmitter &operator=(const ModularEmitter &) { return *this; }
         
-        virtual void emit(double dt);
+        virtual void emitParticles(double dt);
         
     private:
     

src/osgParticle/ModularEmitter.cpp

@@ -21,7 +21,7 @@ osgParticle::ModularEmitter::ModularEmitter(const ModularEmitter& copy, const os
 {
 }
 
-void osgParticle::ModularEmitter::emit(double dt) 
+void osgParticle::ModularEmitter::emitParticles(double dt)
 {
     ConnectedParticleSystem* cps = dynamic_cast<ConnectedParticleSystem*>(getParticleSystem());