diff options
-rw-r--r-- | src/plugins/debugger/cdb/cdbengine.cpp | 5 | ||||
-rw-r--r-- | src/plugins/debugger/cdb/cdbengine.h | 2 | ||||
-rw-r--r-- | src/plugins/debugger/debuggercore.h | 2 | ||||
-rw-r--r-- | src/plugins/debugger/debuggerengine.cpp | 2 | ||||
-rw-r--r-- | src/plugins/debugger/debuggerengine.h | 2 | ||||
-rw-r--r-- | src/plugins/debugger/debuggerplugin.cpp | 6 | ||||
-rw-r--r-- | src/plugins/debugger/gdb/gdbengine.cpp | 4 | ||||
-rw-r--r-- | src/plugins/debugger/gdb/gdbengine.h | 2 | ||||
-rw-r--r-- | src/plugins/debugger/logwindow.cpp | 5 | ||||
-rw-r--r-- | src/plugins/debugger/pdb/pdbengine.cpp | 4 | ||||
-rw-r--r-- | src/plugins/debugger/pdb/pdbengine.h | 2 | ||||
-rw-r--r-- | src/plugins/debugger/qml/qmlcppengine.cpp | 9 | ||||
-rw-r--r-- | src/plugins/debugger/qml/qmlcppengine.h | 2 | ||||
-rw-r--r-- | src/plugins/debugger/qml/qmlengine.cpp | 6 | ||||
-rw-r--r-- | src/plugins/debugger/qml/qmlengine.h | 2 | ||||
-rw-r--r-- | src/plugins/debugger/script/scriptengine.cpp | 3 | ||||
-rw-r--r-- | src/plugins/debugger/script/scriptengine.h | 2 |
17 files changed, 32 insertions, 28 deletions
diff --git a/src/plugins/debugger/cdb/cdbengine.cpp b/src/plugins/debugger/cdb/cdbengine.cpp index bce3ac19108..0f182f67a70 100644 --- a/src/plugins/debugger/cdb/cdbengine.cpp +++ b/src/plugins/debugger/cdb/cdbengine.cpp @@ -1357,9 +1357,10 @@ void CdbEngine::handleThreads(const CdbExtensionCommandPtr &reply) } } -void CdbEngine::executeDebuggerCommand(const QString &command) +void CdbEngine::executeDebuggerCommand(const QString &command, DebuggerLanguages languages) { - postCommand(command.toLocal8Bit(), QuietCommand); + if (languages & CppLanguage) + postCommand(command.toLocal8Bit(), QuietCommand); } // Post command without callback diff --git a/src/plugins/debugger/cdb/cdbengine.h b/src/plugins/debugger/cdb/cdbengine.h index 2f6a8421a70..2b99ed9d767 100644 --- a/src/plugins/debugger/cdb/cdbengine.h +++ b/src/plugins/debugger/cdb/cdbengine.h @@ -115,7 +115,7 @@ public: virtual void executeRunToFunction(const QString &functionName); virtual void executeJumpToLine(const ContextData &data); virtual void assignValueInDebugger(const WatchData *w, const QString &expr, const QVariant &value); - virtual void executeDebuggerCommand(const QString &command); + virtual void executeDebuggerCommand(const QString &command, DebuggerLanguages languages); virtual void activateFrame(int index); virtual void selectThread(int index); diff --git a/src/plugins/debugger/debuggercore.h b/src/plugins/debugger/debuggercore.h index d54b2cf4208..a1810604ca9 100644 --- a/src/plugins/debugger/debuggercore.h +++ b/src/plugins/debugger/debuggercore.h @@ -118,7 +118,7 @@ public: const QVector<Symbol> &symbols) = 0; virtual void openMemoryEditor() = 0; virtual void languagesChanged() = 0; - virtual void executeDebuggerCommand(const QString &command) = 0; + virtual void executeDebuggerCommand(const QString &command, DebuggerLanguages languages) = 0; virtual bool evaluateScriptExpression(const QString &expression) = 0; virtual Utils::SavedAction *action(int code) const = 0; diff --git a/src/plugins/debugger/debuggerengine.cpp b/src/plugins/debugger/debuggerengine.cpp index 1a53d207c64..23ac6b7b1d5 100644 --- a/src/plugins/debugger/debuggerengine.cpp +++ b/src/plugins/debugger/debuggerengine.cpp @@ -1674,7 +1674,7 @@ void DebuggerEngine::executeJumpToLine(const ContextData &) { } -void DebuggerEngine::executeDebuggerCommand(const QString &) +void DebuggerEngine::executeDebuggerCommand(const QString &, DebuggerLanguages) { showStatusMessage(tr("This debugger cannot handle user input.")); } diff --git a/src/plugins/debugger/debuggerengine.h b/src/plugins/debugger/debuggerengine.h index 8665edd9544..13141e606a5 100644 --- a/src/plugins/debugger/debuggerengine.h +++ b/src/plugins/debugger/debuggerengine.h @@ -362,7 +362,7 @@ protected: virtual void executeRunToLine(const Internal::ContextData &data); virtual void executeRunToFunction(const QString &functionName); virtual void executeJumpToLine(const Internal::ContextData &data); - virtual void executeDebuggerCommand(const QString &command); + virtual void executeDebuggerCommand(const QString &command, DebuggerLanguages languages); virtual bool evaluateScriptExpression(const QString &expression); virtual void frameUp(); diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp index f568d9346c1..e42818bf014 100644 --- a/src/plugins/debugger/debuggerplugin.cpp +++ b/src/plugins/debugger/debuggerplugin.cpp @@ -846,7 +846,7 @@ public slots: void aboutToUnloadSession(); void aboutToSaveSession(); - void executeDebuggerCommand(const QString &command); + void executeDebuggerCommand(const QString &command, DebuggerLanguages languages); bool evaluateScriptExpression(const QString &expression); void coreShutdown(); @@ -2526,10 +2526,10 @@ void DebuggerPluginPrivate::aboutToSaveSession() m_breakHandler->saveSessionData(); } -void DebuggerPluginPrivate::executeDebuggerCommand(const QString &command) +void DebuggerPluginPrivate::executeDebuggerCommand(const QString &command, DebuggerLanguages languages) { if (currentEngine()->acceptsDebuggerCommands()) - currentEngine()->executeDebuggerCommand(command); + currentEngine()->executeDebuggerCommand(command, languages); else showStatusMessage(tr("User commands are not accepted in the current state.")); } diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp index 0b31cef0736..f22c01d58e9 100644 --- a/src/plugins/debugger/gdb/gdbengine.cpp +++ b/src/plugins/debugger/gdb/gdbengine.cpp @@ -1234,8 +1234,10 @@ bool GdbEngine::acceptsDebuggerCommands() const || state() == InferiorUnrunnable; } -void GdbEngine::executeDebuggerCommand(const QString &command) +void GdbEngine::executeDebuggerCommand(const QString &command, DebuggerLanguages languages) { + if (!(languages & CppLanguage)) + return; QTC_CHECK(acceptsDebuggerCommands()); GdbCommand cmd; cmd.command = command.toLatin1(); diff --git a/src/plugins/debugger/gdb/gdbengine.h b/src/plugins/debugger/gdb/gdbengine.h index 48551cd6820..c57d529dc50 100644 --- a/src/plugins/debugger/gdb/gdbengine.h +++ b/src/plugins/debugger/gdb/gdbengine.h @@ -242,7 +242,7 @@ private: ////////// General Interface ////////// virtual void abortDebugger(); virtual bool acceptsDebuggerCommands() const; - virtual void executeDebuggerCommand(const QString &command); + virtual void executeDebuggerCommand(const QString &command, DebuggerLanguages languages); virtual QByteArray qtNamespace() const { return m_dumperHelper.qtNamespace(); } virtual void setQtNamespace(const QByteArray &ns) { return m_dumperHelper.setQtNamespace(ns); } diff --git a/src/plugins/debugger/logwindow.cpp b/src/plugins/debugger/logwindow.cpp index 8c5a9fbd019..13f3d070856 100644 --- a/src/plugins/debugger/logwindow.cpp +++ b/src/plugins/debugger/logwindow.cpp @@ -389,12 +389,13 @@ LogWindow::LogWindow(QWidget *parent) void LogWindow::executeLine() { m_ignoreNextInputEcho = true; - debuggerCore()->executeDebuggerCommand(m_inputText->textCursor().block().text()); + debuggerCore()->executeDebuggerCommand(m_inputText->textCursor().block().text(), + CppLanguage); } void LogWindow::sendCommand() { - debuggerCore()->executeDebuggerCommand(m_commandEdit->text()); + debuggerCore()->executeDebuggerCommand(m_commandEdit->text(), CppLanguage); } void LogWindow::showOutput(int channel, const QString &output) diff --git a/src/plugins/debugger/pdb/pdbengine.cpp b/src/plugins/debugger/pdb/pdbengine.cpp index 84793fcb372..846d82035bc 100644 --- a/src/plugins/debugger/pdb/pdbengine.cpp +++ b/src/plugins/debugger/pdb/pdbengine.cpp @@ -98,8 +98,10 @@ PdbEngine::PdbEngine(const DebuggerStartParameters &startParameters) PdbEngine::~PdbEngine() {} -void PdbEngine::executeDebuggerCommand(const QString &command) +void PdbEngine::executeDebuggerCommand(const QString &command, DebuggerLanguages languages) { + if (!(languages & CppLanguage)) + return; QTC_ASSERT(state() == InferiorStopOk, qDebug() << state()); //XSDEBUG("PdbEngine::executeDebuggerCommand:" << command); if (state() == DebuggerNotReady) { diff --git a/src/plugins/debugger/pdb/pdbengine.h b/src/plugins/debugger/pdb/pdbengine.h index d1370b025a9..fa0ce1d221c 100644 --- a/src/plugins/debugger/pdb/pdbengine.h +++ b/src/plugins/debugger/pdb/pdbengine.h @@ -97,7 +97,7 @@ private: void assignValueInDebugger(const WatchData *data, const QString &expr, const QVariant &value); - void executeDebuggerCommand(const QString &command); + void executeDebuggerCommand(const QString &command, DebuggerLanguages languages); void loadSymbols(const QString &moduleName); void loadAllSymbols(); diff --git a/src/plugins/debugger/qml/qmlcppengine.cpp b/src/plugins/debugger/qml/qmlcppengine.cpp index 890789fe869..91297c9d7de 100644 --- a/src/plugins/debugger/qml/qmlcppengine.cpp +++ b/src/plugins/debugger/qml/qmlcppengine.cpp @@ -409,13 +409,10 @@ void QmlCppEngine::executeJumpToLine(const ContextData &data) d->m_activeEngine->executeJumpToLine(data); } -void QmlCppEngine::executeDebuggerCommand(const QString &command) +void QmlCppEngine::executeDebuggerCommand(const QString &command, DebuggerLanguages languages) { - if (d->m_qmlEngine->state() == InferiorStopOk) { - d->m_qmlEngine->executeDebuggerCommand(command); - } else { - d->m_cppEngine->executeDebuggerCommand(command); - } + d->m_qmlEngine->executeDebuggerCommand(command, languages); + d->m_cppEngine->executeDebuggerCommand(command, languages); } bool QmlCppEngine::evaluateScriptExpression(const QString &expression) diff --git a/src/plugins/debugger/qml/qmlcppengine.h b/src/plugins/debugger/qml/qmlcppengine.h index 7d3483ed0ab..7cd2c10be92 100644 --- a/src/plugins/debugger/qml/qmlcppengine.h +++ b/src/plugins/debugger/qml/qmlcppengine.h @@ -116,7 +116,7 @@ protected: void executeRunToLine(const ContextData &data); void executeRunToFunction(const QString &functionName); void executeJumpToLine(const ContextData &data); - void executeDebuggerCommand(const QString &command); + void executeDebuggerCommand(const QString &command, DebuggerLanguages languages); bool evaluateScriptExpression(const QString &expression); void setupEngine(); diff --git a/src/plugins/debugger/qml/qmlengine.cpp b/src/plugins/debugger/qml/qmlengine.cpp index f0e6ebc5729..c6d96d8c289 100644 --- a/src/plugins/debugger/qml/qmlengine.cpp +++ b/src/plugins/debugger/qml/qmlengine.cpp @@ -1141,9 +1141,9 @@ void QmlEngine::appendDebugOutput(QtMsgType type, const QString &message, qtMessageLogHandler()->appendItem(item); } -void QmlEngine::executeDebuggerCommand(const QString& command) +void QmlEngine::executeDebuggerCommand(const QString &command, DebuggerLanguages languages) { - if (d->m_adapter.activeDebuggerClient()) { + if ((languages & QmlLanguage) && d->m_adapter.activeDebuggerClient()) { d->m_adapter.activeDebuggerClient()->executeDebuggerCommand(command); } } @@ -1183,7 +1183,7 @@ bool QmlEngine::evaluateScriptExpression(const QString& expression) } } } else { - executeDebuggerCommand(expression); + executeDebuggerCommand(expression, QmlLanguage); } } else { didEvaluate = false; diff --git a/src/plugins/debugger/qml/qmlengine.h b/src/plugins/debugger/qml/qmlengine.h index 5a4876b39cb..992c1b20659 100644 --- a/src/plugins/debugger/qml/qmlengine.h +++ b/src/plugins/debugger/qml/qmlengine.h @@ -151,7 +151,7 @@ private: bool supportsThreads() const { return false; } void updateWatchData(const WatchData &data, const WatchUpdateFlags &flags); - void executeDebuggerCommand(const QString &command); + void executeDebuggerCommand(const QString &command, DebuggerLanguages languages); bool evaluateScriptExpression(const QString &expression); bool hasCapability(unsigned) const; diff --git a/src/plugins/debugger/script/scriptengine.cpp b/src/plugins/debugger/script/scriptengine.cpp index 3954997f3ac..16d758f6c90 100644 --- a/src/plugins/debugger/script/scriptengine.cpp +++ b/src/plugins/debugger/script/scriptengine.cpp @@ -214,9 +214,10 @@ ScriptEngine::~ScriptEngine() { } -void ScriptEngine::executeDebuggerCommand(const QString &command) +void ScriptEngine::executeDebuggerCommand(const QString &command, DebuggerLanguages languages) { Q_UNUSED(command) + Q_UNUSED(languages) XSDEBUG("FIXME: ScriptEngine::executeDebuggerCommand()"); } diff --git a/src/plugins/debugger/script/scriptengine.h b/src/plugins/debugger/script/scriptengine.h index df9bd7be993..f2ef4f6ec61 100644 --- a/src/plugins/debugger/script/scriptengine.h +++ b/src/plugins/debugger/script/scriptengine.h @@ -95,7 +95,7 @@ private: void assignValueInDebugger(const WatchData *w, const QString &expr, const QVariant &value); - void executeDebuggerCommand(const QString &command); + void executeDebuggerCommand(const QString &command, DebuggerLanguages languages); void loadSymbols(const QString &moduleName); void loadAllSymbols(); |