summaryrefslogtreecommitdiff
path: root/src/plugins/projectexplorer/projectwindow.cpp
diff options
context:
space:
mode:
authordt <qtc-committer@nokia.com>2009-10-08 18:37:18 +0200
committerdt <qtc-committer@nokia.com>2009-11-19 16:35:18 +0100
commit10a0647ddf5d3f80808cc311617410f4eb4eeeff (patch)
treeca0487dcc9b0cc45af883b039c0fec74e110ab0a /src/plugins/projectexplorer/projectwindow.cpp
parent8adef29bf61ed55c045e53b5c81cc038a82ad57d (diff)
downloadqt-creator-10a0647ddf5d3f80808cc311617410f4eb4eeeff.tar.gz
Remove QSharedPointer<> for RunConfiguration
Diffstat (limited to 'src/plugins/projectexplorer/projectwindow.cpp')
-rw-r--r--src/plugins/projectexplorer/projectwindow.cpp24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/plugins/projectexplorer/projectwindow.cpp b/src/plugins/projectexplorer/projectwindow.cpp
index 6a6708506c..93d82f5c29 100644
--- a/src/plugins/projectexplorer/projectwindow.cpp
+++ b/src/plugins/projectexplorer/projectwindow.cpp
@@ -244,8 +244,8 @@ RunConfigurationComboBox::RunConfigurationComboBox(QWidget *parent)
// Connect
foreach(Project *p, session->projects()) {
- foreach(const QSharedPointer<RunConfiguration> &rc, p->runConfigurations()) {
- connect(rc.data(), SIGNAL(nameChanged()), this, SLOT(rebuildTree()));
+ foreach(RunConfiguration *rc, p->runConfigurations()) {
+ connect(rc, SIGNAL(nameChanged()), this, SLOT(rebuildTree()));
}
connectToProject(p);
}
@@ -314,7 +314,7 @@ void RunConfigurationComboBox::activeItemChanged(int index)
QList<Project *> projects = session->projects();
if (pair.first < projects.count()) {
Project *p = projects.at(pair.first);
- QList<QSharedPointer<RunConfiguration> > runconfigurations = p->runConfigurations();
+ QList<RunConfiguration *> runconfigurations = p->runConfigurations();
if (pair.second < runconfigurations.count()) {
session->setStartupProject(p);
p->setActiveRunConfiguration(runconfigurations.at(pair.second));
@@ -345,15 +345,15 @@ void RunConfigurationComboBox::activeRunConfigurationChanged()
void RunConfigurationComboBox::addedRunConfiguration(ProjectExplorer::Project *p, const QString &name)
{
- QSharedPointer<RunConfiguration> runConfiguration = QSharedPointer<RunConfiguration>(0);
- foreach(QSharedPointer<RunConfiguration> rc, p->runConfigurations()) {
+ RunConfiguration *runConfiguration = 0;
+ foreach(RunConfiguration *rc, p->runConfigurations()) {
if (rc->name() == name) {
runConfiguration = rc;
break;
}
}
if (runConfiguration) {
- connect(runConfiguration.data(), SIGNAL(nameChanged()),
+ connect(runConfiguration, SIGNAL(nameChanged()),
this, SLOT(rebuildTree()));
}
rebuildTree();
@@ -361,15 +361,15 @@ void RunConfigurationComboBox::addedRunConfiguration(ProjectExplorer::Project *p
void RunConfigurationComboBox::removedRunConfiguration(ProjectExplorer::Project *p, const QString &name)
{
- QSharedPointer<RunConfiguration> runConfiguration = QSharedPointer<RunConfiguration>(0);
- foreach(QSharedPointer<RunConfiguration> rc, p->runConfigurations()) {
+ RunConfiguration *runConfiguration = 0;
+ foreach(RunConfiguration *rc, p->runConfigurations()) {
if (rc->name() == name) {
runConfiguration = rc;
break;
}
}
if (runConfiguration) {
- disconnect(runConfiguration.data(), SIGNAL(nameChanged()),
+ disconnect(runConfiguration, SIGNAL(nameChanged()),
this, SLOT(rebuildTree()));
}
@@ -379,8 +379,8 @@ void RunConfigurationComboBox::removedRunConfiguration(ProjectExplorer::Project
void RunConfigurationComboBox::projectAdded(ProjectExplorer::Project *p)
{
rebuildTree();
- foreach(const QSharedPointer<RunConfiguration> &rc, p->runConfigurations())
- connect(rc.data(), SIGNAL(nameChanged()), this, SLOT(rebuildTree()));
+ foreach(RunConfiguration *rc, p->runConfigurations())
+ connect(rc, SIGNAL(nameChanged()), this, SLOT(rebuildTree()));
connectToProject(p);
}
@@ -419,7 +419,7 @@ void RunConfigurationComboBox::rebuildTree()
Project *startupProject = session->startupProject();
foreach(Project *p, session->projects()) {
addItem(p->name(), QVariant(0));
- foreach(QSharedPointer<RunConfiguration> rc, p->runConfigurations()) {
+ foreach(RunConfiguration *rc, p->runConfigurations()) {
addItem(" " + rc->name(), QVariant(1));
if ((startupProject == p) && (p->activeRunConfiguration() == rc)){
setCurrentIndex(count() - 1);