History

Enclose entire functions in ifdef

Atlante45 committed 11 years ago

Commit 4ccc2bb1 parent dde11c52 files · +8 −15Browse files

Showing the changes to interface/src/Application.cpp (1 of 2 files). Show all

Unified · Split

interface/src/Application.cpp+5−14
@@ -2304,8 +2304,8 @@ void Application::setActiveFaceTracker() { · 2303 unmodified lines
23042304 #endif
23052305 }
23062306
2307−void Application::setActiveEyeTracker() {
23082307 #ifdef HAVE_IVIEWHMD
2308+void Application::setActiveEyeTracker() {
23092309 auto eyeTracker = DependencyManager::get<EyeTracker>();
23102310 if (!eyeTracker->isInitialized()) {
23112311 return;
@@ -2318,29 +2318,20 @@ void Application::setActiveEyeTracker() { · 6 unmodified lines
23182318 Menu::getInstance()->getActionForOption(MenuOption::OnePointCalibration)->setEnabled(isEyeTracking && !isSimulating);
23192319 Menu::getInstance()->getActionForOption(MenuOption::ThreePointCalibration)->setEnabled(isEyeTracking && !isSimulating);
23202320 Menu::getInstance()->getActionForOption(MenuOption::FivePointCalibration)->setEnabled(isEyeTracking && !isSimulating);
2321−#endif
23222321 }
23232322
23242323 void Application::calibrateEyeTracker1Point() {
2325−#ifdef HAVE_IVIEWHMD
2326− auto eyeTracker = DependencyManager::get<EyeTracker>();
2327− eyeTracker->calibrate(1);
2328−#endif
2324+ DependencyManager::get<EyeTracker>()->calibrate(1);
23292325 }
23302326
23312327 void Application::calibrateEyeTracker3Points() {
2332−#ifdef HAVE_IVIEWHMD
2333− auto eyeTracker = DependencyManager::get<EyeTracker>();
2334− eyeTracker->calibrate(3);
2335−#endif
2328+ DependencyManager::get<EyeTracker>()->calibrate(3);
23362329 }
23372330
23382331 void Application::calibrateEyeTracker5Points() {
2339−#ifdef HAVE_IVIEWHMD
2340− auto eyeTracker = DependencyManager::get<EyeTracker>();
2341− eyeTracker->calibrate(5);
2342−#endif
2332+ DependencyManager::get<EyeTracker>()->calibrate(5);
23432333 }
2334+#endif
23442335
23452336 bool Application::exportEntities(const QString& filename, const QVector<EntityItemID>& entityIDs) {
23462337 QVector<EntityItemPointer> entities;