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

some cleanup

Browse Source
This commit is contained in:
hjk
2009-09-17 16:51:27 +02:00
parent eb6776e05e
commit ae2cfdaa53
3 changed files with 23 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -911,7 +911,8 @@ void DebuggerPlugin::extensionsInitialized()
void DebuggerPlugin::attachCmdLinePid()
{
m_manager->showStatusMessage(tr("Attaching to PID %1.").arg(m_cmdLineAttachPid));
const QString crashParameter = m_cmdLineWinCrashEvent ? QString::number(m_cmdLineWinCrashEvent) : QString();
const QString crashParameter =
m_cmdLineWinCrashEvent ? QString::number(m_cmdLineWinCrashEvent) : QString();
attachExternalApplication(m_cmdLineAttachPid, crashParameter);
}
@@ -1171,13 +1172,13 @@ void DebuggerPlugin::showSettingsDialog()
QLatin1String(Debugger::Constants::DEBUGGER_COMMON_SETTINGS_PAGE));
}
static QSharedPointer<RunConfiguration> activeRunConfiguration()
static RunConfigurationPtr activeRunConfiguration()
{
ProjectExplorer::Project *project =
ProjectExplorerPlugin::instance()->currentProject();
if (project)
return project->activeRunConfiguration();
return QSharedPointer<RunConfiguration>();
return RunConfigurationPtr();
}
void DebuggerPlugin::startExternalApplication()
@@ -1203,7 +1204,7 @@ void DebuggerPlugin::startExternalApplication()
if (dlg.breakAtMain())
m_manager->breakByFunctionMain();
QSharedPointer<RunConfiguration> rc = activeRunConfiguration();
RunConfigurationPtr rc = activeRunConfiguration();
if (rc.isNull())
rc = DebuggerRunner::createDefaultRunConfiguration(sp->executable);
@@ -1229,7 +1230,7 @@ void DebuggerPlugin::attachExternalApplication(qint64 pid, const QString &crashP
sp->attachPID = pid;
sp->crashParameter = crashParameter;
sp->startMode = crashParameter.isEmpty() ? AttachExternal : AttachCrashedExternal;
QSharedPointer<RunConfiguration> rc = activeRunConfiguration();
RunConfigurationPtr rc = activeRunConfiguration();
if (rc.isNull())
rc = DebuggerRunner::createDefaultRunConfiguration();
if (RunControl *runControl = m_debuggerRunner
@@ -1254,7 +1255,7 @@ void DebuggerPlugin::attachCore()
sp->executable = dlg.executableFile();
sp->coreFile = dlg.coreFile();
sp->startMode = AttachCore;
QSharedPointer<RunConfiguration> rc = activeRunConfiguration();
RunConfigurationPtr rc = activeRunConfiguration();
if (rc.isNull())
rc = DebuggerRunner::createDefaultRunConfiguration();
if (RunControl *runControl = m_debuggerRunner
@@ -1289,7 +1290,7 @@ void DebuggerPlugin::startRemoteApplication()
if (dlg.useServerStartScript())
sp->serverStartScript = dlg.serverStartScript();
QSharedPointer<RunConfiguration> rc = activeRunConfiguration();
RunConfigurationPtr rc = activeRunConfiguration();
if (rc.isNull())
rc = DebuggerRunner::createDefaultRunConfiguration();
if (RunControl *runControl = m_debuggerRunner
@@ -1325,7 +1326,7 @@ void DebuggerPlugin::attachRemoteTcf()
if (dlg.useServerStartScript())
sp->serverStartScript = dlg.serverStartScript();
QSharedPointer<RunConfiguration> rc = activeRunConfiguration();
RunConfigurationPtr rc = activeRunConfiguration();
if (rc.isNull())
rc = DebuggerRunner::createDefaultRunConfiguration();
if (RunControl *runControl = m_debuggerRunner