From e2bf0c71fb289b7235d1ec3c7ed041ac061be868 Mon Sep 17 00:00:00 2001
From: hjk <qtc-committer@nokia.com>
Date: Fri, 3 Dec 2010 11:09:50 +0100
Subject: [PATCH] debugger: remove unneeded parameter to
setSimpleDockWidgetArrangement
---
src/plugins/debugger/debuggermainwindow.cpp | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/src/plugins/debugger/debuggermainwindow.cpp b/src/plugins/debugger/debuggermainwindow.cpp
index 2f658c64d3a..0e6ec053a62 100644
--- a/src/plugins/debugger/debuggermainwindow.cpp
+++ b/src/plugins/debugger/debuggermainwindow.cpp
@@ -114,7 +114,7 @@ public:
void createViewsMenuItems();
bool isQmlCppActive() const;
bool isQmlActive() const;
- void setSimpleDockWidgetArrangement(DebuggerLanguages activeLanguages);
+ void setSimpleDockWidgetArrangement();
void updateUi();
public slots:
@@ -628,7 +628,7 @@ void DebuggerMainWindow::readSettings()
void DebuggerMainWindowPrivate::resetDebuggerLayout()
{
- setSimpleDockWidgetArrangement(m_activeDebugLanguages);
+ setSimpleDockWidgetArrangement();
if (isQmlActive())
m_dockWidgetActiveStateQmlCpp = q->saveSettings();
@@ -678,8 +678,7 @@ QMenu *DebuggerMainWindow::createPopupMenu()
return menu;
}
-void DebuggerMainWindowPrivate::setSimpleDockWidgetArrangement
- (DebuggerLanguages activeLanguages)
+void DebuggerMainWindowPrivate::setSimpleDockWidgetArrangement()
{
QTC_ASSERT(q, return);
q->setTrackingEnabled(false);
@@ -716,9 +715,9 @@ void DebuggerMainWindowPrivate::setSimpleDockWidgetArrangement
dockWidget->hide();
}
- if ((activeLanguages.testFlag(CppLanguage)
- && !activeLanguages.testFlag(QmlLanguage))
- || activeLanguages == AnyLanguage) {
+ if ((m_activeDebugLanguages.testFlag(CppLanguage)
+ && !m_activeDebugLanguages.testFlag(QmlLanguage))
+ || m_activeDebugLanguages == AnyLanguage) {
m_stackDock->show();
m_breakDock->show();
m_watchDock->show();
--
GitLab