aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/perforce
diff options
context:
space:
mode:
authordt <qtc-committer@nokia.com>2009-05-05 15:42:52 +0200
committerdt <qtc-committer@nokia.com>2009-05-05 15:42:52 +0200
commit46e71d0fe0f6c1b09c712c166b3262c9b17ff1c8 (patch)
tree57f29d50b7f0d6a4a7c2cb87a08512d30855765e /src/plugins/perforce
parent771f30a60c5d11b3945e55fc671eeeb8710bc05b (diff)
This code can be simplified.
Diffstat (limited to 'src/plugins/perforce')
-rw-r--r--src/plugins/perforce/settingspage.cpp6
-rw-r--r--src/plugins/perforce/settingspage.h2
2 files changed, 2 insertions, 6 deletions
diff --git a/src/plugins/perforce/settingspage.cpp b/src/plugins/perforce/settingspage.cpp
index 1672186e9b..024c2ac01f 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 5f54c5c538..f4c6d028af 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