diff options
| author | David Schulz <david.schulz@qt.io> | 2018-02-02 13:39:18 +0100 |
|---|---|---|
| committer | David Schulz <david.schulz@qt.io> | 2018-02-02 13:15:55 +0000 |
| commit | 0eb7bab20c2c360a2b02a35e9aa076f845ce0185 (patch) | |
| tree | a37fba90e882c52e09a7bbe1bcbbb125cba46ffc /src/plugins/bookmarks | |
| parent | 1611d016a10de4ad450c2d5ef6d5873a984a6c20 (diff) | |
Core: make useMacShortcut constexpr
Change-Id: I293b96428784b6efecac6dae4f2f9690af0027da
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'src/plugins/bookmarks')
| -rw-r--r-- | src/plugins/bookmarks/bookmarkmanager.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/bookmarks/bookmarksplugin.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/bookmarks/bookmarkmanager.cpp b/src/plugins/bookmarks/bookmarkmanager.cpp index 0977134fbd..7397cd96d4 100644 --- a/src/plugins/bookmarks/bookmarkmanager.cpp +++ b/src/plugins/bookmarks/bookmarkmanager.cpp @@ -799,7 +799,7 @@ BookmarkViewFactory::BookmarkViewFactory(BookmarkManager *bm) setDisplayName(BookmarkView::tr("Bookmarks")); setPriority(300); setId("Bookmarks"); - setActivationSequence(QKeySequence(UseMacShortcuts ? tr("Alt+Meta+M") : tr("Alt+M"))); + setActivationSequence(QKeySequence(useMacShortcuts ? tr("Alt+Meta+M") : tr("Alt+M"))); } NavigationView BookmarkViewFactory::createWidget() diff --git a/src/plugins/bookmarks/bookmarksplugin.cpp b/src/plugins/bookmarks/bookmarksplugin.cpp index ddf1984104..8ddd17bcfc 100644 --- a/src/plugins/bookmarks/bookmarksplugin.cpp +++ b/src/plugins/bookmarks/bookmarksplugin.cpp @@ -106,7 +106,7 @@ BookmarksPluginRunData::BookmarksPluginRunData() // Toggle Command *cmd = ActionManager::registerAction(&m_toggleAction, BOOKMARKS_TOGGLE_ACTION, editorManagerContext); - cmd->setDefaultKeySequence(QKeySequence(UseMacShortcuts ? BookmarksPlugin::tr("Meta+M") + cmd->setDefaultKeySequence(QKeySequence(useMacShortcuts ? BookmarksPlugin::tr("Meta+M") : BookmarksPlugin::tr("Ctrl+M"))); mbm->addAction(cmd); @@ -114,13 +114,13 @@ BookmarksPluginRunData::BookmarksPluginRunData() // Previous cmd = ActionManager::registerAction(&m_prevAction, BOOKMARKS_PREV_ACTION, editorManagerContext); - cmd->setDefaultKeySequence(QKeySequence(UseMacShortcuts ? BookmarksPlugin::tr("Meta+,") + cmd->setDefaultKeySequence(QKeySequence(useMacShortcuts ? BookmarksPlugin::tr("Meta+,") : BookmarksPlugin::tr("Ctrl+,"))); mbm->addAction(cmd); // Next cmd = ActionManager::registerAction(&m_nextAction, BOOKMARKS_NEXT_ACTION, editorManagerContext); - cmd->setDefaultKeySequence(QKeySequence(UseMacShortcuts ? BookmarksPlugin::tr("Meta+.") + cmd->setDefaultKeySequence(QKeySequence(useMacShortcuts ? BookmarksPlugin::tr("Meta+.") : BookmarksPlugin::tr("Ctrl+."))); mbm->addAction(cmd); |