From 9ab1b76484bb38c9594df4b8af08b90f48bb9f4d Mon Sep 17 00:00:00 2001 From: Andrew Meadows Date: Wed, 16 Apr 2014 13:28:54 -0700 Subject: [PATCH] use new Qt connect syntax for compile-time checks --- interface/src/Application.cpp | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 0d0ae262a7..f0e2103743 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -1659,16 +1659,12 @@ void Application::init() { _particleCollisionSystem.init(&_particleEditSender, _particles.getTree(), _voxels.getTree(), &_audio, &_avatarManager); - // connect the _particleCollisionSystem to our script engine's ParticleScriptingInterface - connect(&_particleCollisionSystem, - SIGNAL(particleCollisionWithVoxel(const ParticleID&, const VoxelDetail&, const CollisionInfo&)), - ScriptEngine::getParticlesScriptingInterface(), - SIGNAL(particleCollisionWithVoxel(const ParticleID&, const VoxelDetail&, const CollisionInfo&))); + // connect the _particleCollisionSystem to our script engine's ParticlesScriptingInterface + connect(&_particleCollisionSystem, &ParticleCollisionSystem::particleCollisionWithVoxel, + ScriptEngine::getParticlesScriptingInterface(), &ParticlesScriptingInterface::particleCollisionWithVoxel); - connect(&_particleCollisionSystem, - SIGNAL(particleCollisionWithParticle(const ParticleID&, const ParticleID&, const CollisionInfo&)), - ScriptEngine::getParticlesScriptingInterface(), - SIGNAL(particleCollisionWithParticle(const ParticleID&, const ParticleID&, const CollisionInfo&))); + connect(&_particleCollisionSystem, &ParticleCollisionSystem::particleCollisionWithParticle, + ScriptEngine::getParticlesScriptingInterface(), &ParticlesScriptingInterface::particleCollisionWithParticle); _audio.init(_glWidget);