forked from qt-creator/qt-creator
Remove unused QObject parent arguments on options pages
In the new plugin setup scheme they are data members of the plugin pimpl and never use the parent. Change-Id: I28fe150393e8159064dcfbd113ce0320af50fd58 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
@@ -41,9 +41,8 @@
|
||||
using namespace CppTools;
|
||||
using namespace CppTools::Internal;
|
||||
|
||||
CppCodeModelSettingsWidget::CppCodeModelSettingsWidget(QWidget *parent)
|
||||
: QWidget(parent)
|
||||
, m_ui(new Ui::CppCodeModelSettingsPage)
|
||||
CppCodeModelSettingsWidget::CppCodeModelSettingsWidget()
|
||||
: m_ui(new Ui::CppCodeModelSettingsPage)
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
m_ui->expensiveChecksHintIcon->setPixmap(Utils::Icons::WARNING.pixmap());
|
||||
@@ -184,10 +183,8 @@ bool CppCodeModelSettingsWidget::applyGeneralWidgetsToSettings() const
|
||||
return settingsChanged;
|
||||
}
|
||||
|
||||
CppCodeModelSettingsPage::CppCodeModelSettingsPage(QSharedPointer<CppCodeModelSettings> &settings,
|
||||
QObject *parent)
|
||||
: Core::IOptionsPage(parent)
|
||||
, m_settings(settings)
|
||||
CppCodeModelSettingsPage::CppCodeModelSettingsPage(QSharedPointer<CppCodeModelSettings> &settings)
|
||||
: m_settings(settings)
|
||||
{
|
||||
setId(Constants::CPP_CODE_MODEL_SETTINGS_ID);
|
||||
setDisplayName(QCoreApplication::translate("CppTools",Constants::CPP_CODE_MODEL_SETTINGS_NAME));
|
||||
|
||||
@@ -46,7 +46,7 @@ class CppCodeModelSettingsWidget: public QWidget
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
explicit CppCodeModelSettingsWidget(QWidget *parent = nullptr);
|
||||
CppCodeModelSettingsWidget();
|
||||
~CppCodeModelSettingsWidget() override;
|
||||
|
||||
void setSettings(const QSharedPointer<CppCodeModelSettings> &s);
|
||||
@@ -67,8 +67,7 @@ private:
|
||||
class CppCodeModelSettingsPage: public Core::IOptionsPage
|
||||
{
|
||||
public:
|
||||
explicit CppCodeModelSettingsPage(QSharedPointer<CppCodeModelSettings> &settings,
|
||||
QObject *parent = nullptr);
|
||||
explicit CppCodeModelSettingsPage(QSharedPointer<CppCodeModelSettings> &settings);
|
||||
|
||||
QWidget *widget() override;
|
||||
void apply() override;
|
||||
|
||||
@@ -252,8 +252,7 @@ QString CppFileSettings::licenseTemplate()
|
||||
|
||||
// ------------------ CppFileSettingsWidget
|
||||
|
||||
CppFileSettingsWidget::CppFileSettingsWidget(QWidget *parent) :
|
||||
QWidget(parent),
|
||||
CppFileSettingsWidget::CppFileSettingsWidget() :
|
||||
m_ui(new Internal::Ui::CppFileSettingsPage)
|
||||
{
|
||||
m_ui->setupUi(this);
|
||||
@@ -351,9 +350,7 @@ void CppFileSettingsWidget::slotEdit()
|
||||
}
|
||||
|
||||
// --------------- CppFileSettingsPage
|
||||
CppFileSettingsPage::CppFileSettingsPage(QSharedPointer<CppFileSettings> &settings,
|
||||
QObject *parent) :
|
||||
Core::IOptionsPage(parent),
|
||||
CppFileSettingsPage::CppFileSettingsPage(QSharedPointer<CppFileSettings> &settings) :
|
||||
m_settings(settings)
|
||||
{
|
||||
setId(Constants::CPP_FILE_SETTINGS_ID);
|
||||
@@ -363,7 +360,6 @@ CppFileSettingsPage::CppFileSettingsPage(QSharedPointer<CppFileSettings> &settin
|
||||
|
||||
QWidget *CppFileSettingsPage::widget()
|
||||
{
|
||||
|
||||
if (!m_widget) {
|
||||
m_widget = new CppFileSettingsWidget;
|
||||
m_widget->setSettings(*m_settings);
|
||||
|
||||
@@ -70,7 +70,7 @@ class CppFileSettingsWidget : public QWidget
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
explicit CppFileSettingsWidget(QWidget *parent = nullptr);
|
||||
CppFileSettingsWidget();
|
||||
~CppFileSettingsWidget() override;
|
||||
|
||||
CppFileSettings settings() const;
|
||||
@@ -87,8 +87,7 @@ private:
|
||||
class CppFileSettingsPage : public Core::IOptionsPage
|
||||
{
|
||||
public:
|
||||
explicit CppFileSettingsPage(QSharedPointer<CppFileSettings> &settings,
|
||||
QObject *parent = nullptr);
|
||||
explicit CppFileSettingsPage(QSharedPointer<CppFileSettings> &settings);
|
||||
|
||||
QWidget *widget() override;
|
||||
void apply() override;
|
||||
|
||||
Reference in New Issue
Block a user