feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Debugger: Replace RunParameter::languagues by individual bools

Browse Source 
There was almost 1:1 overlap with DebuggerRunTool::is{Cpp,Qml}Debugging,
use one version only.

Change-Id: I4a8f2b7005d3f2e440cdab3eaf6ac476af894308
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2017-09-20 16:34:54 +02:00
parent 32b1244b2a
commit 0a226c77b0
5 changed files with 49 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/plugins/debugger/debuggerplugin.cpp
View File

@@ -970,8 +970,6 @@ public:
ActionContainer *m_menu = 0;
QHash<DebuggerLanguage, Core::Context> m_contextsForLanguage;
Project *m_previousProject = 0;
QPointer<Target> m_previousTarget;
QPointer<RunConfiguration> m_previousRunConfiguration;
@@ -1073,11 +1071,6 @@ DebuggerPluginPrivate::DebuggerPluginPrivate(DebuggerPlugin *plugin)
dd = this;
m_plugin = plugin;
// m_toolBars.insert(CppLanguage, 0);
// m_toolBars.insert(QmlLanguage, 0);
m_contextsForLanguage.insert(CppLanguage, Context(C_CPPDEBUGGER));
m_contextsForLanguage.insert(QmlLanguage, Context(C_QMLDEBUGGER));
}
DebuggerPluginPrivate::~DebuggerPluginPrivate()
@@ -2892,11 +2885,9 @@ static QString formatStartParameters(const DebuggerRunParameters &sp)
str << "Start parameters: '" << sp.displayName << "' mode: " << sp.startMode
<< "\nABI: " << sp.toolChainAbi.toString() << '\n';
str << "Languages: ";
if (sp.languages == AnyLanguage)
str << "any ";
if (sp.languages & CppLanguage)
if (sp.isCppDebugging)
str << "c++ ";
if (sp.languages & QmlLanguage)
if (sp.isQmlDebugging)
str << "qml";
str << '\n';
if (!sp.inferior.executable.isEmpty()) {
@@ -3368,17 +3359,19 @@ void DebuggerPluginPrivate::updateActiveLanguages()
{
if (!dd->m_currentRunTool)
return;
const DebuggerLanguages languages = dd->m_currentRunTool->runParameters().languages;
const DebuggerRunParameters &rp = dd->m_currentRunTool->runParameters();
// Id perspective = (languages & QmlLanguage) && !(languages & CppLanguage)
// ? QmlPerspectiveId : CppPerspectiveId;
// m_mainWindow->restorePerspective(perspective);
for (DebuggerLanguage language: {QmlLanguage, CppLanguage}) {
const Context context = m_contextsForLanguage.value(language);
if (languages & language)
ICore::addAdditionalContext(context);
else
ICore::removeAdditionalContext(context);
}
if (rp.isCppDebugging)
ICore::addAdditionalContext(Context(C_CPPDEBUGGER));
else
ICore::removeAdditionalContext(Context(C_CPPDEBUGGER));
if (rp.isQmlDebugging)
ICore::addAdditionalContext(Context(C_QMLDEBUGGER));
else
ICore::removeAdditionalContext(Context(C_QMLDEBUGGER));
}
void DebuggerPluginPrivate::onModeChanged(Id mode)