This code can be simplified.

This commit is contained in:
dt
2009-05-05 15:42:52 +02:00
parent 771f30a60c
commit 46e71d0fe0
11 changed files with 25 additions and 33 deletions

View File

@@ -97,7 +97,6 @@ QString SettingsPage::trCategory() const
QWidget *SettingsPage::createPage(QWidget *parent) QWidget *SettingsPage::createPage(QWidget *parent)
{ {
if (!m_widget)
m_widget = new SettingsPageWidget(parent); m_widget = new SettingsPageWidget(parent);
m_widget->setSettings(GitPlugin::instance()->settings()); m_widget->setSettings(GitPlugin::instance()->settings());
return m_widget; return m_widget;
@@ -105,8 +104,6 @@ QWidget *SettingsPage::createPage(QWidget *parent)
void SettingsPage::apply() void SettingsPage::apply()
{ {
if (!m_widget)
return;
const GitSettings newSettings = m_widget->settings(); const GitSettings newSettings = m_widget->settings();
// Warn if git cannot be found in path if the widget is on top // Warn if git cannot be found in path if the widget is on top
if (m_widget->isVisible()) { if (m_widget->isVisible()) {

View File

@@ -78,7 +78,7 @@ public:
void finish() { } void finish() { }
private: private:
QPointer<SettingsPageWidget> m_widget; SettingsPageWidget* m_widget;
}; };
} // namespace Internal } // namespace Internal

View File

@@ -108,7 +108,6 @@ QString SettingsPage::trCategory() const
QWidget *SettingsPage::createPage(QWidget *parent) QWidget *SettingsPage::createPage(QWidget *parent)
{ {
if (!m_widget)
m_widget = new SettingsPageWidget(parent); m_widget = new SettingsPageWidget(parent);
m_widget->setSettings(PerforcePlugin::perforcePluginInstance()->settings()); m_widget->setSettings(PerforcePlugin::perforcePluginInstance()->settings());
return m_widget; return m_widget;
@@ -116,8 +115,5 @@ QWidget *SettingsPage::createPage(QWidget *parent)
void SettingsPage::apply() 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()); PerforcePlugin::perforcePluginInstance()->setSettings(m_widget->p4Command(), m_widget->p4Port(), m_widget->p4Client(), m_widget->p4User(), m_widget->defaultEnv());
} }

View File

@@ -76,7 +76,7 @@ public:
void finish() { } void finish() { }
private: private:
QPointer<SettingsPageWidget> m_widget; SettingsPageWidget* m_widget;
}; };
} // namespace Internal } // namespace Internal

View File

@@ -95,6 +95,7 @@ void AbstractMakeStep::setBuildParser(const QString &parser)
} }
if (m_buildParser) { if (m_buildParser) {
m_buildParserName = parser;
connect(m_buildParser, SIGNAL(addToOutputWindow(const QString &)), connect(m_buildParser, SIGNAL(addToOutputWindow(const QString &)),
this, SIGNAL(addToOutputWindow(const QString &)), this, SIGNAL(addToOutputWindow(const QString &)),
Qt::DirectConnection); Qt::DirectConnection);

View File

@@ -51,10 +51,11 @@ public:
virtual void run(QFutureInterface<bool> &); virtual void run(QFutureInterface<bool> &);
protected: protected:
// derived classes needs to call these functions
virtual void stdOut(const QString &line); virtual void stdOut(const QString &line);
virtual void stdError(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); void setBuildParser(const QString &parser);
QString buildParser() const; QString buildParser() const;
private slots: private slots:

View File

@@ -71,7 +71,7 @@ QString SettingsPage::trCategory() const
QWidget *SettingsPage::createPage(QWidget *parent) QWidget *SettingsPage::createPage(QWidget *parent)
{ {
if (!m_page) {
m_page = new QWidget(parent); m_page = new QWidget(parent);
m_ui.setupUi(m_page); m_ui.setupUi(m_page);
connect(m_ui.filterList, SIGNAL(currentItemChanged(QListWidgetItem*,QListWidgetItem*)), connect(m_ui.filterList, SIGNAL(currentItemChanged(QListWidgetItem*,QListWidgetItem*)),
@@ -84,7 +84,7 @@ QWidget *SettingsPage::createPage(QWidget *parent)
this, SLOT(addCustomFilter())); this, SLOT(addCustomFilter()));
connect(m_ui.removeButton, SIGNAL(clicked()), connect(m_ui.removeButton, SIGNAL(clicked()),
this, SLOT(removeCustomFilter())); this, SLOT(removeCustomFilter()));
}
m_ui.refreshInterval->setValue(m_plugin->refreshInterval()); m_ui.refreshInterval->setValue(m_plugin->refreshInterval());
m_filters = m_plugin->filters(); m_filters = m_plugin->filters();
m_customFilters = m_plugin->customFilters(); m_customFilters = m_plugin->customFilters();

View File

@@ -78,7 +78,7 @@ private:
Ui::SettingsWidget m_ui; Ui::SettingsWidget m_ui;
QuickOpenPlugin *m_plugin; QuickOpenPlugin *m_plugin;
QPointer<QWidget> m_page; QWidget* m_page;
QList<IQuickOpenFilter *> m_filters; QList<IQuickOpenFilter *> m_filters;
QList<IQuickOpenFilter *> m_addedFilters; QList<IQuickOpenFilter *> m_addedFilters;
QList<IQuickOpenFilter *> m_removedFilters; QList<IQuickOpenFilter *> m_removedFilters;

View File

@@ -96,7 +96,6 @@ QString SettingsPage::trCategory() const
QWidget *SettingsPage::createPage(QWidget *parent) QWidget *SettingsPage::createPage(QWidget *parent)
{ {
if (!m_widget)
m_widget = new SettingsPageWidget(parent); m_widget = new SettingsPageWidget(parent);
m_widget->setSettings(SubversionPlugin::subversionPluginInstance()->settings()); m_widget->setSettings(SubversionPlugin::subversionPluginInstance()->settings());
return m_widget; return m_widget;
@@ -104,7 +103,5 @@ QWidget *SettingsPage::createPage(QWidget *parent)
void SettingsPage::apply() void SettingsPage::apply()
{ {
if (!m_widget)
return;
SubversionPlugin::subversionPluginInstance()->setSettings(m_widget->settings()); SubversionPlugin::subversionPluginInstance()->setSettings(m_widget->settings());
} }

View File

@@ -77,7 +77,7 @@ public:
void finish() { } void finish() { }
private: private:
QPointer<SettingsPageWidget> m_widget; SettingsPageWidget* m_widget;
}; };
} // namespace Subversion } // namespace Subversion

View File

@@ -80,7 +80,7 @@ signals:
private: private:
void updateNickNames(); void updateNickNames();
QPointer<VCSBaseSettingsWidget> m_widget; VCSBaseSettingsWidget* m_widget;
VCSBaseSettings m_settings; VCSBaseSettings m_settings;
}; };