forked from qt-creator/qt-creator
This code can be simplified.
This commit is contained in:
@@ -97,16 +97,13 @@ 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;
|
||||||
}
|
}
|
||||||
|
|
||||||
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()) {
|
||||||
|
|||||||
@@ -78,7 +78,7 @@ public:
|
|||||||
void finish() { }
|
void finish() { }
|
||||||
|
|
||||||
private:
|
private:
|
||||||
QPointer<SettingsPageWidget> m_widget;
|
SettingsPageWidget* m_widget;
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace Internal
|
} // namespace Internal
|
||||||
|
|||||||
@@ -108,16 +108,12 @@ 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;
|
||||||
}
|
}
|
||||||
|
|
||||||
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());
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -76,7 +76,7 @@ public:
|
|||||||
void finish() { }
|
void finish() { }
|
||||||
|
|
||||||
private:
|
private:
|
||||||
QPointer<SettingsPageWidget> m_widget;
|
SettingsPageWidget* m_widget;
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace Internal
|
} // namespace Internal
|
||||||
|
|||||||
@@ -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);
|
||||||
|
|||||||
@@ -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:
|
||||||
|
|||||||
@@ -71,20 +71,20 @@ 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*)),
|
||||||
this, SLOT(updateButtonStates()));
|
this, SLOT(updateButtonStates()));
|
||||||
connect(m_ui.filterList, SIGNAL(itemActivated(QListWidgetItem *)),
|
connect(m_ui.filterList, SIGNAL(itemActivated(QListWidgetItem *)),
|
||||||
this, SLOT(configureFilter(QListWidgetItem *)));
|
this, SLOT(configureFilter(QListWidgetItem *)));
|
||||||
connect(m_ui.editButton, SIGNAL(clicked()),
|
connect(m_ui.editButton, SIGNAL(clicked()),
|
||||||
this, SLOT(configureFilter()));
|
this, SLOT(configureFilter()));
|
||||||
connect(m_ui.addButton, SIGNAL(clicked()),
|
connect(m_ui.addButton, SIGNAL(clicked()),
|
||||||
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();
|
||||||
|
|||||||
@@ -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;
|
||||||
|
|||||||
@@ -96,15 +96,12 @@ 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;
|
||||||
}
|
}
|
||||||
|
|
||||||
void SettingsPage::apply()
|
void SettingsPage::apply()
|
||||||
{
|
{
|
||||||
if (!m_widget)
|
|
||||||
return;
|
|
||||||
SubversionPlugin::subversionPluginInstance()->setSettings(m_widget->settings());
|
SubversionPlugin::subversionPluginInstance()->setSettings(m_widget->settings());
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -77,7 +77,7 @@ public:
|
|||||||
void finish() { }
|
void finish() { }
|
||||||
|
|
||||||
private:
|
private:
|
||||||
QPointer<SettingsPageWidget> m_widget;
|
SettingsPageWidget* m_widget;
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace Subversion
|
} // namespace Subversion
|
||||||
|
|||||||
@@ -80,7 +80,7 @@ signals:
|
|||||||
|
|
||||||
private:
|
private:
|
||||||
void updateNickNames();
|
void updateNickNames();
|
||||||
QPointer<VCSBaseSettingsWidget> m_widget;
|
VCSBaseSettingsWidget* m_widget;
|
||||||
VCSBaseSettings m_settings;
|
VCSBaseSettings m_settings;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user