diff options
author | Stanislaw Halik <sthalik@misaki.pl> | 2016-09-05 22:09:37 +0200 |
---|---|---|
committer | Stanislaw Halik <sthalik@misaki.pl> | 2016-09-06 04:03:38 +0200 |
commit | aac3d4b4578585b8b3f96685502f2941d492ee1a (patch) | |
tree | b2c75365a41d06c90cb6d74012283f232ed921de /logic | |
parent | 356ec58ae0d51cc04b2d478fdc21b112f7cafb50 (diff) |
{dinput,logic,..}: cleanup
Diffstat (limited to 'logic')
-rw-r--r-- | logic/win32-shortcuts.cpp | 2 | ||||
-rw-r--r-- | logic/work.hpp | 2 |
2 files changed, 2 insertions, 2 deletions
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<unsigned>(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<TrackLogger> make_logger(const main_settings &s); + static std::shared_ptr<TrackLogger> make_logger(const main_settings &s); }; |