diff options
Diffstat (limited to 'logic')
| -rw-r--r-- | logic/main-settings.hpp | 6 | ||||
| -rw-r--r-- | logic/runtime-libraries.cpp | 6 | ||||
| -rw-r--r-- | logic/win32-shortcuts.cpp | 2 | ||||
| -rw-r--r-- | logic/win32-shortcuts.h | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/logic/main-settings.hpp b/logic/main-settings.hpp index df86f856..b7a9fdce 100644 --- a/logic/main-settings.hpp +++ b/logic/main-settings.hpp @@ -72,6 +72,6 @@ struct OTR_LOGIC_EXPORT main_settings final } // ns main_settings_impl -using main_settings_impl::key_opts; -using main_settings_impl::module_settings; -using main_settings_impl::main_settings; +using key_opts = main_settings_impl::key_opts; +using module_settings = main_settings_impl::module_settings; +using main_settings = main_settings_impl::main_settings; diff --git a/logic/runtime-libraries.cpp b/logic/runtime-libraries.cpp index aa38b032..478b9e0e 100644 --- a/logic/runtime-libraries.cpp +++ b/logic/runtime-libraries.cpp @@ -20,7 +20,7 @@ runtime_libraries::runtime_libraries(QFrame* frame, dylibptr t, dylibptr p, dyli if(status = pProtocol->initialize(), !status.is_ok()) { status = tr("Error occurred while loading protocol %1\n\n%2\n") - .arg(p->name).arg(status.error); + .arg(p->name, status.error); goto end; } @@ -37,14 +37,14 @@ runtime_libraries::runtime_libraries(QFrame* frame, dylibptr t, dylibptr p, dyli if(status = pFilter->initialize(), !status.is_ok()) { status = tr("Error occurred while loading filter %1\n\n%2\n") - .arg(f->name).arg(status.error); + .arg(f->name, status.error); goto end; } if (status = pTracker->start_tracker(frame), !status.is_ok()) { status = tr("Error occurred while loading tracker %1\n\n%2\n") - .arg(t->name).arg(status.error); + .arg(t->name, status.error); goto end; } diff --git a/logic/win32-shortcuts.cpp b/logic/win32-shortcuts.cpp index 11764807..4da86afd 100644 --- a/logic/win32-shortcuts.cpp +++ b/logic/win32-shortcuts.cpp @@ -158,7 +158,7 @@ bool win_key::to_qt(const Key& k, QKeySequence& qt_, Qt::KeyboardModifiers &mods return false; } -bool win_key::from_qt(QKeySequence qt_, int& dik, Qt::KeyboardModifiers& mods) +bool win_key::from_qt(QKeySequence const& qt_, int& dik, Qt::KeyboardModifiers& mods) { // CAVEAT don't use QVariant::toUInt() or conversion fails const unsigned qt = static_cast<unsigned>(QVariant(qt_).toInt()); diff --git a/logic/win32-shortcuts.h b/logic/win32-shortcuts.h index 437d251a..af90472f 100644 --- a/logic/win32-shortcuts.h +++ b/logic/win32-shortcuts.h @@ -13,7 +13,7 @@ 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(QKeySequence qt_, int& dik, Qt::KeyboardModifiers &mods); + static bool from_qt(const QKeySequence& qt_, int& dik, Qt::KeyboardModifiers &mods); static bool to_qt(const Key& k, QKeySequence& qt_, Qt::KeyboardModifiers &mods); }; |