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

Debugger: Move some constants to more local scopes

Browse Source 
Change-Id: I1b8b7ca594e4425c272ea092d915482f596698b8
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2018-11-09 13:45:48 +01:00
parent 3ca343dd90
commit 05ba1a0ff9
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/debugger/debuggerconstants.h
View File

@@ -50,7 +50,6 @@ const char G_START_QML[] = "Debugger.Group.Start.Qml";
const char INTERRUPT[] = "Debugger.Interrupt"; const char INTERRUPT[] = "Debugger.Interrupt";
const char CONTINUE[] = "Debugger.Continue"; const char CONTINUE[] = "Debugger.Continue";
const char STOP[] = "Debugger.Stop"; const char STOP[] = "Debugger.Stop";
const char HIDDEN_STOP[] = "Debugger.HiddenStop";
const char ABORT[] = "Debugger.Abort"; const char ABORT[] = "Debugger.Abort";
const char STEP[] = "Debugger.StepLine"; const char STEP[] = "Debugger.StepLine";
const char STEPOUT[] = "Debugger.StepOut"; const char STEPOUT[] = "Debugger.StepOut";
@@ -59,11 +58,8 @@ const char RUNTOLINE[] = "Debugger.RunToLine";
const char RUNTOSELECTEDFUNCTION[] = "Debugger.RunToSelectedFunction"; const char RUNTOSELECTEDFUNCTION[] = "Debugger.RunToSelectedFunction";
const char JUMPTOLINE[] = "Debugger.JumpToLine"; const char JUMPTOLINE[] = "Debugger.JumpToLine";
const char RETURNFROMFUNCTION[] = "Debugger.ReturnFromFunction"; const char RETURNFROMFUNCTION[] = "Debugger.ReturnFromFunction";
const char START_AND_BREAK_ON_MAIN[]= "Debugger.StartAndBreakOnMain";
const char REVERSE[] = "Debugger.ReverseDirection";
const char RESET[] = "Debugger.Reset"; const char RESET[] = "Debugger.Reset";
const char DETACH[] = "Debugger.Detach"; const char DETACH[] = "Debugger.Detach";
const char OPERATE_BY_INSTRUCTION[] = "Debugger.OperateByInstruction";
const char QML_SHOW_APP_ON_TOP[] = "Debugger.QmlShowAppOnTop"; const char QML_SHOW_APP_ON_TOP[] = "Debugger.QmlShowAppOnTop";
const char QML_SELECTTOOL[] = "Debugger.QmlSelectTool"; const char QML_SELECTTOOL[] = "Debugger.QmlSelectTool";
const char QML_ZOOMTOOL[] = "Debugger.QmlZoomTool"; const char QML_ZOOMTOOL[] = "Debugger.QmlZoomTool";

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

@@ -1213,7 +1213,7 @@ bool DebuggerPluginPrivate::initialize(const QStringList &arguments,
m_hiddenStopAction.setAttribute(ProxyAction::UpdateText); m_hiddenStopAction.setAttribute(ProxyAction::UpdateText);
m_hiddenStopAction.setAttribute(ProxyAction::UpdateIcon); m_hiddenStopAction.setAttribute(ProxyAction::UpdateIcon);
cmd = ActionManager::registerAction(&m_hiddenStopAction, Constants::HIDDEN_STOP); cmd = ActionManager::registerAction(&m_hiddenStopAction, "Debugger.HiddenStop");
cmd->setDefaultKeySequence(QKeySequence(useMacShortcuts ? tr("Shift+Ctrl+Y") : tr("Shift+F5"))); cmd->setDefaultKeySequence(QKeySequence(useMacShortcuts ? tr("Shift+Ctrl+Y") : tr("Shift+F5")));
act = new QAction(tr("Abort Debugging"), this); act = new QAction(tr("Abort Debugging"), this);
@@ -1232,7 +1232,7 @@ bool DebuggerPluginPrivate::initialize(const QStringList &arguments,
debugMenu->addSeparator(); debugMenu->addSeparator();
cmd = ActionManager::registerAction(&m_startAndBreakOnMain, cmd = ActionManager::registerAction(&m_startAndBreakOnMain,
Constants::START_AND_BREAK_ON_MAIN, "Debugger.StartAndBreakOnMain",
debuggerNotRunning); debuggerNotRunning);
cmd->setDefaultKeySequence(QKeySequence(useMacShortcuts ? tr("Ctrl+Shift+O") : tr("F10"))); cmd->setDefaultKeySequence(QKeySequence(useMacShortcuts ? tr("Ctrl+Shift+O") : tr("F10")));
cmd->setAttribute(Command::CA_Hide); cmd->setAttribute(Command::CA_Hide);