Showing the changes to interface/src/Application.cpp (1 of 4 files). Show all
Unified · Split
| @@ -1350,17 +1350,17 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo · 1349 unmodified lines | |||
| 1350 | connect(overlays, | 1350 | connect(overlays, |
| 1351 | SIGNAL(mousePressOnOverlay(const OverlayID&, const PointerEvent&)), | 1351 | SIGNAL(mousePressOnOverlay(const OverlayID&, const PointerEvent&)), |
| 1352 | DependencyManager::get<ContextOverlayInterface>().data(), | 1352 | DependencyManager::get<ContextOverlayInterface>().data(), |
| 1353 | SLOT(clickContextOverlay(const OverlayID&, const PointerEvent&))); | 1353 | SLOT(contextOverlays_mousePressOnOverlay(const OverlayID&, const PointerEvent&))); |
| 1354 | 1354 | ||
| 1355 | connect(overlays, | 1355 | connect(overlays, |
| 1356 | SIGNAL(hoverEnterOverlay(const OverlayID&, const PointerEvent&)), | 1356 | SIGNAL(hoverEnterOverlay(const OverlayID&, const PointerEvent&)), |
| 1357 | DependencyManager::get<ContextOverlayInterface>().data(), | 1357 | DependencyManager::get<ContextOverlayInterface>().data(), |
| 1358 | SLOT(hoverEnterContextOverlay(const OverlayID&, const PointerEvent&))); | 1358 | SLOT(contextOverlays_hoverEnterOverlay(const OverlayID&, const PointerEvent&))); |
| 1359 | 1359 | ||
| 1360 | connect(overlays, | 1360 | connect(overlays, |
| 1361 | SIGNAL(hoverLeaveOverlay(const OverlayID&, const PointerEvent&)), | 1361 | SIGNAL(hoverLeaveOverlay(const OverlayID&, const PointerEvent&)), |
| 1362 | DependencyManager::get<ContextOverlayInterface>().data(), | 1362 | DependencyManager::get<ContextOverlayInterface>().data(), |
| 1363 | SLOT(hoverLeaveContextOverlay(const OverlayID&, const PointerEvent&))); | 1363 | SLOT(contextOverlays_hoverLeaveOverlay(const OverlayID&, const PointerEvent&))); |
| 1364 | 1364 | ||
| 1365 | // Add periodic checks to send user activity data | 1365 | // Add periodic checks to send user activity data |
| 1366 | static int CHECK_NEARBY_AVATARS_INTERVAL_MS = 10000; | 1366 | static int CHECK_NEARBY_AVATARS_INTERVAL_MS = 10000; |