diff options
60 files changed, 94 insertions, 132 deletions
diff --git a/src/plugins/android/androidsettingspage.cpp b/src/plugins/android/androidsettingspage.cpp index 7be91957e2..67c5d220dd 100644 --- a/src/plugins/android/androidsettingspage.cpp +++ b/src/plugins/android/androidsettingspage.cpp @@ -38,8 +38,7 @@ using namespace ProjectExplorer; namespace Android { namespace Internal { -AndroidSettingsPage::AndroidSettingsPage(QObject *parent) - : Core::IOptionsPage(parent) +AndroidSettingsPage::AndroidSettingsPage() { setId(Constants::ANDROID_SETTINGS_ID); setDisplayName(tr("Android")); diff --git a/src/plugins/android/androidsettingspage.h b/src/plugins/android/androidsettingspage.h index 274653f940..2cdef16852 100644 --- a/src/plugins/android/androidsettingspage.h +++ b/src/plugins/android/androidsettingspage.h @@ -39,7 +39,7 @@ class AndroidSettingsPage : public Core::IOptionsPage Q_OBJECT public: - explicit AndroidSettingsPage(QObject *parent = nullptr); + AndroidSettingsPage(); QWidget *widget() override; void apply() override; diff --git a/src/plugins/autotest/gtest/gtestsettingspage.cpp b/src/plugins/autotest/gtest/gtestsettingspage.cpp index a500a10753..f1d4d2a827 100644 --- a/src/plugins/autotest/gtest/gtestsettingspage.cpp +++ b/src/plugins/autotest/gtest/gtestsettingspage.cpp @@ -40,8 +40,7 @@ static bool validateFilter(Utils::FancyLineEdit *edit, QString * /*error*/) return edit && GTestUtils::isValidGTestFilter(edit->text()); } -GTestSettingsWidget::GTestSettingsWidget(QWidget *parent) - : QWidget(parent) +GTestSettingsWidget::GTestSettingsWidget() { m_ui.setupUi(this); m_ui.filterLineEdit->setValidationFunction(&validateFilter); diff --git a/src/plugins/autotest/gtest/gtestsettingspage.h b/src/plugins/autotest/gtest/gtestsettingspage.h index f9066f961e..3aa28fbe86 100644 --- a/src/plugins/autotest/gtest/gtestsettingspage.h +++ b/src/plugins/autotest/gtest/gtestsettingspage.h @@ -42,8 +42,9 @@ class GTestSettings; class GTestSettingsWidget : public QWidget { Q_OBJECT + public: - explicit GTestSettingsWidget(QWidget *parent = nullptr); + GTestSettingsWidget(); void setSettings(const GTestSettings &settings); GTestSettings settings() const; diff --git a/src/plugins/autotest/qtest/qttestsettingspage.cpp b/src/plugins/autotest/qtest/qttestsettingspage.cpp index 8652738425..f7471f99f2 100644 --- a/src/plugins/autotest/qtest/qttestsettingspage.cpp +++ b/src/plugins/autotest/qtest/qttestsettingspage.cpp @@ -35,8 +35,7 @@ namespace Autotest { namespace Internal { -QtTestSettingsWidget::QtTestSettingsWidget(QWidget *parent) - : QWidget(parent) +QtTestSettingsWidget::QtTestSettingsWidget() { m_ui.setupUi(this); m_ui.callgrindRB->setEnabled(Utils::HostOsInfo::isAnyUnixHost()); // valgrind available on UNIX diff --git a/src/plugins/autotest/qtest/qttestsettingspage.h b/src/plugins/autotest/qtest/qttestsettingspage.h index 51fe5102e1..aa1e39a48e 100644 --- a/src/plugins/autotest/qtest/qttestsettingspage.h +++ b/src/plugins/autotest/qtest/qttestsettingspage.h @@ -42,8 +42,9 @@ class QtTestSettings; class QtTestSettingsWidget : public QWidget { Q_OBJECT + public: - explicit QtTestSettingsWidget(QWidget *parent = nullptr); + QtTestSettingsWidget(); void setSettings(const QtTestSettings &settings); QtTestSettings settings() const; diff --git a/src/plugins/baremetal/gdbserverproviderssettingspage.cpp b/src/plugins/baremetal/gdbserverproviderssettingspage.cpp index b538ebce33..fb78ef713e 100644 --- a/src/plugins/baremetal/gdbserverproviderssettingspage.cpp +++ b/src/plugins/baremetal/gdbserverproviderssettingspage.cpp @@ -406,8 +406,7 @@ QModelIndex GdbServerProvidersSettingsWidget::currentIndex() const } -GdbServerProvidersSettingsPage::GdbServerProvidersSettingsPage(QObject *parent) - : Core::IOptionsPage(parent) +GdbServerProvidersSettingsPage::GdbServerProvidersSettingsPage() { setId(Constants::GDB_PROVIDERS_SETTINGS_ID); setDisplayName(tr("Bare Metal")); diff --git a/src/plugins/baremetal/gdbserverproviderssettingspage.h b/src/plugins/baremetal/gdbserverproviderssettingspage.h index a68515526e..c41389b307 100644 --- a/src/plugins/baremetal/gdbserverproviderssettingspage.h +++ b/src/plugins/baremetal/gdbserverproviderssettingspage.h @@ -87,7 +87,7 @@ class GdbServerProvidersSettingsPage final : public Core::IOptionsPage Q_OBJECT public: - explicit GdbServerProvidersSettingsPage(QObject *parent = nullptr); + GdbServerProvidersSettingsPage(); private: QWidget *widget() final; diff --git a/src/plugins/beautifier/artisticstyle/artisticstyleoptionspage.cpp b/src/plugins/beautifier/artisticstyle/artisticstyleoptionspage.cpp index 6fb77fc7d0..01deb00b4d 100644 --- a/src/plugins/beautifier/artisticstyle/artisticstyleoptionspage.cpp +++ b/src/plugins/beautifier/artisticstyle/artisticstyleoptionspage.cpp @@ -39,11 +39,8 @@ namespace Beautifier { namespace Internal { namespace ArtisticStyle { -ArtisticStyleOptionsPageWidget::ArtisticStyleOptionsPageWidget(ArtisticStyleSettings *settings, - QWidget *parent) : - QWidget(parent), - ui(new Ui::ArtisticStyleOptionsPage), - m_settings(settings) +ArtisticStyleOptionsPageWidget::ArtisticStyleOptionsPageWidget(ArtisticStyleSettings *settings) + : ui(new Ui::ArtisticStyleOptionsPage), m_settings(settings) { ui->setupUi(this); ui->useHomeFile->setText(ui->useHomeFile->text().replace( diff --git a/src/plugins/beautifier/artisticstyle/artisticstyleoptionspage.h b/src/plugins/beautifier/artisticstyle/artisticstyleoptionspage.h index fe8f604dc3..e1e9141bcb 100644 --- a/src/plugins/beautifier/artisticstyle/artisticstyleoptionspage.h +++ b/src/plugins/beautifier/artisticstyle/artisticstyleoptionspage.h @@ -43,8 +43,7 @@ class ArtisticStyleOptionsPageWidget : public QWidget Q_OBJECT public: - explicit ArtisticStyleOptionsPageWidget(ArtisticStyleSettings *settings, - QWidget *parent = nullptr); + explicit ArtisticStyleOptionsPageWidget(ArtisticStyleSettings *settings); ~ArtisticStyleOptionsPageWidget() override; void restore(); void apply(); diff --git a/src/plugins/beautifier/generaloptionspage.cpp b/src/plugins/beautifier/generaloptionspage.cpp index c2bec70740..ae832f0c98 100644 --- a/src/plugins/beautifier/generaloptionspage.cpp +++ b/src/plugins/beautifier/generaloptionspage.cpp @@ -37,8 +37,7 @@ namespace Beautifier { namespace Internal { GeneralOptionsPageWidget::GeneralOptionsPageWidget(const QSharedPointer<GeneralSettings> &settings, - const QStringList &toolIds, QWidget *parent) : - QWidget(parent), + const QStringList &toolIds) : ui(new Ui::GeneralOptionsPage), m_settings(settings) { diff --git a/src/plugins/beautifier/generaloptionspage.h b/src/plugins/beautifier/generaloptionspage.h index 61f7e84d77..b6335f68ad 100644 --- a/src/plugins/beautifier/generaloptionspage.h +++ b/src/plugins/beautifier/generaloptionspage.h @@ -44,7 +44,7 @@ class GeneralOptionsPageWidget : public QWidget public: explicit GeneralOptionsPageWidget(const QSharedPointer<GeneralSettings> &settings, - const QStringList &toolIds, QWidget *parent = nullptr); + const QStringList &toolIds); ~GeneralOptionsPageWidget() override; void restore(); void apply(bool *autoFormatChanged); diff --git a/src/plugins/clangtools/clangtoolsplugin.cpp b/src/plugins/clangtools/clangtoolsplugin.cpp index 436fc3242a..8fcd5f61b9 100644 --- a/src/plugins/clangtools/clangtoolsplugin.cpp +++ b/src/plugins/clangtools/clangtoolsplugin.cpp @@ -61,8 +61,6 @@ #include <QMessageBox> #include <QMenu> -#include <QtPlugin> - using namespace ProjectExplorer; namespace ClangTools { @@ -71,7 +69,7 @@ namespace Internal { class ClangToolsOptionsPage : public Core::IOptionsPage { public: - explicit ClangToolsOptionsPage() + ClangToolsOptionsPage() { setId(Constants::SETTINGS_PAGE_ID); setDisplayName(QCoreApplication::translate( diff --git a/src/plugins/cmakeprojectmanager/cmakespecificsettingspage.cpp b/src/plugins/cmakeprojectmanager/cmakespecificsettingspage.cpp index d9c8f508a5..e458e7fbd5 100644 --- a/src/plugins/cmakeprojectmanager/cmakespecificsettingspage.cpp +++ b/src/plugins/cmakeprojectmanager/cmakespecificsettingspage.cpp @@ -31,8 +31,7 @@ namespace CMakeProjectManager { namespace Internal { -CMakeSpecificSettingWidget::CMakeSpecificSettingWidget(QWidget *parent): - QWidget(parent) +CMakeSpecificSettingWidget::CMakeSpecificSettingWidget() { m_ui.setupUi(this); m_ui.newFileAddedCopyToCpliSettingGroup->setId(m_ui.alwaysAskRadio, diff --git a/src/plugins/cmakeprojectmanager/cmakespecificsettingspage.h b/src/plugins/cmakeprojectmanager/cmakespecificsettingspage.h index d0b9b266bb..2d4419d0d5 100644 --- a/src/plugins/cmakeprojectmanager/cmakespecificsettingspage.h +++ b/src/plugins/cmakeprojectmanager/cmakespecificsettingspage.h @@ -40,7 +40,8 @@ class CMakeSpecificSettingWidget : public QWidget Q_OBJECT public: - explicit CMakeSpecificSettingWidget(QWidget *parent = nullptr); + CMakeSpecificSettingWidget(); + void setSettings(const CMakeSpecificSettings &settings); CMakeSpecificSettings settings() const; diff --git a/src/plugins/coreplugin/dialogs/externaltoolconfig.cpp b/src/plugins/coreplugin/dialogs/externaltoolconfig.cpp index b69aa2e2c9..b78f0b5dba 100644 --- a/src/plugins/coreplugin/dialogs/externaltoolconfig.cpp +++ b/src/plugins/coreplugin/dialogs/externaltoolconfig.cpp @@ -392,8 +392,7 @@ static void fillBaseEnvironmentComboBox(QComboBox *box) box->addItem(provider.displayName, Id::fromName(provider.id).toSetting()); } -ExternalToolConfig::ExternalToolConfig(QWidget *parent) : - QWidget(parent), +ExternalToolConfig::ExternalToolConfig() : ui(new Ui::ExternalToolConfig), m_model(new ExternalToolModel(this)) { diff --git a/src/plugins/coreplugin/dialogs/externaltoolconfig.h b/src/plugins/coreplugin/dialogs/externaltoolconfig.h index 386eeee38a..ff1b867706 100644 --- a/src/plugins/coreplugin/dialogs/externaltoolconfig.h +++ b/src/plugins/coreplugin/dialogs/externaltoolconfig.h @@ -86,7 +86,7 @@ class ExternalToolConfig : public QWidget Q_OBJECT public: - explicit ExternalToolConfig(QWidget *parent = nullptr); + ExternalToolConfig(); ~ExternalToolConfig() override; void setTools(const QMap<QString, QList<ExternalTool *> > &tools); diff --git a/src/plugins/coreplugin/dialogs/shortcutsettings.cpp b/src/plugins/coreplugin/dialogs/shortcutsettings.cpp index d740b6ca20..86ee6146da 100644 --- a/src/plugins/coreplugin/dialogs/shortcutsettings.cpp +++ b/src/plugins/coreplugin/dialogs/shortcutsettings.cpp @@ -283,8 +283,7 @@ ShortcutSettingsWidget::~ShortcutSettingsWidget() qDeleteAll(m_scitems); } -ShortcutSettings::ShortcutSettings(QObject *parent) - : IOptionsPage(parent) +ShortcutSettings::ShortcutSettings() { setId(Constants::SETTINGS_ID_SHORTCUTS); setDisplayName(tr("Keyboard")); diff --git a/src/plugins/coreplugin/dialogs/shortcutsettings.h b/src/plugins/coreplugin/dialogs/shortcutsettings.h index f54206cd3e..6c10c14463 100644 --- a/src/plugins/coreplugin/dialogs/shortcutsettings.h +++ b/src/plugins/coreplugin/dialogs/shortcutsettings.h @@ -116,7 +116,7 @@ class ShortcutSettings : public IOptionsPage Q_OBJECT public: - ShortcutSettings(QObject *parent = nullptr); + ShortcutSettings(); QWidget *widget() override; void apply() override; diff --git a/src/plugins/coreplugin/mimetypesettings.cpp b/src/plugins/coreplugin/mimetypesettings.cpp index 7b4d891339..83ed2a278b 100644 --- a/src/plugins/coreplugin/mimetypesettings.cpp +++ b/src/plugins/coreplugin/mimetypesettings.cpp @@ -632,9 +632,9 @@ void MimeTypeSettingsPrivate::applyUserModifiedMimeTypes(const UserMimeTypeHash } // MimeTypeSettingsPage -MimeTypeSettings::MimeTypeSettings(QObject *parent) - : IOptionsPage(parent) - , d(new MimeTypeSettingsPrivate) + +MimeTypeSettings::MimeTypeSettings() + : d(new MimeTypeSettingsPrivate) { setId(Constants::SETTINGS_ID_MIMETYPES); setDisplayName(tr("MIME Types")); diff --git a/src/plugins/coreplugin/mimetypesettings.h b/src/plugins/coreplugin/mimetypesettings.h index 3d9059bbfe..a57fa46ca0 100644 --- a/src/plugins/coreplugin/mimetypesettings.h +++ b/src/plugins/coreplugin/mimetypesettings.h @@ -37,7 +37,7 @@ class MimeTypeSettings : public IOptionsPage Q_OBJECT public: - MimeTypeSettings(QObject *parent = nullptr); + MimeTypeSettings(); ~MimeTypeSettings() override; QWidget *widget() override; diff --git a/src/plugins/coreplugin/toolsettings.cpp b/src/plugins/coreplugin/toolsettings.cpp index c157ad0781..8106c2f485 100644 --- a/src/plugins/coreplugin/toolsettings.cpp +++ b/src/plugins/coreplugin/toolsettings.cpp @@ -42,8 +42,7 @@ using namespace Core; using namespace Core::Internal; -ToolSettings::ToolSettings(QObject *parent) : - IOptionsPage(parent) +ToolSettings::ToolSettings() { setId(Constants::SETTINGS_ID_TOOLS); setDisplayName(tr("External Tools")); diff --git a/src/plugins/coreplugin/toolsettings.h b/src/plugins/coreplugin/toolsettings.h index 28972bc213..6e20ff0706 100644 --- a/src/plugins/coreplugin/toolsettings.h +++ b/src/plugins/coreplugin/toolsettings.h @@ -39,7 +39,7 @@ class ToolSettings : public IOptionsPage Q_OBJECT public: - explicit ToolSettings(QObject *parent = nullptr); + ToolSettings(); QWidget *widget() override; void apply() override; diff --git a/src/plugins/cpaster/fileshareprotocolsettingspage.cpp b/src/plugins/cpaster/fileshareprotocolsettingspage.cpp index 51b254ecba..a0b160176b 100644 --- a/src/plugins/cpaster/fileshareprotocolsettingspage.cpp +++ b/src/plugins/cpaster/fileshareprotocolsettingspage.cpp @@ -65,8 +65,7 @@ bool FileShareProtocolSettings::equals(const FileShareProtocolSettings &rhs) con return displayCount == rhs.displayCount && path == rhs.path; } -FileShareProtocolSettingsWidget::FileShareProtocolSettingsWidget(QWidget *parent) : - QWidget(parent) +FileShareProtocolSettingsWidget::FileShareProtocolSettingsWidget() { m_ui.setupUi(this); @@ -91,9 +90,8 @@ FileShareProtocolSettings FileShareProtocolSettingsWidget::settings() const } // ----------FileShareProtocolSettingsPage -FileShareProtocolSettingsPage::FileShareProtocolSettingsPage(const QSharedPointer<FileShareProtocolSettings> &s, - QObject *parent) : - Core::IOptionsPage(parent), m_settings(s), m_widget(nullptr) +FileShareProtocolSettingsPage::FileShareProtocolSettingsPage(const QSharedPointer<FileShareProtocolSettings> &s) + : m_settings(s), m_widget(nullptr) { setId("X.CodePaster.FileSharePaster"); setDisplayName(tr("Fileshare")); diff --git a/src/plugins/cpaster/fileshareprotocolsettingspage.h b/src/plugins/cpaster/fileshareprotocolsettingspage.h index 491c4fe621..aecd5d475c 100644 --- a/src/plugins/cpaster/fileshareprotocolsettingspage.h +++ b/src/plugins/cpaster/fileshareprotocolsettingspage.h @@ -54,10 +54,12 @@ inline bool operator==(const FileShareProtocolSettings &s1, const FileShareProto inline bool operator!=(const FileShareProtocolSettings &s1, const FileShareProtocolSettings &s2) { return !s1.equals(s2); } -class FileShareProtocolSettingsWidget : public QWidget { +class FileShareProtocolSettingsWidget : public QWidget +{ Q_OBJECT + public: - explicit FileShareProtocolSettingsWidget(QWidget *parent = nullptr); + FileShareProtocolSettingsWidget(); void setSettings(const FileShareProtocolSettings &); FileShareProtocolSettings settings() const; @@ -71,8 +73,7 @@ class FileShareProtocolSettingsPage : public Core::IOptionsPage Q_OBJECT public: - explicit FileShareProtocolSettingsPage(const QSharedPointer<FileShareProtocolSettings> &s, - QObject *parent = nullptr); + explicit FileShareProtocolSettingsPage(const QSharedPointer<FileShareProtocolSettings> &s); QWidget *widget() override; void apply() override; 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; diff --git a/src/plugins/debugger/cdb/cdboptionspage.cpp b/src/plugins/debugger/cdb/cdboptionspage.cpp index 868e554d78..1bf4fb4da4 100644 --- a/src/plugins/debugger/cdb/cdboptionspage.cpp +++ b/src/plugins/debugger/cdb/cdboptionspage.cpp @@ -154,9 +154,8 @@ QStringList CdbBreakEventWidget::breakEvents() const return rc; } -CdbOptionsPageWidget::CdbOptionsPageWidget(QWidget *parent) - : QWidget(parent) - , m_breakEventWidget(new CdbBreakEventWidget) +CdbOptionsPageWidget::CdbOptionsPageWidget() + : m_breakEventWidget(new CdbBreakEventWidget) { m_ui.setupUi(this); // Squeeze the groupbox layouts vertically to diff --git a/src/plugins/debugger/cdb/cdboptionspage.h b/src/plugins/debugger/cdb/cdboptionspage.h index 9411672175..03c1bec13e 100644 --- a/src/plugins/debugger/cdb/cdboptionspage.h +++ b/src/plugins/debugger/cdb/cdboptionspage.h @@ -71,7 +71,8 @@ class CdbOptionsPageWidget : public QWidget Q_OBJECT public: - explicit CdbOptionsPageWidget(QWidget *parent = nullptr); + CdbOptionsPageWidget(); + QStringList breakEvents() const; Utils::SavedActionSet group; @@ -91,7 +92,7 @@ class CdbOptionsPage : public Core::IOptionsPage Q_OBJECT public: - explicit CdbOptionsPage(); + CdbOptionsPage(); ~CdbOptionsPage() override; // IOptionsPage @@ -111,7 +112,7 @@ class CdbPathsPage : public Core::IOptionsPage Q_OBJECT public: - explicit CdbPathsPage(); + CdbPathsPage(); ~CdbPathsPage() override; static CdbPathsPage *instance(); diff --git a/src/plugins/designer/settingspage.cpp b/src/plugins/designer/settingspage.cpp index 3b92fbba63..f038b7a4db 100644 --- a/src/plugins/designer/settingspage.cpp +++ b/src/plugins/designer/settingspage.cpp @@ -66,8 +66,7 @@ void SettingsPage::finish() delete m_widget; } -SettingsPageProvider::SettingsPageProvider(QObject *parent) - : IOptionsPageProvider(parent) +SettingsPageProvider::SettingsPageProvider() { setCategory(Designer::Constants::SETTINGS_CATEGORY); setDisplayCategory(QCoreApplication::translate("Designer", diff --git a/src/plugins/designer/settingspage.h b/src/plugins/designer/settingspage.h index 6fc13cbb01..13de3c2808 100644 --- a/src/plugins/designer/settingspage.h +++ b/src/plugins/designer/settingspage.h @@ -60,7 +60,7 @@ class SettingsPageProvider : public Core::IOptionsPageProvider Q_OBJECT public: - explicit SettingsPageProvider(QObject *parent = nullptr); + SettingsPageProvider(); QList<Core::IOptionsPage *> pages() const override; bool matches(const QString &searchKeyWord) const override; diff --git a/src/plugins/ios/iossettingspage.cpp b/src/plugins/ios/iossettingspage.cpp index efe98a1012..cc1ce8e6be 100644 --- a/src/plugins/ios/iossettingspage.cpp +++ b/src/plugins/ios/iossettingspage.cpp @@ -35,8 +35,7 @@ namespace Ios { namespace Internal { -IosSettingsPage::IosSettingsPage(QObject *parent) - : Core::IOptionsPage(parent) +IosSettingsPage::IosSettingsPage() { setId(Constants::IOS_SETTINGS_ID); setDisplayName(tr("iOS")); diff --git a/src/plugins/ios/iossettingspage.h b/src/plugins/ios/iossettingspage.h index 6841184ad1..fd3cb96921 100644 --- a/src/plugins/ios/iossettingspage.h +++ b/src/plugins/ios/iossettingspage.h @@ -39,7 +39,7 @@ class IosSettingsPage : public Core::IOptionsPage Q_OBJECT public: - explicit IosSettingsPage(QObject *parent = nullptr); + IosSettingsPage(); QWidget *widget() override; void apply() override; diff --git a/src/plugins/ios/iossettingswidget.cpp b/src/plugins/ios/iossettingswidget.cpp index 467ded471d..29346b4328 100644 --- a/src/plugins/ios/iossettingswidget.cpp +++ b/src/plugins/ios/iossettingswidget.cpp @@ -62,9 +62,8 @@ static void onSimOperation(const SimulatorInfo &simInfo, SimulatorOperationDialo dlg->addMessage(simInfo, response, contextStr); } -IosSettingsWidget::IosSettingsWidget(QWidget *parent) - : QWidget(parent), - m_ui(new Ui::IosSettingsWidget), +IosSettingsWidget::IosSettingsWidget() + : m_ui(new Ui::IosSettingsWidget), m_simControl(new SimulatorControl(this)) { m_ui->setupUi(this); diff --git a/src/plugins/ios/iossettingswidget.h b/src/plugins/ios/iossettingswidget.h index d0dc9d0af4..535a04f45e 100644 --- a/src/plugins/ios/iossettingswidget.h +++ b/src/plugins/ios/iossettingswidget.h @@ -33,15 +33,13 @@ namespace Ios { namespace Internal { namespace Ui { class IosSettingsWidget; } -class SimulatorInfoModel; -using SimulatorInfoList = QList<SimulatorInfo>; class IosSettingsWidget : public QWidget { Q_OBJECT public: - IosSettingsWidget(QWidget *parent = nullptr); + IosSettingsWidget(); ~IosSettingsWidget() override; void saveSettings(); diff --git a/src/plugins/nim/settings/nimcodestylesettingspage.cpp b/src/plugins/nim/settings/nimcodestylesettingspage.cpp index 0c3d6dd0f2..d93f4d3ed0 100644 --- a/src/plugins/nim/settings/nimcodestylesettingspage.cpp +++ b/src/plugins/nim/settings/nimcodestylesettingspage.cpp @@ -42,9 +42,8 @@ using namespace TextEditor; namespace Nim { -NimCodeStyleSettingsPage::NimCodeStyleSettingsPage(QWidget *parent) - : Core::IOptionsPage(parent) - , m_nimCodeStylePreferences(nullptr) +NimCodeStyleSettingsPage::NimCodeStyleSettingsPage() + : m_nimCodeStylePreferences(nullptr) , m_widget(nullptr) { setId(Nim::Constants::C_NIMCODESTYLESETTINGSPAGE_ID); diff --git a/src/plugins/nim/settings/nimcodestylesettingspage.h b/src/plugins/nim/settings/nimcodestylesettingspage.h index 5f492c4ad0..2f1f779ecb 100644 --- a/src/plugins/nim/settings/nimcodestylesettingspage.h +++ b/src/plugins/nim/settings/nimcodestylesettingspage.h @@ -41,7 +41,7 @@ class NimCodeStyleSettingsPage : public Core::IOptionsPage Q_OBJECT public: - explicit NimCodeStyleSettingsPage(QWidget *parent = nullptr); + NimCodeStyleSettingsPage(); ~NimCodeStyleSettingsPage() override; QWidget *widget() override; diff --git a/src/plugins/projectexplorer/devicesupport/devicesettingspage.cpp b/src/plugins/projectexplorer/devicesupport/devicesettingspage.cpp index 26d3f968e7..06344e68ba 100644 --- a/src/plugins/projectexplorer/devicesupport/devicesettingspage.cpp +++ b/src/plugins/projectexplorer/devicesupport/devicesettingspage.cpp @@ -35,8 +35,7 @@ namespace ProjectExplorer { namespace Internal { -DeviceSettingsPage::DeviceSettingsPage(QObject *parent) - : Core::IOptionsPage(parent) +DeviceSettingsPage::DeviceSettingsPage() { setId(Constants::DEVICE_SETTINGS_PAGE_ID); setDisplayName(tr("Devices")); diff --git a/src/plugins/projectexplorer/devicesupport/devicesettingspage.h b/src/plugins/projectexplorer/devicesupport/devicesettingspage.h index d652ad3c50..1bb167a19d 100644 --- a/src/plugins/projectexplorer/devicesupport/devicesettingspage.h +++ b/src/plugins/projectexplorer/devicesupport/devicesettingspage.h @@ -39,7 +39,7 @@ class DeviceSettingsPage : public Core::IOptionsPage Q_OBJECT public: - DeviceSettingsPage(QObject *parent = nullptr); + DeviceSettingsPage(); QWidget *widget() override; void apply() override; diff --git a/src/plugins/projectexplorer/devicesupport/devicesettingswidget.cpp b/src/plugins/projectexplorer/devicesupport/devicesettingswidget.cpp index af42589622..f33607b5c9 100644 --- a/src/plugins/projectexplorer/devicesupport/devicesettingswidget.cpp +++ b/src/plugins/projectexplorer/devicesupport/devicesettingswidget.cpp @@ -85,9 +85,8 @@ private: const DeviceManager * const m_deviceManager; }; -DeviceSettingsWidget::DeviceSettingsWidget(QWidget *parent) - : QWidget(parent), - m_ui(new Ui::DeviceSettingsWidget), +DeviceSettingsWidget::DeviceSettingsWidget() + : m_ui(new Ui::DeviceSettingsWidget), m_deviceManager(DeviceManager::cloneInstance()), m_deviceManagerModel(new DeviceManagerModel(m_deviceManager, this)), m_nameValidator(new NameValidator(m_deviceManager, this)), diff --git a/src/plugins/projectexplorer/devicesupport/devicesettingswidget.h b/src/plugins/projectexplorer/devicesupport/devicesettingswidget.h index a7961e145d..8c2affa802 100644 --- a/src/plugins/projectexplorer/devicesupport/devicesettingswidget.h +++ b/src/plugins/projectexplorer/devicesupport/devicesettingswidget.h @@ -49,7 +49,7 @@ class DeviceSettingsWidget : public QWidget { Q_OBJECT public: - DeviceSettingsWidget(QWidget *parent = nullptr); + DeviceSettingsWidget(); ~DeviceSettingsWidget() override; void saveSettings(); diff --git a/src/plugins/projectexplorer/devicesupport/sshsettingspage.cpp b/src/plugins/projectexplorer/devicesupport/sshsettingspage.cpp index 152467c93e..289820d437 100644 --- a/src/plugins/projectexplorer/devicesupport/sshsettingspage.cpp +++ b/src/plugins/projectexplorer/devicesupport/sshsettingspage.cpp @@ -74,7 +74,7 @@ private: bool m_keygenPathChanged = false; }; -SshSettingsPage::SshSettingsPage(QObject *parent) : Core::IOptionsPage(parent) +SshSettingsPage::SshSettingsPage() { setId(Constants::SSH_SETTINGS_PAGE_ID); setDisplayName(tr("SSH")); diff --git a/src/plugins/projectexplorer/devicesupport/sshsettingspage.h b/src/plugins/projectexplorer/devicesupport/sshsettingspage.h index 3c6167bba7..14e7f00acb 100644 --- a/src/plugins/projectexplorer/devicesupport/sshsettingspage.h +++ b/src/plugins/projectexplorer/devicesupport/sshsettingspage.h @@ -39,7 +39,7 @@ class SshSettingsPage : public Core::IOptionsPage Q_OBJECT public: - SshSettingsPage(QObject *parent = nullptr); + SshSettingsPage(); private: QWidget *widget() override; diff --git a/src/plugins/qbsprojectmanager/qbsprofilessettingspage.cpp b/src/plugins/qbsprojectmanager/qbsprofilessettingspage.cpp index 5a79d42062..3f3fe351ce 100644 --- a/src/plugins/qbsprojectmanager/qbsprofilessettingspage.cpp +++ b/src/plugins/qbsprojectmanager/qbsprofilessettingspage.cpp @@ -52,7 +52,7 @@ class QbsProfilesSettingsWidget : public QWidget { Q_OBJECT public: - QbsProfilesSettingsWidget(QWidget *parent = nullptr); + QbsProfilesSettingsWidget(); void apply(); @@ -64,10 +64,8 @@ private: qbs::SettingsModel m_model; }; -QbsProfilesSettingsPage::QbsProfilesSettingsPage(QObject *parent) - : Core::IOptionsPage(parent) - , m_useQtcSettingsDirPersistent(QbsProjectManagerSettings::useCreatorSettingsDirForQbs()) - +QbsProfilesSettingsPage::QbsProfilesSettingsPage() + : m_useQtcSettingsDirPersistent(QbsProjectManagerSettings::useCreatorSettingsDirForQbs()) { setId("Y.QbsProfiles"); setDisplayName(QCoreApplication::translate("QbsProjectManager", "Qbs")); @@ -97,9 +95,8 @@ void QbsProfilesSettingsPage::finish() } -QbsProfilesSettingsWidget::QbsProfilesSettingsWidget(QWidget *parent) - : QWidget(parent) - , m_model(QbsProjectManagerSettings::qbsSettingsBaseDir(), qbs::Settings::UserScope) +QbsProfilesSettingsWidget::QbsProfilesSettingsWidget() + : m_model(QbsProjectManagerSettings::qbsSettingsBaseDir(), qbs::Settings::UserScope) { m_model.setEditable(false); m_ui.setupUi(this); diff --git a/src/plugins/qbsprojectmanager/qbsprofilessettingspage.h b/src/plugins/qbsprojectmanager/qbsprofilessettingspage.h index f146b92c72..6227c6f999 100644 --- a/src/plugins/qbsprojectmanager/qbsprofilessettingspage.h +++ b/src/plugins/qbsprojectmanager/qbsprofilessettingspage.h @@ -34,7 +34,7 @@ class QbsProfilesSettingsWidget; class QbsProfilesSettingsPage : public Core::IOptionsPage { public: - QbsProfilesSettingsPage(QObject *parent = nullptr); + QbsProfilesSettingsPage(); private: QWidget *widget() override; diff --git a/src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.cpp b/src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.cpp index 93bbd892b7..bc123b09c7 100644 --- a/src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.cpp +++ b/src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.cpp @@ -90,7 +90,7 @@ public: QbsBuildStepFactory buildStepFactory; QbsCleanStepFactory cleanStepFactory; QbsInstallStepFactory installStepFactory; - QbsProfilesSettingsPage profilesSetttingsPage; + QbsProfilesSettingsPage profilesSettingsPage; QbsKitAspect qbsKitAspect; }; diff --git a/src/plugins/qmljseditor/qmljseditingsettingspage.cpp b/src/plugins/qmljseditor/qmljseditingsettingspage.cpp index 4958cfcba5..7aea17c315 100644 --- a/src/plugins/qmljseditor/qmljseditingsettingspage.cpp +++ b/src/plugins/qmljseditor/qmljseditingsettingspage.cpp @@ -123,8 +123,7 @@ void QmlJsEditingSettings::setAutoFormatOnlyCurrentProject(const bool autoFormat m_autoFormatOnlyCurrentProject = autoFormatOnlyCurrentProject; } -QmlJsEditingSettignsPageWidget::QmlJsEditingSettignsPageWidget(QWidget *parent) : - QWidget(parent) +QmlJsEditingSettignsPageWidget::QmlJsEditingSettignsPageWidget() { m_ui.setupUi(this); } diff --git a/src/plugins/qmljseditor/qmljseditingsettingspage.h b/src/plugins/qmljseditor/qmljseditingsettingspage.h index dd3010e0f2..0be399b3d5 100644 --- a/src/plugins/qmljseditor/qmljseditingsettingspage.h +++ b/src/plugins/qmljseditor/qmljseditingsettingspage.h @@ -82,7 +82,7 @@ class QmlJsEditingSettignsPageWidget : public QWidget Q_OBJECT public: - explicit QmlJsEditingSettignsPageWidget(QWidget *parent = nullptr); + QmlJsEditingSettignsPageWidget(); QmlJsEditingSettings settings() const; void setSettings(const QmlJsEditingSettings &); diff --git a/src/plugins/qmljstools/qmljscodestylesettingspage.cpp b/src/plugins/qmljstools/qmljscodestylesettingspage.cpp index 2de503b782..6379ffafc4 100644 --- a/src/plugins/qmljstools/qmljscodestylesettingspage.cpp +++ b/src/plugins/qmljstools/qmljscodestylesettingspage.cpp @@ -121,9 +121,7 @@ void QmlJSCodeStylePreferencesWidget::updatePreview() // ------------------ CppCodeStyleSettingsPage -QmlJSCodeStyleSettingsPage::QmlJSCodeStyleSettingsPage(/*QSharedPointer<CppFileSettings> &settings,*/ - QWidget *parent) : - Core::IOptionsPage(parent) +QmlJSCodeStyleSettingsPage::QmlJSCodeStyleSettingsPage() { setId(Constants::QML_JS_CODE_STYLE_SETTINGS_ID); setDisplayName(QCoreApplication::translate("QmlJSTools", Constants::QML_JS_CODE_STYLE_SETTINGS_NAME)); diff --git a/src/plugins/qmljstools/qmljscodestylesettingspage.h b/src/plugins/qmljstools/qmljscodestylesettingspage.h index c68f5a8eaf..cdafb430fc 100644 --- a/src/plugins/qmljstools/qmljscodestylesettingspage.h +++ b/src/plugins/qmljstools/qmljscodestylesettingspage.h @@ -71,7 +71,7 @@ class QmlJSCodeStyleSettingsPage : public Core::IOptionsPage Q_OBJECT public: - explicit QmlJSCodeStyleSettingsPage(QWidget *parent = nullptr); + QmlJSCodeStyleSettingsPage(); QWidget *widget() override; void apply() override; diff --git a/src/plugins/qmlprofiler/qmlprofilerconfigwidget.cpp b/src/plugins/qmlprofiler/qmlprofilerconfigwidget.cpp index 37994fd436..3eea277525 100644 --- a/src/plugins/qmlprofiler/qmlprofilerconfigwidget.cpp +++ b/src/plugins/qmlprofiler/qmlprofilerconfigwidget.cpp @@ -29,8 +29,8 @@ namespace QmlProfiler { namespace Internal { -QmlProfilerConfigWidget::QmlProfilerConfigWidget(QmlProfilerSettings *settings, QWidget *parent) : - QWidget(parent), m_ui(new Ui::QmlProfilerConfigWidget), m_settings(settings) +QmlProfilerConfigWidget::QmlProfilerConfigWidget(QmlProfilerSettings *settings) : + m_ui(new Ui::QmlProfilerConfigWidget), m_settings(settings) { m_ui->setupUi(this); updateUi(); diff --git a/src/plugins/qmlprofiler/qmlprofilerconfigwidget.h b/src/plugins/qmlprofiler/qmlprofilerconfigwidget.h index 63e24c64c7..cc80849f85 100644 --- a/src/plugins/qmlprofiler/qmlprofilerconfigwidget.h +++ b/src/plugins/qmlprofiler/qmlprofilerconfigwidget.h @@ -41,7 +41,7 @@ class QmlProfilerConfigWidget : public QWidget Q_OBJECT public: - explicit QmlProfilerConfigWidget(QmlProfilerSettings *settings, QWidget *parent = nullptr); + explicit QmlProfilerConfigWidget(QmlProfilerSettings *settings); ~QmlProfilerConfigWidget() override; private: diff --git a/src/plugins/qnx/qnxsettingspage.cpp b/src/plugins/qnx/qnxsettingspage.cpp index 2b488887dd..f9a8aaa53b 100644 --- a/src/plugins/qnx/qnxsettingspage.cpp +++ b/src/plugins/qnx/qnxsettingspage.cpp @@ -39,8 +39,7 @@ namespace Qnx { namespace Internal { -QnxSettingsPage::QnxSettingsPage(QObject* parent) : - Core::IOptionsPage(parent) +QnxSettingsPage::QnxSettingsPage() { setId(Core::Id(Constants::QNX_SETTINGS_ID)); setDisplayName(tr("QNX")); diff --git a/src/plugins/qnx/qnxsettingspage.h b/src/plugins/qnx/qnxsettingspage.h index ae7be9bb2f..c04f238d32 100644 --- a/src/plugins/qnx/qnxsettingspage.h +++ b/src/plugins/qnx/qnxsettingspage.h @@ -37,8 +37,10 @@ class QnxSettingsWidget; class QnxSettingsPage : public Core::IOptionsPage { Q_OBJECT + public: - explicit QnxSettingsPage(QObject *parent = nullptr); + QnxSettingsPage(); + QWidget *widget() override; void apply() override; void finish() override; diff --git a/src/plugins/qtsupport/codegensettingspage.cpp b/src/plugins/qtsupport/codegensettingspage.cpp index 8f45c02a14..39e23e68c4 100644 --- a/src/plugins/qtsupport/codegensettingspage.cpp +++ b/src/plugins/qtsupport/codegensettingspage.cpp @@ -38,8 +38,7 @@ namespace Internal { // ---------- CodeGenSettingsPageWidget -CodeGenSettingsPageWidget::CodeGenSettingsPageWidget(QWidget *parent) : - QWidget(parent) +CodeGenSettingsPageWidget::CodeGenSettingsPageWidget() { m_ui.setupUi(this); connect(m_ui.includeQtModuleCheckBox, &QAbstractButton::toggled, @@ -89,8 +88,7 @@ void CodeGenSettingsPageWidget::setUiEmbedding(int v) } // ---------- CodeGenSettingsPage -CodeGenSettingsPage::CodeGenSettingsPage(QObject *parent) : - Core::IOptionsPage(parent) +CodeGenSettingsPage::CodeGenSettingsPage() { m_parameters.fromSettings(Core::ICore::settings()); setId(Constants::CODEGEN_SETTINGS_PAGE_ID); diff --git a/src/plugins/qtsupport/codegensettingspage.h b/src/plugins/qtsupport/codegensettingspage.h index b6987824c8..68aee7db29 100644 --- a/src/plugins/qtsupport/codegensettingspage.h +++ b/src/plugins/qtsupport/codegensettingspage.h @@ -40,7 +40,7 @@ class CodeGenSettingsPageWidget : public QWidget { Q_OBJECT public: - explicit CodeGenSettingsPageWidget(QWidget *parent = nullptr); + CodeGenSettingsPageWidget(); CodeGenSettings parameters() const; void setParameters(const CodeGenSettings &p); @@ -55,7 +55,7 @@ private: class CodeGenSettingsPage : public Core::IOptionsPage { public: - explicit CodeGenSettingsPage(QObject *parent = nullptr); + CodeGenSettingsPage(); QWidget *widget() override; void apply() override; diff --git a/src/plugins/todo/optionsdialog.cpp b/src/plugins/todo/optionsdialog.cpp index 706f67cd18..d4b1860c8d 100644 --- a/src/plugins/todo/optionsdialog.cpp +++ b/src/plugins/todo/optionsdialog.cpp @@ -34,8 +34,7 @@ namespace Todo { namespace Internal { -OptionsDialog::OptionsDialog(QWidget *parent) : - QWidget(parent), +OptionsDialog::OptionsDialog() : ui(new Ui::OptionsDialog) { ui->setupUi(this); diff --git a/src/plugins/todo/optionsdialog.h b/src/plugins/todo/optionsdialog.h index 716bdd5fd2..7f48ff2616 100644 --- a/src/plugins/todo/optionsdialog.h +++ b/src/plugins/todo/optionsdialog.h @@ -43,7 +43,7 @@ class Keyword; class OptionsDialog : public QWidget { public: - explicit OptionsDialog(QWidget *parent = nullptr); + OptionsDialog(); ~OptionsDialog() override; void setSettings(const Settings &settings); |