diff options
author | Stanislaw Halik <sthalik@misaki.pl> | 2015-07-20 13:25:33 +0200 |
---|---|---|
committer | Stanislaw Halik <sthalik@misaki.pl> | 2015-07-20 13:25:33 +0200 |
commit | 0c1b4510b3f7a744cc4cad94e0d4dde45925269d (patch) | |
tree | 3fe5d5a56ee4d611c4876059ab7c1eeb8f68f5a4 /ftnoir_tracker_pt/ftnoir_tracker_pt_dialog.cpp | |
parent | fa58baa2bb84fe51a6b835c72a92a7a9050cbf73 (diff) |
cleanup #ifdefs
We're the only maintainer of the PT tracker now, so don't clutter the
file so much.
Diffstat (limited to 'ftnoir_tracker_pt/ftnoir_tracker_pt_dialog.cpp')
-rw-r--r-- | ftnoir_tracker_pt/ftnoir_tracker_pt_dialog.cpp | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/ftnoir_tracker_pt/ftnoir_tracker_pt_dialog.cpp b/ftnoir_tracker_pt/ftnoir_tracker_pt_dialog.cpp index 40262893..9fdab441 100644 --- a/ftnoir_tracker_pt/ftnoir_tracker_pt_dialog.cpp +++ b/ftnoir_tracker_pt/ftnoir_tracker_pt_dialog.cpp @@ -10,12 +10,8 @@ #include <QMessageBox> #include <QDebug> #include <opencv2/core/core.hpp> -#ifndef OPENTRACK_API -# include <boost/shared_ptr.hpp> -#else -# include <memory> -# include "opentrack/camera-names.hpp" -#endif +#include <memory> +#include "opentrack/camera-names.hpp" #include <vector> using namespace std; @@ -28,16 +24,7 @@ TrackerDialog_PT::TrackerDialog_PT() { ui.setupUi( this ); -#ifdef OPENTRACK_API ui.camdevice_combo->addItems(get_camera_names()); -#else - vector<string> device_names; - get_camera_device_names(device_names); - for (vector<string>::iterator iter = device_names.begin(); iter != device_names.end(); ++iter) - { - ui.camdevice_combo->addItem(iter->c_str()); - } -#endif tie_setting(s.camera_name, ui.camdevice_combo); tie_setting(s.cam_res_x, ui.res_x_spin); |