summaryrefslogtreecommitdiff
path: root/src/plugins/qmlinspector
diff options
context:
space:
mode:
authorcon <qtc-committer@nokia.com>2010-04-08 15:21:05 +0200
committercon <qtc-committer@nokia.com>2010-04-08 15:22:40 +0200
commit5892049d652ecf2d1b942be7806b563004b55c09 (patch)
treeac61fc11b59bf53bc6f418259afaa599541d3476 /src/plugins/qmlinspector
parent60b8598676ade05dadbd8114cc0db545890965c6 (diff)
downloadqt-creator-5892049d652ecf2d1b942be7806b563004b55c09.tar.gz
Remove the unused complete this shortcut registered by the qml inspector.
It was conflicting with the normal completion shortcut, and it shouldn't register a new command anyhow. Reviewed-by: Lasse Holmstedt
Diffstat (limited to 'src/plugins/qmlinspector')
-rw-r--r--src/plugins/qmlinspector/components/expressionquerywidget.cpp24
-rw-r--r--src/plugins/qmlinspector/components/expressionquerywidget.h2
-rw-r--r--src/plugins/qmlinspector/qmlinspector.cpp2
3 files changed, 0 insertions, 28 deletions
diff --git a/src/plugins/qmlinspector/components/expressionquerywidget.cpp b/src/plugins/qmlinspector/components/expressionquerywidget.cpp
index 62f6ebcad7..579860bae4 100644
--- a/src/plugins/qmlinspector/components/expressionquerywidget.cpp
+++ b/src/plugins/qmlinspector/components/expressionquerywidget.cpp
@@ -145,30 +145,6 @@ void ExpressionQueryWidget::setFontSettings()
m_lineEdit->setFont(fs.font());
}
-void ExpressionQueryWidget::createCommands(Core::IContext *context)
-{
- Core::ICore *core = Core::ICore::instance();
- Core::ActionManager *am = core->actionManager();
-
- // Add shortcut for invoking automatic completion
- QShortcut *completionShortcut = new QShortcut(m_lineEdit);
- completionShortcut->setWhatsThis(tr("Triggers a completion in this scope"));
- // Make sure the shortcut still works when the completion widget is active
- completionShortcut->setContext(Qt::ApplicationShortcut);
- Core::Command *command = am->registerShortcut(completionShortcut, Qml::Constants::COMPLETE_THIS, context->context());
-#ifndef Q_WS_MAC
- command->setDefaultKeySequence(QKeySequence(tr("Ctrl+Space")));
-#else
- command->setDefaultKeySequence(QKeySequence(tr("Meta+Space")));
-#endif
- connect(completionShortcut, SIGNAL(activated()), this, SLOT(invokeCompletion()));
-}
-
-void ExpressionQueryWidget::invokeCompletion()
-{
- qDebug() << "TODO autocomplete";
-}
-
void ExpressionQueryWidget::setEngineDebug(QDeclarativeEngineDebug *client)
{
m_client = client;
diff --git a/src/plugins/qmlinspector/components/expressionquerywidget.h b/src/plugins/qmlinspector/components/expressionquerywidget.h
index 50ec058b8e..e9127c8596 100644
--- a/src/plugins/qmlinspector/components/expressionquerywidget.h
+++ b/src/plugins/qmlinspector/components/expressionquerywidget.h
@@ -68,7 +68,6 @@ public:
ExpressionQueryWidget(Mode mode = SeparateEntryMode, QDeclarativeEngineDebug *client = 0, QWidget *parent = 0);
- void createCommands(Core::IContext *context);
void setEngineDebug(QDeclarativeEngineDebug *client);
void clear();
@@ -85,7 +84,6 @@ private slots:
void clearTextEditor();
void executeExpression();
void showResult();
- void invokeCompletion();
void changeContextHelpId(const QString &text);
private:
diff --git a/src/plugins/qmlinspector/qmlinspector.cpp b/src/plugins/qmlinspector/qmlinspector.cpp
index cd0d3b5b69..95299a3d5e 100644
--- a/src/plugins/qmlinspector/qmlinspector.cpp
+++ b/src/plugins/qmlinspector/qmlinspector.cpp
@@ -397,8 +397,6 @@ void QmlInspector::createDockWidgets()
core->addContextObject(m_propWatcherContext);
core->addContextObject(m_context);
- m_expressionWidget->createCommands(m_context);
-
connect(m_objectTreeWidget, SIGNAL(contextHelpIdChanged(QString)), m_context,
SLOT(setContextHelpId(QString)));
connect(m_watchTableView, SIGNAL(contextHelpIdChanged(QString)), m_propWatcherContext,