From aac3d4b4578585b8b3f96685502f2941d492ee1a Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Mon, 5 Sep 2016 22:09:37 +0200 Subject: {dinput,logic,..}: cleanup --- logic/win32-shortcuts.cpp | 2 +- logic/work.hpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'logic') diff --git a/logic/win32-shortcuts.cpp b/logic/win32-shortcuts.cpp index df9145a0..114bb46d 100644 --- a/logic/win32-shortcuts.cpp +++ b/logic/win32-shortcuts.cpp @@ -164,7 +164,7 @@ bool win_key::from_qt(QKeySequence qt_, int& dik, Qt::KeyboardModifiers& mods) { // CAVEAT don't use QVariant::toUInt() or conversion fails const unsigned qt = static_cast(QVariant(qt_).toInt()); - const unsigned our_mods = qt & Qt::KeyboardModifierMask; + const unsigned our_mods = unsigned(qt & Qt::KeyboardModifierMask); { const auto key_ = qt; diff --git a/logic/work.hpp b/logic/work.hpp index b20b1824..bf5b5b15 100644 --- a/logic/work.hpp +++ b/logic/work.hpp @@ -39,5 +39,5 @@ struct OPENTRACK_LOGIC_EXPORT Work void reload_shortcuts(); private: - std::shared_ptr make_logger(const main_settings &s); + static std::shared_ptr make_logger(const main_settings &s); }; -- cgit v1.2.3