Skip to content
Snippets Groups Projects
Commit e2bf0c71 authored by hjk's avatar hjk
Browse files

debugger: remove unneeded parameter to setSimpleDockWidgetArrangement

parent 7d90eefb
No related branches found
No related tags found
No related merge requests found
...@@ -114,7 +114,7 @@ public: ...@@ -114,7 +114,7 @@ public:
void createViewsMenuItems(); void createViewsMenuItems();
bool isQmlCppActive() const; bool isQmlCppActive() const;
bool isQmlActive() const; bool isQmlActive() const;
void setSimpleDockWidgetArrangement(DebuggerLanguages activeLanguages); void setSimpleDockWidgetArrangement();
void updateUi(); void updateUi();
public slots: public slots:
...@@ -628,7 +628,7 @@ void DebuggerMainWindow::readSettings() ...@@ -628,7 +628,7 @@ void DebuggerMainWindow::readSettings()
void DebuggerMainWindowPrivate::resetDebuggerLayout() void DebuggerMainWindowPrivate::resetDebuggerLayout()
{ {
setSimpleDockWidgetArrangement(m_activeDebugLanguages); setSimpleDockWidgetArrangement();
if (isQmlActive()) if (isQmlActive())
m_dockWidgetActiveStateQmlCpp = q->saveSettings(); m_dockWidgetActiveStateQmlCpp = q->saveSettings();
...@@ -678,8 +678,7 @@ QMenu *DebuggerMainWindow::createPopupMenu() ...@@ -678,8 +678,7 @@ QMenu *DebuggerMainWindow::createPopupMenu()
return menu; return menu;
} }
void DebuggerMainWindowPrivate::setSimpleDockWidgetArrangement void DebuggerMainWindowPrivate::setSimpleDockWidgetArrangement()
(DebuggerLanguages activeLanguages)
{ {
QTC_ASSERT(q, return); QTC_ASSERT(q, return);
q->setTrackingEnabled(false); q->setTrackingEnabled(false);
...@@ -716,9 +715,9 @@ void DebuggerMainWindowPrivate::setSimpleDockWidgetArrangement ...@@ -716,9 +715,9 @@ void DebuggerMainWindowPrivate::setSimpleDockWidgetArrangement
dockWidget->hide(); dockWidget->hide();
} }
if ((activeLanguages.testFlag(CppLanguage) if ((m_activeDebugLanguages.testFlag(CppLanguage)
&& !activeLanguages.testFlag(QmlLanguage)) && !m_activeDebugLanguages.testFlag(QmlLanguage))
|| activeLanguages == AnyLanguage) { || m_activeDebugLanguages == AnyLanguage) {
m_stackDock->show(); m_stackDock->show();
m_breakDock->show(); m_breakDock->show();
m_watchDock->show(); m_watchDock->show();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment