summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhjk <hjk@qt.io>2019-09-17 16:46:38 +0200
committerhjk <hjk@qt.io>2019-09-18 14:11:51 +0000
commit05906c9be9fa8f6d9f76b32cac86b4035e11a0a5 (patch)
treebf388ab53e1fcbf8f54d02ab6e5db8ec0f9a485b
parente51059c5153463befebb25eacab03d58c25f6abe (diff)
downloadqt-creator-05906c9be9fa8f6d9f76b32cac86b4035e11a0a5.tar.gz
Debugger: Code cosmetics
Change-Id: I8759b5a16385b6abde9680ad6c46be5b0e2abdfc Reviewed-by: Christian Stenger <christian.stenger@qt.io>
-rw-r--r--src/plugins/debugger/debuggermainwindow.cpp2
-rw-r--r--src/plugins/debugger/debuggerplugin.cpp15
2 files changed, 5 insertions, 12 deletions
diff --git a/src/plugins/debugger/debuggermainwindow.cpp b/src/plugins/debugger/debuggermainwindow.cpp
index 44c828122c..2a2d20ff89 100644
--- a/src/plugins/debugger/debuggermainwindow.cpp
+++ b/src/plugins/debugger/debuggermainwindow.cpp
@@ -128,8 +128,6 @@ class DebuggerMainWindowPrivate : public QObject
public:
DebuggerMainWindowPrivate(DebuggerMainWindow *parent);
- void createToolBar();
-
void selectPerspective(Perspective *perspective);
void depopulateCurrentPerspective();
void populateCurrentPerspective();
diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index e354e145a3..d953b5ef71 100644
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -980,8 +980,7 @@ void DebuggerPluginPrivate::parseCommandLineArguments()
QTimer::singleShot(0, this, &DebuggerPluginPrivate::runScheduled);
}
-bool DebuggerPluginPrivate::initialize(const QStringList &arguments,
- QString *errorMessage)
+bool DebuggerPluginPrivate::initialize(const QStringList &arguments, QString *errorMessage)
{
Q_UNUSED(errorMessage)
@@ -1024,12 +1023,8 @@ bool DebuggerPluginPrivate::initialize(const QStringList &arguments,
act->setEnabled(false);
Command *cmd = ActionManager::registerAction(act, Constants::OPEN_MEMORY_EDITOR);
- TaskHub::addCategory(TASK_CATEGORY_DEBUGGER_DEBUGINFO,
- tr("Debug Information"));
- TaskHub::addCategory(TASK_CATEGORY_DEBUGGER_RUNTIME,
- tr("Debugger Runtime"));
-
- QSettings *settings = ICore::settings();
+ TaskHub::addCategory(TASK_CATEGORY_DEBUGGER_DEBUGINFO, tr("Debug Information"));
+ TaskHub::addCategory(TASK_CATEGORY_DEBUGGER_RUNTIME, tr("Debugger Runtime"));
m_debuggerSettings = new DebuggerSettings;
m_debuggerSettings->readSettings();
@@ -1060,7 +1055,7 @@ bool DebuggerPluginPrivate::initialize(const QStringList &arguments,
breakpointManagerView->setIconSize(QSize(10, 10));
breakpointManagerView->setWindowIcon(Icons::BREAKPOINTS.icon());
breakpointManagerView->setSelectionMode(QAbstractItemView::ExtendedSelection);
- breakpointManagerView->setSettings(settings, "Debugger.BreakWindow");
+ breakpointManagerView->setSettings(ICore::settings(), "Debugger.BreakWindow");
breakpointManagerView->setRootIsDecorated(true);
breakpointManagerView->setModel(BreakpointManager::model());
breakpointManagerView->setSpanColumn(BreakpointFunctionColumn);
@@ -1075,7 +1070,7 @@ bool DebuggerPluginPrivate::initialize(const QStringList &arguments,
// Snapshot
auto engineManagerView = new BaseTreeView;
engineManagerView->setWindowTitle(tr("Running Debuggers"));
- engineManagerView->setSettings(settings, "Debugger.SnapshotView");
+ engineManagerView->setSettings(ICore::settings(), "Debugger.SnapshotView");
engineManagerView->setIconSize(QSize(10, 10));
engineManagerView->setModel(m_engineManager.model());