diff options
| author | David Schulz <david.schulz@qt.io> | 2018-11-28 07:26:14 +0100 |
|---|---|---|
| committer | David Schulz <david.schulz@qt.io> | 2018-11-28 12:29:44 +0000 |
| commit | 95cba448a103eb31f285f945913dab44bdea5c68 (patch) | |
| tree | 32babb3d0ae77267d07ed0dd5a0ddff6ddb35889 /src/plugins/qmljseditor | |
| parent | ccd5955843b08224deb4eebb6355e73b687e569b (diff) | |
move find usages to TextEditor
In preperation for supporting find usages by the language client plugin
Task-number: QTCREATORBUG-21577
Change-Id: I7a6da3a9d53478c1d486e0ddc5829c9ea09a2a20
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
Diffstat (limited to 'src/plugins/qmljseditor')
| -rw-r--r-- | src/plugins/qmljseditor/qmljseditor.h | 2 | ||||
| -rw-r--r-- | src/plugins/qmljseditor/qmljseditorconstants.h | 1 | ||||
| -rw-r--r-- | src/plugins/qmljseditor/qmljseditorplugin.cpp | 12 |
3 files changed, 2 insertions, 13 deletions
diff --git a/src/plugins/qmljseditor/qmljseditor.h b/src/plugins/qmljseditor/qmljseditor.h index 1b2767d43ea..251ab2a8177 100644 --- a/src/plugins/qmljseditor/qmljseditor.h +++ b/src/plugins/qmljseditor/qmljseditor.h @@ -74,7 +74,7 @@ public: void inspectElementUnderCursor() const; - void findUsages(); + void findUsages() override; void renameUsages(); void showContextPane(); diff --git a/src/plugins/qmljseditor/qmljseditorconstants.h b/src/plugins/qmljseditor/qmljseditorconstants.h index 624d3b0b169..ac13c9add5a 100644 --- a/src/plugins/qmljseditor/qmljseditorconstants.h +++ b/src/plugins/qmljseditor/qmljseditorconstants.h @@ -41,7 +41,6 @@ const char C_QMLJSEDITOR_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("OpenWith::Editors", const char TASK_SEARCH[] = "QmlJSEditor.TaskSearch"; const char SETTINGS_CATEGORY_QML[] = "J.QtQuick"; -const char FIND_USAGES[] = "QmlJSEditor.FindUsages"; const char RENAME_USAGES[] = "QmlJSEditor.RenameUsages"; const char RUN_SEMANTIC_SCAN[] = "QmlJSEditor.RunSemanticScan"; const char REFORMAT_FILE[] = "QmlJSEditor.ReformatFile"; diff --git a/src/plugins/qmljseditor/qmljseditorplugin.cpp b/src/plugins/qmljseditor/qmljseditorplugin.cpp index 474e2642ffb..318575956eb 100644 --- a/src/plugins/qmljseditor/qmljseditorplugin.cpp +++ b/src/plugins/qmljseditor/qmljseditorplugin.cpp @@ -81,7 +81,6 @@ public: Command *addToolAction(QAction *a, Context &context, Id id, ActionContainer *c1, const QString &keySequence); - void findUsages(); void renameUsages(); void reformatFile(); void showContextPane(); @@ -157,10 +156,7 @@ QmlJSEditorPluginPrivate::QmlJSEditorPluginPrivate() contextMenu->addAction(cmd); qmlToolsMenu->addAction(cmd); - QAction *findUsagesAction = new QAction(QmlJSEditorPlugin::tr("Find Usages"), this); - cmd = ActionManager::registerAction(findUsagesAction, Constants::FIND_USAGES, context); - cmd->setDefaultKeySequence(QKeySequence(QmlJSEditorPlugin::tr("Ctrl+Shift+U"))); - connect(findUsagesAction, &QAction::triggered, this, &QmlJSEditorPluginPrivate::findUsages); + cmd = ActionManager::command(TextEditor::Constants::FIND_USAGES); contextMenu->addAction(cmd); qmlToolsMenu->addAction(cmd); @@ -243,12 +239,6 @@ QuickToolBar *QmlJSEditorPlugin::quickToolBar() return &m_instance->d->m_quickToolBar; } -void QmlJSEditorPluginPrivate::findUsages() -{ - if (QmlJSEditorWidget *editor = qobject_cast<QmlJSEditorWidget*>(EditorManager::currentEditor()->widget())) - editor->findUsages(); -} - void QmlJSEditorPluginPrivate::renameUsages() { if (QmlJSEditorWidget *editor = qobject_cast<QmlJSEditorWidget*>(EditorManager::currentEditor()->widget())) |