From 46e71d0fe0f6c1b09c712c166b3262c9b17ff1c8 Mon Sep 17 00:00:00 2001
From: dt <qtc-committer@nokia.com>
Date: Tue, 5 May 2009 15:42:52 +0200
Subject: [PATCH] This code can be simplified.
---
src/plugins/git/settingspage.cpp | 5 +---
src/plugins/git/settingspage.h | 2 +-
src/plugins/perforce/settingspage.cpp | 6 +---
src/plugins/perforce/settingspage.h | 2 +-
.../projectexplorer/abstractmakestep.cpp | 1 +
.../projectexplorer/abstractmakestep.h | 3 +-
src/plugins/quickopen/settingspage.cpp | 28 +++++++++----------
src/plugins/quickopen/settingspage.h | 2 +-
src/plugins/subversion/settingspage.cpp | 5 +---
src/plugins/subversion/settingspage.h | 2 +-
src/plugins/vcsbase/vcsbasesettingspage.h | 2 +-
11 files changed, 25 insertions(+), 33 deletions(-)
diff --git a/src/plugins/git/settingspage.cpp b/src/plugins/git/settingspage.cpp
index cc6d06d9b53..7765dee3304 100644
--- a/src/plugins/git/settingspage.cpp
+++ b/src/plugins/git/settingspage.cpp
@@ -97,16 +97,13 @@ QString SettingsPage::trCategory() const
QWidget *SettingsPage::createPage(QWidget *parent)
{
- if (!m_widget)
- m_widget = new SettingsPageWidget(parent);
+ m_widget = new SettingsPageWidget(parent);
m_widget->setSettings(GitPlugin::instance()->settings());
return m_widget;
}
void SettingsPage::apply()
{
- if (!m_widget)
- return;
const GitSettings newSettings = m_widget->settings();
// Warn if git cannot be found in path if the widget is on top
if (m_widget->isVisible()) {
diff --git a/src/plugins/git/settingspage.h b/src/plugins/git/settingspage.h
index ec247d8a896..2bb9c0a8d30 100644
--- a/src/plugins/git/settingspage.h
+++ b/src/plugins/git/settingspage.h
@@ -78,7 +78,7 @@ public:
void finish() { }
private:
- QPointer<SettingsPageWidget> m_widget;
+ SettingsPageWidget* m_widget;
};
} // namespace Internal
diff --git a/src/plugins/perforce/settingspage.cpp b/src/plugins/perforce/settingspage.cpp
index 1672186e9b7..024c2ac01fa 100644
--- a/src/plugins/perforce/settingspage.cpp
+++ b/src/plugins/perforce/settingspage.cpp
@@ -108,16 +108,12 @@ QString SettingsPage::trCategory() const
QWidget *SettingsPage::createPage(QWidget *parent)
{
- if (!m_widget)
- m_widget = new SettingsPageWidget(parent);
+ m_widget = new SettingsPageWidget(parent);
m_widget->setSettings(PerforcePlugin::perforcePluginInstance()->settings());
return m_widget;
}
void SettingsPage::apply()
{
- if (!m_widget)
- return;
-
PerforcePlugin::perforcePluginInstance()->setSettings(m_widget->p4Command(), m_widget->p4Port(), m_widget->p4Client(), m_widget->p4User(), m_widget->defaultEnv());
}
diff --git a/src/plugins/perforce/settingspage.h b/src/plugins/perforce/settingspage.h
index 5f54c5c5381..f4c6d028af3 100644
--- a/src/plugins/perforce/settingspage.h
+++ b/src/plugins/perforce/settingspage.h
@@ -76,7 +76,7 @@ public:
void finish() { }
private:
- QPointer<SettingsPageWidget> m_widget;
+ SettingsPageWidget* m_widget;
};
} // namespace Internal
diff --git a/src/plugins/projectexplorer/abstractmakestep.cpp b/src/plugins/projectexplorer/abstractmakestep.cpp
index cde9e5719c6..19b9aa1db74 100644
--- a/src/plugins/projectexplorer/abstractmakestep.cpp
+++ b/src/plugins/projectexplorer/abstractmakestep.cpp
@@ -95,6 +95,7 @@ void AbstractMakeStep::setBuildParser(const QString &parser)
}
if (m_buildParser) {
+ m_buildParserName = parser;
connect(m_buildParser, SIGNAL(addToOutputWindow(const QString &)),
this, SIGNAL(addToOutputWindow(const QString &)),
Qt::DirectConnection);
diff --git a/src/plugins/projectexplorer/abstractmakestep.h b/src/plugins/projectexplorer/abstractmakestep.h
index 0e5e2e9ef6f..0b00501f58d 100644
--- a/src/plugins/projectexplorer/abstractmakestep.h
+++ b/src/plugins/projectexplorer/abstractmakestep.h
@@ -51,10 +51,11 @@ public:
virtual void run(QFutureInterface<bool> &);
protected:
+ // derived classes needs to call these functions
virtual void stdOut(const QString &line);
virtual void stdError(const QString &line);
- // derived classes need to call those functions
+ // derived classes needs to call this function
void setBuildParser(const QString &parser);
QString buildParser() const;
private slots:
diff --git a/src/plugins/quickopen/settingspage.cpp b/src/plugins/quickopen/settingspage.cpp
index bd900e6bba0..dbb69b44273 100644
--- a/src/plugins/quickopen/settingspage.cpp
+++ b/src/plugins/quickopen/settingspage.cpp
@@ -71,20 +71,20 @@ QString SettingsPage::trCategory() const
QWidget *SettingsPage::createPage(QWidget *parent)
{
- if (!m_page) {
- m_page = new QWidget(parent);
- m_ui.setupUi(m_page);
- connect(m_ui.filterList, SIGNAL(currentItemChanged(QListWidgetItem*,QListWidgetItem*)),
- this, SLOT(updateButtonStates()));
- connect(m_ui.filterList, SIGNAL(itemActivated(QListWidgetItem *)),
- this, SLOT(configureFilter(QListWidgetItem *)));
- connect(m_ui.editButton, SIGNAL(clicked()),
- this, SLOT(configureFilter()));
- connect(m_ui.addButton, SIGNAL(clicked()),
- this, SLOT(addCustomFilter()));
- connect(m_ui.removeButton, SIGNAL(clicked()),
- this, SLOT(removeCustomFilter()));
- }
+
+ m_page = new QWidget(parent);
+ m_ui.setupUi(m_page);
+ connect(m_ui.filterList, SIGNAL(currentItemChanged(QListWidgetItem*,QListWidgetItem*)),
+ this, SLOT(updateButtonStates()));
+ connect(m_ui.filterList, SIGNAL(itemActivated(QListWidgetItem *)),
+ this, SLOT(configureFilter(QListWidgetItem *)));
+ connect(m_ui.editButton, SIGNAL(clicked()),
+ this, SLOT(configureFilter()));
+ connect(m_ui.addButton, SIGNAL(clicked()),
+ this, SLOT(addCustomFilter()));
+ connect(m_ui.removeButton, SIGNAL(clicked()),
+ this, SLOT(removeCustomFilter()));
+
m_ui.refreshInterval->setValue(m_plugin->refreshInterval());
m_filters = m_plugin->filters();
m_customFilters = m_plugin->customFilters();
diff --git a/src/plugins/quickopen/settingspage.h b/src/plugins/quickopen/settingspage.h
index 6bb3a2984ab..936ecd082b2 100644
--- a/src/plugins/quickopen/settingspage.h
+++ b/src/plugins/quickopen/settingspage.h
@@ -78,7 +78,7 @@ private:
Ui::SettingsWidget m_ui;
QuickOpenPlugin *m_plugin;
- QPointer<QWidget> m_page;
+ QWidget* m_page;
QList<IQuickOpenFilter *> m_filters;
QList<IQuickOpenFilter *> m_addedFilters;
QList<IQuickOpenFilter *> m_removedFilters;
diff --git a/src/plugins/subversion/settingspage.cpp b/src/plugins/subversion/settingspage.cpp
index e06560feddc..b099b8715ce 100644
--- a/src/plugins/subversion/settingspage.cpp
+++ b/src/plugins/subversion/settingspage.cpp
@@ -96,15 +96,12 @@ QString SettingsPage::trCategory() const
QWidget *SettingsPage::createPage(QWidget *parent)
{
- if (!m_widget)
- m_widget = new SettingsPageWidget(parent);
+ m_widget = new SettingsPageWidget(parent);
m_widget->setSettings(SubversionPlugin::subversionPluginInstance()->settings());
return m_widget;
}
void SettingsPage::apply()
{
- if (!m_widget)
- return;
SubversionPlugin::subversionPluginInstance()->setSettings(m_widget->settings());
}
diff --git a/src/plugins/subversion/settingspage.h b/src/plugins/subversion/settingspage.h
index 7808920e04e..1fc5e8e3350 100644
--- a/src/plugins/subversion/settingspage.h
+++ b/src/plugins/subversion/settingspage.h
@@ -77,7 +77,7 @@ public:
void finish() { }
private:
- QPointer<SettingsPageWidget> m_widget;
+ SettingsPageWidget* m_widget;
};
} // namespace Subversion
diff --git a/src/plugins/vcsbase/vcsbasesettingspage.h b/src/plugins/vcsbase/vcsbasesettingspage.h
index 9c271c561e9..a81daf5f352 100644
--- a/src/plugins/vcsbase/vcsbasesettingspage.h
+++ b/src/plugins/vcsbase/vcsbasesettingspage.h
@@ -80,7 +80,7 @@ signals:
private:
void updateNickNames();
- QPointer<VCSBaseSettingsWidget> m_widget;
+ VCSBaseSettingsWidget* m_widget;
VCSBaseSettings m_settings;
};
--
GitLab