summaryrefslogtreecommitdiff
path: root/src/plugins/cpptools
diff options
context:
space:
mode:
authorhjk <hjk@qt.io>2019-03-21 08:09:35 +0100
committerhjk <hjk@qt.io>2019-09-11 06:03:40 +0000
commite9d8ff21b06d4224765b293de828f2cd1485bf3b (patch)
tree8b0f13027ef806a7f772bb34e6c641c6011fe328 /src/plugins/cpptools
parentbe7c215dd74317e20199ec73e283ca54f4eac20c (diff)
downloadqt-creator-e9d8ff21b06d4224765b293de828f2cd1485bf3b.tar.gz
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>
Diffstat (limited to 'src/plugins/cpptools')
-rw-r--r--src/plugins/cpptools/cppcodemodelsettingspage.cpp11
-rw-r--r--src/plugins/cpptools/cppcodemodelsettingspage.h5
-rw-r--r--src/plugins/cpptools/cppfilesettingspage.cpp8
-rw-r--r--src/plugins/cpptools/cppfilesettingspage.h5
4 files changed, 10 insertions, 19 deletions
diff --git a/src/plugins/cpptools/cppcodemodelsettingspage.cpp b/src/plugins/cpptools/cppcodemodelsettingspage.cpp
index af5f6b1fd2..dc1c02414e 100644
--- a/src/plugins/cpptools/cppcodemodelsettingspage.cpp
+++ b/src/plugins/cpptools/cppcodemodelsettingspage.cpp
@@ -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));
diff --git a/src/plugins/cpptools/cppcodemodelsettingspage.h b/src/plugins/cpptools/cppcodemodelsettingspage.h
index 5ccb5fb37f..4f0722a805 100644
--- a/src/plugins/cpptools/cppcodemodelsettingspage.h
+++ b/src/plugins/cpptools/cppcodemodelsettingspage.h
@@ -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;
diff --git a/src/plugins/cpptools/cppfilesettingspage.cpp b/src/plugins/cpptools/cppfilesettingspage.cpp
index 5ee5ef22cf..b6f7fb5720 100644
--- a/src/plugins/cpptools/cppfilesettingspage.cpp
+++ b/src/plugins/cpptools/cppfilesettingspage.cpp
@@ -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);
diff --git a/src/plugins/cpptools/cppfilesettingspage.h b/src/plugins/cpptools/cppfilesettingspage.h
index 5375664828..4a88e5af5e 100644
--- a/src/plugins/cpptools/cppfilesettingspage.h
+++ b/src/plugins/cpptools/cppfilesettingspage.h
@@ -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;