summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2014-09-22 19:01:28 +0200
committerStanislaw Halik <sthalik@misaki.pl>2014-09-22 19:01:28 +0200
commitf495b0136faf48d397138272eed683ade26187c9 (patch)
treeec171bcc93829ee74b034667b65667b4adc2828b
parent69236c0317a30bf100ec4f3d0f8e58fdc565a34b (diff)
const constexpr -> constexpr
-rw-r--r--ftnoir_tracker_freepie-udp/ftnoir_tracker_freepie-udp.cpp2
-rw-r--r--ftnoir_tracker_hydra/ftnoir_tracker_hydra.cpp2
-rw-r--r--ftnoir_tracker_joystick/ftnoir_tracker_joystick.h2
-rw-r--r--qfunctionconfigurator/qfunctionconfigurator.cpp6
4 files changed, 6 insertions, 6 deletions
diff --git a/ftnoir_tracker_freepie-udp/ftnoir_tracker_freepie-udp.cpp b/ftnoir_tracker_freepie-udp/ftnoir_tracker_freepie-udp.cpp
index ccc74350..c1faebeb 100644
--- a/ftnoir_tracker_freepie-udp/ftnoir_tracker_freepie-udp.cpp
+++ b/ftnoir_tracker_freepie-udp/ftnoir_tracker_freepie-udp.cpp
@@ -46,7 +46,7 @@ void TrackerImpl::run() {
int flags = data.flags & F::Mask;
- constexpr int minsz = offsetof(decltype(data), raw_rot) + sizeof(decltype(data)::raw_rot);
+ static constexpr int minsz = offsetof(decltype(data), raw_rot) + sizeof(decltype(data)::raw_rot);
const bool flags_came_out_wrong = minsz > sz;
if (flags_came_out_wrong)
diff --git a/ftnoir_tracker_hydra/ftnoir_tracker_hydra.cpp b/ftnoir_tracker_hydra/ftnoir_tracker_hydra.cpp
index a28bd398..03c756f9 100644
--- a/ftnoir_tracker_hydra/ftnoir_tracker_hydra.cpp
+++ b/ftnoir_tracker_hydra/ftnoir_tracker_hydra.cpp
@@ -39,7 +39,7 @@ void Hydra_Tracker::GetHeadPoseData(double *data)
data[TX] = acd.controllers[0].pos[0]/50.0;
data[TY] = acd.controllers[0].pos[1]/50.0;
data[TZ] = acd.controllers[0].pos[2]/50.0;
- constexpr double r2d = 57.295781;
+ static constexpr double r2d = 57.295781;
data[Yaw] = ypr[0] * r2d;
data[Pitch] = ypr[1] * r2d;
data[Roll] = ypr[2] * r2d;
diff --git a/ftnoir_tracker_joystick/ftnoir_tracker_joystick.h b/ftnoir_tracker_joystick/ftnoir_tracker_joystick.h
index 2c2ebb47..04a933db 100644
--- a/ftnoir_tracker_joystick/ftnoir_tracker_joystick.h
+++ b/ftnoir_tracker_joystick/ftnoir_tracker_joystick.h
@@ -53,7 +53,7 @@ public:
DIDEVICEINSTANCE def;
int iter; // XXX bad style
settings s;
- static const constexpr int AXIS_MAX = 65535;
+ static constexpr int AXIS_MAX = 65535;
};
class TrackerControls: public QWidget, public ITrackerDialog
diff --git a/qfunctionconfigurator/qfunctionconfigurator.cpp b/qfunctionconfigurator/qfunctionconfigurator.cpp
index 70f68285..1e5b957c 100644
--- a/qfunctionconfigurator/qfunctionconfigurator.cpp
+++ b/qfunctionconfigurator/qfunctionconfigurator.cpp
@@ -154,7 +154,7 @@ void QFunctionConfigurator::drawFunction()
QPen pen(spline_color, 1.2, Qt::SolidLine);
- static const constexpr double step = 1.02;
+ static constexpr double step = 1.02;
const double max = _config->maxInput();
QPointF prev = point_to_pixel(QPointF(0, 0));
@@ -284,12 +284,12 @@ void QFunctionConfigurator::mouseMoveEvent(QMouseEvent *e)
if (!_config)
return;
- static const constexpr int min_refresh_delay = 25;
+ static constexpr int min_refresh_delay = 25;
if (timer.isValid() && timer.elapsed() < min_refresh_delay)
return;
- static const constexpr int refresh_delay = 50;
+ static constexpr int refresh_delay = 50;
QList<QPointF> points = _config->getPoints();
if (moving_control_point_idx >= 0 && moving_control_point_idx < points.size()) {