From 83867b413c449101bbe14615ff857a7785432ede Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Thu, 25 Oct 2018 17:55:27 +0200 Subject: cleanup only - replace warn_unused_result with [[nodiscard]] - remove some redundant w_a_r - replace std::decay with remove_cvref_t - simplify compat/math.hpp --- logic/pipeline.hpp | 7 +------ logic/win32-shortcuts.h | 4 ++-- 2 files changed, 3 insertions(+), 8 deletions(-) (limited to 'logic') diff --git a/logic/pipeline.hpp b/logic/pipeline.hpp index 1cae6db4..91dfc668 100644 --- a/logic/pipeline.hpp +++ b/logic/pipeline.hpp @@ -59,15 +59,10 @@ public: void on_center(); - cc_warn_unused_result euler_t rotate(const rmat& rmat, const euler_t& in, vec3_bool disable) const; - - cc_warn_unused_result + euler_t apply_neck(const rmat& R, int nz, bool disable_tz) const; Pose apply_pipeline(reltrans_state state, const Pose& value, const vec6_bool& disable, bool neck_enable, int neck_z); - - cc_warn_unused_result - euler_t apply_neck(const rmat& R, int nz, bool disable_tz) const; }; using namespace time_units; diff --git a/logic/win32-shortcuts.h b/logic/win32-shortcuts.h index af90472f..afc909ed 100644 --- a/logic/win32-shortcuts.h +++ b/logic/win32-shortcuts.h @@ -13,8 +13,8 @@ struct OTR_LOGIC_EXPORT win_key //win_key(int win, Qt::Key qt) : win(win), qt(qt) {} int win; Qt::Key qt; - static bool from_qt(const QKeySequence& qt_, int& dik, Qt::KeyboardModifiers &mods); - static bool to_qt(const Key& k, QKeySequence& qt_, Qt::KeyboardModifiers &mods); + [[nodiscard]] static bool from_qt(const QKeySequence& qt_, int& dik, Qt::KeyboardModifiers &mods); + [[nodiscard]] static bool to_qt(const Key& k, QKeySequence& qt_, Qt::KeyboardModifiers &mods); }; #endif -- cgit v1.2.3